From 0ba013e67d94f717f836f4dbcb25303678b1d3e0 Mon Sep 17 00:00:00 2001 From: Eclipse Equinox Bot Date: Sun, 2 Feb 2025 03:32:25 +0000 Subject: [PATCH] Perform clean code of bundles/org.eclipse.osgi --- .../osgi/container/ModuleDatabase.java | 1 + .../container/ModuleResolutionReport.java | 10 +- .../osgi/container/ModuleResolver.java | 6 +- .../osgi/container/ModuleRevision.java | 2 + .../osgi/container/ModuleRevisionBuilder.java | 1 + .../EquinoxModuleDataNamespace.java | 1 + .../eclipse/osgi/framework/util/Headers.java | 2 +- .../osgi/framework/util/SecureAction.java | 2 +- .../internal/connect/ConnectInputStream.java | 1 + .../internal/container/ComputeNodeOrder.java | 4 +- .../internal/container/NamespaceList.java | 12 + .../framework/EquinoxEventPublisher.java | 2 +- .../osgi/internal/framework/FilterImpl.java | 2 +- .../framework/SystemBundleActivator.java | 2 +- .../framework/legacy/PackageAdminImpl.java | 1 + .../internal/loader/ModuleClassLoader.java | 1 + .../internal/loader/buddy/GlobalPolicy.java | 2 +- .../loader/classpath/ClasspathManager.java | 2 +- .../osgi/internal/location/BasicLocation.java | 1 + .../osgi/internal/log/EventAdminAdapter.java | 8 +- .../log/ExtendedLogReaderServiceFactory.java | 2 +- .../internal/permadmin/SecurityAdmin.java | 4 + .../osgi/internal/permadmin/SecurityRow.java | 1 + .../permadmin/SecurityRowSnapShot.java | 1 + .../service/security/AuthorizationEngine.java | 4 +- .../signedcontent/BundleToJarInputStream.java | 1 + .../url/ContentHandlerFactoryImpl.java | 4 +- .../url/MultiplexingContentHandler.java | 4 +- .../url/MultiplexingURLStreamHandler.java | 4 +- .../url/URLStreamHandlerFactoryImpl.java | 4 +- .../internal/url/URLStreamHandlerProxy.java | 4 +- .../internal/url/URLStreamHandlerSetter.java | 1 + .../osgi/service/resolver/BundleDelta.java | 2 + .../resolver/ExportPackageDescription.java | 1 + .../service/resolver/GenericDescription.java | 2 + .../osgi/service/resolver/PlatformAdmin.java | 1 + .../eclipse/osgi/service/resolver/State.java | 3 + .../service/resolver/StateObjectFactory.java | 11 +- .../osgi/service/resolver/VersionRange.java | 1 + .../osgi/signedcontent/SignerInfo.java | 1 + .../storage/bundlefile/DirZipBundleEntry.java | 2 +- .../org/apache/felix/resolver/Candidates.java | 15 +- .../apache/felix/resolver/ResolverImpl.java | 52 +++-- .../resolver/SimpleHostedCapability.java | 15 +- .../org/apache/felix/resolver/WireImpl.java | 12 +- .../felix/resolver/WrappedCapability.java | 15 +- .../felix/resolver/WrappedRequirement.java | 12 +- .../felix/resolver/WrappedResource.java | 9 +- .../apache/felix/resolver/util/ArrayMap.java | 27 ++- .../resolver/util/CandidateSelector.java | 3 +- .../felix/resolver/util/CopyOnWriteSet.java | 48 ++-- .../felix/resolver/util/OpenHashMap.java | 213 ++++++++++++------ .../felix/resolver/util/ShadowList.java | 3 +- .../felix/resolver/test/ResolverTest.java | 27 ++- .../resolver/test/util/BundleCapability.java | 12 +- .../resolver/test/util/BundleRequirement.java | 12 +- .../test/util/CandidateComparator.java | 3 +- .../resolver/test/util/GenericCapability.java | 12 +- .../test/util/GenericRequirement.java | 12 +- .../test/util/IdentityCapability.java | 12 +- .../resolver/test/util/IterativeResolver.java | 23 +- .../resolver/test/util/PackageCapability.java | 12 +- .../test/util/PackageRequirement.java | 12 +- .../test/util/ResolveContextImpl.java | 3 +- .../resolver/test/util/ResourceImpl.java | 6 +- .../resolver/test/util/SimpleFilter.java | 3 +- .../felix/utils/version/VersionRange.java | 9 +- .../src/org/osgi/framework/Configurable.java | 2 + .../src/org/osgi/framework/Constants.java | 7 + .../org/osgi/framework/FrameworkEvent.java | 2 + .../org/osgi/framework/PackagePermission.java | 1 + .../framework/hooks/service/EventHook.java | 1 + .../framework/namespace/HostNamespace.java | 1 + .../ConditionalPermissionAdmin.java | 4 + .../ConditionalPermissionInfo.java | 1 + .../service/packageadmin/ExportedPackage.java | 2 + .../service/packageadmin/PackageAdmin.java | 5 + .../service/packageadmin/RequiredBundle.java | 1 + .../osgi/service/startlevel/StartLevel.java | 1 + .../url/AbstractURLStreamHandlerService.java | 1 + .../service/url/URLStreamHandlerSetter.java | 1 + .../framework/eventmgr/EventListeners.java | 1 + .../framework/eventmgr/ListenerQueue.java | 1 + .../internal/reliablefile/ReliableFile.java | 4 +- .../reliablefile/ReliableFileInputStream.java | 2 +- .../osgi/internal/location/Locker_JavaIo.java | 2 +- .../osgi/service/datalocation/Location.java | 1 + .../osgi/service/environment/Constants.java | 1 + .../storagemanager/ManagedOutputStream.java | 6 +- .../osgi/storagemanager/StorageManager.java | 2 +- 90 files changed, 515 insertions(+), 238 deletions(-) diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java index 1835b91f00f..7cd14534297 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java @@ -514,6 +514,7 @@ final Map getWiringsClone() { try { Map clonedWirings = new HashMap<>(wirings); clonedWirings.replaceAll(new BiFunction() { + @Override public ModuleWiring apply(ModuleRevision r, ModuleWiring w) { return new ModuleWiring(r, w.getCapabilities(), w.getRequirements(), w.getProvidedWires(), w.getRequiredWires(), w.getSubstitutedNames()); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java index 975e4a51c3b..734f19e2447 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java @@ -81,11 +81,11 @@ public Type getType() { private final Map> entries; private final ResolutionException resolutionException; private final Map> resolutionResult; - private int totalPerm; - private int processedPerm; - private int usesPerm; - private int subPerm; - private int importPerm; + private final int totalPerm; + private final int processedPerm; + private final int usesPerm; + private final int subPerm; + private final int importPerm; ModuleResolutionReport(Map> resolutionResult, Map> entries, ResolutionException cause, int totalPerm, int processedPerm, int usesPerm, int subPerm, int importPerm) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java index f7dc0bb4db1..f1fbea771d0 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java @@ -507,10 +507,12 @@ public void logUsesConstraintViolation(Resource resource, ResolutionError error) } } + @Override public void logRequirement(String message, Requirement requirement) { debug(String.format(message, ModuleContainer.toString(requirement))); } + @Override public void logCapability(String message, Capability requirement) { debug(String.format(message, ModuleContainer.toString(requirement))); } @@ -643,8 +645,8 @@ public void logProcessPermutation(PermutationType type) { private volatile boolean currentlyResolvingMandatory = false; private final Set transitivelyResolveFailures = new LinkedHashSet<>(); private final Set failedToResolve = new HashSet<>(); - private AtomicBoolean scheduleTimeout = new AtomicBoolean(true); - private AtomicReference> timoutFuture = new AtomicReference<>(); + private final AtomicBoolean scheduleTimeout = new AtomicBoolean(true); + private final AtomicReference> timoutFuture = new AtomicReference<>(); /* * Used to generate the UNRESOLVED_PROVIDER resolution report entries. * diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java index e2a6e400c4f..cca429dc2bc 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java @@ -59,6 +59,7 @@ public final class ModuleRevision implements BundleRevision { private NamespaceList createCapabilities(NamespaceList.Builder capabilityInfos) { return capabilityInfos.transformIntoCopy(new Function() { + @Override public ModuleCapability apply(GenericInfo i) { Map directives = i.mutable ? copyUnmodifiableMap(i.directives) : i.directives; Map attributes = i.mutable ? copyUnmodifiableMap(i.attributes) : i.attributes; @@ -82,6 +83,7 @@ private Map copyUnmodifiableMap(Map map) { private NamespaceList createRequirements(NamespaceList.Builder infos) { return infos.transformIntoCopy(new Function() { + @Override public ModuleRequirement apply(GenericInfo i) { return new ModuleRequirement(i.namespace, i.directives, i.attributes, ModuleRevision.this); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java index 7ce5bfd86c9..2973f98162a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java @@ -58,6 +58,7 @@ public final class ModuleRevisionBuilder { */ public static class GenericInfo { final static Function GETNAMESPACE = new Function() { + @Override public String apply(GenericInfo info) { return info.getNamespace(); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java index fdd0a26470c..74bac198134 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java @@ -69,6 +69,7 @@ public class EquinoxModuleDataNamespace extends Namespace { * * @deprecated use {@link #LAZYSTART_HEADER} */ + @Deprecated public static final String AUTOSTART_HEADER = "Eclipse-AutoStart"; //$NON-NLS-1$ /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java index 6121fe6e445..df5f32c0a98 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java @@ -298,7 +298,7 @@ public static Headers parseManifest(InputStream in) throws Bundl } private static class ArrayEnumeration implements Enumeration { - private E[] array; + private final E[] array; int cur = 0; public ArrayEnumeration(E[] array, int size) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java index 6b5d7dedc3c..ae9a06667a2 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java @@ -45,7 +45,7 @@ */ public class SecureAction { // make sure we use the correct controlContext; - private AccessControlContext controlContext; + private final AccessControlContext controlContext; // uses initialization-on-demand holder idiom to do fast lazy loading private static class BootClassLoaderHolder { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectInputStream.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectInputStream.java index 383597f917c..f1ed59de39f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectInputStream.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectInputStream.java @@ -44,6 +44,7 @@ public int read() throws IOException { throw new IOException(); } + @Override public File getContent() { return null; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java index 1adbbed0c5e..ece53265a8a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java @@ -109,14 +109,14 @@ public Vertex(Object id) { * * Element type: Vertex */ - private List vertexList = new ArrayList<>(100); + private final List vertexList = new ArrayList<>(100); /** * Map from id to vertex. * * Key type: Object; value type: Vertex */ - private Map vertexMap = new HashMap<>(100); + private final Map vertexMap = new HashMap<>(100); /** * DFS visit time. Non-negative. diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/NamespaceList.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/NamespaceList.java index 298b5168e68..f3f82523d07 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/NamespaceList.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/NamespaceList.java @@ -47,16 +47,19 @@ public class NamespaceList { public final static Function WIRE = new Function() { + @Override public String apply(ModuleWire wire) { return wire.getCapability().getNamespace(); } }; public final static Function CAPABILITY = new Function() { + @Override public String apply(ModuleCapability capability) { return capability.getNamespace(); } }; public final static Function REQUIREMENT = new Function() { + @Override public String apply(ModuleRequirement requirement) { return requirement.getNamespace(); } @@ -188,6 +191,7 @@ public boolean hasNext() { return inner.hasNext(); } + @Override public E next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -333,6 +337,7 @@ private boolean addAll(Map> perNamespaceElements) { private List getNamespaceList(String namespace) { return namespaceElements.computeIfAbsent(namespace, new Function>() { + @Override public List apply(String n) { return new ArrayList<>(); } @@ -402,6 +407,7 @@ public void addAllFilteredAfterLastMatch(NamespaceList list, Predicate() { + @Override public boolean test(E e) { return insertionMatcher.test(toAdd, e); } @@ -448,6 +454,7 @@ public boolean remove(Object o) { private void removeNamespaceElement(String namespace, E element) { namespaceElements.computeIfPresent(namespace, new BiFunction, List>() { + @Override public List apply(String n, List es) { if (es.remove(element)) { Builder.this.size--; @@ -482,6 +489,7 @@ public void removeNamespaceIf(Predicate filter) { prepareModification(); namespaceElements.entrySet().removeIf(new Predicate>>() { + @Override public boolean test(Map.Entry> e) { if (filter.test(e.getKey())) { Builder.this.size -= e.getValue().size(); @@ -498,6 +506,7 @@ public boolean removeIf(Predicate filter) { int s = size; namespaceElements.values().removeIf(new Predicate>() { + @Override public boolean test(List es) { return removeElementsIf(es, filter) == null; } @@ -516,6 +525,7 @@ public void removeElementsOfNamespaceIf(String namespace, Predicate f prepareModification(); namespaceElements.computeIfPresent(namespace, new BiFunction, List>() { + @Override public List apply(String n, List es) { return removeElementsIf(es, filter); } @@ -555,6 +565,7 @@ public NamespaceList build() { int[] start = new int[] { 0 }; namespaceElements.replaceAll(new BiFunction, List>() { + @Override public List apply(String n, List es) { int from = start[0]; int to = start[0] += es.size(); @@ -571,6 +582,7 @@ private void prepareModification() { // namespace-lists for subsequent modification namespaceElements = new LinkedHashMap<>(namespaceElements); namespaceElements.replaceAll(new BiFunction, List>() { + @Override public List apply(String n, List es) { return new ArrayList<>(es); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java index 07eb536d876..91394c1abd3 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java @@ -54,7 +54,7 @@ public class EquinoxEventPublisher { private final EquinoxContainer container; - private Object monitor = new Object(); + private final Object monitor = new Object(); private EventManager eventManager; /* diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java index 21265854cf8..70f4da1d1ad 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java @@ -1653,7 +1653,7 @@ static class Range { private Version leftVersion; private Version rightVersion; private char rightRule = 0; - private Collection excludes = new ArrayList<>(0); + private final Collection excludes = new ArrayList<>(0); @Override public String toString() { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java index 0efdbceb5a8..073436534ef 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java @@ -57,7 +57,7 @@ public class SystemBundleActivator implements BundleActivator { private EquinoxFactoryManager urlFactoryManager; - private List> registrations = new ArrayList<>(10); + private final List> registrations = new ArrayList<>(10); private SecurityManager setSecurityManagner; @SuppressWarnings("deprecation") diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java index bfae9b027a2..5068bc15829 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java @@ -378,6 +378,7 @@ private static void addRequirers(Set importing, ModuleWiring wiring, Str /** * @deprecated */ + @Deprecated @Override public String getSpecificationVersion() { return getVersion().toString(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java index 106e7697497..a699e92e2e9 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java @@ -101,6 +101,7 @@ public DefineClassResult(Class clazz, boolean defined) { private static final class ClassNameLock { static final Function SUPPLIER = new Function() { + @Override public ClassNameLock apply(String className) { return new ClassNameLock(className); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java index aa4f4f8ea8e..dd59917e2c2 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/GlobalPolicy.java @@ -39,7 +39,7 @@ * with the highest version will be returned. */ public class GlobalPolicy implements IBuddyPolicy { - private FrameworkWiring frameworkWiring; + private final FrameworkWiring frameworkWiring; public GlobalPolicy(FrameworkWiring frameworkWiring) { this.frameworkWiring = frameworkWiring; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java index 44289890ad7..80bf751d8fb 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java @@ -83,7 +83,7 @@ public class ClasspathManager { private ArrayMap loadedLibraries = null; // used to detect recusive defineClass calls for the same class on the same // class loader (bug 345500) - private ThreadLocal currentDefineContext = new ThreadLocal<>(); + private final ThreadLocal currentDefineContext = new ThreadLocal<>(); /** * Constructs a classpath manager for the given generation and module class diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java index 4b238ad483c..73fdefbe397 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java @@ -119,6 +119,7 @@ public boolean isReadOnly() { /** * @deprecated */ + @Deprecated @Override public boolean setURL(URL value, boolean lock) throws IllegalStateException { try { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java index 97a6bae24f2..02f288c9ae0 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java @@ -33,12 +33,12 @@ public class EventAdminAdapter implements ServiceTrackerCustomizer eventAdminObjectClass = Arrays.asList("org.osgi.service.event.EventAdmin"); //$NON-NLS-1$ private static Collection eventHandlerObjectClass = Arrays.asList("org.osgi.service.event.EventHandler"); //$NON-NLS-1$ - private ServiceTracker eventAdminTracker; - private ServiceTracker eventHandlerTracker; - private BundleContext context; + private final ServiceTracker eventAdminTracker; + private final ServiceTracker eventHandlerTracker; + private final BundleContext context; private ServiceReference eventAdmin; private int logEventHandlers; - private ExtendedLogReaderServiceFactory logReaderServiceFactory; + private final ExtendedLogReaderServiceFactory logReaderServiceFactory; private EventAdminLogListener logListener; public EventAdminAdapter(BundleContext context, ExtendedLogReaderServiceFactory logReaderServiceFactory) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java index e05025688b4..604b518b6a8 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java @@ -420,7 +420,7 @@ void executeNextTask(OrderedTaskQueue taskQueue) { */ class OrderedTaskQueue { private final Queue dependencyQueue = new LinkedList<>(); - private AtomicReference firstTask = new AtomicReference<>(); + private final AtomicReference firstTask = new AtomicReference<>(); void execute(Runnable task, int numListeners) { executeOrderedTask(task, this, numListeners); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java index 9a9c9a9514e..e0ebdc84eb2 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java @@ -255,6 +255,7 @@ void delete(SecurityRow securityRow, boolean firstTry) { /** * @deprecated */ + @Deprecated @Override public ConditionalPermissionInfo addConditionalPermissionInfo(ConditionInfo[] conds, PermissionInfo[] perms) { return setConditionalPermissionInfo(null, conds, perms, true); @@ -287,6 +288,7 @@ public AccessControlContext getAccessControlContext(String[] signers) { /** * @deprecated */ + @Deprecated @Override public ConditionalPermissionInfo getConditionalPermissionInfo(String name) { synchronized (lock) { @@ -297,6 +299,7 @@ public ConditionalPermissionInfo getConditionalPermissionInfo(String name) { /** * @deprecated */ + @Deprecated @Override public Enumeration getConditionalPermissionInfos() { // could implement our own Enumeration, but we don't care about performance @@ -312,6 +315,7 @@ public Enumeration getConditionalPermissionInfos() { /** * @deprecated */ + @Deprecated @Override public ConditionalPermissionInfo setConditionalPermissionInfo(String name, ConditionInfo[] conds, PermissionInfo[] perms) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java index 637d4aa9926..689af1fd43e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java @@ -253,6 +253,7 @@ PermissionInfo[] internalGetPermissionInfos() { /** * @deprecated */ + @Deprecated @Override public void delete() { securityAdmin.delete(this, true); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java index d2f5815a057..cf1030c9715 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java @@ -64,6 +64,7 @@ public PermissionInfo[] getPermissionInfos() { /** * @deprecated */ + @Deprecated @Override public void delete() { throw new UnsupportedOperationException(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java index 6864bc750ba..f241228bec7 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java @@ -29,8 +29,8 @@ */ public abstract class AuthorizationEngine { - private EventManager manager = new EventManager(); - private EventDispatcher dispatcher = new AuthEventDispatcher(); + private final EventManager manager = new EventManager(); + private final EventDispatcher dispatcher = new AuthEventDispatcher(); private final ServiceTracker listenerTracker; public AuthorizationEngine(BundleContext context) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BundleToJarInputStream.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BundleToJarInputStream.java index b323eaa61da..350937bf1a9 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BundleToJarInputStream.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BundleToJarInputStream.java @@ -99,6 +99,7 @@ private boolean isSignatureFile(String entry) { return false; } + @Override public int read() throws IOException { if (nextEntryInput != null) { int result = nextEntryInput.read(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java index 93c0815fa3d..0b4fa3624ce 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java @@ -40,7 +40,7 @@ * content handler. */ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements java.net.ContentHandlerFactory { - private ServiceTracker contentHandlerTracker; + private final ServiceTracker contentHandlerTracker; private static final String contentHandlerClazz = "java.net.ContentHandler"; //$NON-NLS-1$ private static final String CONTENT_HANDLER_PKGS = "java.content.handler.pkgs"; //$NON-NLS-1$ @@ -49,7 +49,7 @@ public class ContentHandlerFactoryImpl extends MultiplexingFactory implements ja private static final List> ignoredClasses = Arrays.asList( new Class[] { MultiplexingContentHandler.class, ContentHandlerFactoryImpl.class, URLConnection.class }); - private Map proxies; + private final Map proxies; private java.net.ContentHandlerFactory parentFactory; public ContentHandlerFactoryImpl(BundleContext context, EquinoxContainer container) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java index 08f6a6ff155..b0ea111bcfa 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java @@ -17,8 +17,8 @@ public class MultiplexingContentHandler extends ContentHandler { - private String contentType; - private ContentHandlerFactoryImpl factory; + private final String contentType; + private final ContentHandlerFactoryImpl factory; public MultiplexingContentHandler(String contentType, ContentHandlerFactoryImpl factory) { this.contentType = contentType; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java index 621bb05b1cc..d8f16d52f1a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java @@ -32,8 +32,8 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler { private static Field handlerField; private static boolean methodsInitialized = false; - private String protocol; - private URLStreamHandlerFactoryImpl factory; + private final String protocol; + private final URLStreamHandlerFactoryImpl factory; private final URLStreamHandler authorized; private static synchronized void initializeMethods(URLStreamHandlerFactoryImpl factory) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java index 68f63e86c7d..155ed3661ef 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java @@ -43,9 +43,9 @@ public class URLStreamHandlerFactoryImpl extends MultiplexingFactory implements private static final List> ignoredClasses = Arrays.asList( new Class[] { MultiplexingURLStreamHandler.class, URLStreamHandlerFactoryImpl.class, URL.class }); - private Map proxies; + private final Map proxies; private URLStreamHandlerFactory parentFactory; - private ThreadLocal> creatingProtocols = new ThreadLocal<>(); + private final ThreadLocal> creatingProtocols = new ThreadLocal<>(); /** * Create the factory. diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java index f62fac292c4..0f0b5e92eb5 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java @@ -214,8 +214,8 @@ public URLStreamHandlerService getRealHandlerService() { private static final class LazyURLStreamHandlerService implements Supplier { - private BundleContext bundleContext; - private ServiceReference reference; + private final BundleContext bundleContext; + private final ServiceReference reference; private URLStreamHandlerService service; private boolean disposed; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java index d619903ad9b..a4de9e596ed 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerSetter.java @@ -29,6 +29,7 @@ public URLStreamHandlerSetter(URLStreamHandlerProxy handler) { * int, String, String) * @deprecated */ + @Deprecated @Override public void setURL(URL url, String protocol, String host, int port, String file, String ref) { handlerProxy.setURL(url, protocol, host, port, file, ref); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java index dd75eb4de45..24953cf75fa 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java @@ -71,6 +71,7 @@ public interface BundleDelta extends Comparable { * @see BundleDelta#getType * @deprecated this type is no longer valid */ + @Deprecated public static final int LINKAGE_CHANGED = 0x20; /** @@ -80,6 +81,7 @@ public interface BundleDelta extends Comparable { * @see BundleDelta#getType * @deprecated this type is no longer valid */ + @Deprecated public static final int OPTIONAL_LINKAGE_CHANGED = 0x40; /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java index 5f4745477f8..22f4f0bc158 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java @@ -37,6 +37,7 @@ public interface ExportPackageDescription extends BaseDescription { * @deprecated all export package descriptions are roots. The Reexport-Package * header never became API. */ + @Deprecated public boolean isRoot(); /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java index e6593dbd5b3..75d5e524806 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java @@ -51,6 +51,7 @@ public interface GenericDescription extends BaseDescription { * * @deprecated matching should only be done against a capability's attributes. */ + @Deprecated @Override public String getName(); @@ -63,6 +64,7 @@ public interface GenericDescription extends BaseDescription { * * @deprecated matching should only be done against a capability's attributes. */ + @Deprecated @Override public Version getVersion(); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java index 9e50b14f291..268c76a67f5 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java @@ -93,6 +93,7 @@ public interface PlatformAdmin { * @return a system resolver * @deprecated in favour of {@link #createResolver()}. */ + @Deprecated public Resolver getResolver(); /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java index 458a04be41d..36c0d408ce9 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java @@ -208,6 +208,7 @@ public interface State { * @deprecated use * {@link #resolveBundle(BundleDescription, boolean, BundleDescription[], ExportPackageDescription[], ExportPackageDescription[], GenericDescription[], BundleDescription[], ExportPackageDescription[], GenericDescription[], Map)} */ + @Deprecated public void resolveBundle(BundleDescription bundle, boolean status, BundleDescription[] hosts, ExportPackageDescription[] selectedExports, BundleDescription[] resolvedRequires, ExportPackageDescription[] resolvedImports); @@ -240,6 +241,7 @@ public void resolveBundle(BundleDescription bundle, boolean status, BundleDescri * @deprecated use * {@link #resolveBundle(BundleDescription, boolean, BundleDescription[], ExportPackageDescription[], ExportPackageDescription[], GenericDescription[], BundleDescription[], ExportPackageDescription[], GenericDescription[], Map)} */ + @Deprecated public void resolveBundle(BundleDescription bundle, boolean status, BundleDescription[] hosts, ExportPackageDescription[] selectedExports, ExportPackageDescription[] substitutedExports, BundleDescription[] resolvedRequires, ExportPackageDescription[] resolvedImports); @@ -438,6 +440,7 @@ public void resolveBundle(BundleDescription bundle, boolean status, BundleDescri * @deprecated The exact form of this has never been defined. There is no * alternative method available. */ + @Deprecated public void setOverrides(Object value); /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java index f9cc4236f2c..0d7d8a10717 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java @@ -51,6 +51,7 @@ public interface StateObjectFactory { * @return the created state * @deprecated use {@link #createState(boolean) } */ + @Deprecated public State createState(); /** @@ -99,6 +100,7 @@ public interface StateObjectFactory { * @deprecated use * {@link #createBundleDescription(long, String, Version, String, BundleSpecification[], HostSpecification, ImportPackageSpecification[], ExportPackageDescription[], boolean, boolean, boolean, String, String[], GenericSpecification[], GenericDescription[])} */ + @Deprecated public BundleDescription createBundleDescription(long id, String symbolicName, Version version, String location, BundleSpecification[] required, HostSpecification host, ImportPackageSpecification[] imports, ExportPackageDescription[] exports, String[] providedPackages, boolean singleton); @@ -138,6 +140,7 @@ public BundleDescription createBundleDescription(long id, String symbolicName, V * @deprecated use * {@link #createBundleDescription(long, String, Version, String, BundleSpecification[], HostSpecification, ImportPackageSpecification[], ExportPackageDescription[], boolean, boolean, boolean, String, String[], GenericSpecification[], GenericDescription[])} */ + @Deprecated public BundleDescription createBundleDescription(long id, String symbolicName, Version version, String location, BundleSpecification[] required, HostSpecification host, ImportPackageSpecification[] imports, ExportPackageDescription[] exports, String[] providedPackages, boolean singleton, boolean attachFragments, @@ -292,6 +295,7 @@ public BundleDescription createBundleDescription(State state, Dictionary manifest, String location, long id) throws BundleException; @@ -435,6 +439,7 @@ public ExportPackageDescription createExportPackageDescription(String packageNam * @deprecated use * {@link #createGenericDescription(String, String, Version, Map)} */ + @Deprecated public GenericDescription createGenericDescription(String name, String type, Version version, Map attributes); @@ -551,6 +556,7 @@ public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, S * @deprecated use {@link #writeState(State, File)} instead * @since 3.1 */ + @Deprecated public void writeState(State state, OutputStream stream) throws IOException; /** @@ -565,6 +571,7 @@ public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, S * @deprecated use {@link #writeState(State, File)} instead * @see #writeState(State, OutputStream) */ + @Deprecated public void writeState(State state, DataOutputStream stream) throws IOException; /** @@ -589,6 +596,7 @@ public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, S * @deprecated use {@link #readState(File)} instead * @since 3.1 */ + @Deprecated public State readState(InputStream stream) throws IOException; /** @@ -601,6 +609,7 @@ public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, S * @deprecated use {@link #readState(File)} instead * @see #readState(InputStream) */ + @Deprecated public State readState(DataInputStream stream) throws IOException; /** @@ -615,7 +624,7 @@ public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, S static class StateObjectFactoryProxy implements StateObjectFactory { private static final String IMPL_NAME = "org.eclipse.osgi.internal.resolver.StateObjectFactoryImpl"; //$NON-NLS-1$ - private Object monitor = new Object(); + private final Object monitor = new Object(); private StateObjectFactory implementation; private StateObjectFactory getImplementation() { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java index 8b4bcd1ec21..eb78e89e3ff 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java @@ -105,6 +105,7 @@ public boolean getIncludeMinimum() { * @return the maximum Version of this VersionRange * @deprecated use {@link org.osgi.framework.VersionRange#getRight()} */ + @Deprecated public Version getMaximum() { Version right = getRight(); return right == null ? versionMax : right; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java index 7ea34967372..80d6bda0f11 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java @@ -58,6 +58,7 @@ public interface SignerInfo { * @deprecated This information is not readily available using the JAR APIs * included with Java. A value {@literal unknown} will be returned. */ + @Deprecated public String getMessageDigestAlgorithm(); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java index bbee32910a7..6846fe8ede0 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java @@ -28,7 +28,7 @@ public class DirZipBundleEntry extends BundleEntry { /** * ZipBundleFile for this entry. */ - private ZipBundleFile bundleFile; + private final ZipBundleFile bundleFile; /** * The name for this entry */ diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java index 25aab4e6072..5900a261415 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java @@ -1231,11 +1231,13 @@ public DynamicImportFailed(Requirement requirement) { this.requirement = requirement; } - public String getMessage() { + @Override + public String getMessage() { return "Dynamic import failed."; } - public Collection getUnresolvedRequirements() { + @Override + public Collection getUnresolvedRequirements() { return Collections.singleton(requirement); } @@ -1254,7 +1256,8 @@ public FragmentNotSelectedError(Resource resource) { this.resource = resource; } - public String getMessage() { + @Override + public String getMessage() { return "Fragment was not selected for attachment: " + resource; } @@ -1284,7 +1287,8 @@ public MissingRequirementError(Requirement requirement, ResolutionError cause) { this.cause = cause; } - public String getMessage() { + @Override + public String getMessage() { String msg = "Unable to resolve " + requirement.getResource() + ": missing requirement " + requirement; if (cause != null) @@ -1294,7 +1298,8 @@ public String getMessage() { return msg; } - public Collection getUnresolvedRequirements() { + @Override + public Collection getUnresolvedRequirements() { return Collections.singleton(requirement); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java index 0a5d0a4347f..533143df76c 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java @@ -89,9 +89,9 @@ static class ResolveSession implements Runnable private final List m_dynamicCandidates; // keeps track of valid related resources that we have seen. // a null value or TRUE indicate it is valid - private Map m_validRelatedResources = new HashMap(0); + private final Map m_validRelatedResources = new HashMap(0); // keeps track of related resources for each resource - private Map> m_relatedResources = new HashMap>(0); + private final Map> m_relatedResources = new HashMap>(0); // Holds candidate permutations based on permutating "uses" chains. // These permutations are given higher priority. private final List m_usesPermutations = new LinkedList(); @@ -408,7 +408,8 @@ public ResolverImpl(Logger logger, Executor executor) this.m_executor = executor; } - public Map> resolve(ResolveContext rc) throws ResolutionException + @Override + public Map> resolve(ResolveContext rc) throws ResolutionException { if (m_executor != null) { @@ -421,7 +422,8 @@ else if (m_parallelism > 1) AccessController.doPrivileged( new PrivilegedAction() { - public ExecutorService run() + @Override + public ExecutorService run() { return Executors.newFixedThreadPool(m_parallelism); } @@ -437,7 +439,8 @@ public ExecutorService run() if (System.getSecurityManager() != null) { AccessController.doPrivileged(new PrivilegedAction(){ - public Void run() { + @Override + public Void run() { executor.shutdownNow(); return null; } @@ -686,7 +689,8 @@ private ResolutionError checkConsistency( return error; } - public Map> resolveDynamic(ResolveContext context, + @Override + public Map> resolveDynamic(ResolveContext context, Wiring hostWiring, Requirement dynamicRequirement) throws ResolutionException { @@ -1182,7 +1186,8 @@ public Computer(Resource resource) { this.resource = resource; } - public void run() + @Override + public void run() { List wireCandidates = getWireCandidates(session, allCandidates, resource); allWireCandidates.put(resource, wireCandidates); @@ -1215,7 +1220,8 @@ public void run() allPackages.put(resource, packages); executor.execute(new Runnable() { - public void run() + @Override + public void run() { calculateExportedPackages(session, allCandidates, resource, packages.m_exportedPkgs, packages.m_substitePkgs); @@ -1229,7 +1235,8 @@ public void run() { executor.execute(new Runnable() { - public void run() + @Override + public void run() { getPackages(session, allCandidates, allWireCandidates, allPackages, resource, allPackages.get(resource)); } @@ -1260,7 +1267,8 @@ public void run() { executor.execute(new Runnable() { - public void run() + @Override + public void run() { getPackageSourcesInternal(session, allPackages, resource, packages); } @@ -1274,7 +1282,8 @@ public void run() { executor.execute(new Runnable() { - public void run() + @Override + public void run() { computeUses(session, allWireCandidates, allPackages, resource); } @@ -1821,7 +1830,8 @@ private static void getPackageSourcesInternal( : resource.getCapabilities(null); @SuppressWarnings("serial") OpenHashMap> pkgs = new OpenHashMap>(caps.size()) { - public Set compute(String pkgName) { + @Override + public Set compute(String pkgName) { return new HashSet(); } }; @@ -2173,12 +2183,14 @@ public Packages(Resource resource) m_exportedPkgs = new OpenHashMap(nbCaps); m_substitePkgs = new OpenHashMap(nbCaps); m_importedPkgs = new OpenHashMap>(nbReqs) { - public List compute(String s) { + @Override + public List compute(String s) { return new ArrayList(); } }; m_requiredPkgs = new OpenHashMap>(nbReqs) { - public List compute(String s) { + @Override + public List compute(String s) { return new ArrayList(); } }; @@ -2328,7 +2340,8 @@ public UseConstraintError(ResolveContext context, Candidates allCandidates, Reso this.m_blame2 = blame2; } - public String getMessage() { + @Override + public String getMessage() { if (m_blame2 == null) { return "Uses constraint violation. Unable to resolve resource " @@ -2362,7 +2375,8 @@ public String getMessage() { } } - public Collection getUnresolvedRequirements() { + @Override + public Collection getUnresolvedRequirements() { if (m_blame2 == null) { // This is an export conflict so there is only the first blame; @@ -2525,7 +2539,8 @@ public void execute(final Runnable runnable) { FutureTask task = new FutureTask(new Runnable() { - public void run() + @Override + public void run() { try { @@ -2595,7 +2610,8 @@ else if (t instanceof Error) static class DumbExecutor implements Executor { - public void execute(Runnable command) + @Override + public void execute(Runnable command) { command.run(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/SimpleHostedCapability.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/SimpleHostedCapability.java index 98e2d4f3d14..624debee567 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/SimpleHostedCapability.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/SimpleHostedCapability.java @@ -34,27 +34,32 @@ class SimpleHostedCapability implements HostedCapability m_cap = cap; } - public Resource getResource() + @Override + public Resource getResource() { return m_host; } - public Capability getDeclaredCapability() + @Override + public Capability getDeclaredCapability() { return m_cap; } - public String getNamespace() + @Override + public String getNamespace() { return m_cap.getNamespace(); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_cap.getDirectives(); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_cap.getAttributes(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WireImpl.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WireImpl.java index a79ac7114a7..6193f830143 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WireImpl.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WireImpl.java @@ -40,22 +40,26 @@ public WireImpl( m_cap = cap; } - public Resource getRequirer() + @Override + public Resource getRequirer() { return m_requirer; } - public Requirement getRequirement() + @Override + public Requirement getRequirement() { return m_req; } - public Resource getProvider() + @Override + public Resource getProvider() { return m_provider; } - public Capability getCapability() + @Override + public Capability getCapability() { return m_cap; } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedCapability.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedCapability.java index f17969e3011..3e5d76964de 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedCapability.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedCapability.java @@ -80,27 +80,32 @@ public int hashCode() return hash; } - public Capability getDeclaredCapability() + @Override + public Capability getDeclaredCapability() { return m_cap; } - public Resource getResource() + @Override + public Resource getResource() { return m_host; } - public String getNamespace() + @Override + public String getNamespace() { return m_cap.getNamespace(); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_cap.getDirectives(); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_augmentedAttrs; } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedRequirement.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedRequirement.java index a9d66dfea76..e38af41efb9 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedRequirement.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedRequirement.java @@ -71,22 +71,26 @@ public Requirement getDeclaredRequirement() return m_req; } - public Resource getResource() + @Override + public Resource getResource() { return m_host; } - public String getNamespace() + @Override + public String getNamespace() { return m_req.getNamespace(); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_req.getDirectives(); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_req.getAttributes(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedResource.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedResource.java index c51f74ee22e..680cfe6e300 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedResource.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/WrappedResource.java @@ -95,7 +95,8 @@ public List getFragments() return m_fragments; } - public List getCapabilities(String namespace) + @Override + public List getCapabilities(String namespace) { if (namespace != null) { List filtered = new ArrayList(); @@ -109,7 +110,8 @@ public List getCapabilities(String namespace) return m_cachedCapabilities; } - public List getRequirements(String namespace) + @Override + public List getRequirements(String namespace) { if (namespace != null) { List filtered = new ArrayList(); @@ -123,7 +125,8 @@ public List getRequirements(String namespace) return m_cachedRequirements; } - public String toString() + @Override + public String toString() { return m_host.toString(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ArrayMap.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ArrayMap.java index c61a194c944..4cb91c79ac3 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ArrayMap.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ArrayMap.java @@ -99,11 +99,13 @@ public Iterator iterator() { return new Iterator() { int index = 0; - public boolean hasNext() { + @Override + public boolean hasNext() { return index < size; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V next() { if (index >= size) { throw new NoSuchElementException(); @@ -111,7 +113,8 @@ public V next() { return (V) table[(index++ << 1) + 1]; } - public void remove() { + @Override + public void remove() { throw new UnsupportedOperationException(); } }; @@ -135,11 +138,13 @@ public Iterator> iterator() { FastEntry entry = new FastEntry(); int index = 0; - public boolean hasNext() { + @Override + public boolean hasNext() { return index < size; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public FastEntry next() { if (index >= size) { throw new NoSuchElementException(); @@ -151,7 +156,8 @@ public FastEntry next() { return entry; } - public void remove() { + @Override + public void remove() { throw new UnsupportedOperationException(); } }; @@ -168,16 +174,19 @@ static class FastEntry implements Entry { K key; V value; - public K getKey() { + @Override + public K getKey() { return key; } - public V getValue() { + @Override + public V getValue() { return value; } - public V setValue(V value) { + @Override + public V setValue(V value) { throw new UnsupportedOperationException(); } } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CandidateSelector.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CandidateSelector.java index de8a5f502d2..74be7d8e907 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CandidateSelector.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CandidateSelector.java @@ -69,7 +69,8 @@ public Capability removeCurrentCandidate() { return current; } - public String toString() { + @Override + public String toString() { return getRemainingCandidates().toString(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CopyOnWriteSet.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CopyOnWriteSet.java index 8ae69973e0e..f52ad8f64bf 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CopyOnWriteSet.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/CopyOnWriteSet.java @@ -40,27 +40,33 @@ public CopyOnWriteSet(Collection col) { data = col.toArray(new Object[col.size()]); } - public Iterator iterator() { + @Override + public Iterator iterator() { return new Iterator() { int idx = 0; - public boolean hasNext() { + @Override + public boolean hasNext() { return idx < data.length; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public E next() { return (E) data[idx++]; } - public void remove() { + @Override + public void remove() { CopyOnWriteSet.this.remove(--idx); } }; } - public int size() { + @Override + public int size() { return data.length; } - public boolean add(E e) { + @Override + public boolean add(E e) { Object[] d = data; if (d.length == 0) { data = new Object[] {e}; @@ -92,11 +98,13 @@ private void remove(int index) { data = a; } - public Object[] toArray() { + @Override + public Object[] toArray() { return data.clone(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public T[] toArray(T[] a) { int size = data.length; if (a.length < size) @@ -160,15 +168,18 @@ public CopyOnWriteSet clone() { } } - public boolean isEmpty() { + @Override + public boolean isEmpty() { return size() == 0; } - public boolean contains(Object o) { + @Override + public boolean contains(Object o) { throw new UnsupportedOperationException(); } - public boolean remove(Object o) { + @Override + public boolean remove(Object o) { int index; if ((index = indexOf(o, data, data.length)) >= 0) { remove(index); @@ -192,11 +203,13 @@ private static int indexOf(Object o, Object[] d, int len) { return -1; } - public boolean containsAll(Collection c) { + @Override + public boolean containsAll(Collection c) { throw new UnsupportedOperationException(); } - public boolean addAll(Collection c) { + @Override + public boolean addAll(Collection c) { Object[] cs = c.toArray(); if (cs.length == 0) return false; @@ -219,15 +232,18 @@ public boolean addAll(Collection c) { return false; } - public boolean retainAll(Collection c) { + @Override + public boolean retainAll(Collection c) { throw new UnsupportedOperationException(); } - public boolean removeAll(Collection c) { + @Override + public boolean removeAll(Collection c) { throw new UnsupportedOperationException(); } - public void clear() { + @Override + public void clear() { throw new UnsupportedOperationException(); } diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/OpenHashMap.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/OpenHashMap.java index b27198c4d60..7d9cc28676d 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/OpenHashMap.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/OpenHashMap.java @@ -119,7 +119,8 @@ public V defaultReturnValue() { return this.defRetValue; } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } else if (!(o instanceof Map)) { @@ -148,7 +149,8 @@ public boolean equals(Object o) { } } - public String toString() { + @Override + public String toString() { StringBuilder s = new StringBuilder(); Iterator> i = this.fast().iterator(); int n = this.size(); @@ -229,7 +231,8 @@ private V removeNullEntry() { return (V) oldValue; } - public void putAll(Map m) { + @Override + public void putAll(Map m) { if ((double) this.f <= 0.5D) { this.ensureCapacity(m.size()); } else { @@ -296,7 +299,8 @@ private int insert(K k, V v) { return -1; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V put(K k, V v) { int pos = this.insert(k, v); if (pos < 0) { @@ -388,7 +392,8 @@ protected final void shiftKeys(int pos) { } } - public V remove(Object k) { + @Override + public V remove(Object k) { if (k == null) { return this.containsNullKey ? this.removeNullEntry() : this.defRetValue; } else { @@ -467,7 +472,8 @@ public V removeLast() { } } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V get(Object k) { if (k == null) { return containsNullKey ? (V) value[n] : defRetValue; @@ -496,7 +502,8 @@ public V get(Object k) { } } - public boolean containsKey(Object k) { + @Override + public boolean containsKey(Object k) { if (k == null) { return this.containsNullKey; } else { @@ -519,7 +526,8 @@ public boolean containsKey(Object k) { } } - public boolean containsValue(Object v) { + @Override + public boolean containsValue(Object v) { Object[] value = this.value; Object[] key = this.key; if (containsNullKey && (value[n] == null && v == null) || value[n].equals(v)) { @@ -533,7 +541,8 @@ public boolean containsValue(Object v) { return false; } - public void clear() { + @Override + public void clear() { if (size != 0) { size = 0; containsNullKey = false; @@ -543,11 +552,13 @@ public void clear() { } } - public int size() { + @Override + public int size() { return this.size; } - public boolean isEmpty() { + @Override + public boolean isEmpty() { return this.size == 0; } @@ -595,7 +606,8 @@ protected void fixPointers(int s, int d) { } } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K firstKey() { if (size == 0) { throw new NoSuchElementException(); @@ -604,7 +616,8 @@ public K firstKey() { } } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K lastKey() { if (size == 0) { throw new NoSuchElementException(); @@ -613,26 +626,31 @@ public K lastKey() { } } - public Comparator comparator() { + @Override + public Comparator comparator() { return null; } - public SortedMap tailMap(K from) { + @Override + public SortedMap tailMap(K from) { throw new UnsupportedOperationException(); } - public SortedMap headMap(K to) { + @Override + public SortedMap headMap(K to) { throw new UnsupportedOperationException(); } - public SortedMap subMap(K from, K to) { + @Override + public SortedMap subMap(K from, K to) { throw new UnsupportedOperationException(); } public Iterable> fast() { if (fast == null) { fast = new Iterable>() { - public Iterator> iterator() { + @Override + public Iterator> iterator() { return new FastEntryIterator(); } }; @@ -641,7 +659,8 @@ public Iterator> iterator() { return fast; } - public SortedSet> entrySet() { + @Override + public SortedSet> entrySet() { if (entries == null) { entries = new MapEntrySet(); } @@ -649,7 +668,8 @@ public SortedSet> entrySet() { return this.entries; } - public SortedSet keySet() { + @Override + public SortedSet keySet() { if (keys == null) { keys = new KeySet(); } @@ -657,22 +677,27 @@ public SortedSet keySet() { return keys; } - public Collection values() { + @Override + public Collection values() { if (values == null) { values = new AbstractObjectCollection() { - public Iterator iterator() { + @Override + public Iterator iterator() { return new ValueIterator(); } - public int size() { + @Override + public int size() { return size; } - public boolean contains(Object v) { + @Override + public boolean contains(Object v) { return containsValue(v); } - public void clear() { + @Override + public void clear() { OpenHashMap.this.clear(); } }; @@ -801,7 +826,8 @@ protected void rehash(int newN) { this.value = newValue; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public OpenHashMap clone() { OpenHashMap c; try { @@ -821,7 +847,8 @@ public OpenHashMap clone() { return c; } - public int hashCode() { + @Override + public int hashCode() { int h = 0; for( int j = realSize(), i = 0, t = 0; j-- != 0; ) { while (key[i] == null) { @@ -912,7 +939,8 @@ public ValueIterator() { super(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V next() { return (V) value[this.nextEntry()]; } @@ -922,29 +950,35 @@ private final class KeySet extends AbstractObjectSet implements SortedSet private KeySet() { } - public Iterator iterator() { + @Override + public Iterator iterator() { return new KeyIterator(); } - public int size() { + @Override + public int size() { return size; } - public boolean contains(Object k) { + @Override + public boolean contains(Object k) { return containsKey(k); } - public boolean remove(Object k) { + @Override + public boolean remove(Object k) { int oldSize = size; OpenHashMap.this.remove(k); return size != oldSize; } - public void clear() { + @Override + public void clear() { OpenHashMap.this.clear(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K first() { if (size == 0) { throw new NoSuchElementException(); @@ -953,7 +987,8 @@ public K first() { } } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K last() { if (size == 0) { throw new NoSuchElementException(); @@ -962,19 +997,23 @@ public K last() { } } - public Comparator comparator() { + @Override + public Comparator comparator() { return null; } - public final SortedSet tailSet(K from) { + @Override + public final SortedSet tailSet(K from) { throw new UnsupportedOperationException(); } - public final SortedSet headSet(K to) { + @Override + public final SortedSet headSet(K to) { throw new UnsupportedOperationException(); } - public final SortedSet subSet(K from, K to) { + @Override + public final SortedSet subSet(K from, K to) { throw new UnsupportedOperationException(); } } @@ -984,7 +1023,8 @@ public KeyIterator() { super(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K next() { return (K) key[this.nextEntry()]; } @@ -994,27 +1034,33 @@ private final class MapEntrySet extends AbstractObjectSet> implement private MapEntrySet() { } - public EntryIterator iterator() { + @Override + public EntryIterator iterator() { return new EntryIterator(); } - public Comparator> comparator() { + @Override + public Comparator> comparator() { return null; } - public SortedSet> subSet(Entry fromElement, Entry toElement) { + @Override + public SortedSet> subSet(Entry fromElement, Entry toElement) { throw new UnsupportedOperationException(); } - public SortedSet> headSet(Entry toElement) { + @Override + public SortedSet> headSet(Entry toElement) { throw new UnsupportedOperationException(); } - public SortedSet> tailSet(Entry fromElement) { + @Override + public SortedSet> tailSet(Entry fromElement) { throw new UnsupportedOperationException(); } - public Entry first() { + @Override + public Entry first() { if (size == 0) { throw new NoSuchElementException(); } else { @@ -1022,7 +1068,8 @@ public Entry first() { } } - public Entry last() { + @Override + public Entry last() { if (size == 0) { throw new NoSuchElementException(); } else { @@ -1030,7 +1077,8 @@ public Entry last() { } } - public boolean contains(Object o) { + @Override + public boolean contains(Object o) { if (!(o instanceof java.util.Map.Entry)) { return false; } else { @@ -1071,7 +1119,8 @@ public boolean contains(Object o) { } } - public boolean remove(Object o) { + @Override + public boolean remove(Object o) { if (!(o instanceof java.util.Map.Entry)) { return false; } else { @@ -1134,11 +1183,13 @@ public boolean remove(Object o) { } } - public int size() { + @Override + public int size() { return size; } - public void clear() { + @Override + public void clear() { OpenHashMap.this.clear(); } } @@ -1151,7 +1202,8 @@ public FastEntryIterator() { this.entry = new MapEntry(); } - public MapEntry next() { + @Override + public MapEntry next() { this.entry.index = this.nextEntry(); return this.entry; } @@ -1164,18 +1216,21 @@ public EntryIterator() { super(); } - public MapEntry next() { + @Override + public MapEntry next() { return this.entry = new MapEntry(this.nextEntry()); } - public void remove() { + @Override + public void remove() { super.remove(); this.entry.index = -1; } } public static abstract class AbstractObjectSet extends AbstractObjectCollection implements Cloneable { - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } else if (!(o instanceof Set)) { @@ -1186,7 +1241,8 @@ public boolean equals(Object o) { } } - public int hashCode() { + @Override + public int hashCode() { int h = 0; int n = this.size(); @@ -1324,24 +1380,28 @@ final class MapEntry implements Entry { MapEntry() { } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public K getKey() { return (K) key[this.index]; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V getValue() { return (V) value[this.index]; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public V setValue(V v) { Object oldValue = value[this.index]; value[this.index] = v; return (V) oldValue; } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (!(o instanceof Entry)) { return false; } else { @@ -1366,13 +1426,15 @@ public boolean equals(Object o) { } } - public int hashCode() { + @Override + public int hashCode() { return (key[this.index] == null ? 0 : key[this.index].hashCode()) ^ (value[this.index] == null ? 0 : value[this.index].hashCode()); } - public String toString() { + @Override + public String toString() { return key[this.index] + "=>" + value[this.index]; } } @@ -1382,13 +1444,15 @@ public static abstract class AbstractObjectCollection extends AbstractCollect protected AbstractObjectCollection() { } - public Object[] toArray() { + @Override + public Object[] toArray() { Object[] a = new Object[this.size()]; unwrap(this.iterator(), a); return a; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public T[] toArray(T[] a) { if (a.length < this.size()) { a = (T[]) Array.newInstance(a.getClass().getComponentType(), this.size()); @@ -1397,7 +1461,8 @@ public T[] toArray(T[] a) { return a; } - public boolean addAll(Collection c) { + @Override + public boolean addAll(Collection c) { boolean retVal = false; Iterator i = c.iterator(); int n = c.size(); @@ -1411,11 +1476,13 @@ public boolean addAll(Collection c) { return retVal; } - public boolean add(K k) { + @Override + public boolean add(K k) { throw new UnsupportedOperationException(); } - public boolean containsAll(Collection c) { + @Override + public boolean containsAll(Collection c) { int n = c.size(); Iterator i = c.iterator(); @@ -1428,7 +1495,8 @@ public boolean containsAll(Collection c) { return false; } - public boolean retainAll(Collection c) { + @Override + public boolean retainAll(Collection c) { boolean retVal = false; int n = this.size(); Iterator i = this.iterator(); @@ -1443,7 +1511,8 @@ public boolean retainAll(Collection c) { return retVal; } - public boolean removeAll(Collection c) { + @Override + public boolean removeAll(Collection c) { boolean retVal = false; int n = c.size(); Iterator i = c.iterator(); @@ -1457,11 +1526,13 @@ public boolean removeAll(Collection c) { return retVal; } - public boolean isEmpty() { + @Override + public boolean isEmpty() { return this.size() == 0; } - public String toString() { + @Override + public String toString() { StringBuilder s = new StringBuilder(); Iterator i = this.iterator(); int n = this.size(); diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ShadowList.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ShadowList.java index a91ba30ee93..be0e2329dba 100644 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ShadowList.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/util/ShadowList.java @@ -52,7 +52,8 @@ private ShadowList(List unmodifiable, List original, Ato m_original = new ArrayList(original); } - public ShadowList copy() { + @Override + public ShadowList copy() { return new ShadowList(this, m_original); } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/ResolverTest.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/ResolverTest.java index 99abd026558..8f5ad0a7616 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/ResolverTest.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/ResolverTest.java @@ -1610,19 +1610,23 @@ public SimpleWire(Requirement requirement, Capability capability, Resource requi this.provider = provider; } - public Capability getCapability() { + @Override + public Capability getCapability() { return capability; } - public Requirement getRequirement() { + @Override + public Requirement getRequirement() { return requirement; } - public Resource getRequirer() { + @Override + public Resource getRequirer() { return requirer; } - public Resource getProvider() { + @Override + public Resource getProvider() { return provider; } } @@ -1641,7 +1645,8 @@ private SimpleWiring(Resource resource, List resourceCapabilities, M this.resourceCapabilities = resourceCapabilities; } - public List getResourceCapabilities(String namespace) { + @Override + public List getResourceCapabilities(String namespace) { if (resourceCapabilities == null) { resourceCapabilities = new ArrayList(); for (Wire wire : invertedWires.get(resource)) { @@ -1662,7 +1667,8 @@ public List getResourceCapabilities(String namespace) { return resourceCapabilities; } - public List getResourceRequirements(String namespace) { + @Override + public List getResourceRequirements(String namespace) { if (resourceRequirements == null) { resourceRequirements = new ArrayList(); for (Wire wire : wires.get(resource)) { @@ -1683,7 +1689,8 @@ public List getResourceRequirements(String namespace) { return resourceRequirements; } - public List getProvidedResourceWires(String namespace) { + @Override + public List getProvidedResourceWires(String namespace) { List providedWires = invertedWires.get(resource); if (namespace != null) { List wires = new ArrayList(); @@ -1697,7 +1704,8 @@ public List getProvidedResourceWires(String namespace) { return providedWires; } - public List getRequiredResourceWires(String namespace) { + @Override + public List getRequiredResourceWires(String namespace) { List requiredWires = wires.get(resource); if (namespace != null) { List wires = new ArrayList(); @@ -1711,7 +1719,8 @@ public List getRequiredResourceWires(String namespace) { return requiredWires; } - public Resource getResource() { + @Override + public Resource getResource() { return resource; } } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleCapability.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleCapability.java index a79e54123f6..9d2e8d3d8db 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleCapability.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleCapability.java @@ -40,7 +40,8 @@ public BundleCapability(Resource resource, String name) m_attrs.put(BundleNamespace.BUNDLE_NAMESPACE.intern(), name); } - public String getNamespace() + @Override + public String getNamespace() { return BundleNamespace.BUNDLE_NAMESPACE.intern(); } @@ -50,7 +51,8 @@ public void addDirective(String name, String value) m_dirs.put(name.intern(), value); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } @@ -60,12 +62,14 @@ public void addAttribute(String name, Object value) m_attrs.put(name.intern(), value); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleRequirement.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleRequirement.java index c1e9e88f437..f6b46db70bd 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleRequirement.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/BundleRequirement.java @@ -42,22 +42,26 @@ public BundleRequirement(Resource resource, String name) m_attrs = new HashMap(); } - public String getNamespace() + @Override + public String getNamespace() { return BundleNamespace.BUNDLE_NAMESPACE.intern(); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/CandidateComparator.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/CandidateComparator.java index 75021f0d571..39ef8d4c65d 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/CandidateComparator.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/CandidateComparator.java @@ -30,7 +30,8 @@ public class CandidateComparator implements Comparator { - public int compare(Capability cap1, Capability cap2) + @Override + public int compare(Capability cap1, Capability cap2) { int c = 0; // Always prefer system bundle diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericCapability.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericCapability.java index 9d58cb4a473..b0b2642a741 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericCapability.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericCapability.java @@ -39,7 +39,8 @@ public GenericCapability(Resource resource, String namespace) m_attrs = new HashMap(); } - public String getNamespace() + @Override + public String getNamespace() { return m_namespace; } @@ -49,7 +50,8 @@ public void addDirective(String name, String value) m_dirs.put(name.intern(), value); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } @@ -59,12 +61,14 @@ public void addAttribute(String name, Object value) m_attrs.put(name.intern(), value); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericRequirement.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericRequirement.java index 2973e35abef..a4b50453160 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericRequirement.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/GenericRequirement.java @@ -53,7 +53,8 @@ public GenericRequirement(Resource resource, String namespace, Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } @@ -73,12 +75,14 @@ public void addAttribute(String name, Object value) m_attrs.put(name.intern(), value); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IdentityCapability.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IdentityCapability.java index 8cbcb2d0941..91359aa6a60 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IdentityCapability.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IdentityCapability.java @@ -42,22 +42,26 @@ public IdentityCapability(Resource resource, String name, String type, Version v m_attrs.put(IdentityNamespace.CAPABILITY_VERSION_ATTRIBUTE, v); } - public String getNamespace() + @Override + public String getNamespace() { return IdentityNamespace.IDENTITY_NAMESPACE; } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IterativeResolver.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IterativeResolver.java index c09a5bce021..95f6f756128 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IterativeResolver.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/IterativeResolver.java @@ -43,7 +43,8 @@ public IterativeResolver(Resolver resolver) { this.resolver = resolver; } - public Map> resolve(final ResolveContext context) throws ResolutionException { + @Override + public Map> resolve(final ResolveContext context) throws ResolutionException { final Map> wires = new HashMap>(); final Map> invertedWires = new HashMap>(); @@ -104,7 +105,7 @@ public Map getWirings() { return wires; } - private class SimpleWiring implements Wiring { + private static class SimpleWiring implements Wiring { final Resource resource; final Map> wires; final Map> invertedWires; @@ -117,7 +118,8 @@ private SimpleWiring(Resource resource, Map> wires, Map getResourceCapabilities(String namespace) { + @Override + public List getResourceCapabilities(String namespace) { if (resourceCapabilities == null) { resourceCapabilities = new ArrayList(); for (Wire wire : invertedWires.get(resource)) { @@ -138,7 +140,8 @@ public List getResourceCapabilities(String namespace) { return resourceCapabilities; } - public List getResourceRequirements(String namespace) { + @Override + public List getResourceRequirements(String namespace) { if (resourceRequirements == null) { resourceRequirements = new ArrayList(); for (Wire wire : wires.get(resource)) { @@ -159,7 +162,8 @@ public List getResourceRequirements(String namespace) { return resourceRequirements; } - public List getProvidedResourceWires(String namespace) { + @Override + public List getProvidedResourceWires(String namespace) { List providedWires = invertedWires.get(resource); if (namespace != null) { List wires = new ArrayList(); @@ -173,7 +177,8 @@ public List getProvidedResourceWires(String namespace) { return providedWires; } - public List getRequiredResourceWires(String namespace) { + @Override + public List getRequiredResourceWires(String namespace) { List requiredWires = wires.get(resource); if (namespace != null) { List wires = new ArrayList(); @@ -187,12 +192,14 @@ public List getRequiredResourceWires(String namespace) { return requiredWires; } - public Resource getResource() { + @Override + public Resource getResource() { return resource; } } - public Map> resolveDynamic(ResolveContext context, + @Override + public Map> resolveDynamic(ResolveContext context, Wiring hostWiring, Requirement dynamicRequirement) throws ResolutionException { throw new UnsupportedOperationException(); diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageCapability.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageCapability.java index 452d85dcdda..44f96ba3fe3 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageCapability.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageCapability.java @@ -39,7 +39,8 @@ public PackageCapability(Resource resource, String name) m_attrs.put(PackageNamespace.PACKAGE_NAMESPACE, name); } - public String getNamespace() + @Override + public String getNamespace() { return PackageNamespace.PACKAGE_NAMESPACE; } @@ -49,7 +50,8 @@ public void addDirective(String name, String value) m_dirs.put(name, value); } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } @@ -59,12 +61,14 @@ public void addAttribute(String name, Object value) m_attrs.put(name, value); } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageRequirement.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageRequirement.java index 5d4422aac7c..749ea8ee245 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageRequirement.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/PackageRequirement.java @@ -41,22 +41,26 @@ public PackageRequirement(Resource resource, String name) m_attrs = new HashMap(); } - public String getNamespace() + @Override + public String getNamespace() { return PackageNamespace.PACKAGE_NAMESPACE; } - public Map getDirectives() + @Override + public Map getDirectives() { return m_dirs; } - public Map getAttributes() + @Override + public Map getAttributes() { return m_attrs; } - public Resource getResource() + @Override + public Resource getResource() { return m_resource; } diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResolveContextImpl.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResolveContextImpl.java index 47123d5e7a7..c255781f1ad 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResolveContextImpl.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResolveContextImpl.java @@ -107,7 +107,8 @@ public Collection getOndemandResources(Resource host) return Collections.emptyList(); } - public List getSubstitutionWires(Wiring wiring) + @Override + public List getSubstitutionWires(Wiring wiring) { List result = m_substitutions.get(wiring); return result == null ? Collections. emptyList() : result; diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResourceImpl.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResourceImpl.java index 5d5afeb7756..52589c03380 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResourceImpl.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/ResourceImpl.java @@ -53,7 +53,8 @@ public void addCapability(Capability cap) m_caps.add(cap); } - public List getCapabilities(String namespace) + @Override + public List getCapabilities(String namespace) { List result = m_caps; if (namespace != null) @@ -75,7 +76,8 @@ public void addRequirement(Requirement req) m_reqs.add(req); } - public List getRequirements(String namespace) + @Override + public List getRequirements(String namespace) { List result = m_reqs; if (namespace != null) diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/SimpleFilter.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/SimpleFilter.java index 5e71c047ec9..3b7e8099a87 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/SimpleFilter.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/resolver/test/util/SimpleFilter.java @@ -64,7 +64,8 @@ public int getOperation() return m_op; } - public String toString() + @Override + public String toString() { String s = null; switch (m_op) diff --git a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/utils/version/VersionRange.java b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/utils/version/VersionRange.java index be4765c0c6d..9ec07e6cf77 100644 --- a/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/utils/version/VersionRange.java +++ b/bundles/org.eclipse.osgi/felix/src_test/org/apache/felix/utils/version/VersionRange.java @@ -349,7 +349,8 @@ private void checkRange() } - public int hashCode() + @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -361,7 +362,8 @@ public int hashCode() } - public boolean equals( Object obj ) + @Override + public boolean equals( Object obj ) { if ( this == obj ) return true; @@ -392,7 +394,8 @@ else if ( !floor.equals( other.floor ) ) } - public String toString() + @Override + public String toString() { if ( ANY_VERSION.equals( this ) ) { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Configurable.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Configurable.java index dce95833dd0..747830714f4 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Configurable.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Configurable.java @@ -28,6 +28,7 @@ * @deprecated As of 1.2. Please use Configuration Admin service. * @author $Id$ */ +@Deprecated public interface Configurable { /** * Returns this service's configuration object. @@ -46,5 +47,6 @@ public interface Configurable { * permission and the Java Runtime Environment supports permissions. * @deprecated As of 1.2. Please use Configuration Admin service. */ + @Deprecated public Object getConfigurationObject(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java index 57af8721d5f..57fe2517d06 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java @@ -130,6 +130,7 @@ public interface Constants { * * @deprecated As of 1.2. */ + @Deprecated String EXPORT_SERVICE = "Export-Service"; /** @@ -163,6 +164,7 @@ public interface Constants { * * @deprecated As of 1.2. */ + @Deprecated String IMPORT_SERVICE = "Import-Service"; /** @@ -248,6 +250,7 @@ public interface Constants { * @deprecated As of 1.3. This has been replaced by * {@link #VERSION_ATTRIBUTE}. */ + @Deprecated String PACKAGE_SPECIFICATION_VERSION = "specification-version"; /** @@ -327,6 +330,7 @@ public interface Constants { * @since 1.2 * @deprecated As of 1.6. Replaced by the {@code osgi.ee} capability. */ + @Deprecated String BUNDLE_REQUIREDEXECUTIONENVIRONMENT = "Bundle-RequiredExecutionEnvironment"; /** @@ -849,6 +853,7 @@ public interface Constants { * @since 1.3 * @deprecated As of 1.9. */ + @Deprecated String EXTENSION_BOOTCLASSPATH = "bootclasspath"; /** @@ -958,6 +963,7 @@ public interface Constants { * @since 1.2 * @deprecated As of 1.6. Replaced by the {@code osgi.ee} capability. */ + @Deprecated String FRAMEWORK_EXECUTIONENVIRONMENT = "org.osgi.framework.executionenvironment"; /** @@ -1036,6 +1042,7 @@ public interface Constants { * @since 1.3 * @deprecated As of 1.10. */ + @Deprecated String SUPPORTS_BOOTCLASSPATH_EXTENSION = "org.osgi.supports.bootclasspath.extension"; /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java index bcff0614c20..d81c4abfb0d 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java @@ -156,6 +156,7 @@ public class FrameworkEvent extends EventObject { * @since 1.5 * @deprecated As of 1.10. */ + @Deprecated public final static int STOPPED_BOOTCLASSPATH_MODIFIED = 0x00000100; /** @@ -191,6 +192,7 @@ public class FrameworkEvent extends EventObject { * the other constructor with the System Bundle as the event * source. */ + @Deprecated public FrameworkEvent(int type, Object source) { super(source); this.type = type; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java index cc8cd627f5c..29a361a5fef 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java @@ -66,6 +66,7 @@ public final class PackagePermission extends BasicPermission { * * @deprecated As of 1.5. Use {@code exportonly} instead. */ + @Deprecated public final static String EXPORT = "export"; /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java index b8c500c6f09..4515de7ba05 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java @@ -32,6 +32,7 @@ * @deprecated As of 1.1. Replaced by {@link EventListenerHook}. * @author $Id$ */ +@Deprecated @ConsumerType public interface EventHook { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java index 5785941ba7c..3001e87ddde 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java @@ -153,6 +153,7 @@ public final class HostNamespace extends AbstractWiringNamespace { * @see #REQUIREMENT_EXTENSION_DIRECTIVE * @deprecated As of 1.2. */ + @Deprecated public final static String EXTENSION_BOOTCLASSPATH = "bootclasspath"; /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java index eee978dba2a..767af944d6c 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java @@ -60,6 +60,7 @@ public interface ConditionalPermissionAdmin { * @deprecated As of 1.1. Use {@link #newConditionalPermissionUpdate()} * instead. */ + @Deprecated ConditionalPermissionInfo addConditionalPermissionInfo(ConditionInfo[] conditions, PermissionInfo[] permissions); /** @@ -96,6 +97,7 @@ public interface ConditionalPermissionAdmin { * @deprecated As of 1.1. Use {@link #newConditionalPermissionUpdate()} * instead. */ + @Deprecated ConditionalPermissionInfo setConditionalPermissionInfo(String name, ConditionInfo[] conditions, PermissionInfo[] permissions); /** @@ -115,6 +117,7 @@ public interface ConditionalPermissionAdmin { * @deprecated As of 1.1. Use {@link #newConditionalPermissionUpdate()} * instead. */ + @Deprecated Enumeration getConditionalPermissionInfos(); /** @@ -127,6 +130,7 @@ public interface ConditionalPermissionAdmin { * @deprecated As of 1.1. Use {@link #newConditionalPermissionUpdate()} * instead. */ + @Deprecated ConditionalPermissionInfo getConditionalPermissionInfo(String name); /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java index 77b137fef95..294d60bd857 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java @@ -89,6 +89,7 @@ public interface ConditionalPermissionInfo { * {@link ConditionalPermissionAdmin#newConditionalPermissionUpdate()} * instead to manage the Conditional Permissions. */ + @Deprecated void delete(); /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/ExportedPackage.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/ExportedPackage.java index f4cdb9e84ce..7a1bb21a5d8 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/ExportedPackage.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/ExportedPackage.java @@ -47,6 +47,7 @@ * org.osgi.framework.wiring package. * @author $Id$ */ +@Deprecated public interface ExportedPackage { /** * Returns the name of the package associated with this exported package. @@ -87,6 +88,7 @@ public interface ExportedPackage { * version information is available. * @deprecated As of 1.2. Replaced by {@link #getVersion()}. */ + @Deprecated public String getSpecificationVersion(); /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/PackageAdmin.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/PackageAdmin.java index 1de8679fcf7..cdc2960b871 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/PackageAdmin.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/PackageAdmin.java @@ -35,6 +35,7 @@ * @see org.osgi.service.packageadmin.ExportedPackage * @see org.osgi.service.packageadmin.RequiredBundle */ +@Deprecated public interface PackageAdmin { /** * Gets the exported packages for the specified bundle. @@ -55,6 +56,7 @@ public interface PackageAdmin { * {@code PackageAdmin} service. * @deprecated */ + @Deprecated public ExportedPackage[] getExportedPackages(Bundle bundle); /** @@ -67,6 +69,7 @@ public interface PackageAdmin { * @since 1.2 * @deprecated */ + @Deprecated public ExportedPackage[] getExportedPackages(String name); /** @@ -83,6 +86,7 @@ public interface PackageAdmin { * @see #getExportedPackages(String) * @deprecated */ + @Deprecated public ExportedPackage getExportedPackage(String name); /** @@ -191,6 +195,7 @@ public interface PackageAdmin { * @since 1.2 * @deprecated */ + @Deprecated public RequiredBundle[] getRequiredBundles(String symbolicName); /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/RequiredBundle.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/RequiredBundle.java index 08ab9c1a6f4..833d2539ce1 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/RequiredBundle.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/RequiredBundle.java @@ -48,6 +48,7 @@ * org.osgi.framework.wiring package. * @author $Id$ */ +@Deprecated public interface RequiredBundle { /** * Returns the symbolic name of this required bundle. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java index 42f3c6bbf68..6a283714c33 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java @@ -72,6 +72,7 @@ * @deprecated This service has been replaced by the * org.osgi.framework.startlevel package. */ +@Deprecated public interface StartLevel { /** * Return the active start level value of the Framework. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/AbstractURLStreamHandlerService.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/AbstractURLStreamHandlerService.java index 71ce6a3846e..a468a2357ad 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/AbstractURLStreamHandlerService.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/AbstractURLStreamHandlerService.java @@ -140,6 +140,7 @@ public boolean sameFile(URL u1, URL u2) { * @deprecated This method is only for compatibility with handlers written * for JDK 1.1. */ + @Deprecated @Override protected void setURL(URL u, String proto, String host, int port, String file, String ref) { realHandler.setURL(u, proto, host, port, file, ref); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/URLStreamHandlerSetter.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/URLStreamHandlerSetter.java index 96648b48a7c..a1991c0a23b 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/URLStreamHandlerSetter.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/url/URLStreamHandlerSetter.java @@ -42,6 +42,7 @@ public interface URLStreamHandlerSetter { * @deprecated This method is only for compatibility with handlers written * for JDK 1.1. */ + @Deprecated @SuppressWarnings("javadoc") public void setURL(URL u, String protocol, String host, int port, String file, String ref); diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java index fc0c913b6eb..c160ad13ebe 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java @@ -28,6 +28,7 @@ * @deprecated As of 3.5. Replaced by CopyOnWriteIdentityMap. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class EventListeners { private final CopyOnWriteIdentityMap list = new CopyOnWriteIdentityMap<>(); diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java index 69973aa8f1d..14e3e104c02 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java @@ -83,6 +83,7 @@ public ListenerQueue(EventManager manager) { * @throws IllegalStateException If called after one of the dispatch methods has been called. * @deprecated As of 3.5. Replaced by {@link #queueListeners(Set, EventDispatcher)}. */ + @Deprecated public void queueListeners(EventListeners listeners, EventDispatcher dispatcher) { queueListeners(listeners.entrySet(), dispatcher); } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java index 586031ac310..aa93a946085 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java @@ -140,7 +140,7 @@ public class ReliableFile { } /** File object for original reference file */ - private File referenceFile; + private final File referenceFile; /** List of checksum file objects: File => specific ReliableFile generation */ private static Hashtable cacheFiles = new Hashtable<>(20); @@ -894,7 +894,7 @@ private static byte[] intToHex(int l) { return buffer; } - private class CacheInfo { + private static class CacheInfo { int filetype; Checksum checksum; long timeStamp; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java index f0ddd3e1434..4ddb658e59c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java @@ -33,7 +33,7 @@ public class ReliableFileInputStream extends FilterInputStream { /** * size of crc and signature */ - private int sigSize; + private final int sigSize; /** * current position reading from file diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java index a1c4d5b5b35..01ca585eda8 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java @@ -19,7 +19,7 @@ * Internal class. */ public class Locker_JavaIo implements Locker { - private File lockFile; + private final File lockFile; private RandomAccessFile lockRAF; public Locker_JavaIo(File lockFile) { diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java index ca1d0bca776..b533e3f7d2d 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java @@ -204,6 +204,7 @@ public interface Location { * @throws IllegalStateException if the location's value is already set * @deprecated use {@link #set(URL, boolean)} instead. */ + @Deprecated public boolean setURL(URL value, boolean lock) throws IllegalStateException; /** diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java index 090284a28e6..1c5449653f3 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java @@ -154,6 +154,7 @@ public interface Constants { * @deprecated use ARCH_X86_64 instead. Note the values * has been changed to be the value of the ARCH_X86_64 constant. */ + @Deprecated public static final String ARCH_AMD64 = ARCH_X86_64; /** diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java index 53b3b98e260..9bf64b02a0b 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java @@ -29,9 +29,9 @@ public final class ManagedOutputStream extends FilterOutputStream { static final int ST_OPEN = 0; static final int ST_CLOSED = 1; - private String target; - private StorageManager manager; - private File outputFile; + private final String target; + private final StorageManager manager; + private final File outputFile; private int state; private ManagedOutputStream[] streamSet = null; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java index f7dcebcd891..3f4a7c27c22 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java @@ -110,7 +110,7 @@ public final class StorageManager { private final boolean openCleanup = Boolean.valueOf(System.getProperty("osgi.embedded.cleanupOnOpen")).booleanValue(); //$NON-NLS-1$ private final boolean saveCleanup = Boolean.valueOf(System.getProperty("osgi.embedded.cleanupOnSave")).booleanValue(); //$NON-NLS-1$ - private class Entry { + private static class Entry { int readId; int writeId; int fileType;