Perform clean code of bundles/org.eclipse.equinox.http.registry

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/DefaultRegistryHttpContext.java

@@ -22,7 +22,7 @@
 import org.osgi.service.http.HttpContext;
 
 public class DefaultRegistryHttpContext implements HttpContext {
-	private HttpContext delegate;
+	private final HttpContext delegate;
 	private List<ResourceMapping> resourceMappings;
 	private Properties mimeMappings;
 
@@ -93,8 +93,8 @@ public Set<String> getResourcePaths(String path) {
 	}
 
 	public static class ResourceMapping {
-		private Bundle bundle;
-		private String bundlePath;
+		private final Bundle bundle;
+		private final String bundlePath;
 
 		public ResourceMapping(Bundle bundle, String path) {
 			this.bundle = bundle;

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/FilterManager.java

@@ -46,13 +46,13 @@ public class FilterManager implements ExtensionPointTracker.Listener {
 
 	private static final String FILTER = "filter"; //$NON-NLS-1$
 
-	private ExtensionPointTracker tracker;
+	private final ExtensionPointTracker tracker;
 
-	private HttpRegistryManager httpRegistryManager;
+	private final HttpRegistryManager httpRegistryManager;
 
-	private Map<IConfigurationElement, Filter> registered = new HashMap<>();
+	private final Map<IConfigurationElement, Filter> registered = new HashMap<>();
 
-	private ServiceReference<?> reference;
+	private final ServiceReference<?> reference;
 
 	public FilterManager(HttpRegistryManager httpRegistryManager, ServiceReference<?> reference,
 			IExtensionRegistry registry) {
@@ -154,7 +154,7 @@ public void removed(IExtension extension) {
 
 	private static class FilterWrapper implements Filter {
 
-		private IConfigurationElement element;
+		private final IConfigurationElement element;
 		private Filter delegate;
 		private FilterConfig config;
 		private boolean loadOnStartup = false;

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java

@@ -37,9 +37,9 @@ public class HttpContextManager implements Listener {
 	private static final String RESOURCEMAPPING = "resource-mapping"; //$NON-NLS-1$
 	private static final String BUNDLE = "bundle"; //$NON-NLS-1$
 
-	private List<IConfigurationElement> registered = new ArrayList<>();
-	private HttpRegistryManager httpRegistryManager;
-	private ExtensionPointTracker tracker;
+	private final List<IConfigurationElement> registered = new ArrayList<>();
+	private final HttpRegistryManager httpRegistryManager;
+	private final ExtensionPointTracker tracker;
 
 	public HttpContextManager(HttpRegistryManager httpRegistryManager, IExtensionRegistry registry) {
 		this.httpRegistryManager = httpRegistryManager;

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpRegistryManager.java

@@ -83,17 +83,17 @@ public HttpContextContribution(HttpContext context, IContributor contributor) {
 		}
 	}
 
-	private HttpContextManager httpContextManager;
-	private ServletManager servletManager;
-	private FilterManager filterManager;
-	private ResourceManager resourceManager;
-	private HttpService httpService;
-	private PackageAdmin packageAdmin;
-	private Map<String, HttpContextContribution> contexts = new HashMap<>();
-	private Map<String, FilterContribution> filters = new HashMap<>();
-	private Map<String, ServletContribution> servlets = new HashMap<>();
-	private Map<String, ResourcesContribution> resources = new HashMap<>();
-	private Set<String> registered = new HashSet<>();
+	private final HttpContextManager httpContextManager;
+	private final ServletManager servletManager;
+	private final FilterManager filterManager;
+	private final ResourceManager resourceManager;
+	private final HttpService httpService;
+	private final PackageAdmin packageAdmin;
+	private final Map<String, HttpContextContribution> contexts = new HashMap<>();
+	private final Map<String, FilterContribution> filters = new HashMap<>();
+	private final Map<String, ServletContribution> servlets = new HashMap<>();
+	private final Map<String, ResourcesContribution> resources = new HashMap<>();
+	private final Set<String> registered = new HashSet<>();
 
 	public HttpRegistryManager(ServiceReference<?> reference, HttpService httpService, PackageAdmin packageAdmin,
 			IExtensionRegistry registry) {

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpServiceTracker.java

@@ -27,8 +27,8 @@
 
 public class HttpServiceTracker extends ServiceTracker<HttpService, HttpService> {
 
-	private PackageAdmin packageAdmin;
-	private IExtensionRegistry registry;
+	private final PackageAdmin packageAdmin;
+	private final IExtensionRegistry registry;
 
 	private ServiceRegistration<?> registration;
 	Map<ServiceReference<HttpService>, HttpRegistryManager> httpRegistryManagers = new HashMap<>();
@@ -98,7 +98,7 @@ public void ungetService(Bundle bundle, ServiceRegistration<HttpContextExtension
 
 	public class HttpContextExtensionServiceImpl implements HttpContextExtensionService {
 
-		private Bundle bundle;
+		private final Bundle bundle;
 
 		public HttpContextExtensionServiceImpl(Bundle bundle) {
 			this.bundle = bundle;

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/ResourceManager.java

@@ -40,13 +40,13 @@ public class ResourceManager implements ExtensionPointTracker.Listener {
 
 	private static final String FILTER = "filter"; //$NON-NLS-1$
 
-	private ExtensionPointTracker tracker;
+	private final ExtensionPointTracker tracker;
 
-	private List<IConfigurationElement> registered = new ArrayList<>();
+	private final List<IConfigurationElement> registered = new ArrayList<>();
 
-	private HttpRegistryManager httpRegistryManager;
+	private final HttpRegistryManager httpRegistryManager;
 
-	private ServiceReference<?> reference;
+	private final ServiceReference<?> reference;
 
 	public ResourceManager(HttpRegistryManager httpRegistryManager, ServiceReference<?> reference,
 			IExtensionRegistry registry) {

bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/ServletManager.java

@@ -47,13 +47,13 @@ public class ServletManager implements ExtensionPointTracker.Listener {
 
 	private static final String FILTER = "filter"; //$NON-NLS-1$
 
-	private ExtensionPointTracker tracker;
+	private final ExtensionPointTracker tracker;
 
-	private HttpRegistryManager httpRegistryManager;
+	private final HttpRegistryManager httpRegistryManager;
 
-	private List<IConfigurationElement> registered = new ArrayList<>();
+	private final List<IConfigurationElement> registered = new ArrayList<>();
 
-	private ServiceReference<?> reference;
+	private final ServiceReference<?> reference;
 
 	public ServletManager(HttpRegistryManager httpRegistryManager, ServiceReference<?> reference,
 			IExtensionRegistry registry) {
@@ -155,7 +155,7 @@ public void removed(IExtension extension) {
 	}
 
 	private static class ServletWrapper implements Servlet {
-		private IConfigurationElement element;
+		private final IConfigurationElement element;
 		private Servlet delegate;
 		private ServletConfig config;
 		private boolean loadOnStartup = false;