http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java b/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java index d1ceddc..3fce797 100644 --- a/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java +++ b/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java @@ -221,7 +221,7 @@ public class WebAppTemplateLoader implements TemplateLoader { } } } catch (SecurityException e) { - ;// ignore + // ignore } }
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java index 814f930..956064a 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java @@ -42,7 +42,7 @@ import org.apache.freemarker.core.util._ClassUtil; * the two. As FTL as no separate namespace for "tags" and functions, both aspect has to be implemented by the same * value. * - * @sine 2.3.25 + * @since 2.3.25 */ @SuppressWarnings("rawtypes") class CustomTagAndELFunctionCombiner { @@ -89,7 +89,7 @@ class CustomTagAndELFunctionCombiner { private static class CombinedTemplateModel { // Marker only - }; + } private static class TemplateDirectiveModelAndSimpleMethodModel extends CombinedTemplateModel implements TemplateDirectiveModel, TemplateMethodModelEx, TemplateSequenceModel, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java index ee65d27..c57d4e4 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java @@ -69,7 +69,6 @@ abstract class FreeMarkerPageContext extends PageContext implements TemplateMode private static final Class OBJECT_CLASS = Object.class; private final Environment environment; - private final int incompatibleImprovements; private List tags = new ArrayList(); private List outs = new ArrayList(); private final GenericServlet servlet; @@ -82,7 +81,6 @@ abstract class FreeMarkerPageContext extends PageContext implements TemplateMode protected FreeMarkerPageContext() throws TemplateModelException { environment = Environment.getCurrentEnvironment(); - incompatibleImprovements = environment.getConfiguration().getIncompatibleImprovements().intValue(); TemplateModel appModel = environment.getGlobalVariable( FreemarkerServlet.KEY_APPLICATION_PRIVATE); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java b/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java index 82ad1cb..4711cd2 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java @@ -66,7 +66,7 @@ class JspTagModelBase { Method dynaSetter; try { dynaSetter = tagClass.getMethod("setDynamicAttribute", - new Class[] {String.class, String.class, Object.class}); + String.class, String.class, Object.class); } catch (NoSuchMethodException nsme) { dynaSetter = null; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java b/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java index b772d7e..930223c 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java @@ -1127,7 +1127,7 @@ public class TaglibFactory implements TemplateHashModel { */ public static final class WebInfPerLibJarMetaInfTldSource extends MetaInfTldSource { public final static WebInfPerLibJarMetaInfTldSource INSTANCE = new WebInfPerLibJarMetaInfTldSource(); - private WebInfPerLibJarMetaInfTldSource() { }; + private WebInfPerLibJarMetaInfTldSource() { } } /** @@ -1162,8 +1162,8 @@ public class TaglibFactory implements TemplateHashModel { */ public Pattern getRootContainerPattern() { return rootContainerPattern; - }; - + } + } /** @@ -1176,7 +1176,7 @@ public class TaglibFactory implements TemplateHashModel { */ public static final class ClearMetaInfTldSource extends MetaInfTldSource { public final static ClearMetaInfTldSource INSTANCE = new ClearMetaInfTldSource(); - private ClearMetaInfTldSource() { }; + private ClearMetaInfTldSource() { } } private interface TldLocation { @@ -1185,13 +1185,13 @@ public class TaglibFactory implements TemplateHashModel { * Reads the TLD file. * @return Not {@code null} */ - public abstract InputStream getInputStream() throws IOException; + InputStream getInputStream() throws IOException; /** * The absolute URL of the TLD file. * @return Not {@code null} */ - public abstract String getXmlSystemId() throws IOException; + String getXmlSystemId() throws IOException; } private interface InputStreamFactory { @@ -1480,7 +1480,7 @@ public class TaglibFactory implements TemplateHashModel { return tagsAndFunctions.isEmpty(); } - private static final Map parseToTagsAndFunctions( + private static Map parseToTagsAndFunctions( ServletContext ctx, TldLocation tldLocation, ObjectWrapper objectWrapper) throws IOException, SAXException { final TldParserForTaglibBuilding tldParser = new TldParserForTaglibBuilding(objectWrapper); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java b/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java index b0be788..1ca5de5 100644 --- a/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java +++ b/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java @@ -57,7 +57,7 @@ public class CanonicalFormTest extends FileTestCase { } private void assertCanonicalFormOf(String ftlFileName) - throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { + throws IOException { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); cfg.setTemplateLoader( new CopyrightCommentRemoverTemplateLoader( http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java b/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java index 1778c60..90cef85 100644 --- a/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java +++ b/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java @@ -45,7 +45,7 @@ public class CustomAttributeTest { private static final Object VALUE_2 = new Object(); private static final Object VALUE_3 = new Object(); private static final Object VALUE_LIST = ImmutableList.<Object>of( - "s", BigDecimal.valueOf(2), Boolean.TRUE, ImmutableMap.<String, String>of("a", "A")); + "s", BigDecimal.valueOf(2), Boolean.TRUE, ImmutableMap.of("a", "A")); private static final Object VALUE_BIGDECIMAL = BigDecimal.valueOf(22); private static final CustomAttribute CUST_ATT_TMP_1 = new CustomAttribute(CustomAttribute.SCOPE_TEMPLATE); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java b/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java index 0a753e6..14e8457 100644 --- a/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java +++ b/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java @@ -1389,8 +1389,7 @@ public class ObjectBuilderSettingsTest { if (map == null) { if (other.map != null) return false; } else if (!map.equals(other.map)) return false; - if (n != other.n) return false; - return true; + return n == other.n; } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/TabSizeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TabSizeTest.java b/src/test/java/org/apache/freemarker/core/TabSizeTest.java index 3f7accc..1af42e0 100644 --- a/src/test/java/org/apache/freemarker/core/TabSizeTest.java +++ b/src/test/java/org/apache/freemarker/core/TabSizeTest.java @@ -35,8 +35,7 @@ public class TabSizeTest extends TemplateTest { @Override protected Configuration createConfiguration() throws Exception { - Configuration cfg = super.createConfiguration(); - return cfg; + return super.createConfiguration(); } @Test @@ -76,7 +75,7 @@ public class TabSizeTest extends TemplateTest { } protected void assertErrorColumnNumber(int expectedColumn, String templateSource) - throws TemplateNotFoundException, MalformedTemplateNameException, IOException { + throws IOException { addTemplate("t", templateSource); try { getConfiguration().getTemplate("t"); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java b/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java index a995b51..b3660e6 100644 --- a/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java +++ b/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java @@ -156,7 +156,7 @@ public class TagSyntaxVariationsTest extends TestCase { * @param expected the expected output or <tt>null</tt> if we expect * a parsing error. */ - private static final void test( + private static void test( Configuration cfg, String template, String expected) throws TemplateException, IOException { Template t = null; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java index 384111d..88602ed 100644 --- a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java @@ -38,7 +38,7 @@ import org.junit.Test; public class TemplatGetEncodingTest { @Test - public void test() throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { + public void test() throws IOException { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); { cfg.setDefaultEncoding("ISO-8859-2"); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java b/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java index 61b936e..8ff71d3 100644 --- a/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java @@ -97,11 +97,11 @@ public class TemplateConstructorsTest { } } - private final Reader createReader() { + private Reader createReader() { return new StringReader(READER_CONTENT); } - private final Reader createReaderForceUTF8() { + private Reader createReaderForceUTF8() { return new StringReader(READER_CONTENT_FORCE_UTF8); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java index a4bfb29..b14a111 100644 --- a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java +++ b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java @@ -139,6 +139,7 @@ public class TheadInterruptingSupportTest { @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { + // Deliberate infinite loop while (true) { body.render(_NullWriter.INSTANCE); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java index d424114..dfb5707 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java @@ -648,7 +648,7 @@ public class DefaultObjectWrapperTest { @Test public void testIteratorWrapping() throws TemplateModelException, ClassNotFoundException { - final List<String> list = ImmutableList.<String> of("a", "b", "c"); + final List<String> list = ImmutableList.of("a", "b", "c"); Iterator<String> it = list.iterator(); TemplateCollectionModel coll = (TemplateCollectionModel) OW300.wrap(it); @@ -933,6 +933,6 @@ public class DefaultObjectWrapperTest { return tupple; } - }; - + } + } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/model/impl/beans/CommonSupertypeForUnwrappingHintTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/CommonSupertypeForUnwrappingHintTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/CommonSupertypeForUnwrappingHintTest.java index edf8c41..e7ea63c 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/CommonSupertypeForUnwrappingHintTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/CommonSupertypeForUnwrappingHintTest.java @@ -124,6 +124,6 @@ public class CommonSupertypeForUnwrappingHintTest extends TestCase { throw new RuntimeException("Not implemented in this dummy."); } - }; - + } + } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java index bcaf81a..c18b049 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java @@ -77,7 +77,7 @@ public class EnumModelsTest { assertNull(eAfterClean.get("C")); } - public static enum E { + public enum E { A, B; @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java index 596b3e7..60c07ef 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java @@ -314,7 +314,7 @@ public class ParameterListPreferabilityTest extends TestCase { }, new Object[] { "a", "b" }); - /** Subclassing is more important than primitive-VS-boxed: */ + // Subclassing is more important than primitive-VS-boxed: testAllCmpPermutationsInc( new Class[][] { new Class[] { boolean.class, boolean.class, boolean.class, String.class }, @@ -333,7 +333,7 @@ public class ParameterListPreferabilityTest extends TestCase { }, new Object[] { true, false, true, "a" }); - /** Subclassing is more important than primitive-VS-boxed: */ + // Subclassing is more important than primitive-VS-boxed: testAllCmpPermutationsInc( new Class[][] { new Class[] { int.class, int.class, int.class, String.class }, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java index c517c21..fd9929f 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java @@ -457,7 +457,7 @@ public class DefaultTemplateResolverTest { } @Test - public void testTemplateNameFormatException() throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { + public void testTemplateNameFormatException() throws IOException { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); cfg.setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE); try { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java index 8923417..66de647 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java @@ -48,7 +48,7 @@ public class MultiTemplateLoaderTest { stl2.putTemplate("2.ftl", "2"); stl2.putTemplate("both.ftl", "both 2"); - MultiTemplateLoader mtl = new MultiTemplateLoader(new TemplateLoader[] { stl1, stl2 }); + MultiTemplateLoader mtl = new MultiTemplateLoader(stl1, stl2); assertEquals("1", getTemplateContent(mtl, "1.ftl")); assertEquals("2", getTemplateContent(mtl, "2.ftl")); assertEquals("both 1", getTemplateContent(mtl, "both.ftl")); @@ -72,7 +72,7 @@ public class MultiTemplateLoaderTest { ByteArrayTemplateLoader stl2 = new ByteArrayTemplateLoader(); stl2.putTemplate("both.ftl", "both 2".getBytes(StandardCharsets.UTF_8)); - MultiTemplateLoader mtl = new MultiTemplateLoader(new TemplateLoader[] { stl1, stl2 }); + MultiTemplateLoader mtl = new MultiTemplateLoader(stl1, stl2); mtl.setSticky(sticky); assertEquals("both 1", getTemplateContent(mtl, "both.ftl")); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java index 41cbf75..cdf5deb 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java @@ -226,7 +226,7 @@ public class TemplateNameFormatTest { } @Test - public void assertBackslashNotSpecialWith23() throws MalformedTemplateNameException, ParseException, IOException { + public void assertBackslashNotSpecialWith23() throws IOException { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); MonitoredTemplateLoader tl = new MonitoredTemplateLoader(); @@ -276,7 +276,7 @@ public class TemplateNameFormatTest { } @Test - public void assertBackslashNotAllowed() throws MalformedTemplateNameException, ParseException, IOException { + public void assertBackslashNotAllowed() throws IOException { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); cfg.setTemplateLoader(new ByteArrayTemplateLoader()); cfg.setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java index 9e32238..5c2a3f6 100644 --- a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java +++ b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java @@ -53,10 +53,8 @@ public abstract class ExamplesTest extends TemplateTest { protected void setupTemplateLoaders(Configuration cfg) { cfg.setTemplateLoader(new MultiTemplateLoader( - new TemplateLoader[] { - new ByteArrayTemplateLoader(), - new ClassTemplateLoader(getClass(), "") - })); + new ByteArrayTemplateLoader(), + new ClassTemplateLoader(getClass(), ""))); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java index c5169d8..a2facaf 100644 --- a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java +++ b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java @@ -110,8 +110,8 @@ public class TemplateConfigurationExamples extends ExamplesTest { assertEquals(UndefinedOutputFormat.INSTANCE, cfg.getTemplate("t.subject.ftl").getOutputFormat()); assertEquals(PlainTextOutputFormat.INSTANCE, cfg.getTemplate("mail/t.subject.ftl").getOutputFormat()); assertEquals(HTMLOutputFormat.INSTANCE, cfg.getTemplate("mail/t.body.ftl").getOutputFormat()); - }; - + } + @Test public void example3() throws Exception { Configuration cfg = getConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java index bef3042..a44c51a 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java @@ -88,11 +88,11 @@ public class TLDParsingTest { TemplateMethodModelEx function = (TemplateMethodModelEx) tagsAndFunctions.get("toUpperCase"); assertNotNull(function); - TemplateScalarModel result = (TemplateScalarModel) function.exec(Arrays.asList(new TemplateModel [] { new SimpleScalar("abc") })); + TemplateScalarModel result = (TemplateScalarModel) function.exec(Arrays.asList(new SimpleScalar("abc"))); assertEquals("ABC", result.getAsString()); function = (TemplateMethodModelEx) tagsAndFunctions.get("toUpperCase2"); assertNotNull(function); - result = (TemplateScalarModel) function.exec(Arrays.asList(new TemplateModel [] { new SimpleScalar("abc") })); + result = (TemplateScalarModel) function.exec(Arrays.asList(new SimpleScalar("abc"))); assertEquals("ABC", result.getAsString()); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java index e4a0a3b..43ac335 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java @@ -30,32 +30,32 @@ public class TaglibMethodUtilTest { @Test public void testGetMethodByFunctionSignature() throws Exception { - Method expected = Functions.class.getMethod("plus", new Class [] { int.class, int.class }); + Method expected = Functions.class.getMethod("plus", int.class, int.class); String signature = "int plus(int, int)"; Method method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); - expected = Functions.class.getMethod("plus", new Class [] { double.class, double.class }); + expected = Functions.class.getMethod("plus", double.class, double.class); signature = "double plus ( double , double )"; method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); - expected = Functions.class.getMethod("plus", new Class [] { String.class, String.class }); + expected = Functions.class.getMethod("plus", String.class, String.class); signature = "java.lang.String plus ( java.lang.String ,java.lang.String )"; method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); - expected = Functions.class.getMethod("plus", new Class [] { double[].class, double[].class }); + expected = Functions.class.getMethod("plus", double[].class, double[].class); signature = "double[] plus ( double[] ,double [] )"; method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); - expected = Functions.class.getMethod("plus", new Class [] { String[].class, String[].class }); + expected = Functions.class.getMethod("plus", String[].class, String[].class); signature = "java.lang.String [] plus ( java.lang.String[] ,java.lang.String [] )"; method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); - expected = Functions.class.getMethod("sum", new Class [] { double[].class }); + expected = Functions.class.getMethod("sum", double[].class); signature = "double sum ( double[] )"; method = TaglibMethodUtil.getMethodByFunctionSignature(Functions.class, signature); assertEquals(expected, method); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestFunctions.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestFunctions.java b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestFunctions.java index 2b227a1..03d1db6 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestFunctions.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestFunctions.java @@ -73,7 +73,7 @@ public final class TestFunctions { @SuppressWarnings("boxing") public static Map<String, Integer> testMap() { - return ImmutableMap.<String, Integer>of("a", 1, "b", 2, "c", 3); + return ImmutableMap.of("a", 1, "b", 2, "c", 3); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java index 68954ab..595f80a 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java @@ -91,7 +91,7 @@ public class TestTag extends BodyTagSupport implements TryCatchFinally { } } - private static final String getFirstLine(String s) { + private static String getFirstLine(String s) { int brIdx = s.indexOf('\n'); if (brIdx == -1) brIdx = s.indexOf('\r'); return brIdx == -1 ? s : s.substring(0, brIdx); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/MonitoredTemplateLoader.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/MonitoredTemplateLoader.java b/src/test/java/org/apache/freemarker/test/MonitoredTemplateLoader.java index 5b79801..510f71a 100644 --- a/src/test/java/org/apache/freemarker/test/MonitoredTemplateLoader.java +++ b/src/test/java/org/apache/freemarker/test/MonitoredTemplateLoader.java @@ -255,9 +255,7 @@ public class MonitoredTemplateLoader implements TemplateLoader { return false; } else if (!name.equals(other.name)) return false; - if (resultStatus != other.resultStatus) - return false; - return true; + return resultStatus == other.resultStatus; } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java index 03afa2c..b231bec 100644 --- a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java +++ b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java @@ -227,7 +227,7 @@ public final class ResourcesExtractor { return finalJarFile; } - private static void jarDirectory(File srcDir, File jarFile) throws FileNotFoundException, IOException { + private static void jarDirectory(File srcDir, File jarFile) throws IOException { boolean finished = false; try { FileOutputStream fileOut = new FileOutputStream(jarFile); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/TemplateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/TemplateTest.java b/src/test/java/org/apache/freemarker/test/TemplateTest.java index 4452e20..68c9ea5 100644 --- a/src/test/java/org/apache/freemarker/test/TemplateTest.java +++ b/src/test/java/org/apache/freemarker/test/TemplateTest.java @@ -82,8 +82,7 @@ public abstract class TemplateTest { } private Template createTemplate(String ftl) throws IOException { - Template t = new Template(null, ftl, getConfiguration()); - return t; + return new Template(null, ftl, getConfiguration()); } protected void assertOutputForNamed(String name, String expectedOut) throws IOException, TemplateException { @@ -130,8 +129,7 @@ public abstract class TemplateTest { protected String getOutput(Template t) throws TemplateException, IOException { StringWriter out = new StringWriter(); t.process(getDataModel(), out); - String actualOut = out.toString(); - return actualOut; + return out.toString(); } protected Configuration createConfiguration() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/servlet/Model2Action.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/servlet/Model2Action.java b/src/test/java/org/apache/freemarker/test/servlet/Model2Action.java index 9565d12..8b0c382 100644 --- a/src/test/java/org/apache/freemarker/test/servlet/Model2Action.java +++ b/src/test/java/org/apache/freemarker/test/servlet/Model2Action.java @@ -32,6 +32,6 @@ public interface Model2Action { * @return The servlet-relative path to forward to, or {@code null} if we expect it to be specified with the * {@value Model2TesterServlet#VIEW_PARAM_NAME} request parameter. */ - public String execute(final HttpServletRequest req, final HttpServletResponse resp) throws Exception; + String execute(final HttpServletRequest req, final HttpServletResponse resp) throws Exception; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java index c0dc4d3..14acde6 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java @@ -242,7 +242,7 @@ public class TemplateTestCase extends FileTestCase { dataModel.put("s4", w5.wrap("world")); } else if (simpleTestName.equals("beans")) { dataModel.put("array", new String[] { "array-0", "array-1"}); - dataModel.put("list", Arrays.asList(new String[] { "list-0", "list-1", "list-2"})); + dataModel.put("list", Arrays.asList("list-0", "list-1", "list-2")); Map<Object, Object> tmap = new HashMap<>(); tmap.put("key", "value"); Object objKey = new Object(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java index bb15359..5133b0a 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java @@ -211,7 +211,7 @@ public class TemplateTestSuite extends TestSuite { final boolean noOutput; { String s = _StringUtil.emptyToNull(testCaseElem.getAttribute(ATTR_NO_OUTPUT)); - noOutput = s == null ? false : _StringUtil.getYesNo(s); + noOutput = s != null && _StringUtil.getYesNo(s); } final Map<String, String> testCaseSettings = getCaseFMSettings(testCaseElem); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java index d8a337e..da5d62f 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java @@ -66,12 +66,8 @@ public class Listables { LINKED_LIST = list; } - private static final List<Integer> EMPTY_LINKED_LIST; - static { - List<Integer> list = new LinkedList<>(); - EMPTY_LINKED_LIST = list; - } - + private static final List<Integer> EMPTY_LINKED_LIST = new LinkedList<>(); + private static final Set<Integer> SET; static { Set<Integer> set = new TreeSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java index a596fc6..c12406c 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java @@ -1004,7 +1004,7 @@ public class OverloadedMethods2 { return new MyBooleanWrapperAsAnotherBooleanModel(); } - public String bugReport363(Map<String, ? extends Object> fields, List<?> listField) { + public String bugReport363(Map<String, ?> fields, List<?> listField) { return "Executed: testMethod(Map fields, List listField) on input: fields=" + fields + " and listField=" + listField; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java index a18f83a..f8bc527 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java @@ -28,7 +28,7 @@ import org.apache.freemarker.core.util.XmlEscape; /** * Simple test of the interaction between MethodModels and TransformModels. */ -public class TransformMethodWrapper1 extends Object implements TemplateMethodModel { +public class TransformMethodWrapper1 implements TemplateMethodModel { /** * Executes a method call. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/983ad9bd/src/test/java/org/apache/freemarker/test/util/FileTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/FileTestCase.java b/src/test/java/org/apache/freemarker/test/util/FileTestCase.java index 24728bd..b607bc9 100644 --- a/src/test/java/org/apache/freemarker/test/util/FileTestCase.java +++ b/src/test/java/org/apache/freemarker/test/util/FileTestCase.java @@ -46,7 +46,7 @@ public abstract class FileTestCase extends TestCase { super(name); } - protected void assertFilesEqual(String testCaseFileName) throws FileNotFoundException, IOException { + protected void assertFilesEqual(String testCaseFileName) throws IOException { try { multilineAssertEquals( loadFile(getExpectedFileFor(testCaseFileName)), @@ -144,19 +144,19 @@ public abstract class FileTestCase extends TestCase { return new File(url.getFile()); } - protected String loadFile(File f) throws FileNotFoundException, IOException { + protected String loadFile(File f) throws IOException { return TestUtil.removeTxtCopyrightComment(loadFile(f, getDefaultCharset())); } - protected String loadFile(File f, String charset) throws FileNotFoundException, IOException { + protected String loadFile(File f, String charset) throws IOException { return loadString(new FileInputStream(f), charset); } - protected String loadResource(String resourceName) throws FileNotFoundException, IOException { + protected String loadResource(String resourceName) throws IOException { return loadResource(resourceName, getDefaultCharset()); } - protected String loadResource(String resourceName, String charset) throws FileNotFoundException, IOException { + protected String loadResource(String resourceName, String charset) throws IOException { return loadString(new FileInputStream(new File(getTestClassDirectory(), resourceName)), charset); }
