spotless

Author: dougqh

components/native-loader/src/main/java/datadog/nativeloader/CompositeLibraryLoadingListener.java

@@ -125,9 +125,9 @@ public CompositeLibraryLoadingListener join(LibraryLoadingListener... listeners)
     combinedListeners.addAll(Arrays.asList(listeners));
     return new CompositeLibraryLoadingListener(combinedListeners);
   }
-  
+
   @Override
   public String toString() {
-	return this.getClass().getSimpleName() + ":" + this.listeners.toString();
+    return this.getClass().getSimpleName() + ":" + this.listeners.toString();
   }
 }

components/native-loader/src/main/java/datadog/nativeloader/NativeLoader.java

@@ -266,11 +266,12 @@ public LibFile resolveDynamic(PlatformSpec platformSpec, String libName)
     return this.resolveDynamicImpl(platformSpec, null, libName);
   }
 
-  public LibFile resolveDynamic(PlatformSpec platformSpec, String libName, LibraryLoadingListener... scopedListeners)
+  public LibFile resolveDynamic(
+      PlatformSpec platformSpec, String libName, LibraryLoadingListener... scopedListeners)
       throws LibraryLoadException {
     return this.resolveDynamicImpl(platformSpec, null, libName, scopedListeners);
   }
-  
+
   /**
    * Resolves a library with an associated component with a different {@link PlatformSpec} than the
    * default
@@ -336,7 +337,7 @@ private LibFile resolveDynamicImpl(
 
   private static LibFile toLibFile(
       Path tempDir,
-	  PlatformSpec platformSpec,
+      PlatformSpec platformSpec,
       String optionalComponent,
       String libName,
       URL url,
@@ -357,14 +358,14 @@ private static LibFile toLibFile(
         }
 
         allListeners.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
-        
+
         return LibFile.fromTempFile(
             platformSpec, optionalComponent, libName, tempFile.toFile(), allListeners);
-        
+
       } catch (Throwable t) {
-    	allListeners.onTempFileCreationFailure(
+        allListeners.onTempFileCreationFailure(
             platformSpec, optionalComponent, libName, tempDir, libExt, tempFile, t);
-    	
+
         throw new LibraryLoadException(libName, t);
       }
     }

components/native-loader/src/test/java/datadog/nativeloader/NativeLoaderTest.java

@@ -4,12 +4,12 @@
 import static datadog.nativeloader.TestPlatformSpec.LINUX;
 import static datadog.nativeloader.TestPlatformSpec.UNSUPPORTED_ARCH;
 import static datadog.nativeloader.TestPlatformSpec.UNSUPPORTED_OS;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -175,33 +175,34 @@ public void fromDir() throws LibraryLoadException {
   @Test
   public void fromDir_override_windows() throws LibraryLoadException {
     TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
-	    
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
-    
+
+    NativeLoader loader =
+        NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
+
     sharedListener.expectResolveDynamic(TestPlatformSpec.windows(), "dummy");
-    
+
     try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.windows(), "dummy")) {
       // loaded directly from directory, so no clean-up required
       assertRegularFile(lib);
       assertTrue(lib.getAbsolutePath().endsWith("dummy.dll"));
     }
-    
+
     sharedListener.assertDone();
   }
 
   @Test
   public void fromDir_override_mac() throws LibraryLoadException {
     NativeLoader loader = NativeLoader.builder().fromDir("test-data").build();
-    
-    TestLibraryLoadingListener scopedListener = new TestLibraryLoadingListener().
-      expectResolveDynamic(TestPlatformSpec.mac(), "dummy");
+
+    TestLibraryLoadingListener scopedListener =
+        new TestLibraryLoadingListener().expectResolveDynamic(TestPlatformSpec.mac(), "dummy");
 
     try (LibFile lib = loader.resolveDynamic(TestPlatformSpec.mac(), "dummy", scopedListener)) {
       // loaded directly from directory, so no clean-up required
       assertRegularFile(lib);
       assertTrue(lib.getAbsolutePath().endsWith("libdummy.dylib"));
     }
-    
+
     scopedListener.assertDone();
   }
 
@@ -228,26 +229,27 @@ public void fromDirList() throws LibraryLoadException {
 
   @Test
   public void fromDir_with_component() throws LibraryLoadException {
-	TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
-	  
-    NativeLoader loader = NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
-    
+    TestLibraryLoadingListener sharedListener = new TestLibraryLoadingListener();
+
+    NativeLoader loader =
+        NativeLoader.builder().fromDir("test-data").addListener(sharedListener).build();
+
     sharedListener.expectResolveDynamic("comp1", "dummy");
 
     try (LibFile lib = loader.resolveDynamic("comp1", "dummy")) {
       assertRegularFile(lib);
       assertTrue(lib.getAbsolutePath().contains("comp1"));
     }
-    
+
     sharedListener.assertDone();
-    
+
     sharedListener.expectResolveDynamic("comp2", "dummy");
 
     try (LibFile lib = loader.resolveDynamic("comp2", "dummy")) {
       assertRegularFile(lib);
       assertTrue(lib.getAbsolutePath().contains("comp2"));
     }
-    
+
     sharedListener.assertDone();
   }
 
@@ -320,19 +322,20 @@ public void fromJarBackedClassLoader() throws IOException, LibraryLoadException
     Path jar = jar("test-data");
     try {
       try (URLClassLoader classLoader = createClassLoader(jar)) {
-    	NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
-        
-    	TestLibraryLoadingListener scopedListener = new TestLibraryLoadingListener().
-    	  expectResolveDynamic("dummy").
-    	  expectTempFileCreated("dummy").
-    	  expectTempFileCleanup("dummy");
-    	    	
-    	try (LibFile lib = loader.resolveDynamic("dummy", scopedListener)) {
+        NativeLoader loader = NativeLoader.builder().fromClassLoader(classLoader).build();
+
+        TestLibraryLoadingListener scopedListener =
+            new TestLibraryLoadingListener()
+                .expectResolveDynamic("dummy")
+                .expectTempFileCreated("dummy")
+                .expectTempFileCleanup("dummy");
+
+        try (LibFile lib = loader.resolveDynamic("dummy", scopedListener)) {
           // loaded from a jar, so copied to temp file
           assertTempFile(lib);
         }
-    	
-    	scopedListener.assertDone();
+
+        scopedListener.assertDone();
       }
     } finally {
       deleteHelper(jar);