This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 3e863a91a9504060e6701d36aaa986b841a7119f Author: Thomas Vandahl <[email protected]> AuthorDate: Mon Dec 15 00:00:03 2025 +0100 Further clean up, modernize instanceof --- .../gk/log4j2/src/java/org/apache/turbine/Turbine.java | 2 +- src/java/org/apache/turbine/Turbine.java | 2 +- .../org/apache/turbine/modules/screens/TemplateScreen.java | 4 +--- .../org/apache/turbine/pipeline/DefaultPipelineData.java | 3 +-- .../org/apache/turbine/services/jsp/TurbineJspService.java | 3 ++- .../turbine/services/rundata/DefaultTurbineRunData.java | 14 +++++++++----- .../turbine/services/security/DefaultSecurityService.java | 1 + .../turbine/services/security/DefaultUserManager.java | 2 +- .../turbine/services/servlet/TurbineServletService.java | 7 +++---- .../turbine/services/velocity/TurbineVelocityService.java | 2 +- .../turbine/modules/actions/VelocityActionDoesNothing.java | 4 ++-- .../modules/actions/VelocitySecureActionDoesNothing.java | 2 +- .../turbine/pipeline/DefaultSessionTimeoutValveTest.java | 12 ++++++------ .../turbine/pipeline/DefaultSetEncodingValveTest.java | 12 ++++++------ .../testcontainer/BuildContainerWithDockerfileTest.java | 7 +++---- .../testcontainer/UserManagerWithContainerTest.java | 3 +-- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java b/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java index 30fd78d8..acbdbf49 100644 --- a/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java +++ b/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java @@ -821,7 +821,7 @@ public class Turbine extends HttpServlet protected void handleException(PipelineData pipelineData, HttpServletResponse res, Throwable t) { - RunData data = (RunData) pipelineData; + RunData data = pipelineData.getRunData(); // make sure that the stack trace makes it the log log.error("Turbine.handleException: ", t); diff --git a/src/java/org/apache/turbine/Turbine.java b/src/java/org/apache/turbine/Turbine.java index 6728ced3..48d0fc8c 100644 --- a/src/java/org/apache/turbine/Turbine.java +++ b/src/java/org/apache/turbine/Turbine.java @@ -842,7 +842,7 @@ public class Turbine extends HttpServlet protected void handleException(PipelineData pipelineData, HttpServletResponse res, Throwable t) { - RunData data = (RunData) pipelineData; + RunData data = pipelineData.getRunData(); // make sure that the stack trace makes it the log log.error("Turbine.handleException: ", t); diff --git a/src/java/org/apache/turbine/modules/screens/TemplateScreen.java b/src/java/org/apache/turbine/modules/screens/TemplateScreen.java index edb9ec26..f01d2c56 100644 --- a/src/java/org/apache/turbine/modules/screens/TemplateScreen.java +++ b/src/java/org/apache/turbine/modules/screens/TemplateScreen.java @@ -29,7 +29,6 @@ import org.apache.turbine.modules.ScreenLoader; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateService; -import org.apache.turbine.util.RunData; import org.apache.turbine.util.template.TemplateInfo; /** @@ -134,8 +133,7 @@ public abstract class TemplateScreen implements Screen */ public static void setTemplate(PipelineData pipelineData, String template) { - RunData data = (RunData)pipelineData; - TemplateInfo ti = data.getTemplateInfo(); + TemplateInfo ti = pipelineData.getRunData().getTemplateInfo(); TemplateService templateService = (TemplateService)TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME); ti.setScreenTemplate(template); diff --git a/src/java/org/apache/turbine/pipeline/DefaultPipelineData.java b/src/java/org/apache/turbine/pipeline/DefaultPipelineData.java index 50be1a6d..1631b987 100644 --- a/src/java/org/apache/turbine/pipeline/DefaultPipelineData.java +++ b/src/java/org/apache/turbine/pipeline/DefaultPipelineData.java @@ -5,7 +5,6 @@ import java.util.Map; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.rundata.RunDataService; -import org.apache.turbine.util.RunData; /* @@ -98,7 +97,7 @@ public class DefaultPipelineData implements PipelineData RunDataService rds = (RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME); if (rds != null) { - rds.putRunData((RunData) this); + rds.putRunData(getRunData()); } } } diff --git a/src/java/org/apache/turbine/services/jsp/TurbineJspService.java b/src/java/org/apache/turbine/services/jsp/TurbineJspService.java index 54406930..ee1acca1 100644 --- a/src/java/org/apache/turbine/services/jsp/TurbineJspService.java +++ b/src/java/org/apache/turbine/services/jsp/TurbineJspService.java @@ -35,6 +35,7 @@ import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.pull.ApplicationTool; import org.apache.turbine.services.pull.tools.TemplateLink; import org.apache.turbine.services.template.BaseTemplateEngineService; +import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; import jakarta.servlet.RequestDispatcher; @@ -138,7 +139,7 @@ public class TurbineJspService throws TurbineException { // throws TurbineRuntimeException if cast fails - pipelineData.getRunData(); + RunData data = pipelineData.getRunData(); /** template name with relative path */ String relativeTemplateName = getRelativeTemplateName(templateName); diff --git a/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java b/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java index 4f383c60..e97e0e65 100644 --- a/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java +++ b/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java @@ -29,11 +29,6 @@ import java.util.Locale; import java.util.Map; import javax.naming.Context; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.apache.fulcrum.parser.CookieParser; @@ -54,6 +49,12 @@ import org.apache.turbine.util.ServerData; import org.apache.turbine.util.SystemError; import org.apache.turbine.util.template.TemplateInfo; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + /** * DefaultTurbineRunData is the default implementation of the * TurbineRunData interface, which is distributed by the Turbine @@ -163,6 +164,7 @@ public class DefaultTurbineRunData * * @return A User. */ + @SuppressWarnings("unchecked") public static <T extends User> T getUserFromSession(HttpSession session) { try @@ -349,6 +351,7 @@ public class DefaultTurbineRunData * * @return the access control list. */ + @SuppressWarnings("unchecked") @Override public <A extends AccessControlList> A getACL() { @@ -731,6 +734,7 @@ public class DefaultTurbineRunData * * @return a user. */ + @SuppressWarnings("unchecked") @Override public <T extends User> T getUser() { diff --git a/src/java/org/apache/turbine/services/security/DefaultSecurityService.java b/src/java/org/apache/turbine/services/security/DefaultSecurityService.java index 7e320a71..bfd1e9b3 100644 --- a/src/java/org/apache/turbine/services/security/DefaultSecurityService.java +++ b/src/java/org/apache/turbine/services/security/DefaultSecurityService.java @@ -622,6 +622,7 @@ public class DefaultSecurityService * * @return a Group object that represents the global group. */ + @SuppressWarnings("unchecked") @Override public <G extends Group> G getGlobalGroup() { diff --git a/src/java/org/apache/turbine/services/security/DefaultUserManager.java b/src/java/org/apache/turbine/services/security/DefaultUserManager.java index d3662120..e289fc55 100644 --- a/src/java/org/apache/turbine/services/security/DefaultUserManager.java +++ b/src/java/org/apache/turbine/services/security/DefaultUserManager.java @@ -36,7 +36,6 @@ import org.apache.fulcrum.security.util.UnknownEntityException; import org.apache.fulcrum.security.util.UserSet; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.turbine.om.security.TurbineUserDelegate; import org.apache.turbine.om.security.User; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.ServiceManager; @@ -95,6 +94,7 @@ public class DefaultUserManager implements UserManager * * @return the wrapped object */ + @SuppressWarnings("unchecked") protected <U extends User> U wrap(TurbineUser user) { return (U) getUserWrapper(user); diff --git a/src/java/org/apache/turbine/services/servlet/TurbineServletService.java b/src/java/org/apache/turbine/services/servlet/TurbineServletService.java index 550b42a4..4178120c 100644 --- a/src/java/org/apache/turbine/services/servlet/TurbineServletService.java +++ b/src/java/org/apache/turbine/services/servlet/TurbineServletService.java @@ -25,15 +25,15 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.turbine.Turbine; import org.apache.turbine.services.TurbineBaseService; import org.apache.turbine.util.ServletUtils; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; + /** * <p>This class provides a context service when the application * is run in a ServletContainer. It is mainly a wrapper around @@ -137,7 +137,6 @@ public class TurbineServletService return null; } - InputStream is = null; return servletContext.getResourceAsStream(uri); } diff --git a/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java b/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java index b24caeae..d4a57b58 100644 --- a/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java +++ b/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java @@ -245,7 +245,7 @@ public class TurbineVelocityService public Context getContext(PipelineData pipelineData) { //Map runDataMap = (Map)pipelineData.get(RunData.class); - RunData data = (RunData)pipelineData; + RunData data = pipelineData.getRunData(); // Attempt to get it from the data first. If it doesn't // exist, create it and then stuff it into the data. Context context = (Context) diff --git a/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java b/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java index b30444aa..062a51dc 100644 --- a/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java +++ b/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java @@ -53,7 +53,7 @@ public class VelocityActionDoesNothing extends VelocityAction { log.debug("Calling doPerform(PipelineData)"); VelocityActionDoesNothing.numberOfCalls++; - RunData rd = (RunData)pipelineData; + RunData rd = pipelineData.getRunData(); assertNotNull("PipelineData object was Null.", rd); VelocityActionDoesNothing.pipelineDataCalls++; } @@ -70,7 +70,7 @@ public class VelocityActionDoesNothing extends VelocityAction { log.debug("Calling arbitraryMethodName(PipelineData)"); VelocityActionDoesNothing.numberOfCalls++; - RunData rd = (RunData)pipelineData; + RunData rd = pipelineData.getRunData(); assertNotNull("RunData object was Null.", rd); VelocityActionDoesNothing.actionEventCalls++; } diff --git a/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java b/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java index f256a3be..47d9b6b3 100644 --- a/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java +++ b/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java @@ -51,7 +51,7 @@ public class VelocitySecureActionDoesNothing extends VelocitySecureAction { log.debug("Calling doPerform(PipelineData)"); VelocitySecureActionDoesNothing.numberOfCalls++; - RunData rd = (RunData)pipelineData; + RunData rd = pipelineData.getRunData(); assertNotNull("PipelineData object was Null.", rd); VelocitySecureActionDoesNothing.pipelineDataCalls++; } diff --git a/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java b/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java index ee5fda02..a90c8e2f 100644 --- a/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java +++ b/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java @@ -25,10 +25,6 @@ import static org.mockito.Mockito.when; import java.util.Vector; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - import org.apache.turbine.Turbine; import org.apache.turbine.TurbineConstants; import org.apache.turbine.test.BaseTestCase; @@ -40,6 +36,10 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Tests TurbinePipeline. * @@ -99,7 +99,7 @@ public class DefaultSessionTimeoutValveTest extends BaseTestCase pipeline.invoke(pipelineData); - RunData runData = (RunData) pipelineData; + RunData runData = pipelineData.getRunData(); assertEquals(0, runData.getSession().getMaxInactiveInterval()); } @@ -119,7 +119,7 @@ public class DefaultSessionTimeoutValveTest extends BaseTestCase pipeline.initialize(); pipeline.invoke(pipelineData); - RunData runData = (RunData) pipelineData; + RunData runData = pipelineData.getRunData(); assertEquals(3600, runData.getSession().getMaxInactiveInterval()); } diff --git a/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java b/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java index fde2caaf..dfbee8d2 100644 --- a/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java +++ b/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java @@ -23,10 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - import org.apache.turbine.Turbine; import org.apache.turbine.TurbineConstants; import org.apache.turbine.test.BaseTestCase; @@ -37,6 +33,10 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Tests TurbinePipeline. * @@ -90,7 +90,7 @@ public class DefaultSetEncodingValveTest extends BaseTestCase pipeline.invoke(pipelineData); - RunData runData = (RunData) pipelineData; + RunData runData = pipelineData.getRunData(); assertEquals(TurbineConstants.PARAMETER_ENCODING_DEFAULT, runData.getCharset().name()); } @@ -110,7 +110,7 @@ public class DefaultSetEncodingValveTest extends BaseTestCase pipeline.initialize(); pipeline.invoke(pipelineData); - RunData runData = (RunData) pipelineData; + RunData runData = pipelineData.getRunData(); assertEquals("UTF-8", runData.getCharset().name()); } diff --git a/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java b/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java index 0d500f7c..63d2775c 100644 --- a/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java +++ b/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java @@ -102,11 +102,10 @@ class BuildContainerWithDockerfileTest { Connection connection; @Container - public static GenericContainer MY_SQL_CONTAINER = new GenericContainer<>( - new ImageFromDockerfile() - .withFileFromPath(".", RESOURCE_PATH) + public static GenericContainer<?> MY_SQL_CONTAINER = new GenericContainer<>( + new ImageFromDockerfile().withFileFromPath(".", RESOURCE_PATH) ).withExposedPorts( SERVICE_PORT ) //.withStartupAttempts( 2 ) - .withEnv( "MYSQL_DATABASE", DATABASE_NAME ) + .withEnv( "MYSQL_DATABASE", DATABASE_NAME ) .withEnv( "MYSQL_USER", "userdb" ) .withEnv( "MYSQL_PASSWORD", "test1234" ) .withEnv( "MYSQL_ROOT_PASSWORD","test1234" ); diff --git a/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java b/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java index 23117076..65112314 100644 --- a/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java +++ b/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java @@ -26,7 +26,6 @@ import static junit.framework.TestCase.fail; import java.io.File; import java.io.FileOutputStream; -import org.apache.fulcrum.security.entity.ExtendedUser; import org.apache.fulcrum.security.util.UnknownEntityException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -74,7 +73,7 @@ class UserManagerWithContainerTest { private static Logger log = LogManager.getLogger(); @Container - private static GenericContainer MY_SQL_CONTAINER = BuildContainerWithDockerfileTest.MY_SQL_CONTAINER; + private static GenericContainer<?> MY_SQL_CONTAINER = BuildContainerWithDockerfileTest.MY_SQL_CONTAINER; @BeforeAll public static void init() {
