Reformatting

sunshower-io · Oct 7, 2021 · 4201489 · 4201489
1 parent 9b606ab
commit 4201489
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 65 deletions.
diff --git a/...el-core/src/main/java/io/zephyr/kernel/concurrency/AbstractAsynchronousObjectTracker.java b/...el-core/src/main/java/io/zephyr/kernel/concurrency/AbstractAsynchronousObjectTracker.java
@@ -20,9 +20,7 @@
 @SuppressWarnings({"PMD.DoNotUseThreads"})
 public abstract class AbstractAsynchronousObjectTracker<T> implements Tracker<T>, EventListener<T> {
 
-  /**
-   * immutable state
-   */
+  /** immutable state */
   final Module host;
 
   final Kernel kernel;
@@ -192,9 +190,7 @@ private boolean isTracked(EventType type, T target) {
     }
   }
 
-  static final class ObjectThreadEventSource extends AbstractEventSource {
-
-  }
+  static final class ObjectThreadEventSource extends AbstractEventSource {}
 
   static final class ObjectEventDispatchState<T> {
 

diff --git a/kernel-core/src/main/java/io/zephyr/kernel/concurrency/AsynchronousEventSource.java b/kernel-core/src/main/java/io/zephyr/kernel/concurrency/AsynchronousEventSource.java
@@ -84,9 +84,7 @@ public void start() {
     }
   }
 
-  /**
-   * waits for initialization
-   */
+  /** waits for initialization */
   public void initialize() {
     synchronized (this) {
       while (!source.running) {

diff --git a/kernel-core/src/main/java/io/zephyr/kernel/concurrency/ModuleThread.java b/kernel-core/src/main/java/io/zephyr/kernel/concurrency/ModuleThread.java
@@ -31,14 +31,12 @@
 import java.util.logging.Logger;
 import lombok.val;
 
-/**
- * not really sure if this is a good idea or not
- */
+/** not really sure if this is a good idea or not */
 @SuppressWarnings({
-    "PMD.DoNotUseThreads",
-    "PMD.AvoidFieldNameMatchingTypeName",
-    "PMD.UnusedPrivateMethod",
-    "PMD.DataflowAnomalyAnalysis"
+  "PMD.DoNotUseThreads",
+  "PMD.AvoidFieldNameMatchingTypeName",
+  "PMD.UnusedPrivateMethod",
+  "PMD.DataflowAnomalyAnalysis"
 })
 @SuppressFBWarnings
 public class ModuleThread implements Startable, Stoppable, TaskQueue, Runnable, VolatileStorage {
@@ -210,7 +208,7 @@ private void handleFailure(Coordinate coordinate, Throwable ex) {
         Events.create(
             module, StatusType.FAILED.unresolvable(FAILURE_TEMPLATE, coordinate, ex.getMessage())));
     module.getLifecycle().setState(Lifecycle.State.Failed);
-    log.log(Level.WARNING, FAILURE_TEMPLATE, new Object[]{coordinate, ex.getMessage()});
+    log.log(Level.WARNING, FAILURE_TEMPLATE, new Object[] {coordinate, ex.getMessage()});
     log.log(Level.FINE, "Reason: ", ex);
   }
 

diff --git a/kernel-modules/zephyr/zephyr-shell/src/test/java/io/zephyr/api/ModuleListenerTestCase.java b/kernel-modules/zephyr/zephyr-shell/src/test/java/io/zephyr/api/ModuleListenerTestCase.java
@@ -8,15 +8,13 @@
 import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-//@Disabled("Need to figure out why these are flaky")
+// @Disabled("Need to figure out why these are flaky")
 public class ModuleListenerTestCase extends ShellTestCase {
 
   static {

diff --git a/...dules/zephyr/zephyr-shell/src/test/java/io/zephyr/kernel/modules/shell/ShellTestCase.java b/...dules/zephyr/zephyr-shell/src/test/java/io/zephyr/kernel/modules/shell/ShellTestCase.java
@@ -96,9 +96,9 @@ protected void startPlugins(String... plugins) {
   protected void startAndWait(int expectedCount, String... plugins) {
     startPlugins(plugins);
     while (kernel.getModuleManager().getModules().stream()
-               .filter(t -> t.getLifecycle().getState() == Lifecycle.State.Active)
-               .count()
-           != expectedCount) {
+            .filter(t -> t.getLifecycle().getState() == Lifecycle.State.Active)
+            .count()
+        != expectedCount) {
       Thread.sleep(200);
     }
   }
@@ -131,9 +131,9 @@ protected void restartKernel() {
 
   protected void runAsync(String... args) {
     new Thread(
-        () -> {
-          run(args);
-        })
+            () -> {
+              run(args);
+            })
         .start();
   }
 
@@ -201,12 +201,15 @@ protected void installAndWaitForModuleCount(int count, Installable... modules) {
 
     val failedCount = new AtomicInteger(0);
     EventListener<Object> listener;
-    kernel.addEventListener(listener = new EventListener<Object>() {
-      @Override
-      public void onEvent(EventType type, Event<Object> event) {
-        failedCount.incrementAndGet();
-      }
-    }, ModuleEvents.INSTALL_FAILED);
+    kernel.addEventListener(
+        listener =
+            new EventListener<Object>() {
+              @Override
+              public void onEvent(EventType type, Event<Object> event) {
+                failedCount.incrementAndGet();
+              }
+            },
+        ModuleEvents.INSTALL_FAILED);
 
     try {
       install(modules);

diff --git a/...-tests/kernel-system-tests/src/test/java/io/sunshower/kernel/core/ServiceTrackerTest.java b/...-tests/kernel-system-tests/src/test/java/io/sunshower/kernel/core/ServiceTrackerTest.java
@@ -28,35 +28,28 @@
 @Clean(value = Clean.Mode.After, context = Clean.Context.Method)
 public class ServiceTrackerTest {
 
-  /**
-   * mocks
-   */
-  @Mock
-  private EventListener<?> listener;
+  /** mocks */
+  @Mock private EventListener<?> listener;
 
-  /**
-   * state
-   */
-  @Inject
-  private Zephyr zephyr;
+  /** state */
+  @Inject private Zephyr zephyr;
 
-  @Inject
-  private ModuleContext context;
-  @Inject
-  private ModuleLifecycleManager lifecycleManager;
+  @Inject private ModuleContext context;
+  @Inject private ModuleLifecycleManager lifecycleManager;
 
   @RepeatedTest(10)
   void ensureTrackingServiceProducesServiceInInstalledTestPlugin() {
     val tracker = context.trackServices(t -> true);
     tracker.addEventListener(listener, ServiceEvents.REGISTERED);
-    tracker.addEventListener(new EventListener<Object>() {
+    tracker.addEventListener(
+        new EventListener<Object>() {
 
-      @Override
-      public void onEvent(EventType type, Event<Object> event) {
-        System.out.println(event);
-
-      }
-    }, ServiceEvents.REGISTERED);
+          @Override
+          public void onEvent(EventType type, Event<Object> event) {
+            System.out.println(event);
+          }
+        },
+        ServiceEvents.REGISTERED);
     zephyr.install(ProjectPlugins.TEST_PLUGIN_1.getUrl());
     zephyr.install(ProjectPlugins.TEST_PLUGIN_2.getUrl());
     lifecycleManager.start(t -> t.getCoordinate().getName().contains("2"));

diff --git a/support/flyway/src/main/java/io/zephyr/support/flyway/ClasspathModuleResourceProvider.java b/support/flyway/src/main/java/io/zephyr/support/flyway/ClasspathModuleResourceProvider.java
@@ -32,16 +32,15 @@ public ClasspathModuleResourceProvider(Module module, String... locations) {
     this(module, false, locations);
   }
 
-  public ClasspathModuleResourceProvider(Module module, boolean searchSubAssemblies,
-      String... locations) {
+  public ClasspathModuleResourceProvider(
+      Module module, boolean searchSubAssemblies, String... locations) {
     this.module = Objects.requireNonNull(module, "Module must not be null");
     validate(locations);
     this.locations = Arrays.asList(locations);
     this.resources = new LinkedHashMap<>();
     this.searchSubAssemblies = searchSubAssemblies;
   }
 
-
   @Override
   public LoadableResource getResource(String name) {
     return resources.get(name);

diff --git a/support/flyway/src/main/java/io/zephyr/support/flyway/FlywaySupport.java b/support/flyway/src/main/java/io/zephyr/support/flyway/FlywaySupport.java
@@ -11,8 +11,8 @@ public static ModuleResourceProviderBuilder classpath(@NonNull Module module) {
     return new ModuleResourceProviderBuilder(module, false);
   }
 
-  public static ModuleResourceProviderBuilder classpath(@NonNull Module module,
-      boolean searchSubAssemblies) {
+  public static ModuleResourceProviderBuilder classpath(
+      @NonNull Module module, boolean searchSubAssemblies) {
     return new ModuleResourceProviderBuilder(module, searchSubAssemblies);
   }
 

diff --git a/zephyr-main/src/main/java/io/zephyr/kernel/launch/KernelLauncher.java b/zephyr-main/src/main/java/io/zephyr/kernel/launch/KernelLauncher.java
@@ -30,13 +30,13 @@
 
 @SuppressFBWarnings
 @SuppressWarnings({
-    "PMD.UseVarargs",
-    "PMD.ArrayIsStoredDirectly",
-    "PMD.UnusedPrivateMethod",
-    "PMD.DoNotCallSystemExit",
-    "PMD.FinalizeOverloaded",
-    "PMD.AvoidDuplicateLiterals",
-    "PMD.DoNotUseThreads"
+  "PMD.UseVarargs",
+  "PMD.ArrayIsStoredDirectly",
+  "PMD.UnusedPrivateMethod",
+  "PMD.DoNotCallSystemExit",
+  "PMD.FinalizeOverloaded",
+  "PMD.AvoidDuplicateLiterals",
+  "PMD.DoNotUseThreads"
 })
 public class KernelLauncher implements EntryPoint, EntryPointRegistry {