Fix merge issues

ctubbsii · Jul 24, 2024 · a7d12d5 · a7d12d5
1 parent d4a9c17
commit a7d12d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/net/revelc/code/apilyzer/PublicApi.java b/src/main/java/net/revelc/code/apilyzer/PublicApi.java
@@ -104,9 +104,9 @@ private void addPublicInnerClasses(List<Class<?>> publicApiClasses, TreeSet<Stri
     }
   }
 
-  private static String formatAnnotation(Annotation annotation) {                                                                 
-  return "@" + annotation.annotationType().getName();                                                                           
-  }                                                                                                                               
+  private static String formatAnnotation(Annotation annotation) {
+    return "@" + annotation.annotationType().getName();
+  }
 
   private boolean annotationExcludes(Annotation[] annotations) {
     return !excludeAnnotationsPs.isEmpty() && Arrays.stream(annotations)

diff --git a/src/main/java/net/revelc/code/apilyzer/maven/plugin/AnalyzeMojo.java b/src/main/java/net/revelc/code/apilyzer/maven/plugin/AnalyzeMojo.java
@@ -19,7 +19,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;

diff --git a/src/main/java/net/revelc/code/apilyzer/util/ClassUtils.java b/src/main/java/net/revelc/code/apilyzer/util/ClassUtils.java
@@ -21,11 +21,12 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
-import java.util.Function;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -38,7 +39,6 @@ private ClassUtils() {
     // do not permit instantiation
   }
 
-
   private static final Function<String, URL> TO_URL = item -> {
     URI uri = new File(item).toURI();
     try {