diff options
author | efiacor <fiachra.corcoran@est.tech> | 2022-12-09 07:28:54 +0000 |
---|---|---|
committer | efiacor <fiachra.corcoran@est.tech> | 2022-12-12 13:26:46 +0000 |
commit | a4d9c6bfc2a648a6892e94ad45e8ab9f64327dc4 (patch) | |
tree | 7d4be952e5c571ebb3d63c7965ea0437a77916db /dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java | |
parent | 86532163d19990e3acfa645a367ed0e0a1c787e0 (diff) |
[DMAAP-BC] Add http connect to Data Router2.0.11
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I71991bab2987a99e5cb9fd5ca79583d7f3566efa
Issue-ID: DMAAP-1643
Diffstat (limited to 'dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java')
-rw-r--r-- | dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java b/dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java index 52d7570..2f2ac00 100644 --- a/dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java +++ b/dmaap-bc/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java @@ -51,7 +51,6 @@ public class JettyServer extends BaseLoggingClass { new CertficateManagerFactory(DmaapConfig.getConfig()).initCertificateManager(); private final Server server; - public Server getServer() { return server; } @@ -61,37 +60,30 @@ public class JettyServer extends BaseLoggingClass { } public JettyServer(Properties params) { - server = new Server(); int httpPort = Integer.parseInt(params.getProperty("IntHttpPort", "80")); int sslPort = Integer.parseInt(params.getProperty("IntHttpsPort", "443")); boolean allowHttp = Boolean.parseBoolean(params.getProperty("HttpAllowed", "false")); serverLogger.info("port params: http=" + httpPort + " https=" + sslPort); serverLogger.info("allowHttp=" + allowHttp); - // HTTP Server HttpConfiguration httpConfig = new HttpConfiguration(); httpConfig.setSecureScheme("https"); httpConfig.setSecurePort(sslPort); httpConfig.setOutputBufferSize(32768); - try (ServerConnector httpConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig))) { httpConnector.setPort(httpPort); httpConnector.setIdleTimeout(30000); - // HTTPS Server HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); httpsConfig.addCustomizer(new SecureRequestCustomizer()); SslContextFactory sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setWantClientAuth(true); - - if ( ! certificateManager.isReady()) { + if (!certificateManager.isReady()) { serverLogger.error("CertificateManager is not ready. NOT starting https!"); } else { setUpKeystore(sslContextFactory); setUpTrustStore(sslContextFactory); - - if (sslPort != 0) { try (ServerConnector sslConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), @@ -111,7 +103,6 @@ public class JettyServer extends BaseLoggingClass { serverLogger.info("NOT starting httpConnector because HttpAllowed param is " + allowHttp); } } - // Set context for servlet. This is shared for http and https ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/"); |