You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 18:38:10 UTC
[commons-weaver] branch master updated: Use final.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new a49d5b9 Use final.
a49d5b9 is described below
commit a49d5b94fe4c7a35b7ff84b76e3cb0de445d9de8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 13:38:06 2020 -0500
Use final.
---
.../commons/weaver/maven/AbstractCWMojo.java | 2 +-
.../commons/weaver/maven/AbstractPrepareMojo.java | 2 +-
.../commons/weaver/maven/AbstractWeaveMojo.java | 2 +-
.../maven/JavaLoggingToMojoLoggingRedirector.java | 2 +-
.../commons/weaver/normalizer/UtilsTest.java | 4 +--
.../java/org/apache/commons/weaver/Finder.java | 4 +--
.../java/org/apache/commons/weaver/FinderTest.java | 32 +++++++++++-----------
.../commons/weaver/test/WeaveProcessorTest.java | 2 +-
.../apache/commons/weaver/test/WeaverTestBase.java | 26 +++++++++---------
.../commons/weaver/test/weaver/TestCleaner.java | 4 +--
.../commons/weaver/test/weaver/TestWeaver.java | 12 ++++----
.../apache/commons/weaver/utils/ProvidersTest.java | 2 +-
12 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractCWMojo.java b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractCWMojo.java
index 0387719..a7131a7 100755
--- a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractCWMojo.java
+++ b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractCWMojo.java
@@ -101,7 +101,7 @@ abstract class AbstractCWMojo extends AbstractMojo {
final List<String> classpath;
try {
classpath = createClasspath();
- } catch (DependencyResolutionException e) {
+ } catch (final DependencyResolutionException e) {
throw new MojoExecutionException("Error getting classpath artifacts", e);
}
final File target = getTarget();
diff --git a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java
index 8555626..6fbf6c2 100644
--- a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java
+++ b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java
@@ -38,7 +38,7 @@ public abstract class AbstractPrepareMojo extends AbstractCWMojo {
}
try {
new CleanProcessor(classpath, target, config).clean();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new MojoExecutionException("cleaning failed due to " + e.getMessage(), e);
}
}
diff --git a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractWeaveMojo.java b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractWeaveMojo.java
index 6638a2e..3048d61 100644
--- a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractWeaveMojo.java
+++ b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractWeaveMojo.java
@@ -35,7 +35,7 @@ public abstract class AbstractWeaveMojo extends AbstractCWMojo {
throws MojoExecutionException {
try {
new WeaveProcessor(classpath, target, config).weave();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new MojoExecutionException("weaving failed due to " + e.getMessage(), e);
}
}
diff --git a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
index a4866a7..a0b5809 100644
--- a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
+++ b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
@@ -74,7 +74,7 @@ public class JavaLoggingToMojoLoggingRedirector {
activeHandler.setLevel(Level.ALL);
rootLogger.setLevel(Level.ALL);
rootLogger.addHandler(activeHandler);
- } catch (Exception exc) {
+ } catch (final Exception exc) {
throw new MojoExecutionException("failed to activate the jul logging redirector", exc);
}
}
diff --git a/modules/normalizer/src/test/java/org/apache/commons/weaver/normalizer/UtilsTest.java b/modules/normalizer/src/test/java/org/apache/commons/weaver/normalizer/UtilsTest.java
index d12eac2..2219456 100644
--- a/modules/normalizer/src/test/java/org/apache/commons/weaver/normalizer/UtilsTest.java
+++ b/modules/normalizer/src/test/java/org/apache/commons/weaver/normalizer/UtilsTest.java
@@ -89,9 +89,9 @@ public class UtilsTest {
Utils.parseTypes("java.lang.Object,,java.lang.Iterable", getClass().getClassLoader());
}
- <E> void assertContainsInOrder(Iterable<E> iterable, E... expectedElements) {
+ <E> void assertContainsInOrder(final Iterable<E> iterable, final E... expectedElements) {
final Iterator<E> iterator = iterable.iterator();
- for (E e : expectedElements) {
+ for (final E e : expectedElements) {
assertTrue(iterator.hasNext());
assertEquals(e, iterator.next());
}
diff --git a/processor/src/main/java/org/apache/commons/weaver/Finder.java b/processor/src/main/java/org/apache/commons/weaver/Finder.java
index 34f55e3..cf0a608 100644
--- a/processor/src/main/java/org/apache/commons/weaver/Finder.java
+++ b/processor/src/main/java/org/apache/commons/weaver/Finder.java
@@ -369,7 +369,7 @@ class Finder extends AnnotationFinder implements Scanner {
return typed(PackageInfo.class, getAnnotationInfos(annotation.getName())::stream).map(packageInfo -> {
try {
return new IncludesClassfile<>(packageInfo.get(), classfileAnnotationsFor(packageInfo));
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
return null;
}
}).filter(hasAnnotation(annotation)).collect(Collectors.toList());
@@ -395,7 +395,7 @@ class Finder extends AnnotationFinder implements Scanner {
return typed(ClassInfo.class, infos::stream).map(classInfo -> {
try {
return new IncludesClassfile<Class<?>>(classInfo.get(), classfileAnnotationsFor(classInfo));
- } catch (ClassNotFoundException e1) {
+ } catch (final ClassNotFoundException e1) {
return null;
}
}).filter(Objects::nonNull).collect(Collectors.toList());
diff --git a/processor/src/test/java/org/apache/commons/weaver/FinderTest.java b/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
index d3832ad..4cca9a3 100644
--- a/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
+++ b/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
@@ -73,14 +73,14 @@ public class FinderTest extends WeaverTestBase {
@Test
public void testElements() throws IOException {
addClassForScanning(ComplexAnnotations.class);
- Map<String, Annotated<Field>> fields = new HashMap<String, Annotated<Field>>();
- for (Annotated<Field> annotated : finder().withAnnotations().findAnnotatedFields(
+ final Map<String, Annotated<Field>> fields = new HashMap<String, Annotated<Field>>();
+ for (final Annotated<Field> annotated : finder().withAnnotations().findAnnotatedFields(
ComplexAnnotations.TestAnnotation.class)) {
fields.put(annotated.get().getName(), annotated);
}
assertEquals(2, fields.size());
- TestAnnotation anno1 = fields.get("dummy1").getAnnotation(TestAnnotation.class);
+ final TestAnnotation anno1 = fields.get("dummy1").getAnnotation(TestAnnotation.class);
assertFalse(anno1.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, anno1.booleanValues()));
@@ -97,7 +97,7 @@ public class FinderTest extends WeaverTestBase {
assertEquals(0L, anno1.longValue());
assertArrayEquals(new long[] { 0L }, anno1.longValues());
- NestAnnotation nest1 = anno1.nest();
+ final NestAnnotation nest1 = anno1.nest();
assertFalse(nest1.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, nest1.booleanValues()));
assertEquals((byte) 0, nest1.byteValue());
@@ -122,7 +122,7 @@ public class FinderTest extends WeaverTestBase {
assertArrayEquals(new Class[] { Object.class }, nest1.types());
assertEquals(1, anno1.nests().length);
- NestAnnotation nest1_0 = anno1.nests()[0];
+ final NestAnnotation nest1_0 = anno1.nests()[0];
assertFalse(nest1_0.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, nest1_0.booleanValues()));
assertEquals((byte) 0, nest1_0.byteValue());
@@ -155,7 +155,7 @@ public class FinderTest extends WeaverTestBase {
assertEquals(Object.class, anno1.type());
assertArrayEquals(new Class[] { Object.class }, anno1.types());
- TestAnnotation anno2 = fields.get("dummy2").getAnnotation(TestAnnotation.class);
+ final TestAnnotation anno2 = fields.get("dummy2").getAnnotation(TestAnnotation.class);
assertFalse(anno2.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, anno2.booleanValues()));
assertEquals((byte) 0, anno2.byteValue());
@@ -171,7 +171,7 @@ public class FinderTest extends WeaverTestBase {
assertEquals(0L, anno2.longValue());
assertArrayEquals(new long[] { 0L }, anno2.longValues());
- NestAnnotation nest2 = anno2.nest();
+ final NestAnnotation nest2 = anno2.nest();
assertFalse(nest2.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, nest2.booleanValues()));
assertEquals((byte) 0, nest2.byteValue());
@@ -196,7 +196,7 @@ public class FinderTest extends WeaverTestBase {
assertArrayEquals(new Class[] { Object.class }, nest2.types());
assertEquals(2, anno2.nests().length);
- NestAnnotation nest2_0 = anno2.nests()[0];
+ final NestAnnotation nest2_0 = anno2.nests()[0];
assertFalse(nest2_0.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, nest2_0.booleanValues()));
assertEquals((byte) 0, nest2_0.byteValue());
@@ -220,7 +220,7 @@ public class FinderTest extends WeaverTestBase {
assertEquals(Object[].class, nest2_0.type());
assertArrayEquals(new Class[] { Object[].class }, nest2_0.types());
- NestAnnotation nest2_1 = anno2.nests()[1];
+ final NestAnnotation nest2_1 = anno2.nests()[1];
assertFalse(nest2_1.booleanValue());
assertTrue(Arrays.equals(new boolean[] { false }, nest2_1.booleanValues()));
assertEquals((byte) 0, nest2_1.byteValue());
@@ -257,9 +257,9 @@ public class FinderTest extends WeaverTestBase {
@Test
public void testObjectMethods() throws IOException {
addClassForScanning(ComplexAnnotations.class);
- for (Annotated<Field> annotated : finder().withAnnotations().findAnnotatedFields(
+ for (final Annotated<Field> annotated : finder().withAnnotations().findAnnotatedFields(
ComplexAnnotations.TestAnnotation.class)) {
- TestAnnotation anno = annotated.getAnnotation(TestAnnotation.class);
+ final TestAnnotation anno = annotated.getAnnotation(TestAnnotation.class);
assertFalse(anno.toString().isEmpty());
assertFalse(anno.hashCode() == 0);
assertTrue(anno.equals(anno));
@@ -274,14 +274,14 @@ public class FinderTest extends WeaverTestBase {
addClassForScanning(TestBeanWithMethodAnnotation.class);
final Set<Class<?>> implementors = new HashSet<Class<?>>();
- for (Annotated<Class<?>> annotated : finder().withAnnotations().findAssignableTypes(TestBeanInterface.class)) {
+ for (final Annotated<Class<?>> annotated : finder().withAnnotations().findAssignableTypes(TestBeanInterface.class)) {
implementors.add(annotated.get());
}
assertEquals(1, implementors.size());
assertTrue(implementors.contains(TestBeanWithClassAnnotation.class));
final Set<Class<?>> subclasses = new HashSet<Class<?>>();
- for (Annotated<Class<?>> annotated : finder().withAnnotations().findAssignableTypes(AbstractTestBean.class)) {
+ for (final Annotated<Class<?>> annotated : finder().withAnnotations().findAssignableTypes(AbstractTestBean.class)) {
subclasses.add(annotated.get());
}
assertEquals(2, subclasses.size());
@@ -296,18 +296,18 @@ public class FinderTest extends WeaverTestBase {
addClassForScanning(TestBeanWithClassAnnotation.class);
addClassForScanning(TestBeanWithMethodAnnotation.class);
- List<Annotated<Class<?>>> allClasses = finder().withAnnotations().getAllClasses();
+ final List<Annotated<Class<?>>> allClasses = finder().withAnnotations().getAllClasses();
assertThat(extract(allClasses), Matchers.<Class<?>> containsInAnyOrder(TestBeanInterface.class,
AbstractTestBean.class, TestBeanWithClassAnnotation.class, TestBeanWithMethodAnnotation.class));
}
- private List<Class<?>> extract(List<Annotated<Class<?>>> input) {
+ private List<Class<?>> extract(final List<Annotated<Class<?>>> input) {
Validate.noNullElements(input);
if (input.isEmpty()) {
return Collections.emptyList();
}
final List<Class<?>> result = new ArrayList<Class<?>>(input.size());
- for (Annotated<Class<?>> c : input) {
+ for (final Annotated<Class<?>> c : input) {
result.add(c.get());
}
return result;
diff --git a/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java b/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java
index cae41fb..4c3c0a2 100644
--- a/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java
+++ b/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java
@@ -42,7 +42,7 @@ public class WeaveProcessorTest extends WeaverTestBase {
final Properties config = new Properties();
config.put("configKey", "configValue");
- WeaveProcessor wp = new WeaveProcessor(getClassPathEntries(), getTargetFolder(), config);
+ final WeaveProcessor wp = new WeaveProcessor(getClassPathEntries(), getTargetFolder(), config);
TestWeaver.wovenClasses.clear();
TestWeaver.wovenMethods.clear();
diff --git a/processor/src/test/java/org/apache/commons/weaver/test/WeaverTestBase.java b/processor/src/test/java/org/apache/commons/weaver/test/WeaverTestBase.java
index e2e2cb1..0598aa9 100644
--- a/processor/src/test/java/org/apache/commons/weaver/test/WeaverTestBase.java
+++ b/processor/src/test/java/org/apache/commons/weaver/test/WeaverTestBase.java
@@ -52,21 +52,21 @@ public abstract class WeaverTestBase {
*
* @param clazz
*/
- protected void addClassForScanning(Class<?> clazz) throws IOException {
- String clazzDirName = clazz.getPackage().getName().replace(".", "/");
- File targetDirFile = new File(getTargetFolder(), clazzDirName);
+ protected void addClassForScanning(final Class<?> clazz) throws IOException {
+ final String clazzDirName = clazz.getPackage().getName().replace(".", "/");
+ final File targetDirFile = new File(getTargetFolder(), clazzDirName);
targetDirFile.mkdirs();
- String fileName = baseName(clazz) + ".class";
- String clazzFileName = clazzDirName + "/" + fileName;
- URL clazzUrl = getClass().getClassLoader().getResource(clazzFileName);
- File targetClazzFile = new File(targetDirFile, fileName);
+ final String fileName = baseName(clazz) + ".class";
+ final String clazzFileName = clazzDirName + "/" + fileName;
+ final URL clazzUrl = getClass().getClassLoader().getResource(clazzFileName);
+ final File targetClazzFile = new File(targetDirFile, fileName);
- byte[] buffer = new byte[0xFFFF];
+ final byte[] buffer = new byte[0xFFFF];
- FileOutputStream fos = new FileOutputStream(targetClazzFile);
+ final FileOutputStream fos = new FileOutputStream(targetClazzFile);
- InputStream inputStream = clazzUrl.openStream();
+ final InputStream inputStream = clazzUrl.openStream();
int len;
while ((len = inputStream.read(buffer)) > 0) {
fos.write(buffer, 0, len);
@@ -74,12 +74,12 @@ public abstract class WeaverTestBase {
fos.flush();
fos.close();
- for (Class<?> inner : clazz.getClasses()) {
+ for (final Class<?> inner : clazz.getClasses()) {
addClassForScanning(inner);
}
}
- private String baseName(Class<?> clazz) {
+ private String baseName(final Class<?> clazz) {
if (clazz.getDeclaringClass() == null) {
return clazz.getSimpleName();
}
@@ -110,7 +110,7 @@ public abstract class WeaverTestBase {
classPathEntries = new ArrayList<String>(1);
try {
classPathEntries.add(getTargetFolder().getCanonicalPath());
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
throw new RuntimeException(ioe);
}
}
diff --git a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
index 894d1af..c07ce9f 100644
--- a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
+++ b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
@@ -31,14 +31,14 @@ import org.apache.commons.weaver.test.beans.TestAnnotation;
public class TestCleaner implements Cleaner {
@Override
- public boolean clean(WeaveEnvironment environment, Scanner scanner) {
+ public boolean clean(final WeaveEnvironment environment, final Scanner scanner) {
boolean result = false;
final ScanRequest scanRequest =
new ScanRequest().add(WeaveInterest.of(TestAnnotation.class, ElementType.TYPE)).add(
WeaveInterest.of(TestAnnotation.class, ElementType.METHOD));
- for (WeavableClass<?> weavableClass : scanner.scan(scanRequest).getClasses()) {
+ for (final WeavableClass<?> weavableClass : scanner.scan(scanRequest).getClasses()) {
if (environment.deleteClassfile(weavableClass.getTarget())) {
result = true;
} else {
diff --git a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestWeaver.java b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestWeaver.java
index 8295ecc..1c6699a 100644
--- a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestWeaver.java
+++ b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestWeaver.java
@@ -46,11 +46,11 @@ public class TestWeaver implements Weaver {
public static List<Class<?>> subclasses = new ArrayList<Class<?>>();
@Override
- public boolean process(WeaveEnvironment environment, Scanner scanner) {
+ public boolean process(final WeaveEnvironment environment, final Scanner scanner) {
Assert.assertNotNull(environment.config);
Assert.assertEquals(1, environment.config.size());
- String configValue = environment.config.getProperty("configKey");
+ final String configValue = environment.config.getProperty("configKey");
Assert.assertEquals("configValue", configValue);
boolean result = false;
@@ -62,22 +62,22 @@ public class TestWeaver implements Weaver {
final ScanResult scanResult = scanner.scan(scanRequest);
- for (WeavableClass<?> weavableClass : scanResult.getClasses().with(TestAnnotation.class)) {
+ for (final WeavableClass<?> weavableClass : scanResult.getClasses().with(TestAnnotation.class)) {
if (wovenClasses.add(weavableClass.getTarget())) {
result = true;
}
}
- for (WeavableMethod<?> weavableMethod : scanResult.getMethods().with(TestAnnotation.class)) {
+ for (final WeavableMethod<?> weavableMethod : scanResult.getMethods().with(TestAnnotation.class)) {
if (wovenMethods.add(weavableMethod.getTarget())) {
result = true;
}
}
- for (WeavableClass<?> weavableClass : scanResult.getClassesAssignableTo(TestBeanInterface.class)) {
+ for (final WeavableClass<?> weavableClass : scanResult.getClassesAssignableTo(TestBeanInterface.class)) {
if (implementors.add(weavableClass.getTarget())) {
result = true;
}
}
- for (WeavableClass<?> weavableClass : scanResult.getClassesAssignableTo(AbstractTestBean.class)) {
+ for (final WeavableClass<?> weavableClass : scanResult.getClassesAssignableTo(AbstractTestBean.class)) {
if (subclasses.add(weavableClass.getTarget())) {
result = true;
}
diff --git a/processor/src/test/java/org/apache/commons/weaver/utils/ProvidersTest.java b/processor/src/test/java/org/apache/commons/weaver/utils/ProvidersTest.java
index b5dd697..6058aa9 100755
--- a/processor/src/test/java/org/apache/commons/weaver/utils/ProvidersTest.java
+++ b/processor/src/test/java/org/apache/commons/weaver/utils/ProvidersTest.java
@@ -76,7 +76,7 @@ public class ProvidersTest {
public class Monkeywrench implements FauxWeaveProvider {
}
- private FauxWeaveProvider a = new A(), b = new B(), c = new C(), w = new W(), x = new X(), y = new Y(), z = new Z(),
+ private final FauxWeaveProvider a = new A(), b = new B(), c = new C(), w = new W(), x = new X(), y = new Y(), z = new Z(),
monkeywrench = new Monkeywrench();
@Test