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
The following commit(s) were added to refs/heads/trunk by this push:
new 7ca360c8 Clean up deprecations, organize imports
7ca360c8 is described below
commit 7ca360c83f0ab073d743f238ff7a64e7bb40e797
Author: Thomas Vandahl <[email protected]>
AuthorDate: Sun Dec 7 20:11:58 2025 +0100
Clean up deprecations, organize imports
---
.../turbine/pipeline/DetermineActionValve.java | 2 --
.../TurbineAssemblerBrokerService.java | 3 +--
.../localization/RundataLocalizationService.java | 11 ++++----
.../schedule/AbstractSchedulerService.java | 2 +-
.../turbine/services/ui/TurbineUIService.java | 9 ++++---
.../org/apache/turbine/util/InputFilterUtils.java | 5 ++--
.../localization/DateTimeFormatterServiceTest.java | 29 +++++++++++-----------
.../localization/LocalizationToolTest.java | 15 +++++------
8 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
b/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
index 85ee065f..9fa193b0 100644
--- a/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
+++ b/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
@@ -22,8 +22,6 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git
a/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
b/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
index 4da33b9a..94c2ae99 100644
---
a/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
+++
b/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
@@ -42,7 +42,6 @@ import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
import org.apache.turbine.util.HttpUtils;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.uri.URIConstants;
/**
* TurbineAssemblerBrokerService allows assemblers (like screens,
@@ -215,7 +214,7 @@ public class TurbineAssemblerBrokerService
{
String key = type + ":" + name;
T assembler = null;
-
+
log.debug("Check name in key {} in assembler.", key);
if (HttpUtils.keyRequiresClean( name ))
{
diff --git
a/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
b/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
index bcb37d66..0605f6d0 100644
---
a/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
+++
b/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
@@ -29,21 +29,22 @@ import org.apache.turbine.om.security.User;
import org.apache.turbine.util.RunData;
/**
- *
+ *
* Instead of reading first the accept-language header in a http request,
* instead this method read the user.getTemp("locale")
* from the RunData to obtain the language choice by the user
* without the browser language rule.
* If user.getPerm("language") is not set,
* the "Accept-Language" header is read.
- *
+ *
* Adapted from the Jetspeed-1 implementation of CustomLocalizationService.
- *
+ *
*/
public class RundataLocalizationService extends DefaultLocalizationService
implements RundataLocalizationInterface {
- private static final Logger log =
LogManager.getLogger(RundataLocalizationService.class);
-
+ private static final long serialVersionUID = -3374820066195748221L;
+ private static final Logger log =
LogManager.getLogger(RundataLocalizationService.class);
+
@Override
public Locale getLocale(RunData data) {
User user = data.getUser();
diff --git
a/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
b/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
index 11935950..c4ddba9f 100644
---
a/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
+++
b/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
@@ -69,7 +69,7 @@ public abstract class AbstractSchedulerService extends
TurbineBaseService implem
setEnabled(getConfiguration().getBoolean("enabled", true));
scheduleQueue = new JobQueue<>();
threadPool = Executors.newCachedThreadPool(
- new BasicThreadFactory.Builder()
+ BasicThreadFactory.builder()
.namingPattern("Turbine-ScheduledJob-")
.daemon(true)
.build());
diff --git a/src/java/org/apache/turbine/services/ui/TurbineUIService.java
b/src/java/org/apache/turbine/services/ui/TurbineUIService.java
index 05b0825f..c1cc421d 100644
--- a/src/java/org/apache/turbine/services/ui/TurbineUIService.java
+++ b/src/java/org/apache/turbine/services/ui/TurbineUIService.java
@@ -21,6 +21,7 @@ package org.apache.turbine.services.ui;
import java.io.File;
import java.io.InputStream;
+import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -281,7 +282,7 @@ public class TurbineUIService
{
Properties defaultSkinProperties = null;
- if (!StringUtils.equals(skinName, SKIN_PROPERTY_DEFAULT))
+ if (!SKIN_PROPERTY_DEFAULT.equals(skinName))
{
defaultSkinProperties = getSkinProperties(SKIN_PROPERTY_DEFAULT);
}
@@ -304,13 +305,13 @@ public class TurbineUIService
catch (Exception e)
{
log.error("Cannot load skin: {}, from: {}", skinName,
sb.toString(), e);
- if (!StringUtils.equals(skinName, getWebappSkinName())
- && !StringUtils.equals(skinName, SKIN_PROPERTY_DEFAULT))
+ if (!Objects.equals(getWebappSkinName(), skinName)
+ && !SKIN_PROPERTY_DEFAULT.equals(skinName))
{
log.error("Attempting to return the skin configured for webapp
instead of {}", skinName);
return getSkinProperties(getWebappSkinName());
}
- else if (!StringUtils.equals(skinName, SKIN_PROPERTY_DEFAULT))
+ else if (!SKIN_PROPERTY_DEFAULT.equals(skinName))
{
log.error("Return the default skin instead of {}", skinName);
return skinProperties; // Already contains the default skin.
diff --git a/src/java/org/apache/turbine/util/InputFilterUtils.java
b/src/java/org/apache/turbine/util/InputFilterUtils.java
index 487a3327..6ed2ae1c 100644
--- a/src/java/org/apache/turbine/util/InputFilterUtils.java
+++ b/src/java/org/apache/turbine/util/InputFilterUtils.java
@@ -20,8 +20,7 @@ package org.apache.turbine.util;
* under the License.
*/
-
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.text.StringEscapeUtils;
/**
@@ -63,6 +62,6 @@ public abstract class InputFilterUtils
* want to filter all the above chars, so we will just disallow
* <.
*/
- return StringUtils.replace(s, "<", "<");
+ return Strings.CS.replace(s, "<", "<");
}
}
diff --git
a/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java
b/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java
index eff70333..90761955 100644
---
a/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java
+++
b/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.mock;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
@@ -38,10 +37,6 @@ import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.util.stream.Stream;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.turbine.annotation.AnnotationProcessor;
import org.apache.turbine.annotation.TurbineService;
@@ -64,6 +59,10 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Test class for DateTimeFormatter.
*
@@ -132,18 +131,18 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
// taking from request context
dateTimeFormatterTool = (DateTimeFormatterTool)
requestContext.get("dateTimeFormatter");
assertNotNull(dateTimeFormatterTool);
-
+
String resultFormat = dateTimeFormatterTool.format(Instant.now());
-
+
System.out.println("format Instant now in tool:"+resultFormat );
assertTrue(resultFormat.length()>5);
-
+
System.out.println("locale in tool:"+
dateTimeFormatterTool.getLocale());
// tool.use.request.locale is by default false, tool will use service
locale
assertTrue(dateTimeFormatterTool.getLocale() == null);
}
-
- // to test configuration
+
+ // to test configuration
// datetime.zoneId
// and locale.default.language l.d.country
@Test
@@ -153,7 +152,7 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
// assertEquals("Europe/Berlin",df.getZoneId().getId());
System.out.println("locale in service:"+ df.getLocale());
// assertEquals("de_DE",df.getLocale().toString());
-
+
}
@Order(2)
@@ -161,7 +160,7 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
Stream<DynamicNode> testDateTimeFormatterInstances() {
// Stream of DateTimeFormatterInterface to check
Stream<DateTimeFormatterInterface> inputStream = Stream.of(
- df,
+ df,
dateTimeFormatterTool);
// Executes tests based on the current input value.
return inputStream.map(dtf -> dynamicContainer(
@@ -201,7 +200,7 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
assertEquals(mmddyyyy, dateTime.format(ldt, "MM/dd/yyyy"));
}
- void formatZonedDateString(DateTimeFormatterInterface dateTime) {
+ void formatZonedDateString(DateTimeFormatterInterface dateTime) {
ZonedDateTime zdt = ZonedDateTime.now(dateTime.getZoneId());
int day = zdt.get(ChronoField.DAY_OF_MONTH);
int month = zdt.get(ChronoField.MONTH_OF_YEAR); // one based
@@ -325,7 +324,7 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
}
void formatInstantString(DateTimeFormatterInterface dateTime) {
-
+
ZonedDateTime zonedToday = ZonedDateTime.now(dateTime.getZoneId());
int day = zonedToday.get(ChronoField.DAY_OF_MONTH);
int month = zonedToday.get(ChronoField.MONTH_OF_YEAR); // one based
@@ -337,7 +336,7 @@ public class DateTimeFormatterServiceTest extends
BaseTestCase {
String mmddyyyy = "" + monthString + "/" + dayString + "/" + year;
assertNotNull(ddmmyyyy);
assertNotNull(mmddyyyy);
-
+
Instant today = Instant.now();
assertNotNull(dateTime.format(today, "dd/MM/yyyy"));
assertNotNull(dateTime.format(today, "MM"));
diff --git
a/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
b/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
index 02896356..dfb05786 100644
---
a/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
+++
b/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
@@ -24,16 +24,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.annotation.AnnotationProcessor;
-import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.annotation.TurbineTool;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.pull.PullService;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
@@ -43,6 +36,10 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Unit test for Localization Tool. Verifies that localization works the same
using the
* deprecated Turbine localization service as well as the new Fulcrum
Localization
@@ -54,10 +51,10 @@ import org.junit.Test;
public class LocalizationToolTest extends BaseTestCase
{
private static TurbineConfig tc = null;
-
+
@TurbineTool(LocalizationTool.class)
private LocalizationTool lt;
-
+
@BeforeClass
public static void setUp() throws Exception
{
