#76 Apply auto-formatting and import sorting

moditect · Aug 3, 2021 · 43595df · 43595df
1 parent b2fcac0
commit 43595df
Show file tree

Hide file tree

Showing 18 changed files with 514 additions and 98 deletions.
diff --git a/etc/eclipse-formatter-config.xml b/etc/eclipse-formatter-config.xml
diff --git a/pom.xml b/pom.xml
@@ -116,6 +116,30 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>net.revelc.code.formatter</groupId>
+          <artifactId>formatter-maven-plugin</artifactId>
+          <version>2.15.0</version>
+          <configuration>
+              <configFile>etc/eclipse-formatter-config.xml</configFile>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>net.revelc.code</groupId>
+          <artifactId>impsort-maven-plugin</artifactId>
+          <version>1.6.0</version>
+          <configuration>
+            <groups>java.,javax.,org.,com.</groups>
+            <removeUnused>true</removeUnused>
+            <staticAfter>true</staticAfter>
+            <!-- <staticGroups>java.,javax.,org.w3c.,org.xml.,junit.</staticGroups> -->
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
@@ -171,6 +195,32 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>net.revelc.code.formatter</groupId>
+        <artifactId>formatter-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>format</id>
+            <goals>
+              <goal>format</goal>
+            </goals>
+            <phase>process-sources</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>net.revelc.code</groupId>
+        <artifactId>impsort-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sort-imports</id>
+            <goals>
+              <goal>sort</goal>
+            </goals>
+            <phase>process-sources</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <resources>
       <resource>

diff --git a/src/main/java/org/moditect/jfrunit/EnableEvent.java b/src/main/java/org/moditect/jfrunit/EnableEvent.java
@@ -40,7 +40,9 @@
     long threshold() default -1L;
 
     enum StacktracePolicy {
-        DEFAULT, INCLUDED, EXCLUDED
+        DEFAULT,
+        INCLUDED,
+        EXCLUDED
     }
 
     long period() default -1L;

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedClassLoader.java b/src/main/java/org/moditect/jfrunit/ExpectedClassLoader.java
@@ -17,10 +17,10 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.consumer.RecordedClassLoader;
-
 import java.util.function.Predicate;
 
+import jdk.jfr.consumer.RecordedClassLoader;
+
 public class ExpectedClassLoader implements Predicate<RecordedClassLoader> {
     private Long id;
     private String name;

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedEvent.java b/src/main/java/org/moditect/jfrunit/ExpectedEvent.java
@@ -93,16 +93,16 @@ public static ExpectedEvent event(String name) {
             return false;
         }
 
-        if(!expectedEvent.getHasProps().isEmpty()) {
-            for(String name: expectedEvent.getHasProps()) {
-                if(!hasPropertyMatching(recordedEvent, name))
+        if (!expectedEvent.getHasProps().isEmpty()) {
+            for (String name : expectedEvent.getHasProps()) {
+                if (!hasPropertyMatching(recordedEvent, name))
                     return false;
             }
         }
 
-        if(!expectedEvent.getHasNotProps().isEmpty()) {
-            for(String name: expectedEvent.getHasNotProps()) {
-                if(hasPropertyMatching(recordedEvent, name)) {
+        if (!expectedEvent.getHasNotProps().isEmpty()) {
+            for (String name : expectedEvent.getHasNotProps()) {
+                if (hasPropertyMatching(recordedEvent, name)) {
                     return false;
                 }
             }
@@ -138,7 +138,7 @@ private static boolean hasPropertyMatching(RecordedEvent recordedEvent, String n
         }
 
         Object value = recordedEvent.getValue(name);
-        return value!=null;
+        return value != null;
     }
 
     private static boolean withPropertyMatching(RecordedEvent recordedEvent, String name, Object value) {

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedMethod.java b/src/main/java/org/moditect/jfrunit/ExpectedMethod.java
@@ -17,11 +17,11 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.consumer.RecordedMethod;
-
 import java.lang.reflect.Method;
 import java.util.function.Predicate;
 
+import jdk.jfr.consumer.RecordedMethod;
+
 public class ExpectedMethod implements Predicate<RecordedMethod> {
     private ExpectedClass type;
     private String name;

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedStackFrame.java b/src/main/java/org/moditect/jfrunit/ExpectedStackFrame.java
@@ -17,11 +17,11 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.consumer.RecordedFrame;
-
 import java.util.Objects;
 import java.util.function.Predicate;
 
+import jdk.jfr.consumer.RecordedFrame;
+
 public class ExpectedStackFrame implements Predicate<RecordedFrame> {
     private Boolean isJavaFrame;
     private Integer bytecodeIndex;
@@ -38,7 +38,6 @@ public ExpectedStackFrame(StackWalker.StackFrame stackFrame) {
         this.method.setName(stackFrame.getMethodName());
     }
 
-
     public ExpectedStackFrame(StackTraceElement stackTraceElement) {
         this.isJavaFrame = !stackTraceElement.isNativeMethod();
         this.method = new ExpectedMethod();

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedThread.java b/src/main/java/org/moditect/jfrunit/ExpectedThread.java
@@ -17,10 +17,10 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.consumer.RecordedThread;
-
 import java.util.function.Predicate;
 
+import jdk.jfr.consumer.RecordedThread;
+
 public class ExpectedThread implements Predicate<RecordedThread> {
     private Long id;
     private Long javaThreadId;

diff --git a/src/main/java/org/moditect/jfrunit/ExpectedThreadGroup.java b/src/main/java/org/moditect/jfrunit/ExpectedThreadGroup.java
@@ -17,10 +17,10 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.consumer.RecordedThreadGroup;
-
 import java.util.function.Predicate;
 
+import jdk.jfr.consumer.RecordedThreadGroup;
+
 public class ExpectedThreadGroup implements Predicate<RecordedThreadGroup> {
     private String name;
     private ExpectedThreadGroup parent;

diff --git a/src/main/java/org/moditect/jfrunit/JfrEventTestExtension.java b/src/main/java/org/moditect/jfrunit/JfrEventTestExtension.java
@@ -34,16 +34,15 @@ public class JfrEventTestExtension implements Extension, BeforeEachCallback, Aft
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
         String enabledConfiguration = AnnotationSupport.findAnnotation(context.getRequiredTestMethod(), EnableConfiguration.class)
-            .map(EnableConfiguration::value)
-            .map(String::trim)
-            .orElse(null);
+                .map(EnableConfiguration::value)
+                .map(String::trim)
+                .orElse(null);
 
         List<EventConfiguration> enabledEvents = AnnotationSupport.findRepeatableAnnotations(context.getRequiredTestMethod(), EnableEvent.class)
                 .stream()
                 .map(e -> new EventConfiguration(e.value(), e.stackTrace(), e.threshold(), e.period()))
                 .collect(Collectors.toList());
 
-
         Object instance = context.getRequiredTestInstance();
         List<JfrEvents> allJfrEvents = getJfrEvents(instance);
         for (JfrEvents jfrEvents : allJfrEvents) {
@@ -63,16 +62,16 @@ public void afterEach(ExtensionContext context) throws Exception {
 
     private List<JfrEvents> getJfrEvents(Object instance) {
         return getAllFields(instance.getClass())
-            .filter(f -> f.getType() == JfrEvents.class)
-            .map(f -> {
-                try {
-                    return (JfrEvents) f.get(instance);
-                }
-                catch (IllegalArgumentException | IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                }
-            })
-            .collect(Collectors.toList());
+                .filter(f -> f.getType() == JfrEvents.class)
+                .map(f -> {
+                    try {
+                        return (JfrEvents) f.get(instance);
+                    }
+                    catch (IllegalArgumentException | IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .collect(Collectors.toList());
     }
 
     /**
@@ -84,7 +83,7 @@ private List<JfrEvents> getJfrEvents(Object instance) {
     private static Stream<Field> getAllFields(Class<?> c) {
         Class<?> superclass = c.getSuperclass();
         return Stream.concat(
-            Arrays.stream(c.getDeclaredFields()),
-            superclass == null ? Stream.empty() : getAllFields(superclass));
+                Arrays.stream(c.getDeclaredFields()),
+                superclass == null ? Stream.empty() : getAllFields(superclass));
     }
 }
diff --git a/src/main/java/org/moditect/jfrunit/JfrEvents.java b/src/main/java/org/moditect/jfrunit/JfrEvents.java
@@ -17,14 +17,6 @@
  */
 package org.moditect.jfrunit;
 
-import jdk.jfr.Configuration;
-import jdk.jfr.EventSettings;
-import jdk.jfr.EventType;
-import jdk.jfr.FlightRecorder;
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordingStream;
-
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
@@ -48,6 +40,14 @@
 import org.moditect.jfrunit.EnableEvent.StacktracePolicy;
 import org.moditect.jfrunit.internal.SyncEvent;
 
+import jdk.jfr.Configuration;
+import jdk.jfr.EventSettings;
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingStream;
+
 public class JfrEvents {
 
     private static final Logger LOGGER = System.getLogger(JfrEvents.class.getName());
@@ -96,7 +96,8 @@ void stopRecordingEvents() {
             Path dumpDir;
             try {
                 dumpDir = Files.createDirectories(Path.of(testSourceUri).getParent().resolve("jfrunit"));
-            } catch (FileSystemNotFoundException e) {
+            }
+            catch (FileSystemNotFoundException e) {
                 dumpDir = Files.createTempDirectory(null);
                 LOGGER.log(Level.WARNING, "'" + testSourceUri.getScheme() + "' is not a valid file system, dumping recording to a temporary location.");
             }
@@ -130,7 +131,8 @@ public void awaitEvents() {
         while (watermark.get() < seq) {
             try {
                 Thread.sleep(INTERNAL_WAIT_TIME);
-            } catch (InterruptedException e) {
+            }
+            catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
@@ -158,7 +160,7 @@ private Stream<RecordedEvent> stream() {
     }
 
     private void awaitStreamStart(CountDownLatch streamStarted) throws InterruptedException {
-        while(streamStarted.getCount() != 0) {
+        while (streamStarted.getCount() != 0) {
             SyncEvent event = new SyncEvent();
             event.sequence = sequence.incrementAndGet();
             event.cause = "awaiting stream start";
@@ -233,7 +235,8 @@ else if (enabledEvent.stackTrace == StacktracePolicy.EXCLUDED) {
             if (isSyncEvent(re)) {
                 watermark.set(re.getLong("sequence"));
                 streamStarted.countDown();
-            } else if (!isInternalSleepEvent(re)) {
+            }
+            else if (!isInternalSleepEvent(re)) {
                 events.add(re);
             }
         });

diff --git a/src/main/java/org/moditect/jfrunit/JfrEventsAssert.java b/src/main/java/org/moditect/jfrunit/JfrEventsAssert.java
@@ -33,16 +33,16 @@ public JfrEventsAssert contains(ExpectedEvent expectedEvent) {
         isNotNull();
 
         boolean found = actual.events()
-            .anyMatch(re -> ExpectedEvent.matches(expectedEvent, re));
+                .anyMatch(re -> ExpectedEvent.matches(expectedEvent, re));
 
         if (!found) {
             if (expectedEvent.getWithProps().isEmpty() && expectedEvent.getHasProps().isEmpty() && expectedEvent.getHasNotProps().isEmpty()) {
                 failWithMessage("No JFR event of type <%s>", expectedEvent.getName());
             }
-            else if(!expectedEvent.getHasProps().isEmpty()) {
+            else if (!expectedEvent.getHasProps().isEmpty()) {
                 failWithMessage("No JFR event of type <%s> with attributes <%s>", expectedEvent.getName(), expectedEvent.getHasProps());
             }
-            else if(!expectedEvent.getHasNotProps().isEmpty()) {
+            else if (!expectedEvent.getHasNotProps().isEmpty()) {
                 failWithMessage("No JFR event of type <%s> without attributes <%s>", expectedEvent.getName(), expectedEvent.getHasNotProps());
             }
             else {

diff --git a/src/main/java/org/moditect/jfrunit/JfrUnitQuarkusLifecycleCallback.java b/src/main/java/org/moditect/jfrunit/JfrUnitQuarkusLifecycleCallback.java
@@ -23,11 +23,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
-import java.util.stream.Stream;
 
 public class JfrUnitQuarkusLifecycleCallback implements QuarkusTestBeforeEachCallback, QuarkusTestAfterEachCallback {
 
@@ -62,22 +62,22 @@ private String getEnabledConfiguration(Method testMethod) {
 
     private List<EventConfiguration> getEnabledEvents(Method testMethod) {
         return Arrays.stream(testMethod.getAnnotationsByType(EnableEvent.class))
-            .map(e -> new EventConfiguration(e.value(), e.stackTrace(), e.threshold(), e.period()))
-            .collect(Collectors.toList());
+                .map(e -> new EventConfiguration(e.value(), e.stackTrace(), e.threshold(), e.period()))
+                .collect(Collectors.toList());
     }
 
     private List<JfrEvents> getJfrEvents(Object instance) {
         return getAllFields(instance.getClass())
-            .filter(f -> f.getType() == JfrEvents.class)
-            .map(f -> {
-                try {
-                    return (JfrEvents) f.get(instance);
-                }
-                catch (IllegalArgumentException | IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                }
-            })
-            .collect(Collectors.toList());
+                .filter(f -> f.getType() == JfrEvents.class)
+                .map(f -> {
+                    try {
+                        return (JfrEvents) f.get(instance);
+                    }
+                    catch (IllegalArgumentException | IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .collect(Collectors.toList());
     }
 
     /**
@@ -88,7 +88,7 @@ private List<JfrEvents> getJfrEvents(Object instance) {
     private static Stream<Field> getAllFields(Class<?> c) {
         Class<?> superclass = c.getSuperclass();
         return Stream.concat(
-            Arrays.stream(c.getDeclaredFields()),
-            superclass == null ? Stream.empty() : getAllFields(superclass));
+                Arrays.stream(c.getDeclaredFields()),
+                superclass == null ? Stream.empty() : getAllFields(superclass));
     }
 }