Clean Code for bundles/org.eclipse.osgi.compatibility.state

bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java

@@ -33,7 +33,7 @@ class PlatformBundleListener implements SynchronousBundleListener, FrameworkList
 	private final ModuleDatabase database;
 	private final ModuleContainer container;
 	private long lastResolveStamp = -1;
-	private AtomicBoolean gotUnresolved = new AtomicBoolean(false);
+	private final AtomicBoolean gotUnresolved = new AtomicBoolean(false);
 
 	PlatformBundleListener(State systemState, StateConverter converter, ModuleDatabase database, ModuleContainer container) {
 		this.systemState = systemState;

bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java

@@ -27,7 +27,7 @@ public class GroupingChecker {
 	// a mapping of bundles to their package roots; keyed by
 	// ResolverBundle -> HashMap of packages; keyed by
 	// package name -> PackageRoots
-	private Map<ResolverBundle, Map<String, PackageRoots>> bundles = new HashMap<>();
+	private final Map<ResolverBundle, Map<String, PackageRoots>> bundles = new HashMap<>();
 
 	/*
 	 * This method fully populates a bundles package roots for the purpose of resolving
@@ -284,7 +284,7 @@ public void clear(ResolverBundle rb) {
 	}
 
 	class PackageRoots {
-		private String name;
+		private final String name;
 		private ResolverExport[] roots;
 
 		PackageRoots(String name) {

bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/PermissionChecker.java

@@ -19,7 +19,7 @@
 
 public class PermissionChecker {
 	private boolean checkPermissions = false;
-	private ResolverImpl resolver;
+	private final ResolverImpl resolver;
 
 	public PermissionChecker(boolean checkPermissions, ResolverImpl resolver) {
 		this.checkPermissions = checkPermissions;

bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java

@@ -21,7 +21,7 @@
  * A companion to ExportPackageDescription from the state used while resolving.
  */
 public class ResolverExport extends VersionSupplier {
-	private ResolverBundle resolverBundle;
+	private final ResolverBundle resolverBundle;
 
 	ResolverExport(ResolverBundle resolverBundle, ExportPackageDescription epd) {
 		super(epd);

bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java

@@ -91,7 +91,7 @@ public class ResolverImpl implements Resolver {
 	// Used to check permissions for import/export, provide/require, host/fragment
 	private final PermissionChecker permissionChecker;
 	// Set of bundles that are pending removal
-	private MappedList<Long, BundleDescription> removalPending = new MappedList<>();
+	private final MappedList<Long, BundleDescription> removalPending = new MappedList<>();
 	// Indicates whether this resolver has been initialized
 	private boolean initialized = false;