[KARAF-5169] remove redundant type specifiers This patch removes redundant type specifiers: * generic specifiers with assignments; * useless casts; * inferable generics.
Signed-off-by: Stephen Kitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/67232b63 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/67232b63 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/67232b63 Branch: refs/heads/master Commit: 67232b636e6f3008ac8c2658358bf20543393945 Parents: b0c0822 Author: Stephen Kitt <[email protected]> Authored: Wed May 31 15:13:19 2017 -0700 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 1 07:47:57 2017 +0200 ---------------------------------------------------------------------- .../internal/BlueprintStateService.java | 2 +- .../karaf/bundle/command/BundlesCommand.java | 2 +- .../karaf/bundle/command/Capabilities.java | 2 +- .../apache/karaf/bundle/command/Headers.java | 14 +-- .../karaf/bundle/command/Requirements.java | 2 +- .../apache/karaf/bundle/command/Restart.java | 2 +- .../apache/karaf/bundle/command/Services.java | 6 +- .../karaf/bundle/command/ShowBundleTree.java | 6 +- .../karaf/bundle/command/bundletree/Node.java | 6 +- .../bundle/core/internal/BundleInfoImpl.java | 12 +-- .../bundle/core/internal/BundleWatcherImpl.java | 6 +- .../bundle/core/internal/osgi/Activator.java | 2 +- .../karaf/bundle/command/TestBundleFactory.java | 6 +- .../bundle/command/bundletree/TreeTest.java | 12 +-- .../core/internal/MavenConfigServiceTest.java | 8 +- .../spring/internal/SpringStateService.java | 2 +- .../org/slf4j/impl/SimpleLoggerFactory.java | 4 +- .../karaf/config/command/ListCommand.java | 4 +- .../karaf/config/command/MetaCommand.java | 2 +- .../completers/ConfigurationCompleter.java | 2 +- .../ConfigurationPropertyCompleter.java | 2 +- .../command/completers/MetaCompleter.java | 2 +- .../karaf/config/command/EditCommandTest.java | 2 +- .../config/command/MockCommandSession.java | 2 +- .../karaf/config/command/UpdateCommandTest.java | 4 +- .../deployer/blueprint/osgi/Activator.java | 2 +- .../features/FeatureDeploymentListener.java | 6 +- .../karaf/deployer/features/osgi/Activator.java | 2 +- .../deployer/spring/SpringTransformer.java | 2 +- .../karaf/deployer/spring/osgi/Activator.java | 2 +- .../karaf/deployer/wrap/osgi/Activator.java | 2 +- .../org/apache/karaf/diagnostic/core/Dump.java | 2 +- .../core/providers/BundleDumpProvider.java | 2 +- .../karaf/diagnostic/internal/Activator.java | 8 +- .../features/command/InfoFeatureCommand.java | 2 +- .../features/command/InstallFeatureCommand.java | 2 +- .../features/command/RegionInfoCommand.java | 2 +- .../karaf/features/command/RepoListCommand.java | 2 +- .../features/command/RepoRefreshCommand.java | 2 +- .../command/UninstallFeatureCommand.java | 2 +- .../karaf/features/internal/model/Content.java | 10 +- .../karaf/features/internal/model/Feature.java | 2 +- .../region/AbstractRegionDigraphVisitor.java | 10 +- .../internal/region/OfflineResolver.java | 6 +- .../features/internal/region/Subsystem.java | 2 +- .../region/SubsystemResolveContext.java | 12 +-- .../internal/region/SubsystemResolver.java | 6 +- .../repository/AggregateRepository.java | 4 +- .../internal/repository/BaseRepository.java | 8 +- .../internal/repository/XmlRepository.java | 4 +- .../internal/resolver/CapabilitySet.java | 2 +- .../internal/resolver/ResolverUtil.java | 2 +- .../internal/resolver/ResourceBuilder.java | 14 +-- .../features/internal/service/Deployer.java | 6 +- .../internal/service/EventAdminListener.java | 6 +- .../service/FeatureConfigInstaller.java | 2 +- .../features/internal/service/Overrides.java | 4 +- .../internal/service/RequirementSort.java | 10 +- .../features/management/codec/JmxFeature.java | 2 +- .../karaf/features/FeaturesServiceTest.java | 4 +- .../org/apache/karaf/features/TestBase.java | 14 +-- .../region/FeaturesDependenciesTest.java | 12 +-- .../features/internal/region/SubsystemTest.java | 82 +++++++------- .../service/BootFeaturesInstallerTest.java | 2 +- .../features/internal/service/DeployerTest.java | 84 +++++++-------- .../internal/service/OverridesTest.java | 4 +- .../internal/service/StateStorageTest.java | 2 +- .../http/core/internal/ServletEventHandler.java | 2 +- .../http/core/internal/ServletServiceImpl.java | 4 +- .../karaf/instance/core/InstanceSettings.java | 12 +-- .../core/internal/InstanceServiceImpl.java | 4 +- .../core/internal/InstancesMBeanImpl.java | 2 +- .../org/apache/karaf/instance/main/Execute.java | 4 +- .../org/apache/karaf/jpm/impl/ProcessImpl.java | 6 +- .../instance/core/InstanceSettingsTest.java | 7 +- .../core/internal/InstanceServiceImplTest.java | 4 +- .../internal/InstanceServiceMBeanImplTest.java | 4 +- .../apache/karaf/itests/ImportServiceTest.java | 2 +- .../apache/karaf/itests/JMXSecurityTest.java | 18 ++-- .../apache/karaf/itests/KarafTestSupport.java | 14 +-- .../org/apache/karaf/itests/PackageTest.java | 2 +- .../karaf/itests/ssh/SshCommandTestBase.java | 2 +- .../org/apache/karaf/itests/util/RunIfRule.java | 2 +- .../blueprint/config/impl/NamespaceHandler.java | 2 +- .../jasypt/handler/NamespaceHandler.java | 2 +- ...tableConfigAdminPropertyPlaceholderTest.java | 4 +- .../EncryptablePropertyPlaceholderTest.java | 4 +- .../jaas/boot/principal/GroupPrincipal.java | 2 +- .../karaf/jaas/boot/principal/RolePolicy.java | 2 +- .../karaf/jaas/command/JaasCommandSupport.java | 4 +- .../karaf/jaas/command/ListUsersCommand.java | 4 +- .../karaf/jaas/command/ManageRealmCommand.java | 2 +- .../completers/LoginModuleNameCompleter.java | 2 +- .../jaas/command/ManageRealmCommandTest.java | 2 +- .../karaf/jaas/config/impl/Activator.java | 10 +- .../apache/karaf/jaas/config/impl/Config.java | 2 +- .../jaas/config/impl/OsgiConfiguration.java | 2 +- .../jaas/config/impl/OsgiKeystoreManager.java | 2 +- .../karaf/jaas/jasypt/impl/Activator.java | 2 +- .../jaas/jasypt/impl/JasyptEncryptionTest.java | 2 +- .../jaas/modules/AbstractKarafLoginModule.java | 2 +- .../audit/EventAdminAuditLoginModule.java | 2 +- .../modules/encryption/EncryptionSupport.java | 2 +- .../karaf/jaas/modules/impl/KarafRealm.java | 4 +- .../jaas/modules/ldap/LDAPLoginModule.java | 2 +- .../karaf/jaas/modules/ldap/LDAPOptions.java | 2 +- .../modules/ldap/ManagedSSLSocketFactory.java | 2 +- .../modules/osgi/OsgiConfigLoginModule.java | 2 +- .../properties/DigestPasswordLoginModule.java | 6 +- .../properties/PropertiesBackingEngine.java | 18 ++-- .../properties/PropertiesLoginModule.java | 6 +- .../publickey/PublickeyBackingEngine.java | 18 ++-- .../modules/publickey/PublickeyLoginModule.java | 8 +- .../modules/syncope/SyncopeBackingEngine.java | 2 +- .../modules/syncope/SyncopeLoginModule.java | 6 +- .../jaas/modules/krb5/Krb5LoginModuleTest.java | 2 +- .../jaas/modules/ldap/LdapLoginModuleTest.java | 6 +- .../jaas/modules/ldap/LdapPoolingTest.java | 4 +- .../properties/PropertiesLoginModuleTest.java | 14 +-- .../java/org/apache/karaf/jms/JmsMessage.java | 2 +- .../jms/pool/internal/PooledConnection.java | 6 +- .../karaf/jms/pool/internal/PooledSession.java | 6 +- .../karaf/jndi/internal/JndiServiceImpl.java | 4 +- .../karaf/jndi/internal/osgi/Activator.java | 2 +- .../karaf/jpa/hibernate/impl/Activator.java | 2 +- .../jpa/hibernate/impl/StatisticsPublisher.java | 2 +- .../java/org/apache/karaf/kar/internal/Kar.java | 2 +- .../karaf/kar/internal/KarServiceImpl.java | 12 +-- .../org/apache/karaf/log/command/LogEntry.java | 2 +- .../org/apache/karaf/log/command/LogTail.java | 2 +- .../log/core/internal/LogServiceLog4j1Impl.java | 2 +- .../apache/karaf/log/core/internal/LruList.java | 2 +- .../karaf/log/core/internal/osgi/Activator.java | 2 +- .../karaf/main/KarafActivatorManager.java | 2 +- .../main/java/org/apache/karaf/main/Main.java | 8 +- .../karaf/main/lock/BaseJDBCLockTest.java | 4 +- .../management/ConnectorServerFactory.java | 2 +- .../karaf/management/KarafMBeanServerGuard.java | 14 +-- .../karaf/management/RmiRegistryFactory.java | 2 +- .../karaf/management/internal/Activator.java | 4 +- .../management/internal/BulkRequestContext.java | 6 +- .../internal/JMXSecurityMBeanImpl.java | 2 +- .../management/KarafMBeanServerGuardTest.java | 106 +++++++++---------- .../internal/JMXSecurityMBeanImplTestCase.java | 10 +- .../karaf/obr/command/ResolveCommand.java | 2 +- .../apache/karaf/packages/command/Exports.java | 2 +- .../karaf/packages/core/PackageVersion.java | 2 +- .../core/internal/PackageServiceImpl.java | 6 +- .../core/internal/filter/ExprTokenizer.java | 2 +- .../core/internal/filter/FilterParser.java | 2 +- .../karaf/profile/command/ProfileDisplay.java | 8 +- .../scheduler/command/support/ScriptJob.java | 2 +- .../internal/ScrServiceMBeanImpl.java | 2 +- .../karaf/service/command/ListServices.java | 6 +- .../service/command/ObjectClassCompleter.java | 2 +- .../org/apache/karaf/service/command/Wait.java | 2 +- .../core/internal/ServicesMBeanImpl.java | 2 +- .../service/command/TestBundleFactory.java | 6 +- .../service/guard/impl/GuardProxyCatalog.java | 20 ++-- .../guard/tools/ACLConfigurationParser.java | 12 +-- .../guard/impl/GuardProxyCatalogTest.java | 88 +++++++-------- .../guard/impl/GuardingEventHookTest.java | 46 ++++---- .../guard/impl/GuardingFindHookTest.java | 20 ++-- .../guard/tools/ACLConfigurationParserTest.java | 22 ++-- .../felix/eventadmin/impl/Configuration.java | 2 +- .../eventadmin/impl/handler/EventAdminImpl.java | 2 +- .../karaf/services/staticcm/Configurations.java | 2 +- .../karaf/shell/commands/impl/InfoAction.java | 6 +- .../shell/commands/impl/ThreadsAction.java | 6 +- .../shell/commands/impl/info/Activator.java | 2 +- .../console/completer/StringsCompleter.java | 2 +- .../commands/basic/DefaultActionPreparator.java | 18 ++-- .../commands/converter/DefaultConverter.java | 2 +- .../gogo/commands/converter/GenericType.java | 2 +- .../shell/commands/basic/SimpleCommand.java | 2 +- .../commands/converter/DefaultConverter.java | 2 +- .../shell/commands/converter/GenericType.java | 2 +- .../shell/commands/meta/ActionMetaData.java | 4 +- .../commands/meta/ActionMetaDataFactory.java | 6 +- .../karaf/shell/compat/ArgumentCompleter.java | 18 ++-- .../karaf/shell/compat/CommandTracker.java | 2 +- .../shell/compat/OldArgumentCompleter.java | 18 ++-- .../shell/console/CommandSessionHolder.java | 2 +- .../karaf/shell/console/MultiException.java | 2 +- .../karaf/shell/console/OsgiCommandSupport.java | 4 +- .../shell/console/commands/GenericType.java | 2 +- .../console/commands/NamespaceHandler.java | 8 +- .../console/completer/AggregateCompleter.java | 2 +- .../console/completer/ArgumentCompleter.java | 18 ++-- .../completer/CommandNamesCompleter.java | 4 +- .../console/completer/CommandsCompleter.java | 30 +++--- .../console/completer/OldArgumentCompleter.java | 18 ++-- .../karaf/shell/console/completer/Parser.java | 8 +- .../console/completer/StringsCompleter.java | 2 +- .../impl/SecuredCommandConfigTransformer.java | 6 +- .../impl/SecuredCommandProcessorImpl.java | 2 +- .../org/apache/karaf/shell/util/ShellUtil.java | 2 +- .../apache/karaf/shell/api/console/Signal.java | 2 +- .../action/command/DefaultActionPreparator.java | 6 +- .../shell/impl/action/command/ManagerImpl.java | 6 +- .../action/osgi/AggregateServiceTracker.java | 6 +- .../impl/action/osgi/CommandExtension.java | 2 +- .../impl/action/osgi/MultiServiceTracker.java | 6 +- .../shell/impl/action/osgi/RegistryImpl.java | 8 +- .../impl/action/osgi/SingleServiceTracker.java | 4 +- .../impl/console/CommandNamesCompleter.java | 2 +- .../karaf/shell/impl/console/RegistryImpl.java | 8 +- .../impl/console/commands/SubShellCommand.java | 2 +- .../impl/console/commands/help/HelpCommand.java | 4 +- .../commands/help/SimpleHelpProvider.java | 2 +- .../impl/console/osgi/EventAdminListener.java | 4 +- .../osgi/secured/SecuredSessionFactoryImpl.java | 6 +- .../shell/impl/console/parsing/KarafParser.java | 2 +- .../shell/impl/console/standalone/Main.java | 2 +- .../support/RegexCommandLoggingFilter.java | 2 +- .../support/completers/StringsCompleter.java | 2 +- .../support/converter/DefaultConverter.java | 2 +- .../shell/support/converter/GenericType.java | 2 +- .../karaf/shell/support/parsing/GogoParser.java | 8 +- .../apache/karaf/shell/support/table/Row.java | 4 +- .../org/apache/karaf/shell/ssh/Activator.java | 2 +- .../karaf/shell/ssh/KarafJaasAuthenticator.java | 2 +- .../org/apache/karaf/shell/ssh/SshUtils.java | 2 +- .../shell/ssh/UserAuthFactoriesFactory.java | 4 +- .../java/org/apache/karaf/shell/table/Row.java | 4 +- .../apache/karaf/shell/table/ShellTable.java | 4 +- .../karaf/subsystem/commands/InfoAction.java | 10 +- .../subsystem/commands/SubsystemCompleter.java | 2 +- .../subsystem/commands/SubsystemSupport.java | 8 +- .../management/internal/SystemMBeanImpl.java | 2 +- .../org/apache/karaf/tooling/AssemblyMojo.java | 2 +- .../java/org/apache/karaf/tooling/KarMojo.java | 2 +- .../commands/AsciiDoctorCommandHelpPrinter.java | 2 +- .../commands/DocBookCommandHelpPrinter.java | 2 +- .../tooling/commands/GenerateHelpMojo.java | 4 +- .../commands/UserConfCommandHelpPrinter.java | 2 +- .../tooling/features/AbstractFeatureMojo.java | 10 +- .../features/ExportFeatureMetaDataMojo.java | 4 +- .../features/GenerateDescriptorMojo.java | 12 +-- .../karaf/tooling/utils/Dependency30Helper.java | 2 +- .../karaf/tooling/utils/ManifestUtils.java | 6 +- .../java/org/apache/karaf/util/XmlUtils.java | 6 +- .../karaf/util/tracker/BaseActivator.java | 2 +- .../web/internal/WebContainerServiceImpl.java | 10 +- .../karaf/web/internal/WebEventHandler.java | 2 +- .../web/management/internal/WebMBeanImpl.java | 4 +- .../webconsole/features/FeaturesPlugin.java | 4 +- .../apache/karaf/webconsole/gogo/Terminal.java | 6 +- .../karaf/webconsole/http/HttpPlugin.java | 8 +- .../webconsole/http/ServletEventHandler.java | 2 +- .../karaf/webconsole/http/WebEventHandler.java | 2 +- .../webconsole/instance/InstancePlugin.java | 2 +- .../webconsole/instance/InstancePluginTest.java | 4 +- 253 files changed, 811 insertions(+), 808 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java ---------------------------------------------------------------------- diff --git a/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java b/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java index 89fde18..dbab501 100644 --- a/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java +++ b/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java @@ -44,7 +44,7 @@ public class BlueprintStateService implements org.osgi.service.blueprint.contain private final Map<Long, BlueprintEvent> states; public BlueprintStateService() { - states = new ConcurrentHashMap<Long, BlueprintEvent>(); + states = new ConcurrentHashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java index 03d8dea..029c144 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java @@ -56,7 +56,7 @@ public abstract class BundlesCommand implements Action { if (bundles.isEmpty()) { throw new IllegalArgumentException("No matching bundles"); } - List<Exception> exceptions = new ArrayList<Exception>(); + List<Exception> exceptions = new ArrayList<>(); for (Bundle bundle : bundles) { try { executeOnBundle(bundle); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/Capabilities.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Capabilities.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Capabilities.java index 970d8b1..3d0f9f5 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Capabilities.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Capabilities.java @@ -155,7 +155,7 @@ public class Capabilities extends BundlesCommand { { // Aggregate matching capabilities. Map<BundleCapability, List<BundleWire>> map = - new HashMap<BundleCapability, List<BundleWire>>(); + new HashMap<>(); for (BundleWire wire : wires) { if (matchNamespace(namespace, wire.getCapability().getNamespace())) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/Headers.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Headers.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Headers.java index 1e88696..d8a4f44 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Headers.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Headers.java @@ -86,17 +86,17 @@ public class Headers extends BundlesCommand { protected String generateFormattedOutput(Bundle bundle) { StringBuilder output = new StringBuilder(); - Map<String, Object> otherAttribs = new TreeMap<String, Object>(); - Map<String, Object> karafAttribs = new TreeMap<String, Object>(); - Map<String, Object> bundleAttribs = new TreeMap<String, Object>(); - Map<String, Object> serviceAttribs = new TreeMap<String, Object>(); - Map<String, Object> packagesAttribs = new TreeMap<String, Object>(); + Map<String, Object> otherAttribs = new TreeMap<>(); + Map<String, Object> karafAttribs = new TreeMap<>(); + Map<String, Object> bundleAttribs = new TreeMap<>(); + Map<String, Object> serviceAttribs = new TreeMap<>(); + Map<String, Object> packagesAttribs = new TreeMap<>(); Dictionary<String, String> dict = bundle.getHeaders(); Enumeration<String> keys = dict.keys(); // do an initial loop and separate the attributes in different groups while (keys.hasMoreElements()) { - String k = (String) keys.nextElement(); + String k = keys.nextElement(); Object v = dict.get(k); if (k.startsWith(KARAF_PREFIX)) { // starts with Karaf-xxx @@ -170,7 +170,7 @@ public class Headers extends BundlesCommand { output.append('\n'); } - Map<String, ClauseFormatter> formatters = new HashMap<String, ClauseFormatter>(); + Map<String, ClauseFormatter> formatters = new HashMap<>(); formatters.put(REQUIRE_BUNDLE_ATTRIB, new ClauseFormatter() { public void pre(Clause clause, StringBuilder output) { boolean isSatisfied = checkBundle(clause.getName(), clause.getAttribute("bundle-version")); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/Requirements.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Requirements.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Requirements.java index 9daf9d9..3468c10 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Requirements.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Requirements.java @@ -123,7 +123,7 @@ public class Requirements extends BundlesCommand { private static Map<BundleRequirement, List<BundleWire>> aggregateRequirements( Pattern namespace, List<BundleWire> wires) { // Aggregate matching capabilities. - Map<BundleRequirement, List<BundleWire>> map = new HashMap<BundleRequirement, List<BundleWire>>(); + Map<BundleRequirement, List<BundleWire>> map = new HashMap<>(); for (BundleWire wire : wires) { if (matchNamespace(namespace, wire.getRequirement().getNamespace())) { map.computeIfAbsent(wire.getRequirement(), k -> new ArrayList<>()).add(wire); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/Restart.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Restart.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Restart.java index fd4c3d7..1ca7213 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Restart.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Restart.java @@ -38,7 +38,7 @@ public class Restart extends BundlesCommand { System.err.println("No bundles specified."); return null; } - List<Exception> exceptions = new ArrayList<Exception>(); + List<Exception> exceptions = new ArrayList<>(); for (Bundle bundle : bundles) { try { bundle.stop(Bundle.STOP_TRANSIENT); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/Services.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Services.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Services.java index b8b4a9b..47167a3 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Services.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Services.java @@ -41,9 +41,9 @@ public class Services extends BundlesCommand { @Option(name = "-p", aliases = {}, description = "Shows the properties of the services", required = false, multiValued = false) boolean showProperties = false; - Set<String> hidden = new HashSet<String>(Arrays.asList(new String[] { - "org.apache.felix.service.command.Function", - "org.apache.karaf.shell.console.Completer" + Set<String> hidden = new HashSet<>(Arrays.asList(new String[] { + "org.apache.felix.service.command.Function", + "org.apache.karaf.shell.console.Completer" })); @Override http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java index befa598..06f7ea7 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java @@ -64,7 +64,7 @@ public class ShowBundleTree extends BundleCommand { long start = System.currentTimeMillis(); // let's do the real work here printHeader(bundle); - tree = new Tree<Bundle>(bundle); + tree = new Tree<>(bundle); createTree(bundle); printTree(tree); printDuplicatePackages(tree); @@ -126,7 +126,7 @@ public class ShowBundleTree extends BundleCommand { */ private void printDuplicatePackages(Tree<Bundle> tree) { Set<Bundle> bundles = tree.flatten(); - Map<String, Set<Bundle>> exports = new HashMap<String, Set<Bundle>>(); + Map<String, Set<Bundle>> exports = new HashMap<>(); for (Bundle bundle : bundles) { for (BundleRevision revision : bundle.adapt(BundleRevisions.class).getRevisions()) { @@ -230,7 +230,7 @@ public class ShowBundleTree extends BundleCommand { */ private void createNode(Node<Bundle> node) { Bundle bundle = node.getValue(); - Collection<Bundle> exporters = new HashSet<Bundle>(); + Collection<Bundle> exporters = new HashSet<>(); exporters.addAll(bundleService.getWiredBundles(bundle).values()); for (Bundle exporter : exporters) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/command/bundletree/Node.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/bundletree/Node.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/bundletree/Node.java index 7d0e5ad..28bff3e 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/bundletree/Node.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/bundletree/Node.java @@ -29,7 +29,7 @@ public class Node<T> { private final T value; private Node<T> parent; - private List<Node<T>> children = new LinkedList<Node<T>>(); + private List<Node<T>> children = new LinkedList<>(); /** * Create a new node. Only meant for wrapper use, @@ -79,7 +79,7 @@ public class Node<T> { * @return the child node. */ public Node<T> addChild(T value) { - Node<T> node = new Node<T>(value, this); + Node<T> node = new Node<>(value, this); children.add(node); return node; } @@ -90,7 +90,7 @@ public class Node<T> { * @return the set of values. */ public Set<T> flatten() { - Set<T> result = new HashSet<T>(); + Set<T> result = new HashSet<>(); result.add(getValue()); for (Node<T> child : getChildren()) { result.addAll(child.flatten()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleInfoImpl.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleInfoImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleInfoImpl.java index 7fd811c..25cb642 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleInfoImpl.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleInfoImpl.java @@ -47,7 +47,7 @@ public class BundleInfoImpl implements BundleInfo { private static Map<Integer, BundleState> bundleStateMap; static { - bundleStateMap = new HashMap<Integer, BundleState>(); + bundleStateMap = new HashMap<>(); bundleStateMap.put(Bundle.ACTIVE, BundleState.Active); bundleStateMap.put(Bundle.INSTALLED, BundleState.Installed); bundleStateMap.put(Bundle.RESOLVED, BundleState.Resolved); @@ -58,11 +58,11 @@ public class BundleInfoImpl implements BundleInfo { public BundleInfoImpl(Bundle bundle, BundleState extState) { BundleStartLevel bsl = bundle.adapt(BundleStartLevel.class); this.startLevel = bsl.getStartLevel(); - this.name = (String)bundle.getHeaders().get(Constants.BUNDLE_NAME); + this.name = bundle.getHeaders().get(Constants.BUNDLE_NAME); this.symbolicName = bundle.getSymbolicName(); - String locationFromHeader = (String)bundle.getHeaders().get(Constants.BUNDLE_UPDATELOCATION); + String locationFromHeader = bundle.getHeaders().get(Constants.BUNDLE_UPDATELOCATION); this.updateLocation = locationFromHeader != null ? locationFromHeader : bundle.getLocation(); - this.version = (String)bundle.getHeaders().get(Constants.BUNDLE_VERSION); + this.version = bundle.getHeaders().get(Constants.BUNDLE_VERSION); this.revisions = populateRevisions(bundle); this.bundleId = bundle.getBundleId(); this.state = (extState != BundleState.Unknown) ? extState : getBundleState(bundle); @@ -71,8 +71,8 @@ public class BundleInfoImpl implements BundleInfo { private void populateFragementInfos(Bundle bundle) { this.isFragment = bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null; - this.fragments = new ArrayList<Bundle>(); - this.fragmentHosts = new ArrayList<Bundle>(); + this.fragments = new ArrayList<>(); + this.fragmentHosts = new ArrayList<>(); BundleRevisions revisions = bundle.adapt(BundleRevisions.class); if (revisions == null) { return; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java index bf0c697..f2a11de 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java @@ -54,7 +54,7 @@ public class BundleWatcherImpl implements Runnable, BundleListener, BundleWatche private AtomicBoolean running = new AtomicBoolean(false); private long interval = 1000L; - private List<String> watchURLs = new CopyOnWriteArrayList<String>(); + private List<String> watchURLs = new CopyOnWriteArrayList<>(); private AtomicInteger counter = new AtomicInteger(0); public BundleWatcherImpl(BundleContext bundleContext, MavenConfigService mavenConfigService, BundleService bundleService) { @@ -76,7 +76,7 @@ public class BundleWatcherImpl implements Runnable, BundleListener, BundleWatche public void run() { logger.debug("Bundle watcher thread started"); int oldCounter = -1; - Set<Bundle> watchedBundles = new HashSet<Bundle>(); + Set<Bundle> watchedBundles = new HashSet<>(); while (running.get() && watchURLs.size() > 0) { if (oldCounter != counter.get()) { oldCounter = counter.get(); @@ -95,7 +95,7 @@ public class BundleWatcherImpl implements Runnable, BundleListener, BundleWatche // Get the wiring before any in case of a refresh of a dependency FrameworkWiring wiring = bundleContext.getBundle(0).adapt(FrameworkWiring.class); File localRepository = this.localRepoDetector.getLocalRepository(); - List<Bundle> updated = new ArrayList<Bundle>(); + List<Bundle> updated = new ArrayList<>(); for (Bundle bundle : watchedBundles) { try { updateBundleIfNecessary(localRepository, updated, bundle); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/osgi/Activator.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/osgi/Activator.java index 7dfdde1..b9e4687 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/osgi/Activator.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/osgi/Activator.java @@ -50,7 +50,7 @@ public class Activator extends BaseActivator { final BundleServiceImpl bundleService = new BundleServiceImpl(bundleContext); register(BundleService.class, bundleService); - bundleStateServicesTracker = new ServiceTracker<BundleStateService, BundleStateService>( + bundleStateServicesTracker = new ServiceTracker<>( bundleContext, BundleStateService.class, new ServiceTrackerCustomizer<BundleStateService, BundleStateService>() { @Override public BundleStateService addingService(ServiceReference<BundleStateService> reference) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/test/java/org/apache/karaf/bundle/command/TestBundleFactory.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/test/java/org/apache/karaf/bundle/command/TestBundleFactory.java b/bundle/core/src/test/java/org/apache/karaf/bundle/command/TestBundleFactory.java index 6912c41..121d857 100644 --- a/bundle/core/src/test/java/org/apache/karaf/bundle/command/TestBundleFactory.java +++ b/bundle/core/src/test/java/org/apache/karaf/bundle/command/TestBundleFactory.java @@ -36,11 +36,11 @@ public class TestBundleFactory { if (keyProp.length % 2 != 0) { throw new IllegalArgumentException(""); } - Hashtable<String, Object> keyPropMap = new Hashtable<String, Object>(); + Hashtable<String, Object> keyPropMap = new Hashtable<>(); int c = 0; while (c < keyProp.length) { String key = (String)keyProp[c++]; - Object value = (Object)keyProp[c++]; + Object value = keyProp[c++]; keyPropMap.put(key, value); expect(serviceRef.getProperty(key)).andReturn(value).anyTimes(); } @@ -51,7 +51,7 @@ public class TestBundleFactory { Bundle createBundle(long id, String name) { Bundle bundle = createMock(Bundle.class); expect(bundle.getBundleId()).andReturn(id).anyTimes(); - Dictionary<String, String> headers = new Hashtable<String, String>(); + Dictionary<String, String> headers = new Hashtable<>(); headers.put(Constants.BUNDLE_NAME, name); expect(bundle.getHeaders()).andReturn(headers).anyTimes(); return bundle; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/test/java/org/apache/karaf/bundle/command/bundletree/TreeTest.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/test/java/org/apache/karaf/bundle/command/bundletree/TreeTest.java b/bundle/core/src/test/java/org/apache/karaf/bundle/command/bundletree/TreeTest.java index 42bb6ce..35ae220 100644 --- a/bundle/core/src/test/java/org/apache/karaf/bundle/command/bundletree/TreeTest.java +++ b/bundle/core/src/test/java/org/apache/karaf/bundle/command/bundletree/TreeTest.java @@ -40,7 +40,7 @@ public class TreeTest { @Test public void writeTreeWithOneChild() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); tree.addChild("child"); BufferedReader reader = read(tree); @@ -51,7 +51,7 @@ public class TreeTest { @Test public void writeTreeWithOneChildAndNodeConverter() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); tree.addChild("child"); StringWriter writer = new StringWriter(); @@ -69,7 +69,7 @@ public class TreeTest { @Test public void writeTreeWithChildAndGrandChild() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); Node<String> node = tree.addChild("child"); node.addChild("grandchild"); @@ -82,7 +82,7 @@ public class TreeTest { @Test public void writeTreeWithTwoChildrenAndOneGrandchild() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); Node<String> child = tree.addChild("child1"); child.addChild("grandchild"); tree.addChild("child2"); @@ -97,7 +97,7 @@ public class TreeTest { @Test public void flattenTree() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); Node<String> child1 = tree.addChild("child1"); child1.addChild("grandchild"); Node<String> child2 = tree.addChild("child2"); @@ -114,7 +114,7 @@ public class TreeTest { @Test public void hasAncestor() throws IOException { - Tree<String> tree = new Tree<String>("root"); + Tree<String> tree = new Tree<>("root"); Node<String> child1 = tree.addChild("child1"); child1.addChild("grandchild"); Node<String> child2 = tree.addChild("child2"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/core/src/test/java/org/apache/karaf/bundle/core/internal/MavenConfigServiceTest.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/test/java/org/apache/karaf/bundle/core/internal/MavenConfigServiceTest.java b/bundle/core/src/test/java/org/apache/karaf/bundle/core/internal/MavenConfigServiceTest.java index 77eda63..772aa73 100644 --- a/bundle/core/src/test/java/org/apache/karaf/bundle/core/internal/MavenConfigServiceTest.java +++ b/bundle/core/src/test/java/org/apache/karaf/bundle/core/internal/MavenConfigServiceTest.java @@ -26,27 +26,27 @@ public class MavenConfigServiceTest { @Test public void testLocalRepoEmpty() throws Exception { - Hashtable<String, Object> config = new Hashtable<String, Object>(); + Hashtable<String, Object> config = new Hashtable<>(); assertEquals(null, MavenConfigService.getLocalRepoFromConfig(config)); } @Test public void testLocalRepoExplicit() throws Exception { - Hashtable<String, Object> config = new Hashtable<String, Object>(); + Hashtable<String, Object> config = new Hashtable<>(); config.put("org.ops4j.pax.url.mvn.localRepository", "foo/bar"); assertEquals("foo/bar", MavenConfigService.getLocalRepoFromConfig(config)); } @Test public void testLocalRepoFromSettings() throws Exception { - Hashtable<String, Object> config = new Hashtable<String, Object>(); + Hashtable<String, Object> config = new Hashtable<>(); config.put("org.ops4j.pax.url.mvn.settings", getClass().getResource("/settings.xml").getPath()); assertEquals("foo/bar", MavenConfigService.getLocalRepoFromConfig(config)); } @Test public void testLocalRepoFromSettingsNs() throws Exception { - Hashtable<String, Object> config = new Hashtable<String, Object>(); + Hashtable<String, Object> config = new Hashtable<>(); config.put("org.ops4j.pax.url.mvn.settings", getClass().getResource("/settings2.xml").getPath()); assertEquals("foo/bar", MavenConfigService.getLocalRepoFromConfig(config)); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java ---------------------------------------------------------------------- diff --git a/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java b/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java index fb7d4f0..857364f 100644 --- a/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java +++ b/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java @@ -46,7 +46,7 @@ public class SpringStateService private final Map<Long, OsgiBundleApplicationContextEvent> states; public SpringStateService() { - this.states = new ConcurrentHashMap<Long, OsgiBundleApplicationContextEvent>(); + this.states = new ConcurrentHashMap<>(); } public String getName() { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java b/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java index d20dee2..76d8144 100644 --- a/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java +++ b/client/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java @@ -33,7 +33,7 @@ public class SimpleLoggerFactory implements ILoggerFactory { Map<String, Logger> loggerMap; public SimpleLoggerFactory() { - loggerMap = new HashMap<String, Logger>(); + loggerMap = new HashMap<>(); } /** @@ -43,7 +43,7 @@ public class SimpleLoggerFactory implements ILoggerFactory { Logger slogger = null; // protect against concurrent access of the loggerMap synchronized (this) { - slogger = (Logger) loggerMap.get(name); + slogger = loggerMap.get(name); if (slogger == null) { slogger = new SimpleLogger(name); loggerMap.put(name, slogger); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/main/java/org/apache/karaf/config/command/ListCommand.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/config/command/ListCommand.java b/config/src/main/java/org/apache/karaf/config/command/ListCommand.java index fb8ef9b..b4df5c6 100644 --- a/config/src/main/java/org/apache/karaf/config/command/ListCommand.java +++ b/config/src/main/java/org/apache/karaf/config/command/ListCommand.java @@ -37,7 +37,7 @@ public class ListCommand extends ConfigCommandSupport { protected Object doExecute() throws Exception { Configuration[] configs = configRepository.getConfigAdmin().listConfigurations(query); if (configs != null) { - Map<String, Configuration> sortedConfigs = new TreeMap<String, Configuration>(); + Map<String, Configuration> sortedConfigs = new TreeMap<>(); for (Configuration config : configs) { sortedConfigs.put(config.getPid(), config); } @@ -52,7 +52,7 @@ public class ListCommand extends ConfigCommandSupport { if (config.getProperties() != null) { System.out.println("Properties:"); Dictionary props = config.getProperties(); - Map<String, Object> sortedProps = new TreeMap<String, Object>(); + Map<String, Object> sortedProps = new TreeMap<>(); for (Enumeration e = props.keys(); e.hasMoreElements();) { Object key = e.nextElement(); sortedProps.put(key.toString(), props.get(key)); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java b/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java index 8443f93..c65e7e2 100644 --- a/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java +++ b/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java @@ -138,7 +138,7 @@ public class MetaCommand extends ConfigCommandSupport { return; } Configuration config = configRepository.getConfigAdmin().getConfiguration(pid); - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); for (AttributeDefinition attr : attrs) { String valueStr = getDefaultValueStr(attr.getDefaultValue()); if (valueStr != null) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java index fe60c56..b0cef13 100644 --- a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java +++ b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java @@ -75,7 +75,7 @@ public class ConfigurationCompleter implements Completer, ConfigurationListener return; } - Collection<String> pids = new ArrayList<String>(); + Collection<String> pids = new ArrayList<>(); for (Configuration config : configs) { pids.add(config.getPid()); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java index a74664d..2805dfb 100644 --- a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java +++ b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java @@ -97,7 +97,7 @@ public class ConfigurationPropertyCompleter implements Completer { */ @SuppressWarnings("rawtypes") private Set<String> getPropertyNames(String pid) { - Set<String> propertyNames = new HashSet<String>(); + Set<String> propertyNames = new HashSet<>(); if (pid != null) { Configuration configuration = null; try { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java b/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java index a258334..6e33916 100644 --- a/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java +++ b/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java @@ -64,7 +64,7 @@ public class MetaCompleter implements Completer, BundleListener { @Override public List<String> callWith(MetaTypeService metatypeService) { - List<String> pids = new ArrayList<String>(); + List<String> pids = new ArrayList<>(); Bundle[] bundles = context.getBundles(); for (Bundle bundle : bundles) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java b/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java index 9737ab6..70c457f 100644 --- a/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java +++ b/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java @@ -57,7 +57,7 @@ public class EditCommandTest extends TestCase { replay(admin); // the ConfigAdmin service returns a Dictionary for an existing PID - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); expect(config.getProperties()).andReturn(props); replay(config); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java b/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java index 33d3c24..5473370 100644 --- a/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java +++ b/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java @@ -34,7 +34,7 @@ import org.apache.karaf.shell.api.console.Terminal; */ class MockCommandSession implements Session { - private Map<String, Object> properties = new HashMap<String, Object>(); + private Map<String, Object> properties = new HashMap<>(); public void close() { // not implemented http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java b/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java index f17ba03..3de1a62 100644 --- a/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java +++ b/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java @@ -37,7 +37,7 @@ public class UpdateCommandTest extends TestCase { private static final String PID = "myPid"; public void testupdateRegularConfig() throws Exception { - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); UpdateCommand command = new UpdateCommand(); ConfigRepository configRepo = EasyMock.createMock(ConfigRepository.class); @@ -54,7 +54,7 @@ public class UpdateCommandTest extends TestCase { } public void testupdateOnNewFactoryPid() throws Exception { - Dictionary<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<>(); UpdateCommand command = new UpdateCommand(); ConfigRepository configRepo = EasyMock.createMock(ConfigRepository.class); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/osgi/Activator.java b/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/osgi/Activator.java index a7db87a..ce7f379 100644 --- a/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/osgi/Activator.java +++ b/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/osgi/Activator.java @@ -32,7 +32,7 @@ public class Activator extends BaseActivator { @Override protected void doStart() throws Exception { - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("url.handler.protocol", "blueprint"); register(URLStreamHandlerService.class, new BlueprintURLHandler(), props); register(new Class[] { ArtifactUrlTransformer.class, ArtifactListener.class }, http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java ---------------------------------------------------------------------- diff --git a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java index 2220b38..2c5bd3d 100644 --- a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java +++ b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java @@ -199,7 +199,7 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle Bundle bundle = bundleEvent.getBundle(); if (bundleEvent.getType() == BundleEvent.RESOLVED) { try { - List<URL> urls = new ArrayList<URL>(); + List<URL> urls = new ArrayList<>(); Enumeration featuresUrlEnumeration = bundle.findEntries("/META-INF/" + FEATURE_PATH + "/", "*.xml", false); while (featuresUrlEnumeration != null && featuresUrlEnumeration.hasMoreElements()) { URL url = (URL) featuresUrlEnumeration.nextElement(); @@ -208,8 +208,8 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle URI needRemovedRepo = null; for (Repository repo : featuresService.listRepositories()) { if (repo.getURI().equals(url.toURI())) { - Set<Feature> features = new HashSet<Feature>(Arrays.asList(repo.getFeatures())); - Set<String> autoInstallFeatures = new HashSet<String>(); + Set<Feature> features = new HashSet<>(Arrays.asList(repo.getFeatures())); + Set<String> autoInstallFeatures = new HashSet<>(); for(Feature feature:features) { if(feature.getInstall() != null && feature.getInstall().equals(Feature.DEFAULT_INSTALL_MODE)){ if (!featuresService.isInstalled(feature)) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/features/src/main/java/org/apache/karaf/deployer/features/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/deployer/features/src/main/java/org/apache/karaf/deployer/features/osgi/Activator.java b/deployer/features/src/main/java/org/apache/karaf/deployer/features/osgi/Activator.java index bc8b572..1a4ac44 100644 --- a/deployer/features/src/main/java/org/apache/karaf/deployer/features/osgi/Activator.java +++ b/deployer/features/src/main/java/org/apache/karaf/deployer/features/osgi/Activator.java @@ -41,7 +41,7 @@ public class Activator extends BaseActivator { return; } - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("url.handler.protocol", "feature"); FeatureURLHandler handler = new FeatureURLHandler(); register(URLStreamHandlerService.class, handler, props); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringTransformer.java ---------------------------------------------------------------------- diff --git a/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringTransformer.java b/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringTransformer.java index 236fb91..3153ef7 100644 --- a/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringTransformer.java +++ b/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringTransformer.java @@ -120,7 +120,7 @@ public class SpringTransformer { public static Set<String> analyze(Source source) throws Exception { - Set<String> refers = new TreeSet<String>(); + Set<String> refers = new TreeSet<>(); ByteArrayOutputStream bout = new ByteArrayOutputStream(); Result r = new StreamResult(bout); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/osgi/Activator.java b/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/osgi/Activator.java index 9e04a83..34089b7 100644 --- a/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/osgi/Activator.java +++ b/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/osgi/Activator.java @@ -32,7 +32,7 @@ public class Activator extends BaseActivator { @Override protected void doStart() throws Exception { - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("url.handler.protocol", "spring"); register(URLStreamHandlerService.class, new SpringURLHandler(), props); register(new Class[] { ArtifactUrlTransformer.class, ArtifactListener.class }, http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/osgi/Activator.java b/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/osgi/Activator.java index f57a98d..1a807eb 100644 --- a/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/osgi/Activator.java +++ b/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/osgi/Activator.java @@ -33,7 +33,7 @@ public class Activator extends BaseActivator { @Override protected void doStart() throws Exception { - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("service.ranking", -1); register(ArtifactUrlTransformer.class, new WrapDeploymentListener(), props); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java ---------------------------------------------------------------------- diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java index fd79511..d5923cd 100644 --- a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java +++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java @@ -45,7 +45,7 @@ public final class Dump { } public static void dump(BundleContext bundleContext, DumpDestination destination, boolean noThreadDump, boolean noHeapDump) { - List<DumpProvider> providers = new ArrayList<DumpProvider>(); + List<DumpProvider> providers = new ArrayList<>(); providers.add(new EnvironmentDumpProvider(bundleContext)); providers.add(new MemoryDumpProvider()); if (!noThreadDump) providers.add(new ThreadDumpProvider()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/providers/BundleDumpProvider.java ---------------------------------------------------------------------- diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/providers/BundleDumpProvider.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/providers/BundleDumpProvider.java index 871097e..7585702 100644 --- a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/providers/BundleDumpProvider.java +++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/providers/BundleDumpProvider.java @@ -33,7 +33,7 @@ public class BundleDumpProvider extends TextDumpProvider { /** * Static map with state mask to string representation. */ - private static Map<Integer, String> stateMap = new HashMap<Integer, String>(); + private static Map<Integer, String> stateMap = new HashMap<>(); /** * Map bundle states to string representation. http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java ---------------------------------------------------------------------- diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java index e227d27..9a32fa2 100644 --- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java +++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java @@ -42,10 +42,10 @@ public class Activator implements BundleActivator { @Override public void start(final BundleContext context) throws Exception { - registrations = new ArrayList<ServiceRegistration<DumpProvider>>(); + registrations = new ArrayList<>(); registrations.add(context.registerService(DumpProvider.class, new LogDumpProvider(context), null)); - featuresServiceTracker = new SingleServiceTracker<FeaturesService>(context, FeaturesService.class, (oldFs, newFs) -> { + featuresServiceTracker = new SingleServiceTracker<>(context, FeaturesService.class, (oldFs, newFs) -> { if (featuresProviderRegistration != null) { featuresProviderRegistration.unregister(); featuresProviderRegistration = null; @@ -62,7 +62,7 @@ public class Activator implements BundleActivator { final DiagnosticDumpMBeanImpl diagnostic = new DiagnosticDumpMBeanImpl(); diagnostic.setBundleContext(context); - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("jmx.objectname", "org.apache.karaf:type=diagnostic,name=" + System.getProperty("karaf.name")); mbeanRegistration = context.registerService( getInterfaceNames(diagnostic), @@ -81,7 +81,7 @@ public class Activator implements BundleActivator { } private String[] getInterfaceNames(Object object) { - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); for (Class cl = object.getClass(); cl != Object.class; cl = cl.getSuperclass()) { addSuperInterfaces(names, cl); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java index e386dbe..a6cdccd 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java @@ -219,7 +219,7 @@ public class InfoFeatureCommand extends FeaturesCommandSupport { if (resolved != null) { if (bundle) { - List<String> bundleLocation = new LinkedList<String>(); + List<String> bundleLocation = new LinkedList<>(); List<BundleInfo> bundles = resolved.getBundles(); for (BundleInfo bundleInfo : bundles) { bundleLocation.add(bundleInfo.getLocation()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java index 9df243b..2262308 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java @@ -75,6 +75,6 @@ public class InstallFeatureCommand extends FeaturesCommandSupport { addOption(FeaturesService.Option.DisplayFeaturesWiring, featuresWiring); addOption(FeaturesService.Option.DisplayAllWiring, allWiring); admin.setResolutionOutputFile(outputFile); - admin.installFeatures(new HashSet<String>(features), region, options); + admin.installFeatures(new HashSet<>(features), region, options); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/RegionInfoCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/RegionInfoCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/RegionInfoCommand.java index 8a3e73e..d49ae03 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/RegionInfoCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/RegionInfoCommand.java @@ -84,7 +84,7 @@ public class RegionInfoCommand implements Action { BundleContext bundleContext = this.bundleContext.getBundle(0).getBundleContext(); System.out.println(region.getName()); if (verbose || bundles) { - for (Long id : new TreeSet<Long>(region.getBundleIds())) { + for (Long id : new TreeSet<>(region.getBundleIds())) { Bundle b = bundleContext.getBundle(id); System.out.println(String.format(" %3d %s%s", id, getStateString(b), b)); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java index 55acf79..50f3b95 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java @@ -59,7 +59,7 @@ public class RepoListCommand extends FeaturesCommandSupport { private void reloadAllRepos(FeaturesService featuresService) throws Exception { System.out.println("Reloading all repositories from their urls"); System.out.println(); - List<Exception> exceptions = new ArrayList<Exception>(); + List<Exception> exceptions = new ArrayList<>(); for (Repository repo : featuresService.listRepositories()) { try { featuresService.addRepository(repo.getURI()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/RepoRefreshCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/RepoRefreshCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/RepoRefreshCommand.java index 2a3e83c..a38f5b3 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/RepoRefreshCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/RepoRefreshCommand.java @@ -43,7 +43,7 @@ public class RepoRefreshCommand extends FeaturesCommandSupport { @Override protected void doExecute(FeaturesService featuresService) throws Exception { - List<URI> uris = new ArrayList<URI>(); + List<URI> uris = new ArrayList<>(); if (nameOrUrl != null) { String effectiveVersion = (version == null) ? "LATEST" : version; URI uri = featuresService.getRepositoryUriFor(nameOrUrl, effectiveVersion); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java index 6084406..5ce3a03 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java @@ -51,6 +51,6 @@ public class UninstallFeatureCommand extends FeaturesCommandSupport { addOption(FeaturesService.Option.Simulate, simulate); addOption(FeaturesService.Option.Verbose, verbose); addOption(FeaturesService.Option.NoAutoRefreshBundles, noRefresh); - admin.uninstallFeatures(new HashSet<String>(features), region, options); + admin.uninstallFeatures(new HashSet<>(features), region, options); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java index 60fa933..483796b 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java @@ -59,7 +59,7 @@ public class Content { */ public List<Config> getConfig() { if (config == null) { - config = new ArrayList<Config>(); + config = new ArrayList<>(); } return this.config; } @@ -140,19 +140,19 @@ public class Content { } public List<org.apache.karaf.features.Dependency> getDependencies() { - return Collections.<org.apache.karaf.features.Dependency>unmodifiableList(getFeature()); + return Collections.unmodifiableList(getFeature()); } public List<BundleInfo> getBundles() { - return Collections.<BundleInfo>unmodifiableList(getBundle()); + return Collections.unmodifiableList(getBundle()); } public List<ConfigInfo> getConfigurations() { - return Collections.<ConfigInfo>unmodifiableList(getConfig()); + return Collections.unmodifiableList(getConfig()); } public List<ConfigFileInfo> getConfigurationFiles() { - return Collections.<ConfigFileInfo>unmodifiableList(getConfigfile()); + return Collections.unmodifiableList(getConfigfile()); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java index 943992a..9c28174 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java @@ -458,7 +458,7 @@ public class Feature extends Content implements org.apache.karaf.features.Featur public List<String> getResourceRepositories() { return resourceRepositories != null ? resourceRepositories - : Collections.<String>emptyList(); + : Collections.emptyList(); } public void setResourceRepositories(List<String> resourceRepositories) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/region/AbstractRegionDigraphVisitor.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/AbstractRegionDigraphVisitor.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/AbstractRegionDigraphVisitor.java index 698db1b..2165580 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/AbstractRegionDigraphVisitor.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/AbstractRegionDigraphVisitor.java @@ -34,9 +34,9 @@ import org.eclipse.equinox.region.RegionFilter; public abstract class AbstractRegionDigraphVisitor<C> implements RegionDigraphVisitor { private final Collection<C> allCandidates; - private final Deque<Set<C>> allowedDeque = new ArrayDeque<Set<C>>(); - private final Deque<Collection<C>> filteredDeque = new ArrayDeque<Collection<C>>(); - private Set<C> allowed = new HashSet<C>(); + private final Deque<Set<C>> allowedDeque = new ArrayDeque<>(); + private final Deque<Collection<C>> filteredDeque = new ArrayDeque<>(); + private Set<C> allowed = new HashSet<>(); public AbstractRegionDigraphVisitor(Collection<C> candidates) { this.allCandidates = candidates; @@ -69,7 +69,7 @@ public abstract class AbstractRegionDigraphVisitor<C> implements RegionDigraphVi public boolean preEdgeTraverse(RegionFilter regionFilter) { // Find the candidates filtered by the previous edge Collection<C> filtered = filteredDeque.isEmpty() ? allCandidates : filteredDeque.peek(); - Collection<C> candidates = new ArrayList<C>(filtered); + Collection<C> candidates = new ArrayList<>(filtered); // remove any candidates contained in the current region candidates.removeAll(allowed); // apply the filter across remaining candidates @@ -87,7 +87,7 @@ public abstract class AbstractRegionDigraphVisitor<C> implements RegionDigraphVi filteredDeque.push(candidates); // push the allowed allowedDeque.push(allowed); - allowed = new HashSet<C>(); + allowed = new HashSet<>(); return true; } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/region/OfflineResolver.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/OfflineResolver.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/OfflineResolver.java index 1c89dc2..4d9d3d0 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/OfflineResolver.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/OfflineResolver.java @@ -81,12 +81,12 @@ public class OfflineResolver { @Override public Collection<Resource> getMandatoryResources() { - List<Resource> resources = new ArrayList<Resource>(); + List<Resource> resources = new ArrayList<>(); Requirement req = new RequirementImpl( null, IDENTITY_NAMESPACE, - Collections.<String, String>emptyMap(), - Collections.<String, Object>emptyMap(), + Collections.emptyMap(), + Collections.emptyMap(), SimpleFilter.parse("(" + IDENTITY_NAMESPACE + "=root)")); Collection<Capability> identities = repository.findProviders(Collections.singleton(req)).get(req); for (Capability identity : identities) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java index f058278..7780890 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java @@ -540,7 +540,7 @@ public class Subsystem extends ResourceImpl { while ((entry = zis.getNextEntry()) != null) { if (MANIFEST_NAME.equals(entry.getName())) { Attributes attributes = new Manifest(zis).getMainAttributes(); - Map<java.lang.String, java.lang.String> headers = new HashMap<java.lang.String, java.lang.String>(); + Map<java.lang.String, java.lang.String> headers = new HashMap<>(); for (Map.Entry attr : attributes.entrySet()) { headers.put(attr.getKey().toString(), attr.getValue().toString()); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java index d90dfd7..48234c1 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java @@ -67,7 +67,7 @@ public class SubsystemResolveContext extends ResolveContext { private final Set<Resource> mandatory = new HashSet<>(); private final CandidateComparator candidateComparator = new CandidateComparator(mandatory); - private final Map<Resource, Subsystem> resToSub = new HashMap<Resource, Subsystem>(); + private final Map<Resource, Subsystem> resToSub = new HashMap<>(); private final Repository repository; private final Repository globalRepository; private final Downloader downloader; @@ -176,7 +176,7 @@ public class SubsystemResolveContext extends ResolveContext { @Override public Collection<Resource> getMandatoryResources() { - return Collections.<Resource>singleton(root); + return Collections.singleton(root); } @Override @@ -311,7 +311,7 @@ public class SubsystemResolveContext extends ResolveContext { List<Capability> identities = resource.getCapabilities(IDENTITY_NAMESPACE); if (identities != null && !identities.isEmpty()) { Capability identity = identities.iterator().next(); - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put(BUNDLE_SYMBOLICNAME_ATTRIBUTE, identity.getAttributes().get(IDENTITY_NAMESPACE)); attrs.put(BUNDLE_VERSION_ATTRIBUTE, identity.getAttributes().get(CAPABILITY_VERSION_ATTRIBUTE)); return filter.isAllowed(VISIBLE_BUNDLE_NAMESPACE, attrs); @@ -324,7 +324,7 @@ public class SubsystemResolveContext extends ResolveContext { class SubsystemRepository implements Repository { private final Repository repository; - private final Map<Subsystem, Map<Capability, Capability>> mapping = new HashMap<Subsystem, Map<Capability, Capability>>(); + private final Map<Subsystem, Map<Capability, Capability>> mapping = new HashMap<>(); public SubsystemRepository(Repository repository) { this.repository = repository; @@ -333,9 +333,9 @@ public class SubsystemResolveContext extends ResolveContext { @Override public Map<Requirement, Collection<Capability>> findProviders(Collection<? extends Requirement> requirements) { Map<Requirement, Collection<Capability>> base = repository.findProviders(requirements); - Map<Requirement, Collection<Capability>> result = new HashMap<Requirement, Collection<Capability>>(); + Map<Requirement, Collection<Capability>> result = new HashMap<>(); for (Map.Entry<Requirement, Collection<Capability>> entry : base.entrySet()) { - List<Capability> caps = new ArrayList<Capability>(); + List<Capability> caps = new ArrayList<>(); Subsystem ss = getSubsystem(entry.getKey().getResource()); while (!ss.isAcceptDependencies()) { ss = ss.getParent(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java index 2a8497b..d131d65 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java @@ -168,7 +168,7 @@ public class SubsystemResolver { if (root != null) { return root.collectPrerequisites(); } - return new HashSet<String>(); + return new HashSet<>(); } public Map<Resource, List<Wire>> resolve( @@ -272,8 +272,8 @@ public class SubsystemResolver { Requirement req = new RequirementImpl( null, IDENTITY_NAMESPACE, - Collections.<String, String>emptyMap(), - Collections.<String, Object>emptyMap(), + Collections.emptyMap(), + Collections.emptyMap(), new SimpleFilter(null, null, SimpleFilter.MATCH_ALL)); Collection<Capability> identities = repository.findProviders(Collections.singleton(req)).get(req); List<Object> resources = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java b/features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java index 0d5e83d..caac614 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/repository/AggregateRepository.java @@ -37,9 +37,9 @@ public class AggregateRepository implements Repository { @Override public Map<Requirement, Collection<Capability>> findProviders(Collection<? extends Requirement> requirements) { - Map<Requirement, Collection<Capability>> result = new HashMap<Requirement, Collection<Capability>>(); + Map<Requirement, Collection<Capability>> result = new HashMap<>(); for (Requirement requirement : requirements) { - List<Capability> caps = new ArrayList<Capability>(); + List<Capability> caps = new ArrayList<>(); for (Repository repository : repositories) { Map<Requirement, Collection<Capability>> resMap = repository.findProviders(Collections.singleton(requirement)); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java b/features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java index 3ce96df..5b81a12 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/repository/BaseRepository.java @@ -43,8 +43,8 @@ public class BaseRepository implements Repository { protected final Map<String, CapabilitySet> capSets; public BaseRepository() { - this.resources = new ArrayList<Resource>(); - this.capSets = new HashMap<String, CapabilitySet>(); + this.resources = new ArrayList<>(); + this.capSets = new HashMap<>(); } public BaseRepository(Collection<Resource> resources) { @@ -68,7 +68,7 @@ public class BaseRepository implements Repository { @Override public Map<Requirement, Collection<Capability>> findProviders(Collection<? extends Requirement> requirements) { - Map<Requirement, Collection<Capability>> result = new HashMap<Requirement, Collection<Capability>>(); + Map<Requirement, Collection<Capability>> result = new HashMap<>(); for (Requirement requirement : requirements) { CapabilitySet set = capSets.get(requirement.getNamespace()); if (set != null) { @@ -83,7 +83,7 @@ public class BaseRepository implements Repository { } result.put(requirement, set.match(sf, true)); } else { - result.put(requirement, Collections.<Capability>emptyList()); + result.put(requirement, Collections.emptyList()); } } return result; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java b/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java index 7d8e084..48de660 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java @@ -48,7 +48,7 @@ public class XmlRepository extends BaseRepository { protected final String url; protected final long expiration; protected final boolean ignoreFailures; - protected final Map<String, XmlLoader> loaders = new HashMap<String, XmlLoader>(); + protected final Map<String, XmlLoader> loaders = new HashMap<>(); protected final ReadWriteLock lock = new ReentrantReadWriteLock(); public XmlRepository(String url, long expiration, boolean ignoreFailures) { @@ -102,7 +102,7 @@ public class XmlRepository extends BaseRepository { private boolean hasResource(String type, String name, Version version) { CapabilitySet set = capSets.get(IDENTITY_NAMESPACE); if (set != null) { - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put(CAPABILITY_TYPE_ATTRIBUTE, type); attrs.put(IDENTITY_NAMESPACE, name); attrs.put(CAPABILITY_VERSION_ATTRIBUTE, version);
