Merge changes from topic 'required_checker'

* changes:
  Extract required(...) method
  Extract class StopWatch from ApiService

diff --git a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
index 81c08b2..4b578b4 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
@@ -53,12 +53,8 @@ public class JettyServer extends BaseLoggingClass {
                boolean allowHttp = Boolean.valueOf(params.getProperty("HttpAllowed", "false"));
        serverLogger.info( "port params: http=" + httpPort + " https=" + sslPort );
        serverLogger.info( "allowHttp=" + allowHttp );
-        String keystore=null;
-        String keystorePwd = null;
-        String keyPwd = null;
-        
-        // HTTP Server
 
+               // HTTP Server
        HttpConfiguration http_config = new HttpConfiguration();
        http_config.setSecureScheme("https");
        http_config.setSecurePort(sslPort);
@@ -76,16 +72,9 @@ public class JettyServer extends BaseLoggingClass {
                        HttpConfiguration https_config = new HttpConfiguration(http_config);
                        https_config.addCustomizer(new SecureRequestCustomizer());
                        SslContextFactory sslContextFactory = new SslContextFactory();
-                       keystore = params.getProperty("KeyStoreFile", "etc/keystore");
-                       logger.info("https Server using keystore at " + keystore);
-                       keystorePwd = params.getProperty("KeyStorePassword", "changeit");
-                       keyPwd = params.getProperty("KeyPassword", "changeit");
-
-
-                       sslContextFactory.setKeyStorePath(keystore);
-                       sslContextFactory.setKeyStorePassword(keystorePwd);
-                       sslContextFactory.setKeyManagerPassword(keyPwd);
 
+                       setUpKeystore(params, sslContextFactory);
+                       setUpTrustStore(params, sslContextFactory);
 
                        if (sslPort != 0) {
                 try(ServerConnector sslConnector = new ServerConnector(server,
@@ -110,7 +99,7 @@ public class JettyServer extends BaseLoggingClass {
                                }
                        }
                }
- 
+
         // Set context for servlet.  This is shared for http and https
                ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
        context.setContextPath("/");
@@ -138,11 +127,25 @@ public class JettyServer extends BaseLoggingClass {
                        }
         } catch ( Exception e ) {
                errorLogger.error( "Exception " + e );
-               errorLogger.error( "possibly unable to use keystore " + keystore + " with passwords " + keystorePwd +  " and " + keyPwd );
-               //System.exit(1);
         } finally {
                server.destroy();
         }
         
     }
+
+       private void setUpKeystore(Properties params, SslContextFactory sslContextFactory) {
+               String keystore = params.getProperty("KeyStoreFile", "etc/keystore");
+               logger.info("https Server using keystore at " + keystore);
+               sslContextFactory.setKeyStorePath(keystore);
+               sslContextFactory.setKeyStorePassword(params.getProperty("KeyStorePassword", "changeit"));
+               sslContextFactory.setKeyManagerPassword(params.getProperty("KeyPassword", "changeit"));
+       }
+
+       private void setUpTrustStore(Properties params, SslContextFactory sslContextFactory) {
+               String truststore = params.getProperty("TrustStoreFile", "etc/org.onap.dmaap-bc.trust.jks");
+               logger.info("https Server using truststore at " + truststore);
+               sslContextFactory.setTrustStorePath(truststore);
+               sslContextFactory.setTrustStoreType(params.getProperty("TrustStoreType", "jks"));
+               sslContextFactory.setTrustStorePassword(params.getProperty("TrustStorePassword", "changeit"));
+       }
 }

diff --git a/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java
index dc2bb2f..af44db0 100644 (file)
--- a/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java
@@ -71,7 +71,7 @@ public class TableHandlerTest {
        public void test1() {
 
 
-               //rh.reflect( "org.onap.dmaap.dbcapi.aaf.client.MrTopicConnection", "get", "idNotSet@namespaceNotSet:pwdNotSet" );      
+               rh.reflect( "org.onap.dmaap.dbcapi.aaf.client.MrTopicConnection", "get", "idNotSet@namespaceNotSet:pwdNotSet" );        
        
        }
 
@@ -84,17 +84,21 @@ public class TableHandlerTest {
 
        @Test
        public void test3() {
-               TableHandler.setSpecialCase("topic", "replication_case", new TopicReplicationTypeHandler());
+               DBFieldHandler.SqlOp trth = new TopicReplicationTypeHandler();
+               TableHandler.setSpecialCase("topic", "replication_case", trth);
 
                try {
                ConnectionFactory cf = new ConnectionFactory();
                TableHandler th = new TableHandler( cf, TopicReplicationTypeHandler.class, "foo", "bar" );
+               DBFieldHandler.SqlOp t = th.getSpecialCase( "foo", "bar" );
+               assert( trth == t );
                } catch (Exception e ) {
                }
                try {
-               ConnectionFactory cf = new ConnectionFactory();
+
                TableHandler th = new TableHandler( TopicReplicationTypeHandler.class, "foo", "bar" );
-               th.getSpecialCase( "foo", "bar" );
+               DBFieldHandler.SqlOp t = th.getSpecialCase( "foo", "bar" );
+               assert( trth == t );
                } catch (Exception e ) {
                }