You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/06/18 20:24:37 UTC
[maven-dependency-analyzer] branch master updated: Fix compiler warnings
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
The following commit(s) were added to refs/heads/master by this push:
new 717e59f Fix compiler warnings
717e59f is described below
commit 717e59f20587cb9171b068f7ccd5605f4f4b7f18
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jun 18 16:06:46 2023 -0400
Fix compiler warnings
- Use @Override
- Use diamonds
---
.../shared/dependency/analyzer/CollectorClassFileVisitor.java | 1 +
.../maven/shared/dependency/analyzer/DefaultClassAnalyzer.java | 1 +
.../dependency/analyzer/DefaultProjectDependencyAnalyzer.java | 3 ++-
.../shared/dependency/analyzer/ProjectDependencyAnalysis.java | 3 +++
.../shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java | 1 +
.../shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java | 4 ++++
.../maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java | 6 ++++++
.../maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java | 1 +
.../shared/dependency/analyzer/asm/DefaultMethodVisitor.java | 8 ++++++++
.../shared/dependency/analyzer/asm/DefaultSignatureVisitor.java | 2 ++
.../dependency/analyzer/asm/DependencyClassFileVisitor.java | 1 +
11 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
index bdbd3c7..4adf2d2 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
@@ -39,6 +39,7 @@ public class CollectorClassFileVisitor implements ClassFileVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitClass(String className, InputStream in) {
// inner classes have equivalent compilation requirement as container class
if (className.indexOf('$') < 0) {
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
index 21e7afa..dfbed05 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
@@ -36,6 +36,7 @@ import java.util.zip.ZipException;
public class DefaultClassAnalyzer implements ClassAnalyzer {
/** {@inheritDoc} */
+ @Override
public Set<String> analyze(URL url) throws IOException {
CollectorClassFileVisitor visitor = new CollectorClassFileVisitor();
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
index 4578842..489afd1 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
@@ -60,6 +60,7 @@ public class DefaultProjectDependencyAnalyzer implements ProjectDependencyAnalyz
private DependencyAnalyzer dependencyAnalyzer;
/** {@inheritDoc} */
+ @Override
public ProjectDependencyAnalysis analyze(MavenProject project) throws ProjectDependencyAnalyzerException {
try {
Map<Artifact, Set<String>> artifactClassMap = buildArtifactClassMap(project);
@@ -226,7 +227,7 @@ public class DefaultProjectDependencyAnalyzer implements ProjectDependencyAnalyz
if (artifact != null) {
Set<String> classesFromArtifact = usedArtifacts.get(artifact);
if (classesFromArtifact == null) {
- classesFromArtifact = new HashSet<String>();
+ classesFromArtifact = new HashSet<>();
usedArtifacts.put(artifact, classesFromArtifact);
}
classesFromArtifact.add(className);
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
index dd4f540..1f71550 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
@@ -218,6 +218,7 @@ public class ProjectDependencyAnalysis {
*
* @return an int
*/
+ @Override
public int hashCode() {
int hashCode = getUsedDeclaredArtifacts().hashCode();
hashCode = (hashCode * 37) + getUsedUndeclaredArtifacts().hashCode();
@@ -228,6 +229,7 @@ public class ProjectDependencyAnalysis {
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object object) {
if (object instanceof ProjectDependencyAnalysis) {
ProjectDependencyAnalysis analysis = (ProjectDependencyAnalysis) object;
@@ -246,6 +248,7 @@ public class ProjectDependencyAnalysis {
*
* @return a {@link java.lang.String} object.
*/
+ @Override
public String toString() {
StringBuilder buffer = new StringBuilder();
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
index 98aebf8..efd4869 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
@@ -37,6 +37,7 @@ import org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer;
@Singleton
public class ASMDependencyAnalyzer implements DependencyAnalyzer {
/** {@inheritDoc} */
+ @Override
public Set<String> analyze(URL url) throws IOException {
DependencyClassFileVisitor visitor = new DependencyClassFileVisitor();
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
index 37e1994..b579273 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
@@ -42,6 +42,7 @@ public class DefaultAnnotationVisitor extends AnnotationVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visit(final String name, final Object value) {
if (value instanceof Type) {
resultCollector.addType((Type) value);
@@ -49,11 +50,13 @@ public class DefaultAnnotationVisitor extends AnnotationVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitEnum(final String name, final String desc, final String value) {
resultCollector.addDesc(desc);
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitAnnotation(final String name, final String desc) {
resultCollector.addDesc(desc);
@@ -61,6 +64,7 @@ public class DefaultAnnotationVisitor extends AnnotationVisitor {
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitArray(final String name) {
return this;
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
index 300b39b..2d683e6 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
@@ -77,6 +77,7 @@ public class DefaultClassVisitor extends ClassVisitor {
* @param superName a {@link java.lang.String} object.
* @param interfaces an array of {@link java.lang.String} objects.
*/
+ @Override
public void visit(
final int version,
final int access,
@@ -93,6 +94,7 @@ public class DefaultClassVisitor extends ClassVisitor {
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
resultCollector.addDesc(desc);
@@ -100,6 +102,7 @@ public class DefaultClassVisitor extends ClassVisitor {
}
/** {@inheritDoc} */
+ @Override
public FieldVisitor visitField(
final int access, final String name, final String desc, final String signature, final Object value) {
if (signature == null) {
@@ -125,6 +128,7 @@ public class DefaultClassVisitor extends ClassVisitor {
* @param exceptions an array of {@link java.lang.String} objects.
* @return a {@link org.objectweb.asm.MethodVisitor} object.
*/
+ @Override
public MethodVisitor visitMethod(
final int access, final String name, final String desc, final String signature, final String[] exceptions) {
if (signature == null) {
@@ -139,11 +143,13 @@ public class DefaultClassVisitor extends ClassVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitNestHost(final String nestHost) {
resultCollector.addName(nestHost);
}
/** {@inheritDoc} */
+ @Override
public void visitNestMember(final String nestMember) {
resultCollector.addName(nestMember);
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
index ee3af37..6f7e140 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
@@ -46,6 +46,7 @@ public class DefaultFieldVisitor extends FieldVisitor {
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
resultCollector.addDesc(desc);
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
index 996193d..cdf0aa1 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
@@ -56,6 +56,7 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
resultCollector.addDesc(desc);
@@ -71,6 +72,7 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public AnnotationVisitor visitParameterAnnotation(final int parameter, final String desc, final boolean visible) {
resultCollector.addDesc(desc);
@@ -87,6 +89,7 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitTypeInsn(final int opcode, final String desc) {
if (desc.charAt(0) == '[') {
resultCollector.addDesc(desc);
@@ -96,6 +99,7 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitFieldInsn(final int opcode, final String owner, final String name, final String desc) {
resultCollector.addName(owner);
/*
@@ -113,6 +117,7 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitLdcInsn(final Object cst) {
if (cst instanceof Type) {
resultCollector.addType((Type) cst);
@@ -120,16 +125,19 @@ public class DefaultMethodVisitor extends MethodVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitMultiANewArrayInsn(final String desc, final int dims) {
resultCollector.addDesc(desc);
}
/** {@inheritDoc} */
+ @Override
public void visitTryCatchBlock(final Label start, final Label end, final Label handler, final String type) {
resultCollector.addName(type);
}
/** {@inheritDoc} */
+ @Override
public void visitLocalVariable(
final String name,
final String desc,
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
index 23b0858..d09bca3 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
@@ -41,11 +41,13 @@ public class DefaultSignatureVisitor extends SignatureVisitor {
}
/** {@inheritDoc} */
+ @Override
public void visitClassType(final String name) {
resultCollector.addName(name);
}
/** {@inheritDoc} */
+ @Override
public void visitInnerClassType(final String name) {
resultCollector.addName(name);
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
index 8c1cd3d..292531e 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
@@ -51,6 +51,7 @@ public class DependencyClassFileVisitor implements ClassFileVisitor {
public DependencyClassFileVisitor() {}
/** {@inheritDoc} */
+ @Override
public void visitClass(String className, InputStream in) {
try {
byte[] byteCode = IOUtils.toByteArray(in);