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 7eaa7312ae56c9f1e4304c2abf32b9e6279f05c2 Author: Thomas Vandahl <[email protected]> AuthorDate: Fri Jul 8 14:46:23 2022 +0200 Organize imports, add license headers, fix warnings --- .../turbine/annotation/AnnotationProcessor.java | 2 +- .../screens/PlainJSONSecureAnnotatedScreen.java | 13 +++-- .../services/pull/util/DateTimeFormatterTool.java | 39 ++++++++++---- .../services/security/DefaultUserManager.java | 1 - .../localization/DateTimeFormatterServiceTest.java | 62 ++++++++++++++-------- .../BuildContainerWithDockerfileTest.java | 2 - 6 files changed, 78 insertions(+), 41 deletions(-) diff --git a/src/java/org/apache/turbine/annotation/AnnotationProcessor.java b/src/java/org/apache/turbine/annotation/AnnotationProcessor.java index aaa384c1..1abf3bb3 100644 --- a/src/java/org/apache/turbine/annotation/AnnotationProcessor.java +++ b/src/java/org/apache/turbine/annotation/AnnotationProcessor.java @@ -529,7 +529,7 @@ public class AnnotationProcessor else { Class<?>[] classes = method.getParameterTypes(); - for (Class c : classes) + for (Class<?> c : classes) { Field[] fields = c.getFields(); // Check for fields SERVICE_NAME and ROLE diff --git a/src/java/org/apache/turbine/modules/screens/PlainJSONSecureAnnotatedScreen.java b/src/java/org/apache/turbine/modules/screens/PlainJSONSecureAnnotatedScreen.java index 5adcd38b..4e56828b 100644 --- a/src/java/org/apache/turbine/modules/screens/PlainJSONSecureAnnotatedScreen.java +++ b/src/java/org/apache/turbine/modules/screens/PlainJSONSecureAnnotatedScreen.java @@ -59,10 +59,15 @@ public class PlainJSONSecureAnnotatedScreen extends PlainJSONScreen protected boolean isAuthorized(PipelineData pipelineData) throws Exception { RunData data = pipelineData.getRunData(); Method[] methods = getClass().getMethods(); - for (Method m : methods) { - if (m.getName().equals( "doOutput" )) { - if ((TurbineAccessControlList)data.getACL() == null) return false; - return AnnotationProcessor.isAuthorized( m, (TurbineAccessControlList)data.getACL(), ConditionType.ANY ); + for (Method m : methods) + { + if (m.getName().equals( "doOutput" )) + { + if (data.getACL() == null) + { + return false; + } + return AnnotationProcessor.isAuthorized( m, (TurbineAccessControlList<?>)data.getACL(), ConditionType.ANY ); } } return false; diff --git a/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java b/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java index b9387cb9..f3bc80de 100644 --- a/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java +++ b/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java @@ -1,7 +1,30 @@ package org.apache.turbine.services.pull.util; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.time.temporal.TemporalAccessor; +import java.util.Locale; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.turbine.annotation.TurbineService; @@ -11,12 +34,6 @@ import org.apache.turbine.services.localization.DateTimeFormatterInterface; import org.apache.turbine.services.localization.DateTimeFormatterService; import org.apache.turbine.services.pull.ApplicationTool; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.time.temporal.TemporalAccessor; -import java.util.Locale; - /** * This pull tool is used to format {@link TemporalAccessor} and * {@link #map(String, DateTimeFormatter, Locale)} (different falvors) @@ -88,7 +105,7 @@ public class DateTimeFormatterTool public String getDateTimeFormatPattern() { return getDtfs().getDateTimeFormatPattern(); } - + /** * Formats the given datetime as a String with the #{@link DateTimeFormatterTool#defaultFormat}. * using the default date format. @@ -110,18 +127,18 @@ public class DateTimeFormatterTool { return getDtfs().format(temporalAccessor, dateFormatString, locale); } - + public String map( String src, String outgoingFormatPattern, Locale locale, String incomingFormatPattern) { return getDtfs().map(src, outgoingFormatPattern, locale, incomingFormatPattern); } - public String map( String src, java.time.format.DateTimeFormatter outgoingFormat, Locale locale, + public String map( String src, java.time.format.DateTimeFormatter outgoingFormat, Locale locale, java.time.format.DateTimeFormatter incomingFormat) { return getDtfs().map(src, outgoingFormat, locale, incomingFormat); } - + public String mapTo( String src, DateTimeFormatter outgoingFormat ) { return getDtfs().map( src, outgoingFormat, null, getDtfs().getDefaultFormat() ); diff --git a/src/java/org/apache/turbine/services/security/DefaultUserManager.java b/src/java/org/apache/turbine/services/security/DefaultUserManager.java index b93b06f5..49e655d2 100644 --- a/src/java/org/apache/turbine/services/security/DefaultUserManager.java +++ b/src/java/org/apache/turbine/services/security/DefaultUserManager.java @@ -21,7 +21,6 @@ package org.apache.turbine.services.security; */ -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java b/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java index 8b915e4a..af0fd6e0 100644 --- a/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java +++ b/src/test/org/apache/turbine/services/localization/DateTimeFormatterServiceTest.java @@ -1,5 +1,43 @@ package org.apache.turbine.services.localization; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; +import static org.junit.jupiter.api.DynamicTest.dynamicTest; +import static org.mockito.Mockito.mock; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoField; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalAccessor; +import java.util.stream.Stream; + +import javax.servlet.ServletConfig; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.fulcrum.parser.DefaultParameterParser; import org.apache.turbine.annotation.AnnotationProcessor; @@ -11,7 +49,6 @@ import org.apache.turbine.services.velocity.VelocityService; import org.apache.turbine.test.BaseTestCase; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineConfig; -import org.apache.turbine.util.TurbineException; import org.apache.velocity.context.Context; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -24,25 +61,6 @@ import org.junit.jupiter.api.TestFactory; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestMethodOrder; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoField; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAccessor; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; -import static org.junit.jupiter.api.DynamicTest.dynamicTest; -import static org.mockito.Mockito.mock; - /** * Test class for DateTimeFormatter. * @@ -66,7 +84,7 @@ public class DateTimeFormatterServiceTest extends BaseTestCase { @TurbineService RunDataService runDataService = null; - + @BeforeAll public void setup() throws Exception { @@ -181,7 +199,7 @@ public class DateTimeFormatterServiceTest extends BaseTestCase { String secsString = (secs < 10 ? "0" : "") + secs; String zone = zdt.getZone().getId(); - String offset = zdt.getOffset().getId(); + /* String offset = */ zdt.getOffset().getId(); // offset formatting not easy matchable, removed String mmddyyyy = "" + monthString + "/" + dayString + "/" + year + " " + hourString + ":" + minsString + ":" + secsString + " " + zone; diff --git a/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java b/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java index 520623c5..071f5c81 100644 --- a/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java +++ b/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java @@ -23,10 +23,8 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; -import java.io.File; import java.nio.file.FileSystems; import java.nio.file.Path; -import java.nio.file.Paths; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement;
