Spotless & minor fixes

.gitignore

@@ -62,6 +62,7 @@ atlassian-ide-plugin.xml
 .project
 .settings
 .metadata
+.factorypath
 
 # NetBeans specific files/directories
-.nbattrs
+.nbattrs

HACKING.md

@@ -22,6 +22,11 @@ Generate documentation:
 ./gradlew javadoc
 ```
 
+Format Java code:
+```
+./gradlew spotlessApply
+```
+
 Format C code:
 ```
 ./gradlew clangFormat

build.gradle

@@ -4,6 +4,8 @@ plugins {
     id "jacoco"
     id "com.adarshr.test-logger" version "2.0.0"
     id "io.franzbecker.gradle-lombok" version "5.0.0"
+    // formatting
+    id "com.diffplug.spotless" version "7.0.3"
 }
 
 apply from: "common.gradle"
@@ -105,6 +107,23 @@ javadoc {
     options.addStringOption("Xdoclint:none", "-quiet")
 }
 
+// format Java code
+spotless {
+    java {
+        target fileTree(dir: projectDir, include: "**/*.java").filter { file ->
+            !file.text.contains("// Code generated")
+        }.collect {
+            it.path.replace(projectDir.path + File.separator, "")
+        }
+        eclipse().configFile("eclipse-format-prefs.xml")
+        leadingTabsToSpaces(4)
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}
+tasks.named("spotlessJava").configure {
+    dependsOn("compileJava")
+}
 
 // format C code
 task clangFormat {

cmake-library/src/main/java/org/rocstreaming/roctoolkit/gradle/plugins/cmake/CMakeExtension.java

@@ -79,7 +79,7 @@ public void setGenerator(String generator) {
                 this.generator.set(GENERATOR.MAKE);
             else if (generator.equals("ninja"))
                 this.generator.set(GENERATOR.NINJA);
-            else 
+            else
                 throw new IllegalArgumentException("generator '" + generator + "' is not supported. Choose one from 'make' or 'ninja'.");
         }
     }

cmake-library/src/main/java/org/rocstreaming/roctoolkit/gradle/tasks/CMake.java

@@ -39,8 +39,8 @@ public void generateCmakeFiles() {
 
         String cmakeExecutable = System.getenv().getOrDefault("CMAKE_EXECUTABLE", "cmake");
         Provider<Directory> targetDirectory = variantDirectory.dir(
-            String.format("%s/%s", getTarget().get().getHost().get(),
-                          getTarget().get().getPlatform().get()));
+                String.format("%s/%s", getTarget().get().getHost().get(),
+                        getTarget().get().getPlatform().get()));
         targetDirectory.get().getAsFile().mkdirs();
 
         ArrayList<String> cliArgs = new ArrayList<>();
@@ -51,7 +51,7 @@ public void generateCmakeFiles() {
         }
         cliArgs.add("-G" + generator.get());
         cliArgs.add("-DCMAKE_TOOLCHAIN_FILE=" +
-                    System.getenv().getOrDefault("CMAKE_TOOLCHAIN_FILE", ""));
+                System.getenv().getOrDefault("CMAKE_TOOLCHAIN_FILE", ""));
         cliArgs.add("--no-warn-unused-cli");
         cliArgs.add(getProjectDirectory().get().getAsFile().getAbsolutePath());
 
@@ -83,9 +83,9 @@ public FileCollection getCMakeLists() {
     @OutputFiles
     public FileCollection getCmakeFiles() {
         return getProject().fileTree(variantDirectory, it -> it.include("**/CMakeFiles/**/*")
-                                                                .include("**/Makefile")
-                                                                .include("**/*.ninja")
-                                                                .include("**/*.cmake"));
+                .include("**/Makefile")
+                .include("**/*.ninja")
+                .include("**/*.cmake"));
     }
 
     @Input

eclipse-format-prefs.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="21">
+  <profile kind="CodeFormatterProfile" name="roc" version="21">
+
+    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="240"/>
+    <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="240"/>
+
+    <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="false"/>
+
+    <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_declaration" value="preserve_positions"/>
+    <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="preserve_positions"/>
+    <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="preserve_positions"/>
+
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="do not insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+  </profile>
+</profiles>

roc_jni/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 project(RocJni C)
 

src/main/java/org/rocstreaming/roctoolkit/Endpoint.java

@@ -145,5 +145,4 @@ public String toString() {
     private native void init(String uri) throws IllegalArgumentException;
 
     private native void validate() throws IllegalArgumentException;
-
 }

src/main/java/org/rocstreaming/roctoolkit/RocContextConfigValidator.java

@@ -1,6 +1,5 @@
 package org.rocstreaming.roctoolkit;
 
-
 /**
  * A <code>RocContextConfigValidator</code> adds validation to RocContextConfig builder.
  */

src/main/java/org/rocstreaming/roctoolkit/RocLibrary.java

@@ -17,5 +17,6 @@ static void loadLibrary() {
         }
     }
 
-    private RocLibrary() {}
+    private RocLibrary() {
+    }
 }

src/test/java/org/rocstreaming/roctoolkit/EndpointTest.java

@@ -326,4 +326,4 @@ public void testEndpointMinimalConstructor() {
         assertNull(endpoint.getResource());
         assertEquals("rtp://192.168.0.1:12345", endpoint.getUri());
     }
-}
+}

src/test/java/org/rocstreaming/roctoolkit/RocContextConfigTest.java

@@ -25,4 +25,4 @@ public void testInvalidConfig(String error, RocContextConfig.Builder builder) {
         assertEquals(error, e.getMessage());
     }
 
-}
+}

src/test/java/org/rocstreaming/roctoolkit/RocContextTest.java

@@ -28,7 +28,8 @@ public void testCloseWithAttachedSender() {
             try (RocContext context = new RocContext()) {
                 sender = new RocSender(context, RocSenderTest.CONFIG);
             } finally {
-                if (sender != null) sender.close();
+                if (sender != null)
+                    sender.close();
             }
         });
     }
@@ -40,7 +41,8 @@ public void testCloseWithAttachedReceiver() {
             try (RocContext context = new RocContext()) {
                 receiver = new RocReceiver(context, RocReceiverTest.CONFIG);
             } finally {
-                if (receiver != null) receiver.close();
+                if (receiver != null)
+                    receiver.close();
             }
         });
     }

src/test/java/org/rocstreaming/roctoolkit/RocReceiverTest.java

@@ -195,7 +195,6 @@ public void testInvalidRead() throws Exception {
         }
     }
 
-
     @Test
     public void testReadZeroizedArray() throws Exception {
         try (RocReceiver receiver = new RocReceiver(context, CONFIG)) {

src/test/java/org/rocstreaming/roctoolkit/RocSenderConfigTest.java

@@ -12,7 +12,6 @@
 
 class RocSenderConfigTest {
 
-
     private static RocSenderConfig.Builder validBuilder() {
         return RocSenderConfig.builder()
                 .frameSampleRate(44100)

src/test/java/org/rocstreaming/roctoolkit/RocSenderTest.java

@@ -59,7 +59,8 @@ public void afterEach() throws Exception {
     public void testCreationAndDeinitialization() {
         assertDoesNotThrow(() -> {
             //noinspection EmptyTryBlock
-            try (RocSender ignored = new RocSender(context, CONFIG)) {}
+            try (RocSender ignored = new RocSender(context, CONFIG)) {
+            }
         });
     }
 

src/test/java/org/rocstreaming/roctoolkit/integration/RocSenderReceiverTest.java

@@ -12,7 +12,6 @@
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-
 public class RocSenderReceiverTest extends BaseTest {
 
     private static final int SAMPLE_RATE = 44100;