http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java ---------------------------------------------------------------------- diff --git a/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java b/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java index ab9b255..93e5add 100644 --- a/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java +++ b/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java @@ -54,7 +54,7 @@ public enum RolePolicy { private String value; - private static final Map<String, RolePolicy> policies = new HashMap<String, RolePolicy>(); + private static final Map<String, RolePolicy> policies = new HashMap<>(); static { for (RolePolicy s : EnumSet.allOf(RolePolicy.class)) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java b/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java index e1da418..0ef7a28d 100644 --- a/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java +++ b/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java @@ -89,14 +89,14 @@ public abstract class JaasCommandSupport implements Action { if (hidden) { return realms; } else { - Map<String, JaasRealm> map = new TreeMap<String, JaasRealm>(); + Map<String, JaasRealm> map = new TreeMap<>(); for (JaasRealm realm : realms) { if (!map.containsKey(realm.getName()) || realm.getRank() > map.get(realm.getName()).getRank()) { map.put(realm.getName(), realm); } } - return new ArrayList<JaasRealm>(map.values()); + return new ArrayList<>(map.values()); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java index 13a0031..ecf1588 100644 --- a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java +++ b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java @@ -67,7 +67,7 @@ public class ListUsersCommand extends JaasCommandSupport { table.column("Role"); for (UserPrincipal user : users) { - List<String> reportedRoles = new ArrayList<String>(); + List<String> reportedRoles = new ArrayList<>(); String userName = user.getName(); for (GroupPrincipal group : engine.listGroups(user)) { @@ -95,7 +95,7 @@ public class ListUsersCommand extends JaasCommandSupport { } private List<String> displayGroupRoles(BackingEngine engine, String userName, GroupPrincipal group, ShellTable table) { - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); List<RolePrincipal> roles = engine.listRoles(group); if (roles != null && roles.size() >= 1) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java index dd1e350..f7855aa 100644 --- a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java +++ b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java @@ -138,7 +138,7 @@ public class ManageRealmCommand extends JaasCommandSupport { commands = (Queue<JaasCommandSupport>) this.session.get(JAAS_CMDS); if (commands == null) { - commands = new LinkedList<JaasCommandSupport>(); + commands = new LinkedList<>(); } this.session.put(JAAS_REALM, realm); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java b/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java index 3b9655d..f3c4f94 100644 --- a/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java +++ b/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java @@ -58,7 +58,7 @@ public class LoginModuleNameCompleter implements Completer { * @return */ private List<String> findLoginModuleClassNames(JaasRealm realm) { - List<String> moduleClassNames = new LinkedList<String>(); + List<String> moduleClassNames = new LinkedList<>(); for (AppConfigurationEntry entry : realm.getEntries()) { String moduleClass = (String) entry.getOptions().get(ProxyLoginModule.PROPERTY_MODULE); if (moduleClass != null) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/command/src/test/java/org/apache/karaf/jaas/command/ManageRealmCommandTest.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/test/java/org/apache/karaf/jaas/command/ManageRealmCommandTest.java b/jaas/command/src/test/java/org/apache/karaf/jaas/command/ManageRealmCommandTest.java index d9458c7..633fbf9 100644 --- a/jaas/command/src/test/java/org/apache/karaf/jaas/command/ManageRealmCommandTest.java +++ b/jaas/command/src/test/java/org/apache/karaf/jaas/command/ManageRealmCommandTest.java @@ -70,7 +70,7 @@ public class ManageRealmCommandTest { // prepare command cmd.index = index; - cmd.setRealms(Arrays.<JaasRealm> asList(realms)); + cmd.setRealms(Arrays.asList(realms)); cmd.setSession(session); for (Config realm : realms) http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Activator.java ---------------------------------------------------------------------- diff --git a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Activator.java b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Activator.java index 9fc6e53..727b66b 100644 --- a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Activator.java +++ b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Activator.java @@ -40,7 +40,7 @@ public class Activator implements BundleActivator { final OsgiKeystoreManager keystoreManager = new OsgiKeystoreManager(); - keystoreInstanceServiceTracker = new ServiceTracker<KeystoreInstance, KeystoreInstance>( + keystoreInstanceServiceTracker = new ServiceTracker<>( context, KeystoreInstance.class, new ServiceTrackerCustomizer<KeystoreInstance, KeystoreInstance>() { @Override public KeystoreInstance addingService(ServiceReference<KeystoreInstance> reference) { @@ -48,9 +48,11 @@ public class Activator implements BundleActivator { keystoreManager.register(service, null); return service; } + @Override public void modifiedService(ServiceReference<KeystoreInstance> reference, KeystoreInstance service) { } + @Override public void removedService(ServiceReference<KeystoreInstance> reference, KeystoreInstance service) { keystoreManager.unregister(service, null); @@ -62,7 +64,7 @@ public class Activator implements BundleActivator { osgiConfiguration = new OsgiConfiguration(); osgiConfiguration.init(); - jaasRealmServiceTracker = new ServiceTracker<JaasRealm, JaasRealm>( + jaasRealmServiceTracker = new ServiceTracker<>( context, JaasRealm.class, new ServiceTrackerCustomizer<JaasRealm, JaasRealm>() { @Override public JaasRealm addingService(ServiceReference<JaasRealm> reference) { @@ -70,9 +72,11 @@ public class Activator implements BundleActivator { osgiConfiguration.register(service, null); return service; } + @Override public void modifiedService(ServiceReference<JaasRealm> reference, JaasRealm service) { - } + } + @Override public void removedService(ServiceReference<JaasRealm> reference, JaasRealm service) { osgiConfiguration.unregister(service, null); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Config.java ---------------------------------------------------------------------- diff --git a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Config.java b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Config.java index b7966b1..aecfd67 100644 --- a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Config.java +++ b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/Config.java @@ -75,7 +75,7 @@ public class Config implements JaasRealm { Module[] modules = this.modules; AppConfigurationEntry[] entries = new AppConfigurationEntry[modules.length]; for (int i = 0; i < modules.length; i++) { - Map<String,Object> options = new HashMap<String,Object>(); + Map<String,Object> options = new HashMap<>(); // put the bundle context in the options map // it's required to be able to use the encryption service // in the AbstractKarafLoginModule http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java ---------------------------------------------------------------------- diff --git a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java index cdc2471..8d46999 100644 --- a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java +++ b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class OsgiConfiguration extends Configuration { - private final List<JaasRealm> realms = new CopyOnWriteArrayIdentityList<JaasRealm>(); + private final List<JaasRealm> realms = new CopyOnWriteArrayIdentityList<>(); private Configuration defaultConfiguration; public void init() { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java ---------------------------------------------------------------------- diff --git a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java index 878b9e8..87b745f 100644 --- a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java +++ b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java @@ -38,7 +38,7 @@ public class OsgiKeystoreManager implements KeystoreManager { private final static transient Logger logger = LoggerFactory.getLogger(OsgiKeystoreManager.class); - private List<KeystoreInstance> keystores = new CopyOnWriteArrayIdentityList<KeystoreInstance>(); + private List<KeystoreInstance> keystores = new CopyOnWriteArrayIdentityList<>(); public void register(KeystoreInstance keystore, Map<String, ?> properties) { keystores.add(keystore); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/Activator.java ---------------------------------------------------------------------- diff --git a/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/Activator.java b/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/Activator.java index bbb3eac..483ef35 100644 --- a/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/Activator.java +++ b/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/Activator.java @@ -29,7 +29,7 @@ public class Activator implements BundleActivator { @Override public void start(BundleContext context) throws Exception { - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("name", "jasypt"); registration = context.registerService( EncryptionService.class, http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java ---------------------------------------------------------------------- diff --git a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java index a118ef9..e3d8cd4 100644 --- a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java +++ b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java @@ -32,7 +32,7 @@ public class JasyptEncryptionTest extends TestCase { * @see junit.framework.TestCase#setUp() */ public void setUp() { - Map<String,String> props = new HashMap<String,String>(); + Map<String,String> props = new HashMap<>(); props.put(EncryptionService.ALGORITHM, "MD5"); this.encryption = new JasyptEncryption(props); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java index 6f821e7..7f7807b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java @@ -33,7 +33,7 @@ import org.osgi.framework.BundleContext; */ public abstract class AbstractKarafLoginModule implements LoginModule { - protected Set<Principal> principals = new HashSet<Principal>(); + protected Set<Principal> principals = new HashSet<>(); protected Subject subject; protected String user; protected CallbackHandler callbackHandler; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java index 7581a6a..8375013 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java @@ -67,7 +67,7 @@ public class EventAdminAuditLoginModule extends AbstractAuditLoginModule { if (ref != null) { EventAdmin eventAdmin = bundleContext.getService(ref); try { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("type", topic.substring(topic.lastIndexOf("/") + 1).toLowerCase()); props.put("timestamp", System.currentTimeMillis()); props.put("username", username); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java index 18e695d..ff2f12a 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java @@ -49,7 +49,7 @@ public class EncryptionSupport { public Encryption getEncryption() { if (encryption == null) { - Map<String, String> encOpts = new HashMap<String, String>(); + Map<String, String> encOpts = new HashMap<>(); for (String key : options.keySet()) { if (key.startsWith("encryption.")) { encOpts.put(key.substring("encryption.".length()), options.get(key).toString()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java index 7998dc3..8e4c99d 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java @@ -61,7 +61,7 @@ public class KarafRealm implements JaasRealm { @Override public AppConfigurationEntry[] getEntries() { - Map<String, Object> propertiesOptions = new HashMap<String, Object>(); + Map<String, Object> propertiesOptions = new HashMap<>(); propertiesOptions.put(BundleContext.class.getName(), bundleContext); propertiesOptions.put(ProxyLoginModule.PROPERTY_MODULE, PROPERTIES_MODULE); propertiesOptions.put(ProxyLoginModule.PROPERTY_BUNDLE, Long.toString(bundleContext.getBundle().getBundleId())); @@ -74,7 +74,7 @@ public class KarafRealm implements JaasRealm { propertiesOptions.put("encryption.algorithm", properties.get("encryption.algorithm")); propertiesOptions.put("encryption.encoding", properties.get("encryption.encoding")); - Map<String, Object> publicKeyOptions = new HashMap<String, Object>(); + Map<String, Object> publicKeyOptions = new HashMap<>(); publicKeyOptions.put(BundleContext.class.getName(), bundleContext); publicKeyOptions.put(ProxyLoginModule.PROPERTY_MODULE, PUBLIC_KEY_MODULE); publicKeyOptions.put(ProxyLoginModule.PROPERTY_BUNDLE, Long.toString(bundleContext.getBundle().getBundleId())); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java index 3266c90..b189057 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java @@ -106,7 +106,7 @@ public class LDAPLoginModule extends AbstractKarafLoginModule { tmpPassword = new char[0]; } String password = new String(tmpPassword); - principals = new HashSet<Principal>(); + principals = new HashSet<>(); LDAPCache cache = LDAPCache.getCache(options); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java index 3f2ba44..f2c130b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java @@ -120,7 +120,7 @@ public class LDAPOptions { } private Map<String, Set<String>> parseRoleMapping(String option) { - Map<String, Set<String>> roleMapping = new HashMap<String, Set<String>>(); + Map<String, Set<String>> roleMapping = new HashMap<>(); if (option != null) { LOGGER.debug("Parse role mapping {}", option); String[] mappings = option.split(";"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/ManagedSSLSocketFactory.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/ManagedSSLSocketFactory.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/ManagedSSLSocketFactory.java index 3796068..e4d464b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/ManagedSSLSocketFactory.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/ManagedSSLSocketFactory.java @@ -22,7 +22,7 @@ import javax.net.ssl.SSLSocketFactory; public class ManagedSSLSocketFactory extends SSLSocketFactory implements Comparator<Object> { - private static final ThreadLocal<SSLSocketFactory> factories = new ThreadLocal<SSLSocketFactory>(); + private static final ThreadLocal<SSLSocketFactory> factories = new ThreadLocal<>(); public static void setSocketFactory(SSLSocketFactory factory) { factories.set(factory); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java index 3c7b08a..c5d03f0 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java @@ -86,7 +86,7 @@ public class OsgiConfigLoginModule extends AbstractKarafLoginModule { } } - principals = new HashSet<Principal>(); + principals = new HashSet<>(); principals.add(new UserPrincipal(user)); for (int i = 1; i < infos.length; i++) { principals.add(new RolePrincipal(infos[i])); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java index ffbd9cc..5ddf7d4 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java @@ -163,7 +163,7 @@ public class DigestPasswordLoginModule extends AbstractKarafLoginModule { // user infos container read from the users properties file String userInfos = null; try { - userInfos = (String) users.get(user); + userInfos = users.get(user); } catch (NullPointerException e) { //error handled in the next statement } @@ -205,13 +205,13 @@ public class DigestPasswordLoginModule extends AbstractKarafLoginModule { } } - principals = new HashSet<Principal>(); + principals = new HashSet<>(); principals.add(new UserPrincipal(user)); for (int i = 1; i < infos.length; i++) { if (infos[i].trim().startsWith(PropertiesBackingEngine.GROUP_PREFIX)) { // it's a group reference principals.add(new GroupPrincipal(infos[i].trim().substring(PropertiesBackingEngine.GROUP_PREFIX.length()))); - String groupInfo = (String) users.get(infos[i].trim()); + String groupInfo = users.get(infos[i].trim()); if (groupInfo != null) { String[] roles = groupInfo.split(","); for (int j = 1; j < roles.length; j++) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java index 77e9e2e..1c3a85b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java @@ -71,7 +71,7 @@ public class PropertiesBackingEngine implements BackingEngine { } } - String userInfos = (String) users.get(username); + String userInfos = users.get(username); //If user already exists, update password if (userInfos != null && userInfos.length() > 0) { @@ -113,7 +113,7 @@ public class PropertiesBackingEngine implements BackingEngine { @Override public List<UserPrincipal> listUsers() { - List<UserPrincipal> result = new ArrayList<UserPrincipal>(); + List<UserPrincipal> result = new ArrayList<>(); for (Object user : users.keySet()) { String userName = (String) user; @@ -137,8 +137,8 @@ public class PropertiesBackingEngine implements BackingEngine { private List<RolePrincipal> listRoles(String name) { - List<RolePrincipal> result = new ArrayList<RolePrincipal>(); - String userInfo = (String) users.get(name); + List<RolePrincipal> result = new ArrayList<>(); + String userInfo = users.get(name); String[] infos = userInfo.split(","); for (int i = 1; i < infos.length; i++) { String roleName = infos[i]; @@ -160,7 +160,7 @@ public class PropertiesBackingEngine implements BackingEngine { @Override public void addRole(String username, String role) { - String userInfos = (String) users.get(username); + String userInfos = users.get(username); if (userInfos != null) { for (RolePrincipal rp : listRoles(username)) { if (role.equals(rp.getName())) { @@ -187,7 +187,7 @@ public class PropertiesBackingEngine implements BackingEngine { String[] infos = null; StringBuffer userInfoBuffer = new StringBuffer(); - String userInfos = (String) users.get(username); + String userInfos = users.get(username); //If user already exists, remove the role if (userInfos != null && userInfos.length() > 0) { @@ -219,8 +219,8 @@ public class PropertiesBackingEngine implements BackingEngine { } private List<GroupPrincipal> listGroups(String userName) { - List<GroupPrincipal> result = new ArrayList<GroupPrincipal>(); - String userInfo = (String) users.get(userName); + List<GroupPrincipal> result = new ArrayList<>(); + String userInfo = users.get(userName); if (userInfo != null) { String[] infos = userInfo.split(","); for (int i = 1; i < infos.length; i++) { @@ -271,7 +271,7 @@ public class PropertiesBackingEngine implements BackingEngine { } public Map<GroupPrincipal, String> listGroups() { - Map<GroupPrincipal, String> result = new HashMap<GroupPrincipal, String>(); + Map<GroupPrincipal, String> result = new HashMap<>(); for (String name : users.keySet()) { if (name.startsWith(GROUP_PREFIX)) { result.put(new GroupPrincipal(name.substring(GROUP_PREFIX.length())), users.get(name)); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java index f5a6f67..d4da774 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java @@ -107,7 +107,7 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule { String userInfos = null; try { - userInfos = (String) users.get(user); + userInfos = users.get(user); } catch (NullPointerException e) { //error handled in the next statement } @@ -132,13 +132,13 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule { } } - principals = new HashSet<Principal>(); + principals = new HashSet<>(); principals.add(new UserPrincipal(user)); for (int i = 1; i < infos.length; i++) { if (infos[i].trim().startsWith(PropertiesBackingEngine.GROUP_PREFIX)) { // it's a group reference principals.add(new GroupPrincipal(infos[i].trim().substring(PropertiesBackingEngine.GROUP_PREFIX.length()))); - String groupInfo = (String) users.get(infos[i].trim()); + String groupInfo = users.get(infos[i].trim()); if (groupInfo != null) { String[] roles = groupInfo.split(","); for (int j = 1; j < roles.length; j++) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java index cc5c079..2eb246b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java @@ -54,7 +54,7 @@ public class PublickeyBackingEngine implements BackingEngine { String newPublickey = publickey; - String userInfos = (String) users.get(username); + String userInfos = users.get(username); //If user already exists, update publickey if (userInfos != null && userInfos.length() > 0) { @@ -96,7 +96,7 @@ public class PublickeyBackingEngine implements BackingEngine { @Override public List<UserPrincipal> listUsers() { - List<UserPrincipal> result = new ArrayList<UserPrincipal>(); + List<UserPrincipal> result = new ArrayList<>(); for (Object user : users.keySet()) { String userName = (String) user; @@ -120,8 +120,8 @@ public class PublickeyBackingEngine implements BackingEngine { private List<RolePrincipal> listRoles(String name) { - List<RolePrincipal> result = new ArrayList<RolePrincipal>(); - String userInfo = (String) users.get(name); + List<RolePrincipal> result = new ArrayList<>(); + String userInfo = users.get(name); String[] infos = userInfo.split(","); for (int i = 1; i < infos.length; i++) { String roleName = infos[i]; @@ -143,7 +143,7 @@ public class PublickeyBackingEngine implements BackingEngine { @Override public void addRole(String username, String role) { - String userInfos = (String) users.get(username); + String userInfos = users.get(username); if (userInfos != null) { for (RolePrincipal rp : listRoles(username)) { if (role.equals(rp.getName())) { @@ -165,7 +165,7 @@ public class PublickeyBackingEngine implements BackingEngine { String[] infos = null; StringBuffer userInfoBuffer = new StringBuffer(); - String userInfos = (String) users.get(username); + String userInfos = users.get(username); //If user already exists, remove the role if (userInfos != null && userInfos.length() > 0) { @@ -197,8 +197,8 @@ public class PublickeyBackingEngine implements BackingEngine { } private List<GroupPrincipal> listGroups(String userName) { - List<GroupPrincipal> result = new ArrayList<GroupPrincipal>(); - String userInfo = (String) users.get(userName); + List<GroupPrincipal> result = new ArrayList<>(); + String userInfo = users.get(userName); if (userInfo != null) { String[] infos = userInfo.split(","); for (int i = 1; i < infos.length; i++) { @@ -249,7 +249,7 @@ public class PublickeyBackingEngine implements BackingEngine { } public Map<GroupPrincipal, String> listGroups() { - Map<GroupPrincipal, String> result = new HashMap<GroupPrincipal, String>(); + Map<GroupPrincipal, String> result = new HashMap<>(); for (String name : users.keySet()) { if (name.startsWith(GROUP_PREFIX)) { result.put(new GroupPrincipal(name.substring(GROUP_PREFIX.length())), users.get(name)); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java index 310e39b..e7cfdaf 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java @@ -56,7 +56,7 @@ public class PublickeyLoginModule extends AbstractKarafLoginModule { public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) { super.initialize(subject, callbackHandler, options); - usersFile = (String) options.get(USERS_FILE) + ""; + usersFile = options.get(USERS_FILE) + ""; if (debug) { LOG.debug("Initialized debug=" + debug + " usersFile=" + usersFile); } @@ -94,7 +94,7 @@ public class PublickeyLoginModule extends AbstractKarafLoginModule { String userInfos = null; try { - userInfos = (String) users.get(user); + userInfos = users.get(user); } catch (NullPointerException e) { //error handled in the next statement } @@ -119,13 +119,13 @@ public class PublickeyLoginModule extends AbstractKarafLoginModule { } } - principals = new HashSet<Principal>(); + principals = new HashSet<>(); principals.add(new UserPrincipal(user)); for (int i = 1; i < infos.length; i++) { if (infos[i].trim().startsWith(PropertiesBackingEngine.GROUP_PREFIX)) { // it's a group reference principals.add(new GroupPrincipal(infos[i].trim().substring(PropertiesBackingEngine.GROUP_PREFIX.length()))); - String groupInfo = (String) users.get(infos[i].trim()); + String groupInfo = users.get(infos[i].trim()); if (groupInfo != null) { String[] roles = groupInfo.split(","); for (int j = 1; j < roles.length; j++) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java index d3121ca..16c7352 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java @@ -159,7 +159,7 @@ public class SyncopeBackingEngine implements BackingEngine { } public List<GroupPrincipal> listGroups(UserPrincipal principal) { - return new ArrayList<GroupPrincipal>(); + return new ArrayList<>(); } public void addGroup(String username, String group) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java index ea5b94d..1af9751 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java @@ -73,7 +73,7 @@ public class SyncopeLoginModule extends AbstractKarafLoginModule { tmpPassword = new char[0]; } String password = new String(tmpPassword); - principals = new HashSet<Principal>(); + principals = new HashSet<>(); // authenticate the user on Syncope LOGGER.debug("Authenticate user {} on Syncope located {}", user, address); @@ -82,7 +82,7 @@ public class SyncopeLoginModule extends AbstractKarafLoginModule { client.getCredentialsProvider().setCredentials(AuthScope.ANY, creds); HttpGet get = new HttpGet(address + "/users/self"); get.setHeader("Content-Type", "application/xml"); - List<String> roles = new ArrayList<String>(); + List<String> roles = new ArrayList<>(); try { CloseableHttpResponse response = client.execute(get); LOGGER.debug("Syncope HTTP response status code: {}", response.getStatusLine().getStatusCode()); @@ -116,7 +116,7 @@ public class SyncopeLoginModule extends AbstractKarafLoginModule { * @throws Exception in case of extraction failure. */ protected List<String> extractingRoles(String response) throws Exception { - List<String> roles = new ArrayList<String>(); + List<String> roles = new ArrayList<>(); if (response != null && !response.isEmpty()) { // extract the <memberships> element if it exists int index = response.indexOf("<memberships>"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java index 6febdd9..96dd1cc 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java @@ -422,7 +422,7 @@ public class Krb5LoginModuleTest extends AbstractKerberosITest { private String createKeytab() throws Exception { File file = folder.newFile("test.keytab"); - List<KeytabEntry> entries = new ArrayList<KeytabEntry>(); + List<KeytabEntry> entries = new ArrayList<>(); entries.add(createKeytabEntry()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java index e93c0dd..f82934f 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java @@ -372,7 +372,7 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit { assertEquals(4, subject.getPrincipals().size()); - final List<String> roles = new ArrayList<String>(Arrays.asList("karaf", "test", "another")); + final List<String> roles = new ArrayList<>(Arrays.asList("karaf", "test", "another")); boolean foundUser = false; boolean foundRole = false; @@ -418,7 +418,7 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit { assertEquals(4, subject.getPrincipals().size()); - final List<String> roles = new ArrayList<String>(Arrays.asList("karaf", "test", "another")); + final List<String> roles = new ArrayList<>(Arrays.asList("karaf", "test", "another")); boolean foundUser = false; boolean foundRole = false; @@ -468,7 +468,7 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit { assertEquals(2, subject.getPrincipals().size()); - final List<String> roles = new ArrayList<String>(Arrays.asList("karaf")); + final List<String> roles = new ArrayList<>(Arrays.asList("karaf")); boolean foundUser = false; boolean foundRole = false; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java index e968e81..4f2a48d 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java @@ -79,7 +79,7 @@ public class LdapPoolingTest extends AbstractLdapTestUnit { System.setProperty("com.sun.jndi.ldap.connect.pool.maxsize", "2"); System.setProperty("com.sun.jndi.ldap.connect.pool.protocol", "ssl"); System.setProperty("com.sun.jndi.ldap.connect.pool.debug", "all"); - Hashtable<String, String> env = new Hashtable<String, String>(); + Hashtable<String, String> env = new Hashtable<>(); env.put("com.sun.jndi.ldap.connect.pool", "true"); env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory"); env.put("java.naming.provider.url", "ldaps://localhost:" + getLdapServer().getPortSSL() + "/ou=system"); @@ -111,7 +111,7 @@ public class LdapPoolingTest extends AbstractLdapTestUnit { System.setProperty("com.sun.jndi.ldap.connect.pool.maxsize", "2"); System.setProperty("com.sun.jndi.ldap.connect.pool.protocol", "ssl"); System.setProperty("com.sun.jndi.ldap.connect.pool.debug", "all"); - Hashtable<String, String> env = new Hashtable<String, String>(); + Hashtable<String, String> env = new Hashtable<>(); env.put("com.sun.jndi.ldap.connect.pool", "false"); env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory"); env.put("java.naming.provider.url", "ldaps://localhost:" + getLdapServer().getPortSSL() + "/ou=system"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java index 37f6965..5e75272 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java @@ -47,7 +47,7 @@ public class PropertiesLoginModuleTest { pbe.addUser("pqr", "abc"); PropertiesLoginModule module = new PropertiesLoginModule(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, f.getAbsolutePath()); CallbackHandler cb = new CallbackHandler() { @Override @@ -103,7 +103,7 @@ public class PropertiesLoginModuleTest { pbe.addUser("pqr", "abc"); PropertiesLoginModule module = new PropertiesLoginModule(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, f.getAbsolutePath()); CallbackHandler cb = new CallbackHandler() { @Override @@ -144,7 +144,7 @@ public class PropertiesLoginModuleTest { pbe.addGroupRole("group1", "r1"); PropertiesLoginModule module = new PropertiesLoginModule(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, f.getAbsolutePath()); CallbackHandler cb = new CallbackHandler() { @Override @@ -212,7 +212,7 @@ public class PropertiesLoginModuleTest { pbe.addGroupRole("group1", "r1"); PropertiesLoginModule module = new PropertiesLoginModule(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, f.getAbsolutePath()); CallbackHandler cb = new CallbackHandler() { @Override @@ -264,7 +264,7 @@ public class PropertiesLoginModuleTest { PropertiesLoginModule module = new PropertiesLoginModule(); Subject subject = new Subject(); CallbackHandler handler = new NullHandler(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, getTestUsersFile()); module.initialize(subject, handler, null, options); @@ -280,7 +280,7 @@ public class PropertiesLoginModuleTest { PropertiesLoginModule module = new PropertiesLoginModule(); Subject sub = new Subject(); CallbackHandler handler = new NamePasswordHandler("test", "test"); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, usersFilePath); module.initialize(sub, handler, null, options); module.login(); @@ -290,7 +290,7 @@ public class PropertiesLoginModuleTest { public void testNullCallbackHandler() { PropertiesLoginModule module = new PropertiesLoginModule(); Subject subject = new Subject(); - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put(PropertiesLoginModule.USER_FILE, getTestUsersFile()); module.initialize(subject, null, null, options ); try { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jms/core/src/main/java/org/apache/karaf/jms/JmsMessage.java ---------------------------------------------------------------------- diff --git a/jms/core/src/main/java/org/apache/karaf/jms/JmsMessage.java b/jms/core/src/main/java/org/apache/karaf/jms/JmsMessage.java index a85af10..acf13bf 100644 --- a/jms/core/src/main/java/org/apache/karaf/jms/JmsMessage.java +++ b/jms/core/src/main/java/org/apache/karaf/jms/JmsMessage.java @@ -28,7 +28,7 @@ import java.util.Map; */ public class JmsMessage { - private Map<String, Object> properties = new HashMap<String, Object>(); + private Map<String, Object> properties = new HashMap<>(); private String content; private String charset = "UTF-8"; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledConnection.java ---------------------------------------------------------------------- diff --git a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledConnection.java b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledConnection.java index f9b1d9c..38ccf6a 100755 --- a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledConnection.java +++ b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledConnection.java @@ -54,9 +54,9 @@ public class PooledConnection implements TopicConnection, QueueConnection, Poole protected ConnectionPool pool; private volatile boolean stopped; - private final List<TemporaryQueue> connTempQueues = new CopyOnWriteArrayList<TemporaryQueue>(); - private final List<TemporaryTopic> connTempTopics = new CopyOnWriteArrayList<TemporaryTopic>(); - private final List<PooledSession> loanedSessions = new CopyOnWriteArrayList<PooledSession>(); + private final List<TemporaryQueue> connTempQueues = new CopyOnWriteArrayList<>(); + private final List<TemporaryTopic> connTempTopics = new CopyOnWriteArrayList<>(); + private final List<PooledSession> loanedSessions = new CopyOnWriteArrayList<>(); /** * Creates a new PooledConnection instance that uses the given ConnectionPool to create http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java ---------------------------------------------------------------------- diff --git a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java index eaf2d67..fe72394 100644 --- a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java +++ b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java @@ -54,9 +54,9 @@ public class PooledSession implements Session, TopicSession, QueueSession, XASes private final SessionKey key; private final KeyedObjectPool<SessionKey, PooledSession> sessionPool; - private final CopyOnWriteArrayList<MessageConsumer> consumers = new CopyOnWriteArrayList<MessageConsumer>(); - private final CopyOnWriteArrayList<QueueBrowser> browsers = new CopyOnWriteArrayList<QueueBrowser>(); - private final CopyOnWriteArrayList<PooledSessionEventListener> sessionEventListeners = new CopyOnWriteArrayList<PooledSessionEventListener>(); + private final CopyOnWriteArrayList<MessageConsumer> consumers = new CopyOnWriteArrayList<>(); + private final CopyOnWriteArrayList<QueueBrowser> browsers = new CopyOnWriteArrayList<>(); + private final CopyOnWriteArrayList<PooledSessionEventListener> sessionEventListeners = new CopyOnWriteArrayList<>(); private MessageProducer producer; private TopicPublisher publisher; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java ---------------------------------------------------------------------- diff --git a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java index 07ddfc5..83afe4e 100644 --- a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java +++ b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java @@ -49,7 +49,7 @@ public class JndiServiceImpl implements JndiService { @Override public Map<String, String> names(String name) throws Exception { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); if (name.startsWith(OSGI_JNDI_CONTEXT_PREFIX)) { // OSGi service binding // make a lookup using directly the OSGi service @@ -104,7 +104,7 @@ public class JndiServiceImpl implements JndiService { } public List<String> contexts(String name) throws Exception { - List<String> contexts = new ArrayList<String>(); + List<String> contexts = new ArrayList<>(); Context context = new InitialContext(); NamingEnumeration<NameClassPair> pairs = context.list(name); while (pairs.hasMoreElements()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jndi/src/main/java/org/apache/karaf/jndi/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/jndi/src/main/java/org/apache/karaf/jndi/internal/osgi/Activator.java b/jndi/src/main/java/org/apache/karaf/jndi/internal/osgi/Activator.java index c830018..ada6303 100644 --- a/jndi/src/main/java/org/apache/karaf/jndi/internal/osgi/Activator.java +++ b/jndi/src/main/java/org/apache/karaf/jndi/internal/osgi/Activator.java @@ -45,7 +45,7 @@ public class Activator extends BaseActivator { JndiServiceImpl service = new JndiServiceImpl(); service.setBundleContext(bundleContext); service.setProxyManager(proxyManager); - Hashtable<String, String> props = new Hashtable<String, String>(); + Hashtable<String, String> props = new Hashtable<>(); // bind the JNDI service itself in the JNDI context props.put("osgi.jndi.service.name", "jndi"); register(JndiService.class, service, props); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/Activator.java ---------------------------------------------------------------------- diff --git a/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/Activator.java b/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/Activator.java index 2090841..9156a13 100644 --- a/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/Activator.java +++ b/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/Activator.java @@ -36,7 +36,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer<MBea @Override public void start(BundleContext context) throws Exception { this.context = context; - mbeanServerTracker = new ServiceTracker<MBeanServer, MBeanServer>(context, MBeanServer.class, this); + mbeanServerTracker = new ServiceTracker<>(context, MBeanServer.class, this); mbeanServerTracker.open(); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/StatisticsPublisher.java ---------------------------------------------------------------------- diff --git a/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/StatisticsPublisher.java b/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/StatisticsPublisher.java index e347539..d4ba4ff 100644 --- a/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/StatisticsPublisher.java +++ b/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/impl/StatisticsPublisher.java @@ -51,7 +51,7 @@ public class StatisticsPublisher implements ServiceTrackerCustomizer<EntityManag public StatisticsPublisher(BundleContext context, MBeanServer mbeanServer) { this.context = context; this.mbeanServer = mbeanServer; - this.emfTracker = new ServiceTracker<EntityManagerFactory, EntityManagerFactory>(context, EntityManagerFactory.class, this); + this.emfTracker = new ServiceTracker<>(context, EntityManagerFactory.class, this); } public void start() { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java ---------------------------------------------------------------------- diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java index 601d97f..c4d459f 100644 --- a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java +++ b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java @@ -82,7 +82,7 @@ public class Kar { InputStream is = null; JarInputStream zipIs = null; FeatureDetector featureDetector = new FeatureDetector(); - this.featureRepos = new ArrayList<URI>(); + this.featureRepos = new ArrayList<>(); this.shouldInstallFeatures = true; try { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java ---------------------------------------------------------------------- diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java index f769fc8..c8f270c 100644 --- a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java +++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java @@ -168,7 +168,7 @@ public class KarServiceImpl implements KarService { private List<URI> readFromFile(File repoListFile) { - ArrayList<URI> uriList = new ArrayList<URI>(); + ArrayList<URI> uriList = new ArrayList<>(); FileReader fr = null; try { fr = new FileReader(repoListFile); @@ -237,7 +237,7 @@ public class KarServiceImpl implements KarService { @Override public List<String> list() throws Exception { - List<String> kars = new ArrayList<String>(); + List<String> kars = new ArrayList<>(); for (File kar : storage.listFiles()) { if (kar.isDirectory()) { kars.add(kar.getName()); @@ -310,10 +310,10 @@ public class KarServiceImpl implements KarService { Manifest manifest = createNonAutoStartManifest(repo.getURI()); jos = new JarOutputStream(new BufferedOutputStream(fos, 100000), manifest); - Map<URI, Integer> locationMap = new HashMap<URI, Integer>(); + Map<URI, Integer> locationMap = new HashMap<>(); copyResourceToJar(jos, repo.getURI(), locationMap); - Map<String, Feature> featureMap = new HashMap<String, Feature>(); + Map<String, Feature> featureMap = new HashMap<>(); for (Feature feature : repo.getFeatures()) { featureMap.put(feature.getName(), feature); } @@ -338,7 +338,7 @@ public class KarServiceImpl implements KarService { } private Set<Feature> getFeatures(Map<String, Feature> featureMap, List<String> features, int depth) { - Set<Feature> featureSet = new HashSet<Feature>(); + Set<Feature> featureSet = new HashSet<>(); if (depth > 5) { // Break after some recursions to avoid endless loops return featureSet; @@ -355,7 +355,7 @@ public class KarServiceImpl implements KarService { } else { featureSet.add(feature); List<Dependency> deps = feature.getDependencies(); - List<String> depNames = new ArrayList<String>(); + List<String> depNames = new ArrayList<>(); for (Dependency dependency : deps) { depNames.add(dependency.getName()); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/log/src/main/java/org/apache/karaf/log/command/LogEntry.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/command/LogEntry.java b/log/src/main/java/org/apache/karaf/log/command/LogEntry.java index d7c17a9..26821e9 100644 --- a/log/src/main/java/org/apache/karaf/log/command/LogEntry.java +++ b/log/src/main/java/org/apache/karaf/log/command/LogEntry.java @@ -43,7 +43,7 @@ public class LogEntry implements Action { @Reference LogService logService; - private final Map<String,Integer> mappings = new HashMap<String,Integer>(); + private final Map<String,Integer> mappings = new HashMap<>(); public LogEntry() { mappings.put("ERROR", 1); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/log/src/main/java/org/apache/karaf/log/command/LogTail.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/command/LogTail.java b/log/src/main/java/org/apache/karaf/log/command/LogTail.java index 516a3c3..9e6ae61 100644 --- a/log/src/main/java/org/apache/karaf/log/command/LogTail.java +++ b/log/src/main/java/org/apache/karaf/log/command/LogTail.java @@ -102,7 +102,7 @@ public class LogTail extends DisplayLog { } out.flush(); // Tail - final BlockingQueue<PaxLoggingEvent> queue = new LinkedBlockingQueue<PaxLoggingEvent>(); + final BlockingQueue<PaxLoggingEvent> queue = new LinkedBlockingQueue<>(); PaxAppender appender = new PaxAppender() { public void doAppend(PaxLoggingEvent event) { queue.add(event); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/log/src/main/java/org/apache/karaf/log/core/internal/LogServiceLog4j1Impl.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/LogServiceLog4j1Impl.java b/log/src/main/java/org/apache/karaf/log/core/internal/LogServiceLog4j1Impl.java index e9d6cd5..8b46182 100644 --- a/log/src/main/java/org/apache/karaf/log/core/internal/LogServiceLog4j1Impl.java +++ b/log/src/main/java/org/apache/karaf/log/core/internal/LogServiceLog4j1Impl.java @@ -44,7 +44,7 @@ public class LogServiceLog4j1Impl implements LogServiceInternal { String root = getLevelFromProperty((String) config.get(ROOT_LOGGER_PREFIX)); loggers.put(ROOT_LOGGER, root); for (Enumeration<String> e = config.keys(); e.hasMoreElements(); ) { - String prop = (String) e.nextElement(); + String prop = e.nextElement(); if (prop.startsWith(LOGGER_PREFIX)) { String val = getLevelFromProperty((String) config.get(prop)); loggers.put(prop.substring(LOGGER_PREFIX.length()), val); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/log/src/main/java/org/apache/karaf/log/core/internal/LruList.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/LruList.java b/log/src/main/java/org/apache/karaf/log/core/internal/LruList.java index ca4329b..34485b1 100644 --- a/log/src/main/java/org/apache/karaf/log/core/internal/LruList.java +++ b/log/src/main/java/org/apache/karaf/log/core/internal/LruList.java @@ -43,7 +43,7 @@ public class LruList implements PaxAppender { } elements = new PaxLoggingEvent[size]; maxElements = elements.length; - appenders = new ArrayList<PaxAppender>(); + appenders = new ArrayList<>(); } public synchronized int size() { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java b/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java index c0a6a23..5a9bf9f 100644 --- a/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java +++ b/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java @@ -56,7 +56,7 @@ public class Activator extends BaseActivator implements ManagedService { String traceColor = getString("traceColor", "39"); LruList events = new LruList(size); - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("org.ops4j.pax.logging.appender.name", "VmLogAppender"); register(PaxAppender.class, events, props); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java b/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java index 48475d9..6d8c99a 100644 --- a/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java +++ b/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java @@ -39,7 +39,7 @@ public class KarafActivatorManager { Logger LOG = Logger.getLogger(this.getClass().getName()); - private List<BundleActivator> karafActivators = new ArrayList<BundleActivator>(); + private List<BundleActivator> karafActivators = new ArrayList<>(); private final ClassLoader classLoader; private final Framework framework; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/main/src/main/java/org/apache/karaf/main/Main.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java index ea82f31..60f082c 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -443,7 +443,7 @@ public class Main { } private ClassLoader createClassLoader(ArtifactResolver resolver) throws Exception { - List<URL> urls = new ArrayList<URL>(); + List<URL> urls = new ArrayList<>(); urls.add(resolver.resolve(config.frameworkBundle).toURL()); File[] libs = new File(config.karafHome, "lib").listFiles(); if (libs != null) { @@ -494,7 +494,7 @@ public class Main { public List<BundleInfo> readBundlesFromStartupProperties(File startupPropsFile) { Properties startupProps = PropertiesLoader.loadPropertiesOrFail(startupPropsFile); - List<BundleInfo> bundeList = new ArrayList<BundleInfo>(); + List<BundleInfo> bundeList = new ArrayList<>(); for (String key : startupProps.keySet()) { try { BundleInfo bi = new BundleInfo(); @@ -534,12 +534,12 @@ public class Main { } private boolean isNotFragment(Bundle b) { - String fragmentHostHeader = (String) b.getHeaders().get(Constants.FRAGMENT_HOST); + String fragmentHostHeader = b.getHeaders().get(Constants.FRAGMENT_HOST); return fragmentHostHeader == null || fragmentHostHeader.trim().length() == 0; } private List<File> getBundleRepos() { - List<File> bundleDirs = new ArrayList<File>(); + List<File> bundleDirs = new ArrayList<>(); File homeSystemRepo = new File(config.karafHome, config.defaultRepo); if (!homeSystemRepo.isDirectory()) { throw new RuntimeException("system repo folder not found: " + homeSystemRepo.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java ---------------------------------------------------------------------- diff --git a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java index 76776d9..1630cb7 100644 --- a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java +++ b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java @@ -89,7 +89,7 @@ public abstract class BaseJDBCLockTest { expect(connection.isClosed()).andReturn(false); connection.setAutoCommit(false); expect(connection.getMetaData()).andReturn(metaData).anyTimes(); - expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet); + expect(metaData.getTables(isNull(), isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet); expect(resultSet.next()).andReturn(false); resultSet.close(); expectLastCall().atLeastOnce(); @@ -111,7 +111,7 @@ public abstract class BaseJDBCLockTest { public void initShouldNotCreateTheSchemaIfItAlreadyExists() throws Exception { connection.setAutoCommit(false); expect(connection.getMetaData()).andReturn(metaData); - expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet); + expect(metaData.getTables(isNull(), isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet); expect(resultSet.next()).andReturn(true); resultSet.close(); expectLastCall().atLeastOnce(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java index d0a20f0..3fa02b8 100644 --- a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java +++ b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java @@ -347,7 +347,7 @@ public class ConnectorServerFactory { } public ServerSocket createServerSocket(int port) throws IOException { - ServerSocket serverSocket = (ServerSocket) ServerSocketFactory.getDefault().createServerSocket(port, 50, InetAddress.getByName(rmiServerHost)); + ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(port, 50, InetAddress.getByName(rmiServerHost)); return serverSocket; } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java index 831ab47..b0d3464 100644 --- a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java +++ b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java @@ -111,7 +111,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { MBeanInfo info = mbeanServer.getMBeanInfo(objectName); for (MBeanOperationInfo operation : info.getOperations()) { - List<String> sig = new ArrayList<String>(); + List<String> sig = new ArrayList<>(); for (MBeanParameterInfo param : operation.getSignature()) { sig.add(param.getType()); } @@ -168,7 +168,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { continue; } - List<String> sig = new ArrayList<String>(); + List<String> sig = new ArrayList<>(); for (MBeanParameterInfo param : op.getSignature()) { sig.add(param.getType()); } @@ -285,7 +285,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { } private boolean canBypassRBAC(BulkRequestContext context, ObjectName objectName, String operationName) { - List<String> allBypassObjectName = new ArrayList<String>(); + List<String> allBypassObjectName = new ArrayList<>(); List<Dictionary<String, Object>> configs = context.getWhitelistProperties(); for (Dictionary<String, Object> config : configs) { @@ -352,7 +352,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { String generalPid = getGeneralPid(context.getAllPids(), pid); if (generalPid.length() > 0) { Dictionary<String, Object> config = context.getConfiguration(generalPid); - List<String> roles = new ArrayList<String>(); + List<String> roles = new ArrayList<>(); ACLConfigurationParser.Specificity s = ACLConfigurationParser.getRolesForInvocation(methodName, params, signature, config, roles); if (s != ACLConfigurationParser.Specificity.NO_MATCH) { return roles; @@ -365,7 +365,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { private String getGeneralPid(List<String> allPids, String pid) { String ret = ""; String[] pidStrArray = pid.split(Pattern.quote(".")); - Set<String[]> rets = new TreeSet<String[]>(WILDCARD_PID_COMPARATOR); + Set<String[]> rets = new TreeSet<>(WILDCARD_PID_COMPARATOR); for (String id : allPids) { String[] idStrArray = id.split(Pattern.quote(".")); if (idStrArray.length == pidStrArray.length) { @@ -401,7 +401,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { } private List<String> getNameSegments(ObjectName objectName) { - List<String> segments = new ArrayList<String>(); + List<String> segments = new ArrayList<>(); segments.add(objectName.getDomain()); // TODO can an ObjectName property contain a comma as key or value ? // TODO support quoting as described in http://docs.oracle.com/javaee/1.4/api/javax/management/ObjectName.html @@ -435,7 +435,7 @@ public class KarafMBeanServerGuard implements InvocationHandler { * @return the PIDs corresponding with the ObjectName in the above order. */ private List<String> iterateDownPids(List<String> segments) { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); for (int i = segments.size(); i > 0; i--) { StringBuilder sb = new StringBuilder(); sb.append(JMX_ACL_PID_PREFIX); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java index 76139de..360b9cd 100644 --- a/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java +++ b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java @@ -131,7 +131,7 @@ public class RmiRegistryFactory { } if (registry != null) { // register the registry as an OSGi service - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("port", getPort()); props.put("host", getHost()); bundleContext.registerService(Registry.class, registry, props); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java index 41d6798..1a22e9b 100644 --- a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java +++ b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java @@ -120,7 +120,7 @@ public class Activator extends BaseActivator implements ManagedService { connectorServerFactory.setDaemon(daemon); connectorServerFactory.setThreaded(threaded); connectorServerFactory.setObjectName(objectName); - Map<String, Object> environment = new HashMap<String, Object>(); + Map<String, Object> environment = new HashMap<>(); environment.put("jmx.remote.authenticator", jaasAuthenticator); try { connectorServerFactory.setEnvironment(environment); @@ -145,7 +145,7 @@ public class Activator extends BaseActivator implements ManagedService { register(MBeanServer.class, mbeanServer); - keystoreInstanceServiceTracker = new ServiceTracker<KeystoreInstance, KeystoreInstance>( + keystoreInstanceServiceTracker = new ServiceTracker<>( bundleContext, KeystoreInstance.class, new ServiceTrackerCustomizer<KeystoreInstance, KeystoreInstance>() { @Override public KeystoreInstance addingService(ServiceReference<KeystoreInstance> reference) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/internal/BulkRequestContext.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/BulkRequestContext.java b/management/server/src/main/java/org/apache/karaf/management/internal/BulkRequestContext.java index d4e91ea..7d1e064 100644 --- a/management/server/src/main/java/org/apache/karaf/management/internal/BulkRequestContext.java +++ b/management/server/src/main/java/org/apache/karaf/management/internal/BulkRequestContext.java @@ -43,8 +43,8 @@ import org.osgi.service.cm.ConfigurationAdmin; */ public class BulkRequestContext { - private List<String> allPids = new ArrayList<String>(); - private List<Dictionary<String, Object>> whiteListProperties = new ArrayList<Dictionary<String, Object>>(); + private List<String> allPids = new ArrayList<>(); + private List<Dictionary<String, Object>> whiteListProperties = new ArrayList<>(); private ConfigurationAdmin configAdmin; @@ -54,7 +54,7 @@ public class BulkRequestContext { private Set<Principal> principals = new HashSet<>(); // cache with lifecycle bound to BulkRequestContext instance - private Map<String, Dictionary<String, Object>> cachedConfigurations = new HashMap<String, Dictionary<String, Object>>(); + private Map<String, Dictionary<String, Object>> cachedConfigurations = new HashMap<>(); private BulkRequestContext() {} http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/management/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java b/management/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java index 3cde22c..bd5cf8a 100644 --- a/management/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java +++ b/management/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java @@ -94,7 +94,7 @@ public class JMXSecurityMBeanImpl extends StandardMBean implements JMXSecurityMB table.put(data); } else { for (String method : methods) { - List<String> argTypes = new ArrayList<String>(); + List<String> argTypes = new ArrayList<>(); String name = parseMethodName(method, argTypes); boolean res;
