Merge pull request #300 from Philippus/adopt-sbt-java-formatter

Adopt sbt-java-formatter

Author: Philippus

.git-blame-ignore-revs

@@ -9,3 +9,6 @@ d9ed5546c4de868b176b13b9b04bb8caf3543926
 
 # Scala Steward: Reformat with scalafmt 3.10.4
 73984fb901d347e84b6331981b225f74cbdb3fed
+
+# Reformat with sbt-java-formatter 0.10.0
+3a2e6552f80f743fa5cc16c78c5fed2280768849

.sbtopts

@@ -0,0 +1,5 @@
+-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED

project/plugins.sbt

@@ -1,3 +1,5 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
 
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0")
+
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")

src/main/java/au/com/onegeek/sbtdotenv/NativeEnvironmentManager.java

@@ -1,92 +1,83 @@
 package au.com.onegeek.sbtdotenv;
 
-import java.util.Map;
-
 import com.sun.jna.Library;
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
+import java.util.Map;
 
 /**
  * Change the actual program environment so that changes propagate to child processes
  *
- * Taken from: http://stackoverflow.com/questions/318239/how-do-i-set-environment-variables-from-java/7201825#7201825
+ * <p>Taken from:
+ * http://stackoverflow.com/questions/318239/how-do-i-set-environment-variables-from-java/7201825#7201825
  *
- * Created by mfellows on 20/07/2014.
+ * <p>Created by mfellows on 20/07/2014.
  */
 public abstract class NativeEnvironmentManager {
-    public abstract void setEnv(String key, String value);
+  public abstract void setEnv(String key, String value);
 
-    static class EnvironmentException extends RuntimeException {
-        EnvironmentException(String key) {
-            super("Failed to set environment variable: " + key);
-        }
+  static class EnvironmentException extends RuntimeException {
+    EnvironmentException(String key) {
+      super("Failed to set environment variable: " + key);
     }
+  }
 
-    static class WindowsNativeEnvironmentManagerImpl extends NativeEnvironmentManager {
-        public interface WindowsEnvironmentLibC extends Library {
-            WindowsEnvironmentLibC INSTANCE = (
-                (WindowsEnvironmentLibC) Native.load("msvcrt",
-                    WindowsEnvironmentLibC.class)
-            );
+  static class WindowsNativeEnvironmentManagerImpl extends NativeEnvironmentManager {
+    public interface WindowsEnvironmentLibC extends Library {
+      WindowsEnvironmentLibC INSTANCE =
+          ((WindowsEnvironmentLibC) Native.load("msvcrt", WindowsEnvironmentLibC.class));
 
-            int _putenv(String name);
-        }
+      int _putenv(String name);
+    }
 
-        private WindowsEnvironmentLibC libc = WindowsEnvironmentLibC.INSTANCE;
+    private WindowsEnvironmentLibC libc = WindowsEnvironmentLibC.INSTANCE;
 
-        @Override
-        public void setEnv(String name, String value) {
-            String s = name + "=";
-            if (value != null)
-                s += value;
+    @Override
+    public void setEnv(String name, String value) {
+      String s = name + "=";
+      if (value != null) s += value;
 
-            if (libc._putenv(s) != 0)
-                throw new EnvironmentException(name);
-        }
+      if (libc._putenv(s) != 0) throw new EnvironmentException(name);
     }
+  }
+
+  static class PosixNativeEnvironmentManagerImpl extends NativeEnvironmentManager {
+    public interface PosixEnvironmentLibC extends Library {
+      PosixEnvironmentLibC INSTANCE =
+          ((PosixEnvironmentLibC) Native.load("c", PosixEnvironmentLibC.class));
+
+      int setenv(String name, String value, int overwrite);
 
-    static class PosixNativeEnvironmentManagerImpl extends NativeEnvironmentManager {
-        public interface PosixEnvironmentLibC extends Library {
-            PosixEnvironmentLibC INSTANCE = (
-                (PosixEnvironmentLibC) Native.load("c",
-                    PosixEnvironmentLibC.class)
-            );
-
-            int setenv(String name, String value, int overwrite);
-            int unsetenv(String name);
-        }
-
-        private PosixEnvironmentLibC libc = PosixEnvironmentLibC.INSTANCE;
-
-        @Override
-        public void setEnv(String name, String value) {
-            int result;
-            if (value != null)
-                result = libc.setenv(name, value, 1);
-            else
-                result = libc.unsetenv(name);
-
-            if (result != 0)
-                throw new EnvironmentException(name);
-        }
+      int unsetenv(String name);
     }
 
-    private static NativeEnvironmentManager instance = null;
-    private static NativeEnvironmentManager getInstance() {
-        if (instance == null) {
-            if (Platform.isWindows())
-                instance = new WindowsNativeEnvironmentManagerImpl();
-            else
-                instance = new PosixNativeEnvironmentManagerImpl();
-        }
+    private PosixEnvironmentLibC libc = PosixEnvironmentLibC.INSTANCE;
 
-        return instance;
+    @Override
+    public void setEnv(String name, String value) {
+      int result;
+      if (value != null) result = libc.setenv(name, value, 1);
+      else result = libc.unsetenv(name);
+
+      if (result != 0) throw new EnvironmentException(name);
     }
+  }
+
+  private static NativeEnvironmentManager instance = null;
+
+  private static NativeEnvironmentManager getInstance() {
+    if (instance == null) {
+      if (Platform.isWindows()) instance = new WindowsNativeEnvironmentManagerImpl();
+      else instance = new PosixNativeEnvironmentManagerImpl();
+    }
+
+    return instance;
+  }
 
-    public static void setEnv(Map<String, String> env) {
-        NativeEnvironmentManager envManager = NativeEnvironmentManager.getInstance();
-        for (Map.Entry<String, String> entry : env.entrySet()) {
-            envManager.setEnv(entry.getKey(), entry.getValue());
-        }
+  public static void setEnv(Map<String, String> env) {
+    NativeEnvironmentManager envManager = NativeEnvironmentManager.getInstance();
+    for (Map.Entry<String, String> entry : env.entrySet()) {
+      envManager.setEnv(entry.getKey(), entry.getValue());
     }
+  }
 }