X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fserver%2FJettyServer.java;h=a33e8ec4a6e4e4cb36fc0931c646c52c0bde5b46;hb=a2d44c58079fb01dacfd0177e625c97c25259cc1;hp=52d7570d9c6ec17e07ab058c6f710368ffbf0951;hpb=71d3d0925874247de5e657821638b1c08360f571;p=dmaap%2Fbuscontroller.git

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..a33e8ec 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
@@ -22,9 +22,9 @@
 
 package org.onap.dmaap.dbcapi.server;
 
-import com.google.common.collect.Sets;
+import jakarta.servlet.DispatcherType;
+import java.util.EnumSet;
 import java.util.Properties;
-import javax.servlet.DispatcherType;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -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.Server 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("/");
@@ -121,17 +112,18 @@ public class JettyServer extends BaseLoggingClass {
             .addServlet(org.glassfish.jersey.servlet.ServletContainer.class, "/webapi/*");
         jerseyServlet.setInitOrder(1);
         jerseyServlet.setInitParameter("jersey.config.server.provider.packages", "org.onap.dmaap.dbcapi.resources");
-        jerseyServlet.setInitParameter("javax.ws.rs.Application", "org.onap.dmaap.dbcapi.server.ApplicationConfig");
+        jerseyServlet.setInitParameter("jakarta.ws.rs.Application", "org.onap.dmaap.dbcapi.server.ApplicationConfig");
 
         // also serve up some static pages...
         ServletHolder staticServlet = context.addServlet(DefaultServlet.class, "/*");
         staticServlet.setInitParameter("resourceBase", "www");
         staticServlet.setInitParameter("pathInfoOnly", "true");
 
-        registerAuthFilters(context);
+        if (Boolean.parseBoolean(params.getProperty("enableCADI", "false"))) {
+            registerAuthFilters(context);
+        }
 
         try {
-
             serverLogger.info("Starting jetty server");
             String unitTest = params.getProperty("UnitTest", "No");
             serverLogger.info("UnitTest=" + unitTest);
@@ -145,14 +137,13 @@ public class JettyServer extends BaseLoggingClass {
         } finally {
             server.destroy();
         }
-
     }
 
     private void registerAuthFilters(ServletContextHandler context) {
-        context.addFilter("org.onap.dmaap.dbcapi.resources.AAFAuthenticationFilter", "/webapi/*",
-            Sets.newEnumSet(Sets.newHashSet(DispatcherType.FORWARD, DispatcherType.REQUEST), DispatcherType.class));
-        context.addFilter("org.onap.dmaap.dbcapi.resources.AAFAuthorizationFilter", "/webapi/*",
-            Sets.newEnumSet(Sets.newHashSet(DispatcherType.FORWARD, DispatcherType.REQUEST), DispatcherType.class));
+        context.addFilter("org.onap.dmaap.dbcapi.resources.AAFAuthenticationFilter", "/webapi/*", EnumSet.of(
+            DispatcherType.FORWARD, DispatcherType.REQUEST));
+        context.addFilter("org.onap.dmaap.dbcapi.resources.AAFAuthorizationFilter", "/webapi/*", EnumSet.of(
+            DispatcherType.FORWARD, DispatcherType.REQUEST));
     }
 
     private void setUpKeystore(SslContextFactory sslContextFactory) {