You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/01/18 18:49:02 UTC
[freemarker] 02/02: Forward ported from 2.3-gae: Added missing
@Overrides (Java 6 language cleanup)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit c4145e3a1ffc182f1fc8d27025632e6776c723d4
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Jan 18 18:13:05 2020 +0100
Forward ported from 2.3-gae: Added missing @Overrides (Java 6 language cleanup)
---
.../java/org/freemarker/converter/GenericConverterTest.java | 1 +
.../java/org/apache/freemarker/core/AttemptLoggingTest.java | 2 ++
.../freemarker/core/model/impl/AlphabeticalMethodSorter.java | 1 +
.../impl/DefaultObjectWrapperMemberAccessPolicyTest.java | 4 ++++
.../model/impl/Java8BridgeMethodsWithDefaultMethodBean.java | 1 +
.../model/impl/MemberSelectorListMemberAccessPolicyTest.java | 4 ++++
.../apache/freemarker/core/model/impl/MethodMatcherTest.java | 4 ++++
.../impl/DefaultTruncateBuiltinAlgorithmTest.java | 3 +++
.../org/apache/freemarker/core/BuiltInsForStringsBasic.java | 12 ++++++++++++
.../freemarker/core/LoggingAttemptExceptionReporter.java | 1 +
.../model/impl/MemberSelectorListMemberAccessPolicy.java | 4 ++++
.../form/AbstractHtmlElementTemplateDirectiveModel.java | 1 +
.../spring/model/form/ButtonTemplateDirectiveModel.java | 1 +
.../spring/model/form/FormTemplateDirectiveModel.java | 1 +
.../java/org/apache/freemarker/spring/web/view/EchoTag.java | 2 ++
.../freemarker/test/templateutil/AssertFailsDirective.java | 1 +
16 files changed, 43 insertions(+)
diff --git a/freemarker-converter/src/test/java/org/freemarker/converter/GenericConverterTest.java b/freemarker-converter/src/test/java/org/freemarker/converter/GenericConverterTest.java
index ff0cc36..f170fc6 100644
--- a/freemarker-converter/src/test/java/org/freemarker/converter/GenericConverterTest.java
+++ b/freemarker-converter/src/test/java/org/freemarker/converter/GenericConverterTest.java
@@ -43,6 +43,7 @@ import org.junit.Test;
*/
public class GenericConverterTest extends ConverterTest {
+ @Override
protected void createSourceFiles() throws IOException {
write(new File(srcDir, "t1.txt"), "t1", UTF_8);
write(new File(srcDir, "t2.txt"), "t2", UTF_8);
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/AttemptLoggingTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/AttemptLoggingTest.java
index 9204ac5..77098e3 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/AttemptLoggingTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/AttemptLoggingTest.java
@@ -65,6 +65,7 @@ public class AttemptLoggingTest extends TemplateTest {
setConfiguration(newConfigurationBuilder()
.attemptExceptionReporter(new TestAttemptExceptionReporter(reports))
.templateExceptionHandler(new TemplateExceptionHandler() {
+ @Override
public void handleTemplateException(TemplateException te, Environment env, Writer out)
throws TemplateException {
try {
@@ -87,6 +88,7 @@ public class AttemptLoggingTest extends TemplateTest {
this.reports = reports;
}
+ @Override
public void report(TemplateException te, Environment env) {
reports.add(te.getMessage());
}
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AlphabeticalMethodSorter.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AlphabeticalMethodSorter.java
index 149ad0d..dc178d1 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AlphabeticalMethodSorter.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AlphabeticalMethodSorter.java
@@ -35,6 +35,7 @@ class AlphabeticalMethodSorter implements MethodSorter {
@Override
public void sortMethodDescriptors(List<MethodDescriptor> methodDescriptors) {
Collections.sort(methodDescriptors, new Comparator<MethodDescriptor>() {
+ @Override
public int compare(MethodDescriptor o1, MethodDescriptor o2) {
int res = o1.getMethod().toString().compareTo(o2.getMethod().toString());
return desc ? -res : res;
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperMemberAccessPolicyTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperMemberAccessPolicyTest.java
index 529fd84..f92ba92 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperMemberAccessPolicyTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperMemberAccessPolicyTest.java
@@ -519,16 +519,20 @@ public class DefaultObjectWrapperMemberAccessPolicyTest {
public void testMemberAccessPolicyAndStatics() throws TemplateException {
DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0)
.memberAccessPolicy(new MemberAccessPolicy() {
+ @Override
public ClassMemberAccessPolicy forClass(Class<?> contextClass) {
return new ClassMemberAccessPolicy() {
+ @Override
public boolean isMethodExposed(Method method) {
return method.getName().equals("m1");
}
+ @Override
public boolean isConstructorExposed(Constructor<?> constructor) {
return false;
}
+ @Override
public boolean isFieldExposed(Field field) {
String name = field.getName();
return name.equals("F1") || name.equals("V1");
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
index c7d27a6..574e0fa 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
@@ -22,6 +22,7 @@ public class Java8BridgeMethodsWithDefaultMethodBean implements Java8BridgeMetho
static final String M1_RETURN_VALUE = "m1ReturnValue";
+ @Override
public String m1() {
return M1_RETURN_VALUE;
}
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicyTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicyTest.java
index 9c7d92f..4727fdd 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicyTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicyTest.java
@@ -547,6 +547,7 @@ public class MemberSelectorListMemberAccessPolicyTest {
public static class D1 implements I1 {
public int f1;
+ @Override
public void m1() {
}
}
@@ -560,6 +561,7 @@ public class MemberSelectorListMemberAccessPolicyTest {
}
+ @Override
public void m2() {
}
}
@@ -568,6 +570,7 @@ public class MemberSelectorListMemberAccessPolicyTest {
}
public static class F1 implements J1 {
+ @Override
public void m2() {
}
}
@@ -661,6 +664,7 @@ public class MemberSelectorListMemberAccessPolicyTest {
@Override
public void m5() {}
+ @Override
public void m6() {}
}
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MethodMatcherTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MethodMatcherTest.java
index effeb13..375d4d4 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MethodMatcherTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MethodMatcherTest.java
@@ -49,6 +49,7 @@ public class MethodMatcherTest {
}
public static class TestReturnTypeOverloadString extends TestReturnTypeOverloadGeneric<String> {
+ @Override
public String m() {
return "";
};
@@ -136,16 +137,19 @@ public class MethodMatcherTest {
}
public static class TestInheritance2SafeRunnable1 implements Runnable {
+ @Override
public void run() {
}
}
public static class TestInheritance2SafeRunnable2 implements Runnable {
+ @Override
public void run() {
}
}
public static class TestInheritance2UnsafeRunnable implements Runnable {
+ @Override
public void run() {
}
}
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/pluggablebuiltin/impl/DefaultTruncateBuiltinAlgorithmTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/pluggablebuiltin/impl/DefaultTruncateBuiltinAlgorithmTest.java
index f567825..e5621bc 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/pluggablebuiltin/impl/DefaultTruncateBuiltinAlgorithmTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/pluggablebuiltin/impl/DefaultTruncateBuiltinAlgorithmTest.java
@@ -398,6 +398,7 @@ public class DefaultTruncateBuiltinAlgorithmTest {
EMPTY_TERMINATOR_INSTANCE, DOTS_INSTANCE, ASCII_NO_W_SPACE_INSTANCE, M_TERM_INSTANCE }) {
for (TruncateCaller tc : new TruncateCaller[] {
new TruncateCaller() {
+ @Override
public TemplateModel truncate(String s, int maxLength, TemplateModel terminator,
Integer terminatorLength, Environment env) throws
TemplateException {
@@ -405,6 +406,7 @@ public class DefaultTruncateBuiltinAlgorithmTest {
}
},
new TruncateCaller() {
+ @Override
public TemplateModel truncate(String s, int maxLength, TemplateModel terminator,
Integer terminatorLength, Environment env) throws
TemplateException {
@@ -412,6 +414,7 @@ public class DefaultTruncateBuiltinAlgorithmTest {
}
},
new TruncateCaller() {
+ @Override
public TemplateModel truncate(String s, int maxLength, TemplateModel terminator,
Integer terminatorLength, Environment env) throws
TemplateException {
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsBasic.java b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsBasic.java
index 13f7327..be2910d 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsBasic.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/BuiltInsForStringsBasic.java
@@ -809,6 +809,7 @@ class BuiltInsForStringsBasic {
}
static class truncateBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -816,12 +817,14 @@ class BuiltInsForStringsBasic {
return algorithm.truncate(s, maxLength, (TemplateStringModel) terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return false;
}
}
static class truncate_wBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -829,12 +832,14 @@ class BuiltInsForStringsBasic {
return algorithm.truncateW(s, maxLength, (TemplateStringModel) terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return false;
}
}
static class truncate_cBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -842,12 +847,14 @@ class BuiltInsForStringsBasic {
return algorithm.truncateC(s, maxLength, (TemplateStringModel) terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return false;
}
}
static class truncate_mBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -855,12 +862,14 @@ class BuiltInsForStringsBasic {
return algorithm.truncateM(s, maxLength, terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return true;
}
}
static class truncate_w_mBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -868,12 +877,14 @@ class BuiltInsForStringsBasic {
return algorithm.truncateWM(s, maxLength, terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return true;
}
}
static class truncate_c_mBI extends AbstractTruncateBI {
+ @Override
protected TemplateModel truncate(
TruncateBuiltinAlgorithm algorithm, String s, int maxLength,
TemplateModel terminator, Integer terminatorLength, Environment env)
@@ -881,6 +892,7 @@ class BuiltInsForStringsBasic {
return algorithm.truncateCM(s, maxLength, terminator, terminatorLength, env);
}
+ @Override
protected boolean allowMarkupTerminator() {
return true;
}
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/LoggingAttemptExceptionReporter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/LoggingAttemptExceptionReporter.java
index 30c787a..bda680e 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/LoggingAttemptExceptionReporter.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/LoggingAttemptExceptionReporter.java
@@ -37,6 +37,7 @@ class LoggingAttemptExceptionReporter implements AttemptExceptionReporter {
this.logAsWarn = logAsWarn;
}
+ @Override
public void report(TemplateException te, Environment env) {
String message = "Error executing FreeMarker template part in the #attempt block";
if (!logAsWarn) {
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
index 84d3410..4b0ceb6 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
@@ -329,8 +329,10 @@ public abstract class MemberSelectorListMemberAccessPolicy implements MemberAcce
}
}
+ @Override
public final ClassMemberAccessPolicy forClass(final Class<?> contextClass) {
return new ClassMemberAccessPolicy() {
+ @Override
public boolean isMethodExposed(Method method) {
return matchResultToIsExposedResult(
methodMatcher.matches(contextClass, method)
@@ -339,6 +341,7 @@ public abstract class MemberSelectorListMemberAccessPolicy implements MemberAcce
!= null);
}
+ @Override
public boolean isConstructorExposed(Constructor<?> constructor) {
return matchResultToIsExposedResult(
constructorMatcher.matches(contextClass, constructor)
@@ -347,6 +350,7 @@ public abstract class MemberSelectorListMemberAccessPolicy implements MemberAcce
!= null);
}
+ @Override
public boolean isFieldExposed(Field field) {
return matchResultToIsExposedResult(
fieldMatcher.matches(contextClass, field)
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
index 9eb8ebb..3005075 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/AbstractHtmlElementTemplateDirectiveModel.java
@@ -306,6 +306,7 @@ abstract class AbstractHtmlElementTemplateDirectiveModel
return true;
}
+ @Override
protected void writeDefaultAttributes(TagOutputter tagOut) throws TemplateException, IOException {
super.writeDefaultAttributes(tagOut);
writeOptionalAttributes(tagOut);
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModel.java
index 40597d6..72ca43e 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModel.java
@@ -140,6 +140,7 @@ class ButtonTemplateDirectiveModel extends AbstractHtmlElementTemplateDirectiveM
}
}
+ @Override
public String getName() {
return name;
}
diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
index c95da6c..79ab1ed 100644
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
+++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModel.java
@@ -282,6 +282,7 @@ class FormTemplateDirectiveModel extends AbstractHtmlElementTemplateDirectiveMod
return autocomplete;
}
+ @Override
public String getName() {
return name;
}
diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/EchoTag.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/EchoTag.java
index 155474f..2a7e752 100644
--- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/EchoTag.java
+++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/EchoTag.java
@@ -39,6 +39,7 @@ public class EchoTag extends TagSupport {
this.message = message;
}
+ @Override
public int doEndTag() throws JspException {
try {
pageContext.getOut().print(message);
@@ -48,6 +49,7 @@ public class EchoTag extends TagSupport {
return EVAL_PAGE;
}
+ @Override
public void release() {
this.message = null;
}
diff --git a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/templateutil/AssertFailsDirective.java b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/templateutil/AssertFailsDirective.java
index 84e22a0..907cbbb 100644
--- a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/templateutil/AssertFailsDirective.java
+++ b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/templateutil/AssertFailsDirective.java
@@ -56,6 +56,7 @@ public class AssertFailsDirective implements TemplateDirectiveModel {
private AssertFailsDirective() {
}
+ @Override
public void execute(TemplateModel[] args, CallPlace callPlace, Writer out, Environment env)
throws TemplateException, IOException {
String message = CallableUtils.getOptionalStringArgument(args, MESSAGE_ARG_IDX, this);