Code tidy after code inspections

peter-lawrey · peter-lawrey · commit 2b090f046433 · 2018-04-21T17:41:31.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityStrategies.java b/affinity/src/main/java/net/openhft/affinity/AffinityStrategies.java
@@ -75,6 +75,6 @@ public boolean matches(int cpuId, int cpuId2) {
             CpuLayout cpuLayout = AffinityLock.cpuLayout();
             return cpuLayout.socketId(cpuId) != cpuLayout.socketId(cpuId2);
         }
-    };
+    }
 
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -34,7 +34,7 @@ class LockInventory {
      * The locks belonging to physical cores. Since a physical core can host multiple logical cores
      * the relationship is one to many.
      */
-    private final NavigableMap<Integer, AffinityLock[]> physicalCoreLocks = new TreeMap<Integer, AffinityLock[]>();
+    private final NavigableMap<Integer, AffinityLock[]> physicalCoreLocks = new TreeMap<>();
     private CpuLayout cpuLayout;
     /**
      * The lock belonging to each logical core. 1-to-1 relationship
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java b/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java
@@ -23,6 +23,7 @@
 
 import java.util.Arrays;
 import java.util.BitSet;
+import java.util.Collections;
 import java.util.List;
 
 public class LinuxHelper {
@@ -281,7 +282,7 @@ public static class cpu_set_t extends Structure {
         static final int __CPU_SETSIZE = 1024;
         static final int __NCPUBITS = 8 * NativeLong.SIZE;
         static final int SIZE_OF_CPU_SET_T = (__CPU_SETSIZE / __NCPUBITS) * NativeLong.SIZE;
-        static List<String> FIELD_ORDER = Arrays.asList("__bits");
+        static List<String> FIELD_ORDER = Collections.singletonList("__bits");
         public NativeLong[] __bits = new NativeLong[__CPU_SETSIZE / __NCPUBITS];
 
         public cpu_set_t() {
@@ -293,7 +294,7 @@ public cpu_set_t() {
         @SuppressWarnings({"UnusedDeclaration"})
         public static void __CPU_ZERO(cpu_set_t cpuset) {
             for (NativeLong bits : cpuset.__bits) {
-                bits.setValue(0l);
+                bits.setValue(0L);
             }
         }
 
@@ -302,7 +303,7 @@ public static int __CPUELT(int cpu) {
         }
 
         public static long __CPUMASK(int cpu) {
-            return 1l << (cpu % __NCPUBITS);
+            return 1L << (cpu % __NCPUBITS);
         }
 
         @SuppressWarnings({"UnusedDeclaration"})
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java
@@ -70,7 +70,7 @@ public enum PosixJNAAffinity implements IAffinity {
         LOADED = loaded;
     }
 
-    private final ThreadLocal<Integer> THREAD_ID = new ThreadLocal<Integer>();
+    private final ThreadLocal<Integer> THREAD_ID = new ThreadLocal<>();
 
     public static boolean is64Bit() {
         return IS64BIT;
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/Utilities.java b/affinity/src/main/java/net/openhft/affinity/impl/Utilities.java
@@ -39,8 +39,8 @@ public static String toHexString(final BitSet set) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         PrintWriter writer = new PrintWriter(out);
         final long[] longs = set.toLongArray();
-        for (int i = 0; i < longs.length; i++) {
-            writer.write(Long.toHexString(longs[i]));
+        for (long aLong : longs) {
+            writer.write(Long.toHexString(aLong));
         }
         writer.flush();
 
@@ -51,8 +51,8 @@ public static String toBinaryString(BitSet set) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         PrintWriter writer = new PrintWriter(out);
         final long[] longs = set.toLongArray();
-        for (int i = 0; i < longs.length; i++) {
-            writer.write(Long.toBinaryString(longs[i]));
+        for (long aLong : longs) {
+            writer.write(Long.toBinaryString(aLong));
         }
         writer.flush();
 
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/VanillaCpuLayout.java b/affinity/src/main/java/net/openhft/affinity/impl/VanillaCpuLayout.java
@@ -40,9 +40,9 @@ public class VanillaCpuLayout implements CpuLayout {
 
     VanillaCpuLayout(@NotNull List<CpuInfo> cpuDetails) {
         this.cpuDetails = cpuDetails;
-        SortedSet<Integer> sockets = new TreeSet<Integer>(),
-                cores = new TreeSet<Integer>(),
-                threads = new TreeSet<Integer>();
+        SortedSet<Integer> sockets = new TreeSet<>(),
+                cores = new TreeSet<>(),
+                threads = new TreeSet<>();
         for (CpuInfo cpuDetail : cpuDetails) {
             sockets.add(cpuDetail.socketId);
             cores.add((cpuDetail.socketId << 16) + cpuDetail.coreId);
@@ -78,7 +78,7 @@ public static VanillaCpuLayout fromProperties(InputStream is) throws IOException
 
     @NotNull
     public static VanillaCpuLayout fromProperties(@NotNull Properties prop) {
-        List<CpuInfo> cpuDetails = new ArrayList<CpuInfo>();
+        List<CpuInfo> cpuDetails = new ArrayList<>();
         for (int i = 0; i < MAX_CPUS_SUPPORTED; i++) {
             String line = prop.getProperty("" + i);
             if (line == null) break;
@@ -115,9 +115,9 @@ private static InputStream openFile(String filename) throws FileNotFoundExceptio
     public static VanillaCpuLayout fromCpuInfo(InputStream is) throws IOException {
         BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
         String line;
-        List<CpuInfo> cpuDetails = new ArrayList<CpuInfo>();
+        List<CpuInfo> cpuDetails = new ArrayList<>();
         CpuInfo details = new CpuInfo();
-        Map<String, Integer> threadCount = new LinkedHashMap<String, Integer>();
+        Map<String, Integer> threadCount = new LinkedHashMap<>();
 
         while ((line = br.readLine()) != null) {
             if (line.trim().isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,6 @@ public boolean matches(int cpuId, int cpuId2) {`
`75`	`75`	`CpuLayout cpuLayout = AffinityLock.cpuLayout();`
`76`	`76`	`return cpuLayout.socketId(cpuId) != cpuLayout.socketId(cpuId2);`
`77`	`77`	`}`
`78`		`- };`
	`78`	`+ }`
`79`	`79`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public enum PosixJNAAffinity implements IAffinity {`
`70`	`70`	`LOADED = loaded;`
`71`	`71`	`}`
`72`	`72`
`73`		`- private final ThreadLocal<Integer> THREAD_ID = new ThreadLocal<Integer>();`
	`73`	`+ private final ThreadLocal<Integer> THREAD_ID = new ThreadLocal<>();`
`74`	`74`
`75`	`75`	`public static boolean is64Bit() {`
`76`	`76`	`return IS64BIT;`