Skip to content

Commit

Permalink
Merge pull request #204 from pferraro/main
Browse files Browse the repository at this point in the history 
Upgrade to WildFly 30.0.0.Final.
  • Loading branch information
@pferraro
pferraro authored Oct 19, 2023
2 parents 96e9e79 + db24177 commit 3c2e7e4
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 219 deletions.
4 changes: 2 additions & 2 deletions ...na/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSessionDestroyAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import java.util.stream.Stream;

import org.apache.catalina.Context;
import org.wildfly.clustering.web.cache.session.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.SessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.SessionAttributesFilter;
import org.wildfly.clustering.web.session.ImmutableSession;

import jakarta.servlet.http.HttpSessionBindingEvent;
Expand Down
4 changes: 2 additions & 2 deletions 10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.resumeBatch()) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid(session);
throw e;
Expand Down Expand Up @@ -232,7 +232,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
for (String name: oldSession.getAttributes().getAttributeNames()) {
newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
}
newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setTimeout(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessTime());
newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
Expand Down
2 changes: 1 addition & 1 deletion 10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid.accept(session);
throw e;
Expand Down
38 changes: 0 additions & 38 deletions ...lina/src/main/java/org/wildfly/clustering/tomcat/catalina/LocalSessionContextFactory.java
View file

This file was deleted.

36 changes: 0 additions & 36 deletions ...ain/java/org/wildfly/clustering/tomcat/catalina/authenticator/LocalSSOContextFactory.java
View file

This file was deleted.

17 changes: 13 additions & 4 deletions 10.1/hotrod/src/main/java/org/wildfly/clustering/tomcat/hotrod/HotRodManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
import org.wildfly.clustering.tomcat.catalina.DistributableManager;
import org.wildfly.clustering.tomcat.catalina.CatalinaIdentifierFactory;
import org.wildfly.clustering.tomcat.catalina.LocalSessionContext;
import org.wildfly.clustering.tomcat.catalina.LocalSessionContextFactory;
import org.wildfly.clustering.web.LocalContextFactory;
import org.wildfly.clustering.web.hotrod.session.HotRodSessionManagerFactory;
import org.wildfly.clustering.web.hotrod.session.HotRodSessionManagerFactoryConfiguration;
import org.wildfly.clustering.web.session.ImmutableSession;
Expand Down Expand Up @@ -101,6 +99,7 @@ public class HotRodManager extends ManagerBase {
private volatile SessionMarshallerFactory marshallerFactory = SessionMarshallerFactory.JBOSS;
private volatile String templateName = DefaultTemplate.DIST_SYNC.getTemplateName();
private volatile URI uri = null;
private volatile int expirationThreadPoolSize = 16;

public void setUri(String uri) {
this.uri = URI.create(uri);
Expand Down Expand Up @@ -134,6 +133,10 @@ public void setMarshaller(String marshallerFactory) {
this.setMarshallerFactory(SessionMarshallerFactory.valueOf(marshallerFactory));
}

public void setExpirationThreadPoolSize(int size) {
this.expirationThreadPoolSize = size;
}

@Deprecated
public void setPersistenceStrategy(String strategy) {
this.setPersistenceStrategy(SessionAttributePersistenceStrategy.valueOf(strategy));
Expand Down Expand Up @@ -177,6 +180,7 @@ protected void startInternal() throws LifecycleException {
loadedImmutabilities.add(loadedImmutability);
}
Immutability immutability = new CompositeImmutability(new CompositeIterable<>(EnumSet.allOf(DefaultImmutability.class), EnumSet.allOf(SessionAttributeImmutability.class), loadedImmutabilities));
int expirationThreadPoolSize = this.expirationThreadPoolSize;

HotRodSessionManagerFactoryConfiguration<HttpSession, ServletContext, HttpSessionActivationListener, LocalSessionContext> sessionManagerFactoryConfig = new HotRodSessionManagerFactoryConfiguration<>() {
@Override
Expand Down Expand Up @@ -205,8 +209,8 @@ public String getServerName() {
}

@Override
public LocalContextFactory<LocalSessionContext> getLocalContextFactory() {
return LocalSessionContextFactory.INSTANCE;
public Supplier<LocalSessionContext> getLocalContextFactory() {
return LocalSessionContext::new;
}

@Override
Expand All @@ -223,6 +227,11 @@ public Immutability getImmutability() {
public SpecificationProvider<HttpSession, ServletContext, HttpSessionActivationListener> getSpecificationProvider() {
return CatalinaSpecificationProvider.INSTANCE;
}

@Override
public int getExpirationThreadPoolSize() {
return expirationThreadPoolSize;
}
};

this.managerFactory = new HotRodSessionManagerFactory<>(sessionManagerFactoryConfig);
Expand Down
2 changes: 1 addition & 1 deletion 10.1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</modules>

<properties>
<version.org.apache.tomcat>10.1.12</version.org.apache.tomcat>
<version.org.apache.tomcat>10.1.15</version.org.apache.tomcat>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions ...na/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSessionDestroyAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import javax.servlet.http.HttpSessionListener;

import org.apache.catalina.Context;
import org.wildfly.clustering.web.cache.session.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.SessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.SessionAttributesFilter;
import org.wildfly.clustering.web.session.ImmutableSession;

/**
Expand Down
4 changes: 2 additions & 2 deletions 8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.resumeBatch()) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid(session);
throw e;
Expand Down Expand Up @@ -232,7 +232,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
for (String name: oldSession.getAttributes().getAttributeNames()) {
newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
}
newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setTimeout(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessTime());
newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
Expand Down
2 changes: 1 addition & 1 deletion 8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid.accept(session);
throw e;
Expand Down
38 changes: 0 additions & 38 deletions ...lina/src/main/java/org/wildfly/clustering/tomcat/catalina/LocalSessionContextFactory.java
View file

This file was deleted.

17 changes: 13 additions & 4 deletions 8.5/hotrod/src/main/java/org/wildfly/clustering/tomcat/hotrod/HotRodManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
import org.wildfly.clustering.tomcat.catalina.CatalinaSpecificationProvider;
import org.wildfly.clustering.tomcat.catalina.DistributableManager;
import org.wildfly.clustering.tomcat.catalina.LocalSessionContext;
import org.wildfly.clustering.tomcat.catalina.LocalSessionContextFactory;
import org.wildfly.clustering.web.LocalContextFactory;
import org.wildfly.clustering.web.hotrod.session.HotRodSessionManagerFactory;
import org.wildfly.clustering.web.hotrod.session.HotRodSessionManagerFactoryConfiguration;
import org.wildfly.clustering.web.session.ImmutableSession;
Expand Down Expand Up @@ -99,6 +97,7 @@ public class HotRodManager extends ManagerBase {
private volatile SessionMarshallerFactory marshallerFactory = SessionMarshallerFactory.JBOSS;
private volatile String templateName = DefaultTemplate.DIST_SYNC.getTemplateName();
private volatile URI uri = null;
private volatile int expirationThreadPoolSize = 16;

public void setUri(String uri) {
this.uri = URI.create(uri);
Expand Down Expand Up @@ -132,6 +131,10 @@ public void setMarshaller(String marshallerFactory) {
this.setMarshallerFactory(SessionMarshallerFactory.valueOf(marshallerFactory));
}

public void setExpirationThreadPoolSize(int size) {
this.expirationThreadPoolSize = size;
}

@Deprecated
public void setPersistenceStrategy(String strategy) {
this.setPersistenceStrategy(SessionAttributePersistenceStrategy.valueOf(strategy));
Expand Down Expand Up @@ -175,6 +178,7 @@ protected void startInternal() throws LifecycleException {
loadedImmutabilities.add(loadedImmutability);
}
Immutability immutability = new CompositeImmutability(new CompositeIterable<>(EnumSet.allOf(DefaultImmutability.class), EnumSet.allOf(SessionAttributeImmutability.class), loadedImmutabilities));
int expirationThreadPoolSize = this.expirationThreadPoolSize;

HotRodSessionManagerFactoryConfiguration<HttpSession, ServletContext, HttpSessionActivationListener, LocalSessionContext> sessionManagerFactoryConfig = new HotRodSessionManagerFactoryConfiguration<>() {
@Override
Expand Down Expand Up @@ -203,8 +207,8 @@ public String getServerName() {
}

@Override
public LocalContextFactory<LocalSessionContext> getLocalContextFactory() {
return LocalSessionContextFactory.INSTANCE;
public Supplier<LocalSessionContext> getLocalContextFactory() {
return LocalSessionContext::new;
}

@Override
Expand All @@ -221,6 +225,11 @@ public Immutability getImmutability() {
public SpecificationProvider<HttpSession, ServletContext, HttpSessionActivationListener> getSpecificationProvider() {
return CatalinaSpecificationProvider.INSTANCE;
}

@Override
public int getExpirationThreadPoolSize() {
return expirationThreadPoolSize;
}
};

this.managerFactory = new HotRodSessionManagerFactory<>(sessionManagerFactoryConfig);
Expand Down
2 changes: 1 addition & 1 deletion 8.5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</modules>

<properties>
<version.org.apache.tomcat>8.5.91</version.org.apache.tomcat>
<version.org.apache.tomcat>8.5.95</version.org.apache.tomcat>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions ...na/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSessionDestroyAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import javax.servlet.http.HttpSessionListener;

import org.apache.catalina.Context;
import org.wildfly.clustering.web.cache.session.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.SessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.ImmutableSessionAttributesFilter;
import org.wildfly.clustering.web.cache.session.attributes.coarse.SessionAttributesFilter;
import org.wildfly.clustering.web.session.ImmutableSession;

/**
Expand Down
4 changes: 2 additions & 2 deletions 9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.resumeBatch()) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid(session);
throw e;
Expand Down Expand Up @@ -232,7 +232,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
for (String name: oldSession.getAttributes().getAttributeNames()) {
newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
}
newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setTimeout(oldSession.getMetaData().getTimeout());
newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessTime());
newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
Expand Down
2 changes: 1 addition & 1 deletion 9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public int getMaxInactiveInterval() {
public void setMaxInactiveInterval(int interval) {
Session<LocalSessionContext> session = this.session.get();
try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
session.getMetaData().setMaxInactiveInterval((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
session.getMetaData().setTimeout((interval > 0) ? Duration.ofSeconds(interval) : Duration.ZERO);
} catch (IllegalStateException e) {
this.closeIfInvalid.accept(session);
throw e;
Expand Down
Loading

0 comments on commit 3c2e7e4

Please sign in to comment.