diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..d029f52f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = tab +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index cc23d672..e650b510 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -13,19 +13,20 @@ jobs: os: - ubuntu-latest java: - - 17 - - 21 - 25 name: Java ${{ matrix.java }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v6 - - name: Setup Java ${{ matrix.java }} + - name: Setup Java uses: actions/setup-java@v5 with: - java-version: ${{ matrix.java }} + java-version: | + 17 + 21 + 25 distribution: 'temurin' cache: maven - name: Verify - run: mvn --batch-mode verify + run: mvn --batch-mode --no-transfer-progress verify -P lts diff --git a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java index 64af0a37..2c26bdf5 100644 --- a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java +++ b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java @@ -219,7 +219,7 @@ public ClassLoader getClassLoader() { Contextualizer contextualizer = Contextualizer.withContextProvider(ThreadContextClassLoaderReference.CURRENT.provide(context.getLoader().getClassLoader())); ContainerProvider provider = new ServletContainerProvider<>(); AtomicReference> sessionManagerReference = new AtomicReference<>(); - Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getDetachableSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); + Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); Supplier identifierFactory = new CatalinaIdentifierFactory(this.getSessionIdGenerator()); SessionManagerConfiguration sessionManagerConfiguration = new SessionManagerConfiguration<>() { @@ -240,7 +240,7 @@ public Supplier getIdentifierFactory() { @Override public Consumer getExpirationListener() { - return Consumer.empty().andThen(contextualizer.contextualize(destroyNotifier)); + return Consumer.of().andThen(contextualizer.contextualize(destroyNotifier)); } }; sessionManagerReference.setPlain(managerFactory.createSessionManager(sessionManagerConfiguration)); diff --git a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java index 1b199a71..a0d9a511 100644 --- a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java +++ b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java @@ -137,7 +137,7 @@ private org.apache.catalina.Session getSession(BiFunction createBatchEntry() { } private static org.apache.catalina.Session close(Supplier batchProvider, Runnable closeTask) { - return close(batchProvider, Consumer.empty(), closeTask); + return close(batchProvider, Consumer.of(), closeTask); } private static org.apache.catalina.Session close(Supplier batchProvider, Consumer batchTask, Runnable closeTask) { diff --git a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java index 1b47ff7c..4fbcb02d 100644 --- a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java +++ b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java @@ -107,7 +107,7 @@ public void setMaxInactiveInterval(int interval) { @Override public void invalidate() { Session session = this.reference.get(); - HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getDetachableSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); + HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this.manager, event); this.close(session, Session::invalidate); } diff --git a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java index 136f4959..663f282f 100644 --- a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java +++ b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java @@ -25,6 +25,10 @@ public class SessionCookieValve extends ValveBase { private static final VarHandle SESSION = findSessionField(); + /** Creates a new valve */ + public SessionCookieValve() { + } + private static VarHandle findSessionField() { try { return MethodHandles.privateLookupIn(Request.class, MethodHandles.lookup()).findVarHandle(Request.class, "session", Session.class); @@ -33,10 +37,6 @@ private static VarHandle findSessionField() { } } - /** Creates a new valve */ - public SessionCookieValve() { - } - @Override public void invoke(Request request, Response response) throws IOException, ServletException { try { diff --git a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java index e06a8941..e4166a90 100644 --- a/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java +++ b/10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java @@ -59,7 +59,7 @@ protected void removeSession(String ssoId, Session session) { try (User sso = this.manager.findUser(ssoId)) { if (sso != null) { sso.getSessions().removeSession(getDeployment(session.getManager())); - if (sso.getSessions().getDeployments().isEmpty()) { + if (sso.getSessions().getSessions().isEmpty()) { sso.invalidate(); } } diff --git a/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java b/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java index 1b64e49c..a6ec5d56 100644 --- a/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java +++ b/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java @@ -57,8 +57,8 @@ public void setAddress(String address) { } @Override - public void renameThread(String base_name, Thread thread) { - this.factory.renameThread(base_name, thread); + public void renameThread(String baseName, Thread thread) { + this.factory.renameThread(baseName, thread); } @Override diff --git a/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java b/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java index e67f9b19..8ca81299 100644 --- a/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java +++ b/10.1/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java @@ -87,7 +87,7 @@ public class InfinispanManager extends AbstractManager { private static final AtomicInteger COUNTER = new AtomicInteger(0); private volatile String resourceName = "infinispan.xml"; - private volatile String cacheName = null; + private volatile String cacheName; /** * Creates a distributed manager. diff --git a/10.1/infinispan/embedded/src/test/resources/tomcat/server.xml b/10.1/infinispan/embedded/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/10.1/infinispan/embedded/src/test/resources/tomcat/server.xml +++ b/10.1/infinispan/embedded/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/10.1/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/10.1/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java index 26b0aafa..62cdec3a 100644 --- a/10.1/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java +++ b/10.1/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java @@ -45,8 +45,9 @@ public class HotRodManager extends AbstractManager { private final Properties properties = new Properties(); - private volatile String templateName = null; - private String configuration = """ + private volatile String templateName; + private volatile String configuration = +""" { "distributed-cache" : { "mode" : "SYNC", @@ -64,8 +65,9 @@ public class HotRodManager extends AbstractManager { "locking" : "PESSIMISTIC" } } -}"""; - private volatile URI uri = null; +} +"""; + private volatile URI uri; /** * Creates a new distributed manager. diff --git a/10.1/infinispan/remote/src/test/resources/tomcat/server.xml b/10.1/infinispan/remote/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/10.1/infinispan/remote/src/test/resources/tomcat/server.xml +++ b/10.1/infinispan/remote/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java index 64af0a37..2c26bdf5 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java @@ -219,7 +219,7 @@ public ClassLoader getClassLoader() { Contextualizer contextualizer = Contextualizer.withContextProvider(ThreadContextClassLoaderReference.CURRENT.provide(context.getLoader().getClassLoader())); ContainerProvider provider = new ServletContainerProvider<>(); AtomicReference> sessionManagerReference = new AtomicReference<>(); - Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getDetachableSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); + Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); Supplier identifierFactory = new CatalinaIdentifierFactory(this.getSessionIdGenerator()); SessionManagerConfiguration sessionManagerConfiguration = new SessionManagerConfiguration<>() { @@ -240,7 +240,7 @@ public Supplier getIdentifierFactory() { @Override public Consumer getExpirationListener() { - return Consumer.empty().andThen(contextualizer.contextualize(destroyNotifier)); + return Consumer.of().andThen(contextualizer.contextualize(destroyNotifier)); } }; sessionManagerReference.setPlain(managerFactory.createSessionManager(sessionManagerConfiguration)); diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java index b9c5ccb2..434b0d51 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java @@ -137,7 +137,7 @@ private org.apache.catalina.Session getSession(BiFunction createBatchEntry() { } private static org.apache.catalina.Session close(Supplier batchProvider, Runnable closeTask) { - return close(batchProvider, Consumer.empty(), closeTask); + return close(batchProvider, Consumer.of(), closeTask); } private static org.apache.catalina.Session close(Supplier batchProvider, Consumer batchTask, Runnable closeTask) { diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAccessor.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAccessor.java index 7bcc4043..62c9d8d9 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAccessor.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAccessor.java @@ -38,7 +38,7 @@ public void access(java.util.function.Consumer consumer) { try (Session session = this.manager.getSessionManager().findSession(this.identifier.get())) { if (session != null) { try (Context context = batch.suspendWithContext()) { - consumer.accept(new HttpSessionAdapter(this.manager, Supplier.of(session), context.get(), Runner.empty())); + consumer.accept(new HttpSessionAdapter(this.manager, Supplier.of(session), context.get(), Runner.of())); } } } catch (RuntimeException | Error e) { diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java index a9ea3650..ca2c64ed 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java @@ -107,7 +107,7 @@ public void setMaxInactiveInterval(int interval) { @Override public void invalidate() { Session session = this.reference.get(); - HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getDetachableSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); + HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this.manager, event); this.close(session, Session::invalidate); } diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java index 136f4959..663f282f 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java @@ -25,6 +25,10 @@ public class SessionCookieValve extends ValveBase { private static final VarHandle SESSION = findSessionField(); + /** Creates a new valve */ + public SessionCookieValve() { + } + private static VarHandle findSessionField() { try { return MethodHandles.privateLookupIn(Request.class, MethodHandles.lookup()).findVarHandle(Request.class, "session", Session.class); @@ -33,10 +37,6 @@ private static VarHandle findSessionField() { } } - /** Creates a new valve */ - public SessionCookieValve() { - } - @Override public void invoke(Request request, Response response) throws IOException, ServletException { try { diff --git a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java index e06a8941..e4166a90 100644 --- a/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java +++ b/11.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java @@ -59,7 +59,7 @@ protected void removeSession(String ssoId, Session session) { try (User sso = this.manager.findUser(ssoId)) { if (sso != null) { sso.getSessions().removeSession(getDeployment(session.getManager())); - if (sso.getSessions().getDeployments().isEmpty()) { + if (sso.getSessions().getSessions().isEmpty()) { sso.invalidate(); } } diff --git a/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java b/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java index 1b64e49c..a6ec5d56 100644 --- a/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java +++ b/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java @@ -57,8 +57,8 @@ public void setAddress(String address) { } @Override - public void renameThread(String base_name, Thread thread) { - this.factory.renameThread(base_name, thread); + public void renameThread(String baseName, Thread thread) { + this.factory.renameThread(baseName, thread); } @Override diff --git a/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java b/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java index e67f9b19..8ca81299 100644 --- a/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java +++ b/11.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java @@ -87,7 +87,7 @@ public class InfinispanManager extends AbstractManager { private static final AtomicInteger COUNTER = new AtomicInteger(0); private volatile String resourceName = "infinispan.xml"; - private volatile String cacheName = null; + private volatile String cacheName; /** * Creates a distributed manager. diff --git a/11.0/infinispan/embedded/src/test/resources/tomcat/server.xml b/11.0/infinispan/embedded/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/11.0/infinispan/embedded/src/test/resources/tomcat/server.xml +++ b/11.0/infinispan/embedded/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/11.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/11.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java index 26b0aafa..ceead988 100644 --- a/11.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java +++ b/11.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java @@ -45,8 +45,10 @@ public class HotRodManager extends AbstractManager { private final Properties properties = new Properties(); - private volatile String templateName = null; - private String configuration = """ + private volatile String templateName; + + private volatile String configuration = +""" { "distributed-cache" : { "mode" : "SYNC", @@ -64,8 +66,9 @@ public class HotRodManager extends AbstractManager { "locking" : "PESSIMISTIC" } } -}"""; - private volatile URI uri = null; +} +"""; + private volatile URI uri; /** * Creates a new distributed manager. diff --git a/11.0/infinispan/remote/src/test/resources/tomcat/server.xml b/11.0/infinispan/remote/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/11.0/infinispan/remote/src/test/resources/tomcat/server.xml +++ b/11.0/infinispan/remote/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java index 8dbab7c3..4e25ae67 100644 --- a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java +++ b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractManager.java @@ -219,7 +219,7 @@ public ClassLoader getClassLoader() { Contextualizer contextualizer = Contextualizer.withContextProvider(ThreadContextClassLoaderReference.CURRENT.provide(context.getLoader().getClassLoader())); ContainerProvider provider = new ServletContainerProvider<>(); AtomicReference> sessionManagerReference = new AtomicReference<>(); - Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getDetachableSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); + Consumer destroyNotifier = session -> CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this, new HttpSessionEvent(provider.getSession(sessionManagerReference.getPlain(), session, this.getContext().getServletContext()))); Supplier identifierFactory = new CatalinaIdentifierFactory(this.getSessionIdGenerator()); SessionManagerConfiguration sessionManagerConfiguration = new SessionManagerConfiguration<>() { @@ -240,7 +240,7 @@ public Supplier getIdentifierFactory() { @Override public Consumer getExpirationListener() { - return Consumer.empty().andThen(contextualizer.contextualize(destroyNotifier)); + return Consumer.of().andThen(contextualizer.contextualize(destroyNotifier)); } }; sessionManagerReference.setPlain(managerFactory.createSessionManager(sessionManagerConfiguration)); diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java index bbde4079..86f2f7ac 100644 --- a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java +++ b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableManager.java @@ -137,7 +137,7 @@ private org.apache.catalina.Session getSession(BiFunction createBatchEntry() { } private static org.apache.catalina.Session close(Supplier batchProvider, Runnable closeTask) { - return close(batchProvider, Consumer.empty(), closeTask); + return close(batchProvider, Consumer.of(), closeTask); } private static org.apache.catalina.Session close(Supplier batchProvider, Consumer batchTask, Runnable closeTask) { diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java index 1ee943e1..f18819d1 100644 --- a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java +++ b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java @@ -107,7 +107,7 @@ public void setMaxInactiveInterval(int interval) { @Override public void invalidate() { Session session = this.reference.get(); - HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getDetachableSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); + HttpSessionEvent event = new HttpSessionEvent(this.manager.getContainerProvider().getSession(this.manager.getSessionManager(), session, this.manager.getContext().getServletContext())); CatalinaSessionEventNotifier.Lifecycle.DESTROY.accept(this.manager, event); this.close(session, Session::invalidate); } diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java index d01be68a..8e809e05 100644 --- a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java +++ b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/SessionCookieValve.java @@ -25,6 +25,10 @@ public class SessionCookieValve extends ValveBase { private static final VarHandle SESSION = findSessionField(); + /** Creates a new valve */ + public SessionCookieValve() { + } + private static VarHandle findSessionField() { try { return MethodHandles.privateLookupIn(Request.class, MethodHandles.lookup()).findVarHandle(Request.class, "session", Session.class); @@ -33,10 +37,6 @@ private static VarHandle findSessionField() { } } - /** Creates a new valve */ - public SessionCookieValve() { - } - @Override public void invoke(Request request, Response response) throws IOException, ServletException { try { diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java index c3cd8924..9308e15a 100644 --- a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java +++ b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/authenticator/DistributableSingleSignOn.java @@ -59,7 +59,7 @@ protected void removeSession(String ssoId, Session session) { try (User sso = this.manager.findUser(ssoId)) { if (sso != null) { sso.getSessions().removeSession(getDeployment(session.getManager())); - if (sso.getSessions().getDeployments().isEmpty()) { + if (sso.getSessions().getSessions().isEmpty()) { sso.invalidate(); } } diff --git a/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java b/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java index 1b64e49c..a6ec5d56 100644 --- a/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java +++ b/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/ClassLoaderThreadFactory.java @@ -57,8 +57,8 @@ public void setAddress(String address) { } @Override - public void renameThread(String base_name, Thread thread) { - this.factory.renameThread(base_name, thread); + public void renameThread(String baseName, Thread thread) { + this.factory.renameThread(baseName, thread); } @Override diff --git a/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java b/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java index 7d4d722b..469ce5e2 100644 --- a/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java +++ b/9.0/infinispan/embedded/src/main/java/org/wildfly/clustering/tomcat/infinispan/embedded/InfinispanManager.java @@ -86,7 +86,7 @@ public class InfinispanManager extends AbstractManager { private static final AtomicInteger COUNTER = new AtomicInteger(0); private volatile String resourceName = "infinispan.xml"; - private volatile String cacheName = null; + private volatile String cacheName; /** * Creates a distributed manager. diff --git a/9.0/infinispan/embedded/src/test/resources/tomcat/server.xml b/9.0/infinispan/embedded/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/9.0/infinispan/embedded/src/test/resources/tomcat/server.xml +++ b/9.0/infinispan/embedded/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/9.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/9.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java index 3e9a368b..35d78d74 100644 --- a/9.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java +++ b/9.0/infinispan/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java @@ -45,8 +45,9 @@ public class HotRodManager extends AbstractManager { private final Properties properties = new Properties(); - private volatile String templateName = null; - private String configuration = """ + private volatile String templateName; + private volatile String configuration = +""" { "distributed-cache" : { "mode" : "SYNC", @@ -64,8 +65,9 @@ public class HotRodManager extends AbstractManager { "locking" : "PESSIMISTIC" } } -}"""; - private volatile URI uri = null; +} +"""; + private volatile URI uri; /** * Creates a new distributed manager. diff --git a/9.0/infinispan/remote/src/test/resources/tomcat/server.xml b/9.0/infinispan/remote/src/test/resources/tomcat/server.xml index 53ff2a15..3c2c6796 100644 --- a/9.0/infinispan/remote/src/test/resources/tomcat/server.xml +++ b/9.0/infinispan/remote/src/test/resources/tomcat/server.xml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - + - \ No newline at end of file + diff --git a/SECURITY.md b/SECURITY.md index 63469042..1ba399c7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,10 +1,10 @@ -# Security Policy - +# Security Policy + ## Security Contacts and Procedures - + The wildfly-clustering-tomcat community takes security very seriously, and we aim to take immediate action to address serious security-related problems that involve our products or services. - + Please report any suspected security vulnerability in this project to Red Hat Product Security at secalert@redhat.com. You can use our GPG key to communicate with us securely. - + To report an issue in any Red Hat branded website or online service, please contact Red Hat Information Security at site-security@redhat.com. https://access.redhat.com/security/team/contact diff --git a/bom/pom.xml b/bom/pom.xml index 5eabb1d6..94c425bd 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -9,7 +9,7 @@ org.wildfly.clustering wildfly-clustering-parent - 9.0.2.Final + 10.0.0.Beta6 diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index 3e664b06..00000000 --- a/checkstyle.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 578bacc2..3d29f915 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.wildfly.clustering wildfly-clustering-bom - 9.0.2.Final + 10.0.0.Beta6 pom import @@ -135,6 +135,19 @@ @{argLine} -javaagent:${org.mockito:mockito-core:jar} + + org.ec4j.maven + editorconfig-maven-plugin + + + default-check + validate + + check + + + + diff --git a/spi/src/main/java/org/wildfly/clustering/tomcat/SessionMarshallerFactory.java b/spi/src/main/java/org/wildfly/clustering/tomcat/SessionMarshallerFactory.java index fc2a027c..3784e566 100644 --- a/spi/src/main/java/org/wildfly/clustering/tomcat/SessionMarshallerFactory.java +++ b/spi/src/main/java/org/wildfly/clustering/tomcat/SessionMarshallerFactory.java @@ -45,5 +45,4 @@ public ByteBufferMarshaller apply(UnaryOperator properties, ClassLoader return new ProtoStreamByteBufferMarshaller(SerializationContextBuilder.newInstance(ClassLoaderMarshaller.of(loader)).load(loader).build()); } }, - ; } diff --git a/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractHotRodSessionManagerITCase.java b/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractHotRodSessionManagerITCase.java index 07079053..524dfea3 100644 --- a/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractHotRodSessionManagerITCase.java +++ b/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractHotRodSessionManagerITCase.java @@ -41,6 +41,8 @@ public abstract class AbstractHotRodSessionManagerITCase extends AbstractSession private final Class managerClass; + private SessionManagementParameters parameters; + protected AbstractHotRodSessionManagerITCase(Class managerClass, Class endpointClass) { super(new SessionManagementTesterConfiguration() { @Override @@ -56,8 +58,6 @@ public Optional getFailoverGracePeriod() { this.managerClass = managerClass; } - private SessionManagementParameters parameters; - @ParameterizedTest @ArgumentsSource(HotRodSessionManagerArgumentsProvider.class) @RunAsClient @@ -75,12 +75,13 @@ public WebArchive createArchive(SessionManagementTesterConfiguration configurati XMLStreamWriter writer = factory.createXMLStreamWriter(stringWriter); writer.writeStartDocument(StandardCharsets.UTF_8.displayName(), "1.0"); writer.writeStartElement("Context"); - { - writer.writeStartElement("Manager"); - writer.writeAttribute("className", this.managerClass.getName()); - writer.writeAttribute("granularity", this.parameters.getSessionPersistenceGranularity().toString()); - writer.writeAttribute("marshaller", this.parameters.getSessionMarshallerFactory().toString()); - writer.writeAttribute("configuration", """ + + writer.writeStartElement("Manager"); + writer.writeAttribute("className", this.managerClass.getName()); + writer.writeAttribute("granularity", this.parameters.getSessionPersistenceGranularity().toString()); + writer.writeAttribute("marshaller", this.parameters.getSessionMarshallerFactory().toString()); + writer.writeAttribute("configuration", +""" { "local-cache" : { "encoding" : { @@ -99,10 +100,11 @@ public WebArchive createArchive(SessionManagementTesterConfiguration configurati "locking" : "PESSIMISTIC" } } -}"""); - writer.writeAttribute("uri", String.format("hotrod://%s:%s@%s:%s", container.getUsername(), String.valueOf(container.getPassword()), container.getHost(), container.getPort())); - writer.writeEndElement(); - } +} +"""); + writer.writeAttribute("uri", String.format("hotrod://%s:%s@%s:%s", container.getUsername(), String.valueOf(container.getPassword()), container.getHost(), container.getPort())); + writer.writeEndElement(); + writer.writeEndElement(); writer.writeEndDocument(); writer.close(); diff --git a/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractInfinispanSessionManagerITCase.java b/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractInfinispanSessionManagerITCase.java index d5a194a2..8f4eaffa 100644 --- a/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractInfinispanSessionManagerITCase.java +++ b/spi/src/test/java/org/wildfly/clustering/tomcat/AbstractInfinispanSessionManagerITCase.java @@ -32,6 +32,8 @@ public abstract class AbstractInfinispanSessionManagerITCase extends AbstractSes private final Class managerClass; + private SessionManagementParameters parameters; + protected AbstractInfinispanSessionManagerITCase(Class managerClass, Class endpointClass) { super(new SessionManagementTesterConfiguration() { @Override @@ -42,8 +44,6 @@ public Class getEndpointClass() { this.managerClass = managerClass; } - private SessionManagementParameters parameters; - @ParameterizedTest @ArgumentsSource(InfinispanSessionManagerArgumentsProvider.class) @RunAsClient @@ -60,13 +60,13 @@ public WebArchive createArchive(SessionManagementTesterConfiguration configurati XMLStreamWriter writer = factory.createXMLStreamWriter(stringWriter); writer.writeStartDocument(StandardCharsets.UTF_8.displayName(), "1.0"); writer.writeStartElement("Context"); - { - writer.writeStartElement("Manager"); - writer.writeAttribute("className", this.managerClass.getName()); - writer.writeAttribute("granularity", this.parameters.getSessionPersistenceGranularity().toString()); - writer.writeAttribute("marshaller", this.parameters.getSessionMarshallerFactory().toString()); - writer.writeEndElement(); - } + + writer.writeStartElement("Manager"); + writer.writeAttribute("className", this.managerClass.getName()); + writer.writeAttribute("granularity", this.parameters.getSessionPersistenceGranularity().toString()); + writer.writeAttribute("marshaller", this.parameters.getSessionMarshallerFactory().toString()); + writer.writeEndElement(); + writer.writeEndElement(); writer.writeEndDocument(); writer.close();