http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java index 8f4ec7f..eef1cf9 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/CapabilitySet.java @@ -46,7 +46,7 @@ public class CapabilitySet { indices = new TreeMap<>(); for (int i = 0; (indexProps != null) && (i < indexProps.size()); i++) { indices.put( - indexProps.get(i), new HashMap<Object, Set<Capability>>()); + indexProps.get(i), new HashMap<>()); } }
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResolverUtil.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResolverUtil.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResolverUtil.java index 2f4c5b4..7fb2839 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResolverUtil.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResolverUtil.java @@ -92,7 +92,7 @@ public class ResolverUtil public static List<Requirement> getDynamicRequirements(List<Requirement> reqs) { - List<Requirement> result = new ArrayList<Requirement>(); + List<Requirement> result = new ArrayList<>(); if (reqs != null) { for (Requirement req : reqs) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java index 122d59a..c524009 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java @@ -122,7 +122,7 @@ public final class ResourceBuilder { if (uri != null) { Map<String, Object> attrs = new HashMap<>(); attrs.put(ContentNamespace.CAPABILITY_URL_ATTRIBUTE, uri); - resource.addCapability(new CapabilityImpl(resource, ContentNamespace.CONTENT_NAMESPACE, Collections.<String, String>emptyMap(), attrs)); + resource.addCapability(new CapabilityImpl(resource, ContentNamespace.CONTENT_NAMESPACE, Collections.emptyMap(), attrs)); } // Add a bundle and host capability to all @@ -190,7 +190,7 @@ public final class ResourceBuilder { // Parse Bundle-RequiredExecutionEnvironment. // List<Requirement> breeReqs = - parseBreeHeader((String) headerMap.get(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT), resource); + parseBreeHeader(headerMap.get(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT), resource); // // Parse Export-Package. @@ -377,7 +377,7 @@ public final class ResourceBuilder { resource, ServiceNamespace.SERVICE_NAMESPACE, dirs, - Collections.<String, Object>emptyMap(), + Collections.emptyMap(), SimpleFilter.parse(filter))); } } @@ -422,7 +422,7 @@ public final class ResourceBuilder { resource, BundleRevision.PACKAGE_NAMESPACE, newDirs, - Collections.<String, Object>emptyMap(), + Collections.emptyMap(), sf) ); } @@ -850,7 +850,7 @@ public final class ResourceBuilder { } private static List<Requirement> parseBreeHeader(String header, Resource resource) { - List<String> filters = new ArrayList<String>(); + List<String> filters = new ArrayList<>(); for (String entry : parseDelimitedString(header, ",")) { List<String> names = parseDelimitedString(entry, "/"); List<String> left = parseDelimitedString(names.get(0), "-"); @@ -930,11 +930,11 @@ public final class ResourceBuilder { } SimpleFilter sf = SimpleFilter.parse(reqFilter); - return Collections.<Requirement>singletonList(new RequirementImpl( + return Collections.singletonList(new RequirementImpl( resource, ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE, Collections.singletonMap(ExecutionEnvironmentNamespace.REQUIREMENT_FILTER_DIRECTIVE, reqFilter), - Collections.<String, Object>emptyMap(), + Collections.emptyMap(), sf)); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java index 267f6c0..df5e9a1 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java @@ -595,8 +595,8 @@ public class Deployer { toRefresh.put(serviceBundle, "FeaturesService bundle is being updated"); computeBundlesToRefresh(toRefresh, dstate.bundles.values(), - Collections.<Resource, Bundle>emptyMap(), - Collections.<Resource, List<Wire>>emptyMap()); + Collections.emptyMap(), + Collections.emptyMap()); installSupport.stopBundle(serviceBundle, STOP_TRANSIENT); try ( InputStream is = getBundleInputStream(resource, providers) @@ -964,7 +964,7 @@ public class Deployer { // Compute the new list of fragments Map<Bundle, Set<Resource>> newFragments = new HashMap<>(); for (Bundle bundle : bundles) { - newFragments.put(bundle, new HashSet<Resource>()); + newFragments.put(bundle, new HashSet<>()); } if (resolution != null) { for (Resource res : resolution.keySet()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/service/EventAdminListener.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/EventAdminListener.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/EventAdminListener.java index bd5c0d5..67a340e 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/EventAdminListener.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/EventAdminListener.java @@ -39,7 +39,7 @@ public class EventAdminListener implements FeaturesListener { private final ServiceTracker<EventAdmin, EventAdmin> tracker; public EventAdminListener(BundleContext context) { - tracker = new ServiceTracker<EventAdmin, EventAdmin>(context, EventAdmin.class.getName(), null); + tracker = new ServiceTracker<>(context, EventAdmin.class.getName(), null); tracker.open(); } @@ -49,7 +49,7 @@ public class EventAdminListener implements FeaturesListener { if (eventAdmin == null) { return; } - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); props.put(EventConstants.TYPE, event.getType()); props.put(EventConstants.EVENT, event); props.put(EventConstants.TIMESTAMP, System.currentTimeMillis()); @@ -78,7 +78,7 @@ public class EventAdminListener implements FeaturesListener { if (eventAdmin == null) { return; } - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); props.put(EventConstants.TYPE, event.getType()); props.put(EventConstants.EVENT, event); props.put(EventConstants.TIMESTAMP, System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java index 92700b5..52de7ae 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java @@ -185,7 +185,7 @@ public class FeatureConfigInstaller { // Substitute all variables, but keep unknown ones. final String dummyKey = ""; try { - finalname = InterpolationHelper.substVars(finalname, dummyKey, null, null, (SubstitutionCallback) null, + finalname = InterpolationHelper.substVars(finalname, dummyKey, null, null, null, true, true, false); } catch (final IllegalArgumentException ex) { LOGGER.info("Substitution failed. Skip substitution of variables of configuration final name ({}).", http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java index 58fdbae..5e48bdf 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java @@ -79,7 +79,7 @@ public final class Overrides { // Ignore invalid overrides continue; } - for (String uri : new ArrayList<String>(resources.keySet())) { + for (String uri : new ArrayList<>(resources.keySet())) { Resource res = resources.get(uri); if (shouldOverride(res, over, overrideRange)) { resources.put(uri, over); @@ -110,7 +110,7 @@ public final class Overrides { } public static Set<String> loadOverrides(String overridesUrl) { - Set<String> overrides = new HashSet<String>(); + Set<String> overrides = new HashSet<>(); try { if (overridesUrl != null) { try ( http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/service/RequirementSort.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/RequirementSort.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/RequirementSort.java index 7f32943..1bfe070 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/RequirementSort.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/RequirementSort.java @@ -42,20 +42,20 @@ public final class RequirementSort<T extends Resource> { * @return sorted collection of resources. */ public static <T extends Resource> Collection<T> sort(Collection<T> resources) { - Set<String> namespaces = new HashSet<String>(); + Set<String> namespaces = new HashSet<>(); for (Resource r : resources) { for (Capability cap : r.getCapabilities(null)) { namespaces.add(cap.getNamespace()); } } - CapabilitySet capSet = new CapabilitySet(new ArrayList<String>(namespaces)); + CapabilitySet capSet = new CapabilitySet(new ArrayList<>(namespaces)); for (Resource r : resources) { for (Capability cap : r.getCapabilities(null)) { capSet.addCapability(cap); } } - Set<T> sorted = new LinkedHashSet<T>(); - Set<T> visited = new LinkedHashSet<T>(); + Set<T> sorted = new LinkedHashSet<>(); + Set<T> visited = new LinkedHashSet<>(); for (T r : resources) { visit(r, visited, sorted, capSet); } @@ -74,7 +74,7 @@ public final class RequirementSort<T extends Resource> { @SuppressWarnings("unchecked") private static <T extends Resource> Set<T> collectDependencies(T resource, CapabilitySet capSet) { - Set<T> result = new LinkedHashSet<T>(); + Set<T> result = new LinkedHashSet<>(); for (Requirement requirement : resource.getRequirements(null)) { String filter = requirement.getDirectives().get(Constants.FILTER_DIRECTIVE); SimpleFilter sf = (filter != null) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/management/codec/JmxFeature.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/management/codec/JmxFeature.java b/features/core/src/main/java/org/apache/karaf/features/management/codec/JmxFeature.java index 1dcaf9c..ae5469e 100644 --- a/features/core/src/main/java/org/apache/karaf/features/management/codec/JmxFeature.java +++ b/features/core/src/main/java/org/apache/karaf/features/management/codec/JmxFeature.java @@ -166,7 +166,7 @@ public class JmxFeature { FEATURE_CONFIG_ELEMENT_TABLE); for (Object key : props.keySet()) { String[] itemNames = FeaturesServiceMBean.FEATURE_CONFIG_ELEMENT; - Object[] itemValues = { (String) key, + Object[] itemValues = {key, props.getProperty((String) key) }; CompositeData element = new CompositeDataSupport( FEATURE_CONFIG_ELEMENT, itemNames, itemValues); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java b/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java index a47943d..ab5e31e 100644 --- a/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java @@ -375,12 +375,12 @@ public class FeaturesServiceTest extends TestBase { FeaturesServiceImpl svc = new FeaturesServiceImpl(new Storage(), null, null, resolver, installSupport, null, cfg); svc.addRepository(uri); try { - List<String> features = new ArrayList<String>(); + List<String> features = new ArrayList<>(); for (Feature feature : svc.listFeatures()) { features.add(feature.getId()); } Collections.reverse(features); - svc.installFeatures(new CopyOnWriteArraySet<String>(features), + svc.installFeatures(new CopyOnWriteArraySet<>(features), EnumSet.noneOf(FeaturesService.Option.class)); fail("Call should have thrown an exception"); } catch (MultiException e) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/TestBase.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/TestBase.java b/features/core/src/test/java/org/apache/karaf/features/TestBase.java index 46ee80e..f926f06 100644 --- a/features/core/src/test/java/org/apache/karaf/features/TestBase.java +++ b/features/core/src/test/java/org/apache/karaf/features/TestBase.java @@ -37,7 +37,7 @@ public class TestBase { Bundle bundle = EasyMock.createNiceMock(Bundle.class); // Be aware that this means all bundles are treated as different - expect(bundle.compareTo(EasyMock.<Bundle>anyObject())).andReturn(1).anyTimes(); + expect(bundle.compareTo(EasyMock.anyObject())).andReturn(1).anyTimes(); expect(bundle.getBundleId()).andReturn(id).anyTimes(); expect(bundle.getSymbolicName()).andReturn(symbolicName).anyTimes(); @@ -50,7 +50,7 @@ public class TestBase { } public Dictionary<String, String> headers(String ... keyAndHeader) { - Hashtable<String, String> headersTable = new Hashtable<String, String>(); + Hashtable<String, String> headersTable = new Hashtable<>(); int c=0; while (c < keyAndHeader.length) { String key = keyAndHeader[c++]; @@ -61,7 +61,7 @@ public class TestBase { } public Map<String, Map<String, Feature>> features(Feature ... features) { - final Map<String, Map<String, Feature>> featuresMap = new HashMap<String, Map<String,Feature>>(); + final Map<String, Map<String, Feature>> featuresMap = new HashMap<>(); for (Feature feature : features) { Map<String, Feature> featureVersion = getOrCreate(featuresMap, feature); featureVersion.put(feature.getVersion(), feature); @@ -82,19 +82,19 @@ public class TestBase { } public Set<Bundle> setOf(Bundle ... elements) { - return new HashSet<Bundle>(Arrays.asList(elements)); + return new HashSet<>(Arrays.asList(elements)); } public Set<Long> setOf(Long ... elements) { - return new HashSet<Long>(Arrays.asList(elements)); + return new HashSet<>(Arrays.asList(elements)); } public Set<String> setOf(String ... elements) { - return new HashSet<String>(asList(elements)); + return new HashSet<>(asList(elements)); } public Set<Feature> setOf(Feature ... elements) { - return new HashSet<Feature>(Arrays.asList(elements)); + return new HashSet<>(Arrays.asList(elements)); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/region/FeaturesDependenciesTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/region/FeaturesDependenciesTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/region/FeaturesDependenciesTest.java index c5bdfe0..bf9f24f 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/region/FeaturesDependenciesTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/region/FeaturesDependenciesTest.java @@ -131,12 +131,12 @@ public class FeaturesDependenciesTest { private void doTestFeatureDependency(String[] features, String[] bundles) throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data8/features.xml").toURI()); - Map<String, Set<String>> requirements = new HashMap<String, Set<String>>(); + Map<String, Set<String>> requirements = new HashMap<>(); for (String feature : features) { addToMapSet(requirements, "root", feature); } - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); for (String bundle : bundles) { addToMapSet(expected, "root", bundle); } @@ -144,8 +144,8 @@ public class FeaturesDependenciesTest { SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data8")); resolver.prepare(Arrays.asList(repo.getFeatures()), requirements, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -173,7 +173,7 @@ public class FeaturesDependenciesTest { } private Map<String, Set<String>> getBundleNamesPerRegions(SubsystemResolver resolver) { - Map<String, Set<String>> mapping = new HashMap<String, Set<String>>(); + Map<String, Set<String>> mapping = new HashMap<>(); Map<String, Set<Resource>> bundles = resolver.getBundlesPerRegions(); for (Map.Entry<String,Set<Resource>> entry : bundles.entrySet()) { for (Resource r : entry.getValue()) { @@ -187,7 +187,7 @@ public class FeaturesDependenciesTest { private void dumpWiring(SubsystemResolver resolver) { System.out.println("Wiring"); Map<Resource, List<Wire>> wiring = resolver.getWiring(); - List<Resource> resources = new ArrayList<Resource>(wiring.keySet()); + List<Resource> resources = new ArrayList<>(wiring.keySet()); Collections.sort(resources, new Comparator<Resource>() { @Override public int compare(Resource o1, Resource o2) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java index cc113eb..c952fc7 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java @@ -52,11 +52,11 @@ public class SubsystemTest { public void test1() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data1/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root", "f1"); addToMapSet(features, "root/apps1", "f2"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root", "a/1.0.0"); addToMapSet(expected, "root", "c/1.0.0"); addToMapSet(expected, "root/apps1", "b/1.0.0"); @@ -64,8 +64,8 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data1")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -77,12 +77,12 @@ public class SubsystemTest { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data2/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root/apps1", "f1"); addToMapSet(features, "root/apps1", "f3"); addToMapSet(features, "root/apps2", "f1"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root/apps1", "c/1.0.0"); addToMapSet(expected, "root/apps1", "b/1.0.0"); addToMapSet(expected, "root/apps1", "e/1.0.0"); @@ -95,8 +95,8 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data2")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -107,16 +107,16 @@ public class SubsystemTest { public void testOverrides() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data3/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root/apps1", "f1"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root/apps1", "a/1.0.1"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data3")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); + Collections.emptyMap()); resolver.resolve(Collections.singleton("b"), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -128,16 +128,16 @@ public class SubsystemTest { public void testConditionalUnsatisfiedWithOptional() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data4/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root/apps1", "f1"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root/apps1", "a/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data4")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -148,18 +148,18 @@ public class SubsystemTest { public void testConditionalSatisfiedWithOptional() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data4/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root/apps1", "f1"); addToMapSet(features, "root/apps1", "f2"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root/apps1", "a/1.0.0"); addToMapSet(expected, "root/apps1", "b/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data4")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -170,18 +170,18 @@ public class SubsystemTest { public void testBundle() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data1/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root/apps1", "bundle:a"); addToMapSet(features, "root/apps1", "bundle:c;dependency=true"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root/apps1", "a/1.0.0"); addToMapSet(expected, "root/apps1", "c/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data1")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -192,17 +192,17 @@ public class SubsystemTest { public void testFeatureOptional() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data5/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root", "f1"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root", "a/1.0.0"); addToMapSet(expected, "root", "b/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data5")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -213,18 +213,18 @@ public class SubsystemTest { public void testFeatureOptionalAlreadyProvided() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data5/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root", "f1"); addToMapSet(features, "root", "f3"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root", "a/1.0.0"); addToMapSet(expected, "root", "c/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data5")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -235,18 +235,18 @@ public class SubsystemTest { public void testFeatureOptionalAlreadyProvided2() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data6/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root", "pax-http"); addToMapSet(features, "root", "pax-http-tomcat"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root", "a/1.0.0"); addToMapSet(expected, "root", "c/1.0.0"); SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data6")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -257,11 +257,11 @@ public class SubsystemTest { public void testResourceRepositories() throws Exception { RepositoryImpl repo = new RepositoryImpl(getClass().getResource("data7/features.xml").toURI()); - Map<String, Set<String>> features = new HashMap<String, Set<String>>(); + Map<String, Set<String>> features = new HashMap<>(); addToMapSet(features, "root", "f1"); addToMapSet(features, "root/apps1", "f2"); - Map<String, Set<String>> expected = new HashMap<String, Set<String>>(); + Map<String, Set<String>> expected = new HashMap<>(); addToMapSet(expected, "root", "a/1.0.0"); addToMapSet(expected, "root", "c/1.0.0"); addToMapSet(expected, "root/apps1", "b/1.0.0"); @@ -269,8 +269,8 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(this.resolver, new TestDownloadManager(getClass(), "data7")); resolver.prepare(Arrays.asList(repo.getFeatures()), features, - Collections.<String, Set<BundleRevision>>emptyMap()); - resolver.resolve(Collections.<String>emptySet(), + Collections.emptyMap()); + resolver.resolve(Collections.emptySet(), FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE, null, null, null); @@ -298,7 +298,7 @@ public class SubsystemTest { } private Map<String, Set<String>> getBundleNamesPerRegions(SubsystemResolver resolver) { - Map<String, Set<String>> mapping = new HashMap<String, Set<String>>(); + Map<String, Set<String>> mapping = new HashMap<>(); Map<String, Set<Resource>> bundles = resolver.getBundlesPerRegions(); for (Map.Entry<String,Set<Resource>> entry : bundles.entrySet()) { for (Resource r : entry.getValue()) { @@ -312,7 +312,7 @@ public class SubsystemTest { private void dumpWiring(SubsystemResolver resolver) { System.out.println("Wiring"); Map<Resource, List<Wire>> wiring = resolver.getWiring(); - List<Resource> resources = new ArrayList<Resource>(wiring.keySet()); + List<Resource> resources = new ArrayList<>(wiring.keySet()); Collections.sort(resources, new Comparator<Resource>() { @Override public int compare(Resource o1, Resource o2) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java index dede5d1..f4a3cea 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java @@ -65,7 +65,7 @@ public class BootFeaturesInstallerTest extends TestBase { bootFeatures.installBootFeatures(); verify(impl); - List<String> features = new ArrayList<String>(featuresCapture.getValue()); + List<String> features = new ArrayList<>(featuresCapture.getValue()); Assert.assertEquals("config", features.get(0)); Assert.assertEquals("standard", features.get(1)); Assert.assertEquals("region", features.get(2)); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java index de7a7cd..77aeb07 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java @@ -84,10 +84,10 @@ public class DeployerTest { EasyMock.expectLastCall().anyTimes(); callback.callListeners(DeploymentEvent.DEPLOYMENT_STARTED); EasyMock.expectLastCall(); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); - callback.saveState(EasyMock.<State>anyObject()); + callback.saveState(EasyMock.anyObject()); EasyMock.expectLastCall(); installSupport.installConfigs(f100); EasyMock.expectLastCall(); @@ -95,9 +95,9 @@ public class DeployerTest { EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_INSTALLED); EasyMock.expectLastCall(); - installSupport.resolveBundles(EasyMock.<Set<Bundle>>anyObject(), - EasyMock.<Map<Resource, List<Wire>>>anyObject(), - EasyMock.<Map<Resource, Bundle>>anyObject()); + installSupport.resolveBundles(EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_RESOLVED); EasyMock.expectLastCall(); @@ -107,7 +107,7 @@ public class DeployerTest { EasyMock.expectLastCall(); Bundle bundleA = createTestBundle(1, Bundle.ACTIVE, dataDir, "a100"); - EasyMock.expect(installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("a100"), EasyMock.<InputStream>anyObject())) + EasyMock.expect(installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("a100"), EasyMock.anyObject())) .andReturn(bundleA); c.replay(); @@ -120,7 +120,7 @@ public class DeployerTest { dstate.features.put(f100.getId(), f100); dstate.features.put(f101.getId(), f101); dstate.filtersPerRegion = new HashMap<>(); - dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<String, Map<String, Set<String>>>()); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); Deployer.DeploymentRequest request = new Deployer.DeploymentRequest(); request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; @@ -170,7 +170,7 @@ public class DeployerTest { return null; } }); - installSupport.updateBundle(EasyMock.eq(bundleA), EasyMock.<String>anyObject(), EasyMock.<InputStream>anyObject()); + installSupport.updateBundle(EasyMock.eq(bundleA), EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() { @Override public Object answer() throws Throwable { @@ -187,10 +187,10 @@ public class DeployerTest { installSupport.startBundle(EasyMock.eq(bundleA)); EasyMock.expectLastCall(); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); - callback.saveState(EasyMock.<State>anyObject()); + callback.saveState(EasyMock.anyObject()); EasyMock.expectLastCall(); installSupport.installConfigs(f101); EasyMock.expectLastCall(); @@ -198,13 +198,13 @@ public class DeployerTest { EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_INSTALLED); EasyMock.expectLastCall(); - installSupport.resolveBundles(EasyMock.eq(Collections.<Bundle>singleton(bundleA)), - EasyMock.<Map<Resource, List<Wire>>>anyObject(), - EasyMock.<Map<Resource, Bundle>>anyObject()); + installSupport.resolveBundles(EasyMock.eq(Collections.singleton(bundleA)), + EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_RESOLVED); EasyMock.expectLastCall(); - installSupport.refreshPackages(EasyMock.eq(Collections.<Bundle>singleton(bundleA))); + installSupport.refreshPackages(EasyMock.eq(Collections.singleton(bundleA))); EasyMock.expectLastCall(); callback.callListeners(FeatureEventMatcher.eq(new FeatureEvent(FeatureEvent.EventType.FeatureUninstalled, f100, FeaturesService.ROOT_REGION, false))); EasyMock.expectLastCall(); @@ -227,7 +227,7 @@ public class DeployerTest { dstate.features.put(f100.getId(), f100); dstate.features.put(f101.getId(), f101); dstate.filtersPerRegion = new HashMap<>(); - dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<String, Map<String, Set<String>>>()); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); Deployer.DeploymentRequest request = new Deployer.DeploymentRequest(); request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; @@ -266,10 +266,10 @@ public class DeployerTest { EasyMock.expectLastCall().anyTimes(); callback.callListeners(DeploymentEvent.DEPLOYMENT_STARTED); EasyMock.expectLastCall(); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); - callback.saveState(EasyMock.<State>anyObject()); + callback.saveState(EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_INSTALLED); EasyMock.expectLastCall(); @@ -277,9 +277,9 @@ public class DeployerTest { EasyMock.expectLastCall(); installSupport.installLibraries(f1); EasyMock.expectLastCall(); - installSupport.resolveBundles(EasyMock.<Set<Bundle>>anyObject(), - EasyMock.<Map<Resource, List<Wire>>>anyObject(), - EasyMock.<Map<Resource, Bundle>>anyObject()); + installSupport.resolveBundles(EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_RESOLVED); EasyMock.expectLastCall(); @@ -298,7 +298,7 @@ public class DeployerTest { addToMapSet(dstate.bundlesPerRegion, ROOT_REGION, serviceBundle.getBundleId()); dstate.features = Collections.singletonMap(f1.getId(), f1); dstate.filtersPerRegion = new HashMap<>(); - dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<String, Map<String, Set<String>>>()); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); Deployer.DeploymentRequest request = new Deployer.DeploymentRequest(); request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; @@ -340,12 +340,12 @@ public class DeployerTest { EasyMock.expectLastCall().anyTimes(); callback.callListeners(DeploymentEvent.DEPLOYMENT_STARTED); EasyMock.expectLastCall(); - installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("a100"), EasyMock.<InputStream>anyObject()); + installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("a100"), EasyMock.anyObject()); EasyMock.expectLastCall().andReturn(serviceBundle1); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); - callback.saveState(EasyMock.<State>anyObject()); + callback.saveState(EasyMock.anyObject()); EasyMock.expectLastCall(); installSupport.installConfigs(EasyMock.anyObject()); EasyMock.expectLastCall(); @@ -353,9 +353,9 @@ public class DeployerTest { EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_INSTALLED); EasyMock.expectLastCall(); - installSupport.resolveBundles(EasyMock.<Set<Bundle>>anyObject(), - EasyMock.<Map<Resource, List<Wire>>>anyObject(), - EasyMock.<Map<Resource, Bundle>>anyObject()); + installSupport.resolveBundles(EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_RESOLVED); EasyMock.expectLastCall(); @@ -374,7 +374,7 @@ public class DeployerTest { dstate.features.put(f1.getId(), f1); dstate.features.put(f2.getId(), f2); dstate.filtersPerRegion = new HashMap<>(); - dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<String, Map<String, Set<String>>>()); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); Deployer.DeploymentRequest request = new Deployer.DeploymentRequest(); request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; @@ -402,12 +402,12 @@ public class DeployerTest { EasyMock.expectLastCall().anyTimes(); callback.callListeners(DeploymentEvent.DEPLOYMENT_STARTED); EasyMock.expectLastCall(); - installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("b100"), EasyMock.<InputStream>anyObject()); + installSupport.installBundle(EasyMock.eq(ROOT_REGION), EasyMock.eq("b100"), EasyMock.anyObject()); EasyMock.expectLastCall().andReturn(serviceBundle2); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); - callback.saveState(EasyMock.<State>anyObject()); + callback.saveState(EasyMock.anyObject()); EasyMock.expectLastCall(); installSupport.installConfigs(f2); EasyMock.expectLastCall(); @@ -415,9 +415,9 @@ public class DeployerTest { EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_INSTALLED); EasyMock.expectLastCall(); - installSupport.resolveBundles(EasyMock.<Set<Bundle>>anyObject(), - EasyMock.<Map<Resource, List<Wire>>>anyObject(), - EasyMock.<Map<Resource, Bundle>>anyObject()); + installSupport.resolveBundles(EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); EasyMock.expectLastCall(); callback.callListeners(DeploymentEvent.BUNDLES_RESOLVED); EasyMock.expectLastCall(); @@ -441,7 +441,7 @@ public class DeployerTest { dstate.features.put(f1.getId(), f1); dstate.features.put(f2.getId(), f2); dstate.filtersPerRegion = new HashMap<>(); - dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<String, Map<String, Set<String>>>()); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); request = new Deployer.DeploymentRequest(); request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; @@ -524,8 +524,8 @@ public class DeployerTest { EasyMock.expectLastCall().atLeastOnce(); installSupport.installLibraries(EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); - installSupport.replaceDigraph(EasyMock.<Map<String, Map<String, Map<String, Set<String>>>>>anyObject(), - EasyMock.<Map<String, Set<Long>>>anyObject()); + installSupport.replaceDigraph(EasyMock.anyObject(), + EasyMock.anyObject()); expectLastCall().atLeastOnce(); installSupport.resolveBundles(anyObject(Set.class), anyObject(Map.class), anyObject(Map.class)); expectLastCall().atLeastOnce(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/service/OverridesTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/OverridesTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/OverridesTest.java index d6e28f8..660ffb0 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/service/OverridesTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/OverridesTest.java @@ -153,7 +153,7 @@ public class OverridesTest { } static Map<String, Resource> asResourceMap(Resource... resources) { - Map<String, Resource> map = new HashMap<String, Resource>(); + Map<String, Resource> map = new HashMap<>(); for (Resource resource : resources) { map.put(getUri(resource), resource); } @@ -162,7 +162,7 @@ public class OverridesTest { static class Builder { String uri; - Map<String,String> headers = new HashMap<String,String>(); + Map<String,String> headers = new HashMap<>(); Builder(String uri) { this.uri = uri; this.headers.put("Bundle-ManifestVersion", "2"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/test/java/org/apache/karaf/features/internal/service/StateStorageTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/StateStorageTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/StateStorageTest.java index fbd819f..1786257 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/service/StateStorageTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/StateStorageTest.java @@ -39,7 +39,7 @@ public class StateStorageTest { oldState.bundleChecksums.put(4l, 32794l); oldState.requirements.put("bar", Collections.singleton("f1")); oldState.managedBundles.put("reg", Collections.singleton(32l)); - oldState.managedBundles.put("reg2", new HashSet<Long>(Arrays.asList(24l, 43l))); + oldState.managedBundles.put("reg2", new HashSet<>(Arrays.asList(24l, 43l))); oldState.repositories.add("repo"); TestStorage storage = new TestStorage(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java ---------------------------------------------------------------------- diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java b/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java index 3f794b6..21f7253 100644 --- a/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java +++ b/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java @@ -28,7 +28,7 @@ import org.osgi.framework.Bundle; public class ServletEventHandler implements ServletListener { - Map<String, ServletEvent> servletEvents = new HashMap<String, ServletEvent>(); + Map<String, ServletEvent> servletEvents = new HashMap<>(); public synchronized void servletEvent(ServletEvent event) { servletEvents.put(event.getServletName(), event); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java ---------------------------------------------------------------------- diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java b/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java index 9b0c7fd..2ed842e 100644 --- a/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java +++ b/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java @@ -35,7 +35,7 @@ public class ServletServiceImpl implements ServletService { @Override public List<ServletInfo> getServlets() { - List<ServletInfo> servletInfos = new ArrayList<ServletInfo>(); + List<ServletInfo> servletInfos = new ArrayList<>(); Collection<ServletEvent> events = servletEventHandler.getServletEvents(); for (ServletEvent event : events) { Servlet servlet = event.getServlet(); @@ -52,7 +52,7 @@ public class ServletServiceImpl implements ServletService { String alias = event.getAlias() != null ? event.getAlias() : " "; - String[] urls = (String[])(event.getUrlParameter() != null ? event.getUrlParameter() : new String[] {""}); + String[] urls = event.getUrlParameter() != null ? event.getUrlParameter() : new String[] {""}; ServletInfo info = new ServletInfo(); info.setBundleId(event.getBundle().getBundleId()); info.setName(servletName); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/main/java/org/apache/karaf/instance/core/InstanceSettings.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/InstanceSettings.java b/instance/src/main/java/org/apache/karaf/instance/core/InstanceSettings.java index c8a0063..99cfacb 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/InstanceSettings.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/InstanceSettings.java @@ -42,7 +42,7 @@ public class InstanceSettings { } public InstanceSettings(int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts, List<String> featureURLs, List<String> features, String address) { - this(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, featureURLs, features, address, new HashMap<String, URL>(), new HashMap<String, URL>()); + this(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, featureURLs, features, address, new HashMap<>(), new HashMap<>()); } public InstanceSettings(int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts, List<String> featureURLs, List<String> features, String address, Map<String, URL> textResources, Map<String, URL> binaryResources) { @@ -55,12 +55,12 @@ public class InstanceSettings { this.rmiServerPort = rmiServerPort; this.location = location; this.javaOpts = javaOpts; - this.featureURLs = featureURLs != null ? featureURLs : new ArrayList<String>(); - this.features = features != null ? features : new ArrayList<String>(); + this.featureURLs = featureURLs != null ? featureURLs : new ArrayList<>(); + this.features = features != null ? features : new ArrayList<>(); this.address = address; - this.textResources = textResources != null ? textResources : new HashMap<String, URL>(); - this.binaryResources = binaryResources != null ? binaryResources : new HashMap<String, URL>(); - this.profiles = profiles != null ? profiles : new ArrayList<String>(); + this.textResources = textResources != null ? textResources : new HashMap<>(); + this.binaryResources = binaryResources != null ? binaryResources : new HashMap<>(); + this.profiles = profiles != null ? profiles : new ArrayList<>(); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index b6a66a9..010b52b 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -683,7 +683,7 @@ public class InstanceServiceImpl implements InstanceService { oldLocation.renameTo(newLocation); // create the properties map including the instance name and instance location // TODO: replacing is bad, we should re-extract the needed files - HashMap<String, String> props = new HashMap<String, String>(); + HashMap<String, String> props = new HashMap<>(); props.put(oldName, newName); props.put(oldLocationPath, newLocation.getPath()); // replace all references to the "old" name by the new one in etc/system.properties @@ -738,7 +738,7 @@ public class InstanceServiceImpl implements InstanceService { // create the properties map including the instance name, location, ssh and rmi port numbers // TODO: replacing stuff anywhere is not really good, we might end up replacing unwanted stuff // TODO: if no ports are overriden, shouldn't we choose new ports ? - HashMap<String, String> props = new HashMap<String, String>(); + HashMap<String, String> props = new HashMap<>(); props.put(name, cloneName); props.put(locationPath, cloneLocationPath); if (settings.getSshPort() > 0) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java index 378d332..62cedc9 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java @@ -229,7 +229,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean } private List<String> parseStringList(String value) { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); if (value != null) { for (String el : value.split(",")) { String trimmed = el.trim(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/main/java/org/apache/karaf/instance/main/Execute.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/main/Execute.java b/instance/src/main/java/org/apache/karaf/instance/main/Execute.java index c96e62b..f7feda4 100644 --- a/instance/src/main/java/org/apache/karaf/instance/main/Execute.java +++ b/instance/src/main/java/org/apache/karaf/instance/main/Execute.java @@ -58,7 +58,7 @@ public class Execute { StartCommand.class, StatusCommand.class, StopCommand.class}; - private static final Map<String, Class<?>> COMMANDS = new TreeMap<String, Class<?>>(); + private static final Map<String, Class<?>> COMMANDS = new TreeMap<>(); static { for (Class<?> c : COMMAND_CLASSES) { @@ -136,7 +136,7 @@ public class Execute { static void execute(InstanceCommandSupport command, File storageFile, String[] args) throws Exception { DefaultActionPreparator dap = new DefaultActionPreparator(); - List<Object> params = new ArrayList<Object>(Arrays.asList(args)); + List<Object> params = new ArrayList<>(Arrays.asList(args)); params.remove(0); // this is the actual command name if (!dap.prepare(command, null, params)) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java b/instance/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java index d831fb7..e710c7a 100644 --- a/instance/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java +++ b/instance/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java @@ -53,7 +53,7 @@ public class ProcessImpl implements Process { public boolean isRunning() throws IOException { if (ScriptUtils.isWindows()) { - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); props.put("${pid}", Integer.toString(pid)); int ret = ScriptUtils.execute("running", props); return ret == 0; @@ -75,7 +75,7 @@ public class ProcessImpl implements Process { public void destroy() throws IOException { int ret; if (ScriptUtils.isWindows()) { - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); props.put("${pid}", Integer.toString(pid)); ret = ScriptUtils.execute("destroy", props); } else { @@ -114,7 +114,7 @@ public class ProcessImpl implements Process { //File error = File.createTempFile("jpm.", ".error"); File pidFile = File.createTempFile("jpm.", ".pid"); try { - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); //props.put("${in.file}", input.getCanonicalPath()); //props.put("${out.file}", output.getCanonicalPath()); //props.put("${err.file}", error.getCanonicalPath()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/test/java/org/apache/karaf/instance/core/InstanceSettingsTest.java ---------------------------------------------------------------------- diff --git a/instance/src/test/java/org/apache/karaf/instance/core/InstanceSettingsTest.java b/instance/src/test/java/org/apache/karaf/instance/core/InstanceSettingsTest.java index 264176b..c33b4b0 100644 --- a/instance/src/test/java/org/apache/karaf/instance/core/InstanceSettingsTest.java +++ b/instance/src/test/java/org/apache/karaf/instance/core/InstanceSettingsTest.java @@ -22,13 +22,12 @@ import java.util.List; import junit.framework.TestCase; -import org.apache.karaf.instance.core.InstanceSettings; import org.junit.Assert; public class InstanceSettingsTest extends TestCase { public void testInstanceSettings() { InstanceSettings is = - new InstanceSettings(1, 1, 1, null, null, Collections.<String>emptyList(), Arrays.asList("hi")); + new InstanceSettings(1, 1, 1, null, null, Collections.emptyList(), Arrays.asList("hi")); assertEquals(1, is.getSshPort()); assertEquals(1, is.getRmiRegistryPort()); assertEquals(1, is.getRmiServerPort()); @@ -38,7 +37,7 @@ public class InstanceSettingsTest extends TestCase { } public void testEqualsHashCode() { - testEqualsHashCode(1, 1, 1, "top", "foo", Collections.<String>emptyList(), Arrays.asList("hi")); + testEqualsHashCode(1, 1, 1, "top", "foo", Collections.emptyList(), Arrays.asList("hi")); testEqualsHashCode(0, 0, 0, null, null, null, null); } @@ -50,7 +49,7 @@ public class InstanceSettingsTest extends TestCase { } public void testEqualsHashCode2() { - InstanceSettings is = new InstanceSettings(1, 1, 1, "top", "foo", Collections.<String>emptyList(), Arrays.asList("hi")); + InstanceSettings is = new InstanceSettings(1, 1, 1, "top", "foo", Collections.emptyList(), Arrays.asList("hi")); Assert.assertFalse(is.equals(null)); Assert.assertFalse(is.equals(new Object())); assertEquals(is, is); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java ---------------------------------------------------------------------- diff --git a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java index 09e8ba6..24f6ac5 100644 --- a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java +++ b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java @@ -109,10 +109,10 @@ public class InstanceServiceImplTest { public void testTextResources() throws Exception { InstanceServiceImpl service = new InstanceServiceImpl(); service.setStorageLocation(new File("target/instances/" + System.currentTimeMillis())); - Map<String, URL> textResources = new HashMap<String, URL>(); + Map<String, URL> textResources = new HashMap<>(); textResources.put("etc/myresource", getClass().getClassLoader().getResource("myresource")); - InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null, null, textResources, new HashMap<String, URL>()); + InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null, null, textResources, new HashMap<>()); Instance instance = service.createInstance(getName(), settings, false); assertFileExists(instance.getLocation(), "etc/myresource"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java ---------------------------------------------------------------------- diff --git a/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java b/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java index 8dbf49a..608033c 100644 --- a/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java +++ b/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java @@ -36,7 +36,7 @@ public class InstanceServiceMBeanImplTest extends TestCase { public void testCreateInstance() throws Exception { final InstanceSettings instanceSettings = new InstanceSettings(123, 456,789, "somewhere", "someopts", - Collections.<String>emptyList(), Arrays.asList("webconsole", "funfeat"), "localhost"); + Collections.emptyList(), Arrays.asList("webconsole", "funfeat"), "localhost"); final Instance inst = EasyMock.createMock(Instance.class); EasyMock.expect(inst.getPid()).andReturn(42); @@ -52,7 +52,7 @@ public class InstanceServiceMBeanImplTest extends TestCase { public void testCreateInstance2() throws Exception { final InstanceSettings instanceSettings = new InstanceSettings(0, 0, 0, null, null, - Collections.<String>emptyList(), Collections.<String>emptyList(), "localhost"); + Collections.emptyList(), Collections.emptyList(), "localhost"); InstanceService instanceService = EasyMock.createMock(InstanceService.class); EasyMock.expect(instanceService.createInstance("t1", instanceSettings, false)).andReturn(null); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java index c9418cd..7492d11 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java @@ -42,7 +42,7 @@ public class ImportServiceTest extends KarafTestSupport { @SuppressWarnings("deprecation") @Configuration public Option[] config() { - List<Option> options = new ArrayList<Option>(Arrays.asList(super.config())); + List<Option> options = new ArrayList<>(Arrays.asList(super.config())); InputStream testBundleImportService = bundle() .set(Constants.IMPORT_SERVICE, "FooService") .set(Constants.BUNDLE_SYMBOLICNAME, BUNDLE1_NAME) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/JMXSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JMXSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/JMXSecurityTest.java index ae7b084..5a5a0ad 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JMXSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JMXSecurityTest.java @@ -66,7 +66,7 @@ public class JMXSecurityTest extends KarafTestSupport { @Configuration public Option[] config() { - List<Option> options = new ArrayList<Option>(Arrays.asList(super.config())); + List<Option> options = new ArrayList<>(Arrays.asList(super.config())); // Add some extra options used by this test... options.addAll(Arrays.asList( @@ -276,12 +276,12 @@ public class JMXSecurityTest extends KarafTestSupport { new Object [] {serviceMBean.toString(), "getServices", new String [] {}}, new String [] {String.class.getName(), String.class.getName(), String[].class.getName()})); - Map<String, List<String>> map = new HashMap<String, List<String>>(); + Map<String, List<String>> map = new HashMap<>(); TabularData td = (TabularData) connection.invoke(securityMBean, "canInvoke", new Object [] {map}, new String [] {Map.class.getName()}); assertEquals(0, td.size()); - Map<String, List<String>> map2 = new HashMap<String, List<String>>(); - map2.put(systemMBean.toString(), Collections.<String>emptyList()); + Map<String, List<String>> map2 = new HashMap<>(); + map2.put(systemMBean.toString(), Collections.emptyList()); map2.put(serviceMBean.toString(), Arrays.asList("getServices(boolean)", "getServices(long)", "getServices(long,boolean)", "getServices()")); TabularData td2 = (TabularData) connection.invoke(securityMBean, "canInvoke", new Object [] {map2}, new String [] {Map.class.getName()}); assertEquals(5, td2.size()); @@ -311,7 +311,7 @@ public class JMXSecurityTest extends KarafTestSupport { assertEquals("", cd5.get("Method")); assertTrue((Boolean) cd5.get("CanInvoke")); - Map<String, List<String>> map3 = new HashMap<String, List<String>>(); + Map<String, List<String>> map3 = new HashMap<>(); map3.put(serviceMBean.toString(), Collections.singletonList("getServices")); TabularData td3 = (TabularData) connection.invoke(securityMBean, "canInvoke", new Object [] {map3}, new String [] {Map.class.getName()}); assertEquals(1, td3.size()); @@ -321,7 +321,7 @@ public class JMXSecurityTest extends KarafTestSupport { assertEquals("getServices", cd6.get("Method")); assertTrue((Boolean) cd6.get("CanInvoke")); - Map<String, List<String>> map4 = new HashMap<String, List<String>>(); + Map<String, List<String>> map4 = new HashMap<>(); map4.put(systemMBean.toString(), Collections.singletonList("halt")); TabularData td4 = (TabularData) connection.invoke(securityMBean, "canInvoke", new Object [] {map4}, new String [] {Map.class.getName()}); assertEquals(1, td4.size()); @@ -363,7 +363,7 @@ public class JMXSecurityTest extends KarafTestSupport { else assertNull(m2.get("x")); - Map<String, String> newProps = new HashMap<String, String>(); + Map<String, String> newProps = new HashMap<>(); newProps.put("a.b.c", "abc"); newProps.put("d.e.f", "def"); assertJmxInvoke(shouldSucceed, connection, mbean, "update", new Object [] {pid, newProps}, new String [] {String.class.getName(), Map.class.getName()}); @@ -407,7 +407,7 @@ public class JMXSecurityTest extends KarafTestSupport { TabularType tt = new TabularType("PROPERTIES", "X", ct, new String [] {"Key"}); TabularDataSupport tds = new TabularDataSupport(tt); - Map<String, Object> data = new HashMap<String, Object>(); + Map<String, Object> data = new HashMap<>(); data.put("Key", "foo"); data.put("Value", "bar"); data.put("Type", "String"); @@ -428,7 +428,7 @@ public class JMXSecurityTest extends KarafTestSupport { assertJmxInvoke(shouldSucceed, connection, mbean, "delete", new Object [] {pid}, new String [] {String.class.getName()}); TabularDataSupport tds2 = new TabularDataSupport(tt); - Map<String, Object> data2 = new HashMap<String, Object>(); + Map<String, Object> data2 = new HashMap<>(); data2.put("Key", "a.b.c"); data2.put("Value", "d.e.f"); data2.put("Type", "String"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java index f73d4a5..71eb3e7 100644 --- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java @@ -274,10 +274,10 @@ public class KarafTestSupport { FutureTask<String> commandFuture; if (principals.length == 0) { - commandFuture = new FutureTask<String>(commandCallable); + commandFuture = new FutureTask<>(commandCallable); } else { // If principals are defined, run the command callable via Subject.doAs() - commandFuture = new FutureTask<String>(new Callable<String>() { + commandFuture = new FutureTask<>(new Callable<String>() { @Override public String call() throws Exception { Subject subject = new Subject(); @@ -390,7 +390,7 @@ public class KarafTestSupport { } protected void waitForService(String filter, long timeout) throws InvalidSyntaxException, InterruptedException { - ServiceTracker<Object, Object> st = new ServiceTracker<Object, Object>(bundleContext, bundleContext.createFilter(filter), null); + ServiceTracker<Object, Object> st = new ServiceTracker<>(bundleContext, bundleContext.createFilter(filter), null); try { st.open(); st.waitForService(timeout); @@ -438,7 +438,7 @@ public class KarafTestSupport { */ @SuppressWarnings("rawtypes") private static Collection<ServiceReference> asCollection(ServiceReference[] references) { - return references != null ? Arrays.asList(references) : Collections.<ServiceReference>emptyList(); + return references != null ? Arrays.asList(references) : Collections.emptyList(); } public JMXConnector getJMXConnector() throws Exception { @@ -447,7 +447,7 @@ public class KarafTestSupport { public JMXConnector getJMXConnector(String userName, String passWord) throws Exception { JMXServiceURL url = new JMXServiceURL(getJmxServiceUrl()); - Hashtable<String, Object> env = new Hashtable<String, Object>(); + Hashtable<String, Object> env = new Hashtable<>(); String[] credentials = new String[]{ userName, passWord }; env.put("jmx.remote.credentials", credentials); JMXConnector connector = JMXConnectorFactory.connect(url, env); @@ -496,9 +496,9 @@ public class KarafTestSupport { } public void assertFeaturesInstalled(String ... expectedFeatures) throws Exception { - Set<String> expectedFeaturesSet = new HashSet<String>(Arrays.asList(expectedFeatures)); + Set<String> expectedFeaturesSet = new HashSet<>(Arrays.asList(expectedFeatures)); Feature[] features = featureService.listInstalledFeatures(); - Set<String> installedFeatures = new HashSet<String>(); + Set<String> installedFeatures = new HashSet<>(); for (Feature feature : features) { installedFeatures.add(feature.getName()); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/PackageTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java index 1ece6d3..89f58b8 100644 --- a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java @@ -77,7 +77,7 @@ public class PackageTest extends KarafTestSupport { public void duplicatePackageTest() throws Exception { // Leaving out version to make test easier to manage // We currently expect no duplicate package exports - Map<String, Integer> expectedDups = new HashMap<String, Integer>(); + Map<String, Integer> expectedDups = new HashMap<>(); List<PackageVersion> packageVersionMap = packageService.getExports(); for (PackageVersion pVer : packageVersionMap) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java b/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java index e5bd6f0..b252506 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java +++ b/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java @@ -52,7 +52,7 @@ public class SshCommandTestBase extends KarafTestSupport { @Before public void installSshFeature() throws Exception { - featuresBefore = new HashSet<Feature>(Arrays.asList(featureService.listInstalledFeatures())); + featuresBefore = new HashSet<>(Arrays.asList(featureService.listInstalledFeatures())); installAndAssertFeature("ssh"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/itests/src/test/java/org/apache/karaf/itests/util/RunIfRule.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/util/RunIfRule.java b/itests/src/test/java/org/apache/karaf/itests/util/RunIfRule.java index 435c92d..9f9dffb 100644 --- a/itests/src/test/java/org/apache/karaf/itests/util/RunIfRule.java +++ b/itests/src/test/java/org/apache/karaf/itests/util/RunIfRule.java @@ -45,7 +45,7 @@ public class RunIfRule implements MethodRule { } public Statement apply(Statement base, FrameworkMethod method, Object target) { - List<RunIf> ignores = findRunIfs(method.getAnnotations(), new ArrayList<RunIf>(), new HashSet<Class>()); + List<RunIf> ignores = findRunIfs(method.getAnnotations(), new ArrayList<>(), new HashSet<>()); if (ignores.isEmpty()) { return base; } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java ---------------------------------------------------------------------- diff --git a/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java b/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java index 0da83ae..1352bbc 100644 --- a/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java +++ b/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java @@ -56,7 +56,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan } public Set<Class> getManagedClasses() { - return new HashSet<Class>(Arrays.asList( + return new HashSet<>(Arrays.asList( Config.class, ResourceKeystoreInstance.class )); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java ---------------------------------------------------------------------- diff --git a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java index 1251ac9..9b4fdbb 100644 --- a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java +++ b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java @@ -57,7 +57,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan } public Set<Class> getManagedClasses() { - return new HashSet<Class>(Arrays.asList( + return new HashSet<>(Arrays.asList( EncryptablePropertyPlaceholder.class )); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java ---------------------------------------------------------------------- diff --git a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java index 4fe818a..b345c7c 100644 --- a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java +++ b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java @@ -90,7 +90,7 @@ public class EncryptableConfigAdminPropertyPlaceholderTest extends TestCase { StreamUtils.copy(bundle.build(), fos); fos.close(); JarInputStream jis = new JarInputStream(new FileInputStream(file)); - Map<String, String> headers = new HashMap<String, String>(); + Map<String, String> headers = new HashMap<>(); for (Map.Entry entry : jis.getManifest().getMainAttributes().entrySet()) { headers.put(entry.getKey().toString(), entry.getValue().toString()); } @@ -226,7 +226,7 @@ public class EncryptableConfigAdminPropertyPlaceholderTest extends TestCase { * Provides an iterable collection of references, even if the original array is null */ private static final Collection<ServiceReference> asCollection(ServiceReference[] references) { - List<ServiceReference> result = new LinkedList<ServiceReference>(); + List<ServiceReference> result = new LinkedList<>(); if (references != null) { for (ServiceReference reference : references) { result.add(reference); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java ---------------------------------------------------------------------- diff --git a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java index 7f2074a..8d8376b 100644 --- a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java +++ b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java @@ -99,7 +99,7 @@ public class EncryptablePropertyPlaceholderTest extends TestCase { StreamUtils.copy(bundle.build(), fos); fos.close(); JarInputStream jis = new JarInputStream(new FileInputStream(file)); - Map<String, String> headers = new HashMap<String, String>(); + Map<String, String> headers = new HashMap<>(); for (Map.Entry entry : jis.getManifest().getMainAttributes().entrySet()) { headers.put(entry.getKey().toString(), entry.getValue().toString()); } @@ -199,7 +199,7 @@ public class EncryptablePropertyPlaceholderTest extends TestCase { * Provides an iterable collection of references, even if the original array is null */ private static final Collection<ServiceReference> asCollection(ServiceReference[] references) { - List<ServiceReference> result = new LinkedList<ServiceReference>(); + List<ServiceReference> result = new LinkedList<>(); if (references != null) { for (ServiceReference reference : references) { result.add(reference); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java ---------------------------------------------------------------------- diff --git a/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java b/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java index b999937..92e58d4 100644 --- a/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java +++ b/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java @@ -25,7 +25,7 @@ public class GroupPrincipal implements Group, Serializable { private String name; - private Hashtable<String,Principal> members = new Hashtable<String, Principal>(); + private Hashtable<String,Principal> members = new Hashtable<>(); public GroupPrincipal(String name) { assert name != null;
