Refactor access modifiers and suppress warnings in affinity classes

peter-lawrey · peter-lawrey · commit e9b0f01b9f7f · 2025-11-11T16:46:32.000Z
diff --git a/affinity-test/pom.xml b/affinity-test/pom.xml
@@ -24,6 +24,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jacoco.line.coverage>0</jacoco.line.coverage>
+        <jacoco.branch.coverage>0</jacoco.branch.coverage>
     </properties>
 
     <dependencyManagement>
diff --git a/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiBundleTest.java b/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiBundleTest.java
@@ -21,7 +21,7 @@
 @RunWith(PaxExam.class)
 public class OSGiBundleTest extends net.openhft.affinity.osgi.OSGiTestBase {
     @Inject
-    BundleContext context;
+    private BundleContext context;
 
     @Configuration
     public Option[] config() {
diff --git a/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiTestBase.java b/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiTestBase.java
@@ -11,9 +11,9 @@
 
 import java.io.File;
 
-public class OSGiTestBase {
+class OSGiTestBase {
 
-    public static Option workspaceBundle(String projectName) {
+    static Option workspaceBundle(String projectName) {
         String baseDir = System.getProperty("main.basedir");
         String bundleDir;
 
@@ -30,11 +30,11 @@ public static Option workspaceBundle(String projectName) {
         return null;
     }
 
-    public static MavenArtifactProvisionOption mavenBundleAsInProject(final String groupId, final String artifactId) {
+    static MavenArtifactProvisionOption mavenBundleAsInProject(final String groupId, final String artifactId) {
         return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).versionAsInProject();
     }
 
-    public static Bundle findBundle(BundleContext context, String symbolicName) {
+    static Bundle findBundle(BundleContext context, String symbolicName) {
         Bundle[] bundles = context.getBundles();
         for (Bundle bundle : bundles) {
             if (bundle != null) {
diff --git a/affinity/pom.xml b/affinity/pom.xml
@@ -25,6 +25,8 @@
     <properties>
         <native.source.dir>src/main/c</native.source.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jacoco.line.coverage>0.5</jacoco.line.coverage>
+        <jacoco.branch.coverage>0.4</jacoco.branch.coverage>
     </properties>
 
     <dependencyManagement>
@@ -132,35 +134,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>sonar</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.sonarsource.scanner.maven</groupId>
-                        <artifactId>sonar-maven-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>report</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <build>
diff --git a/affinity/src/main/java/software/chronicle/enterprise/internals/impl/NativeAffinity.java b/affinity/src/main/java/software/chronicle/enterprise/internals/impl/NativeAffinity.java
@@ -28,6 +28,7 @@ public enum NativeAffinity implements IAffinity {
 
     private native static long rdtsc0();
 
+    @SuppressWarnings("restricted")
     private static boolean loadAffinityNativeLibrary() {
         try {
             System.loadLibrary("CEInternals");
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockDumpLocksTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockDumpLocksTest.java
@@ -17,7 +17,7 @@
 
 public class AffinityLockDumpLocksTest extends BaseAffinityTest {
 
-    static void supressUnusedWarning(AutoCloseable c) {
+    private static void supressUnusedWarning(AutoCloseable c) {
         // do nothing
     }
 
diff --git a/affinity/src/test/java/net/openhft/affinity/MultiProcessAffinityTest.java b/affinity/src/test/java/net/openhft/affinity/MultiProcessAffinityTest.java
@@ -142,7 +142,7 @@ static class RepeatedAffinityLocker implements Callable<Void> {
         private final int iterations;
         private final String cpuIdToLock;
 
-        public RepeatedAffinityLocker(String cpuIdToLock, int iterations) {
+        RepeatedAffinityLocker(String cpuIdToLock, int iterations) {
             this.iterations = iterations;
             this.cpuIdToLock = cpuIdToLock;
         }
@@ -255,7 +255,7 @@ public static void main(String[] args) throws InterruptedException, IOException
         }
 
         @NotNull
-        protected static File toFile(int id) {
+        static File toFile(int id) {
             return new TestFileLockBasedLockChecker().doToFile(id);
         }
     }
diff --git a/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java b/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java
@@ -18,14 +18,14 @@
  */
 public abstract class AbstractAffinityImplTest extends BaseAffinityTest {
 
-    protected static final int CORES = Runtime.getRuntime().availableProcessors();
-    protected static final BitSet CORES_MASK = new BitSet(CORES);
+    private static final int CORES = Runtime.getRuntime().availableProcessors();
+    private static final BitSet CORES_MASK = new BitSet(CORES);
 
     static {
         CORES_MASK.set(0, CORES, true);
     }
 
-    public abstract IAffinity getImpl();
+    protected abstract IAffinity getImpl();
 
     @Test
     public void getAffinityCompletesGracefully() {
diff --git a/affinity/src/test/java/software/chronicle/enterprise/internals/JnaAffinityTest.java b/affinity/src/test/java/software/chronicle/enterprise/internals/JnaAffinityTest.java
@@ -20,8 +20,8 @@
  * @author peter.lawrey
  */
 public class JnaAffinityTest extends BaseAffinityTest {
-    protected static final int CORES = Runtime.getRuntime().availableProcessors();
-    protected static final BitSet CORES_MASK = new BitSet(CORES);
+    private static final int CORES = Runtime.getRuntime().availableProcessors();
+    private static final BitSet CORES_MASK = new BitSet(CORES);
 
     static {
         CORES_MASK.set(0, CORES, true);
@@ -90,7 +90,7 @@ public void tearDown() {
         getImpl().setAffinity(CORES_MASK);
     }
 
-    public IAffinity getImpl() {
+    private IAffinity getImpl() {
         return LinuxJNAAffinity.INSTANCE;
     }
 }
diff --git a/affinity/src/test/java/software/chronicle/enterprise/internals/NativeAffinityTest.java b/affinity/src/test/java/software/chronicle/enterprise/internals/NativeAffinityTest.java
@@ -18,8 +18,8 @@
  * @author peter.lawrey
  */
 public class NativeAffinityTest extends BaseAffinityTest {
-    protected static final int CORES = Runtime.getRuntime().availableProcessors();
-    protected static final BitSet CORES_MASK = new BitSet(CORES);
+    private static final int CORES = Runtime.getRuntime().availableProcessors();
+    private static final BitSet CORES_MASK = new BitSet(CORES);
 
     static {
         CORES_MASK.set(0, CORES, true);
@@ -116,7 +116,7 @@ public void tearDown() {
         getImpl().setAffinity(CORES_MASK);
     }
 
-    public IAffinity getImpl() {
+    private IAffinity getImpl() {
         return NativeAffinity.INSTANCE;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`public class AffinityLockDumpLocksTest extends BaseAffinityTest {`
`19`	`19`
`20`		`- static void supressUnusedWarning(AutoCloseable c) {`
	`20`	`+ private static void supressUnusedWarning(AutoCloseable c) {`
`21`	`21`	`// do nothing`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ static class RepeatedAffinityLocker implements Callable<Void> {`
`142`	`142`	`private final int iterations;`
`143`	`143`	`private final String cpuIdToLock;`
`144`	`144`
`145`		`- public RepeatedAffinityLocker(String cpuIdToLock, int iterations) {`
	`145`	`+ RepeatedAffinityLocker(String cpuIdToLock, int iterations) {`
`146`	`146`	`this.iterations = iterations;`
`147`	`147`	`this.cpuIdToLock = cpuIdToLock;`
`148`	`148`	`}`
`@@ -255,7 +255,7 @@ public static void main(String[] args) throws InterruptedException, IOException`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`@NotNull`
`258`		`- protected static File toFile(int id) {`
	`258`	`+ static File toFile(int id) {`
`259`	`259`	`return new TestFileLockBasedLockChecker().doToFile(id);`
`260`	`260`	`}`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`* @author peter.lawrey`
`21`	`21`	`*/`
`22`	`22`	`public class JnaAffinityTest extends BaseAffinityTest {`
`23`		`- protected static final int CORES = Runtime.getRuntime().availableProcessors();`
`24`		`- protected static final BitSet CORES_MASK = new BitSet(CORES);`
	`23`	`+ private static final int CORES = Runtime.getRuntime().availableProcessors();`
	`24`	`+ private static final BitSet CORES_MASK = new BitSet(CORES);`
`25`	`25`
`26`	`26`	`static {`
`27`	`27`	`CORES_MASK.set(0, CORES, true);`
`@@ -90,7 +90,7 @@ public void tearDown() {`
`90`	`90`	`getImpl().setAffinity(CORES_MASK);`
`91`	`91`	`}`
`92`	`92`
`93`		`- public IAffinity getImpl() {`
	`93`	`+ private IAffinity getImpl() {`
`94`	`94`	`return LinuxJNAAffinity.INSTANCE;`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`* @author peter.lawrey`
`19`	`19`	`*/`
`20`	`20`	`public class NativeAffinityTest extends BaseAffinityTest {`
`21`		`- protected static final int CORES = Runtime.getRuntime().availableProcessors();`
`22`		`- protected static final BitSet CORES_MASK = new BitSet(CORES);`
	`21`	`+ private static final int CORES = Runtime.getRuntime().availableProcessors();`
	`22`	`+ private static final BitSet CORES_MASK = new BitSet(CORES);`
`23`	`23`
`24`	`24`	`static {`
`25`	`25`	`CORES_MASK.set(0, CORES, true);`
`@@ -116,7 +116,7 @@ public void tearDown() {`
`116`	`116`	`getImpl().setAffinity(CORES_MASK);`
`117`	`117`	`}`
`118`	`118`
`119`		`- public IAffinity getImpl() {`
	`119`	`+ private IAffinity getImpl() {`
`120`	`120`	`return NativeAffinity.INSTANCE;`
`121`	`121`	`}`
`122`	`122`	`}`