LightPIT: comparison src/main/java/de/uapcore/lightpit/DatabaseFacade.java

-:fd8c40ff78c3
+:824d4042c857
 /*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2018 Mike Becker. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 *   1. Redistributions of source code must retain the above copyright
 *      notice, this list of conditions and the following disclaimer.
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 */
 package de.uapcore.lightpit;
+import de.uapcore.lightpit.dao.DataAccessObjects;
+import de.uapcore.lightpit.dao.postgres.PGDataAccessObjects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 /**
 * Timeout in seconds for the validation test.
 */
 private static final int DB_TEST_TIMEOUT = 10;
+/**
+* Specifies the database dialect.
+*/
 public enum Dialect {
 Postgres
 }
 /**
 * The database dialect to use.
 * <p>
-* May be override by context parameter.
+* May be overridden by context parameter.
 *
 * @see Constants#CTX_ATTR_DB_DIALECT
 */
 private Dialect dialect = Dialect.Postgres;
 /**
 * The default schema to test against when validating the connection.
-*
+* <p>
 * May be overridden by context parameter.
 *
 * @see Constants#CTX_ATTR_DB_SCHEMA
 */
 private static final String DB_DEFAULT_SCHEMA = "lightpit";
 /**
 * The attribute name in the Servlet context under which an instance of this class can be found.
 */
 public static final String SC_ATTR_NAME = DatabaseFacade.class.getName();
 private static final String DS_JNDI_NAME = "jdbc/lightpit/app";
 private DataSource dataSource;
+private DataAccessObjects dataAccessObjects;
 /**
 * Returns the data source.
-*
+* <p>
 * The Optional returned should never be empty. However, if something goes
 * wrong during initialization, the data source might be absent.
 * Hence, users of this data source are forced to check the existence.
 *
 * @return a data source
 */
 public Optional<DataSource> getDataSource() {
 // TODO: this should not be an optional, if an empty optional is actually an exception
 return Optional.ofNullable(dataSource);
 }
+/**
+* Returns the data access objects.
+*
+* @return an interface to obtain the data access objects
+*/
+public DataAccessObjects getDataAccessObjects() {
+return dataAccessObjects;
+}
 public Dialect getSQLDialect() {
 return dialect;
 }
 private static void checkConnection(DataSource ds, String testSchema) {
 }
 @Override
 public void contextInitialized(ServletContextEvent sce) {
 ServletContext sc = sce.getServletContext();
 dataSource = null;
 final String contextName = Optional
 .ofNullable(sc.getInitParameter(Constants.CTX_ATTR_JNDI_CONTEXT))
 .orElse("java:comp/env");
 final String dbSchema = Optional
 .ofNullable(sc.getInitParameter(Constants.CTX_ATTR_DB_SCHEMA))
 } catch (IllegalArgumentException ex) {
 LOG.error("Unknown or unsupported database dialect {}. Defaulting to {}.", dbDialect, dialect);
 }
 }
+dataAccessObjects = createDataAccessObjects(dialect);
 try {
 LOG.debug("Trying to access JNDI context {}...", contextName);
 Context initialCtx = new InitialContext();
 Context ctx = (Context) initialCtx.lookup(contextName);
 checkConnection(dataSource, dbSchema);
 }
 } catch (NamingException | ClassCastException ex) {
 LOG.error("Cannot access JNDI resources.", ex);
 }
 sc.setAttribute(SC_ATTR_NAME, this);
 LOG.info("Database facade injected into ServletContext.");
+}
+private static DataAccessObjects createDataAccessObjects(Dialect dialect) {
+switch (dialect) {
+case Postgres:
+return new PGDataAccessObjects();
+default:
+throw new AssertionError("Non-exhaustive switch - this is a bug.");
+}
 }
 @Override
 public void contextDestroyed(ServletContextEvent sce) {
 dataSource = null;
 }
 }

Mercurial > hg > LightPIT / file comparison

comparison: src/main/java/de/uapcore/lightpit/DatabaseFacade.java

src/main/java/de/uapcore/lightpit/DatabaseFacade.java