1 files changed, 7 insertions, 7 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
index 2f7bdc7f..4e1eda9f 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
@@ -22,13 +22,12 @@
 
 package org.onap.policy.common.endpoints.http.server.internal;
 
-import io.prometheus.client.exporter.MetricsServlet;
 import io.prometheus.client.hotspot.DefaultExports;
+import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
+import jakarta.servlet.Servlet;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.DispatcherType;
-import javax.servlet.Servlet;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -72,7 +71,7 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
     /**
      * Logger.
      */
-    private static Logger logger = LoggerFactory.getLogger(JettyServletServer.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyServletServer.class);
 
     private static final String NOT_SUPPORTED = " is not supported on this type of jetty server";
 
@@ -101,7 +100,7 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
     protected boolean sniHostCheck;
 
     /**
-     * Server auth user name.
+     * Server auth username.
      */
     @Getter
     protected String user;
@@ -146,7 +145,7 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
      * Start condition.
      */
     @ToString.Exclude
-    protected Object startCondition = new Object();
+    protected final Object startCondition = new Object();
 
     /**
      * Constructor.
@@ -227,7 +226,8 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
             tempFilterPath = "/*";
         }
 
-        context.addFilter(filterClass, tempFilterPath, EnumSet.of(DispatcherType.INCLUDE, DispatcherType.REQUEST));
+        context.addFilter(filterClass, tempFilterPath,
+            EnumSet.of(jakarta.servlet.DispatcherType.INCLUDE, jakarta.servlet.DispatcherType.REQUEST));
     }
 
     protected ServletHolder getServlet(@NonNull Class<? extends Servlet> servlet, @NonNull String servletPath) {