diff --git a/.gitignore b/.gitignore index 2945707a2..18d2ca6cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ target/ .classpath .project -.settings/ \ No newline at end of file +.settings/ diff --git a/src/main/java/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java b/src/main/java/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java index 649d2abea..9a83aaa90 100644 --- a/src/main/java/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java +++ b/src/main/java/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java @@ -677,7 +677,7 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { } // create new user - Set newRoles = new HashSet(currentRoles); + Set newRoles = new HashSet<>(currentRoles); newRoles.remove(roleName); User newUser = new User(existingUser.getUserId(), existingUser.getUsername(), existingUser.getPassword(), existingUser.getFirstname(), existingUser.getLastname(), existingUser.getUserState(), newRoles, @@ -973,7 +973,7 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { // create new set of privileges with out the to removed privilege Set privilegeNames = existingRole.getPrivilegeNames(); - Map newPrivileges = new HashMap(privilegeNames.size() - 1); + Map newPrivileges = new HashMap<>(privilegeNames.size() - 1); for (String name : privilegeNames) { IPrivilege privilege = existingRole.getPrivilege(name); if (!privilege.getName().equals(privilegeName)) @@ -1053,8 +1053,8 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { List sessions = this.privilegeContextMap.values().stream().map(p -> p.getCertificate()) .filter(c -> !c.getUserState().isSystem()).collect(Collectors.toList()); - try (OutputStream outputStream = AesCryptoHelper.wrapEncrypt(this.secretKey, - new FileOutputStream(this.persistSessionsPath))) { + try (FileOutputStream fout = new FileOutputStream(this.persistSessionsPath); + OutputStream outputStream = AesCryptoHelper.wrapEncrypt(this.secretKey, fout)) { CertificateStubsDomWriter writer = new CertificateStubsDomWriter(sessions, outputStream); writer.write(); @@ -1083,8 +1083,8 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { "Sessions data file is not a file but exists at " + this.persistSessionsPath.getAbsolutePath()); List certificateStubs; - try (InputStream inputStream = AesCryptoHelper.wrapDecrypt(this.secretKey, - new FileInputStream(this.persistSessionsPath))) { + try (FileInputStream fin = new FileInputStream(this.persistSessionsPath); + InputStream inputStream = AesCryptoHelper.wrapDecrypt(this.secretKey, fin)) { CertificateStubsSaxReader reader = new CertificateStubsSaxReader(inputStream); certificateStubs = reader.read(); @@ -1199,8 +1199,8 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { private PrivilegeContext buildPrivilegeContext(Certificate certificate, User user) { Set userRoles = user.getRoles(); - Map privileges = new HashMap(); - Map policies = new HashMap(); + Map privileges = new HashMap<>(); + Map policies = new HashMap<>(); // get a cache of the privileges and policies for this user for (String roleName : userRoles) { diff --git a/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java b/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java index 40e4b1dc4..c161b5beb 100644 --- a/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java +++ b/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java @@ -58,14 +58,14 @@ public class XmlPersistenceHandler implements PersistenceHandler { @Override public List getAllUsers() { synchronized (this.userMap) { - return new LinkedList(this.userMap.values()); + return new LinkedList<>(this.userMap.values()); } } @Override public List getAllRoles() { synchronized (this.roleMap) { - return new LinkedList(this.roleMap.values()); + return new LinkedList<>(this.roleMap.values()); } } @@ -138,7 +138,7 @@ public class XmlPersistenceHandler implements PersistenceHandler { public void initialize(Map paramsMap) { // copy parameter map - this.parameterMap = Collections.unmodifiableMap(new HashMap(paramsMap)); + this.parameterMap = Collections.unmodifiableMap(new HashMap<>(paramsMap)); // get and validate base bath String basePath = this.parameterMap.get(XmlConstants.XML_PARAM_BASE_PATH); diff --git a/src/main/java/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java b/src/main/java/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java index f9d3b158b..6504e12d4 100644 --- a/src/main/java/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java +++ b/src/main/java/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java @@ -77,9 +77,9 @@ public class BootstrapConfigurationHelper { throw new RuntimeException("Could not create path " + pathF.getAbsolutePath()); } - Map parameterMap = new HashMap(); - Map encryptionHandlerParameterMap = new HashMap(); - Map persistenceHandlerParameterMap = new HashMap(); + Map parameterMap = new HashMap<>(); + Map encryptionHandlerParameterMap = new HashMap<>(); + Map persistenceHandlerParameterMap = new HashMap<>(); // TODO ask other questions... parameterMap.put("autoPersistOnPasswordChange", "true"); diff --git a/src/main/java/ch/eitchnet/privilege/helper/PasswordCreaterUI.java b/src/main/java/ch/eitchnet/privilege/helper/PasswordCreaterUI.java index d409a196e..62eab7fa8 100644 --- a/src/main/java/ch/eitchnet/privilege/helper/PasswordCreaterUI.java +++ b/src/main/java/ch/eitchnet/privilege/helper/PasswordCreaterUI.java @@ -61,7 +61,7 @@ public class PasswordCreaterUI { JLabel hash = new JLabel("Hash:", SwingConstants.RIGHT); String[] digests = new String[] { "MD2", "MD5", "SHA-1", "SHA-256", "SHA-384", "SHA-512" }; - final JComboBox digestCombo = new JComboBox(digests); + final JComboBox digestCombo = new JComboBox<>(digests); digestCombo.setSelectedIndex(3); final JPasswordField passwordField = new JPasswordField(); final JTextField hashField = new JTextField(150); diff --git a/src/main/java/ch/eitchnet/privilege/helper/PrivilegeInitializationHelper.java b/src/main/java/ch/eitchnet/privilege/helper/PrivilegeInitializationHelper.java index 03bc8d21e..5cdf1b556 100644 --- a/src/main/java/ch/eitchnet/privilege/helper/PrivilegeInitializationHelper.java +++ b/src/main/java/ch/eitchnet/privilege/helper/PrivilegeInitializationHelper.java @@ -59,8 +59,8 @@ public class PrivilegeInitializationHelper { } // delegate using input stream - try { - return initializeFromXml(new FileInputStream(privilegeXmlFile)); + try (FileInputStream fin = new FileInputStream(privilegeXmlFile)) { + return initializeFromXml(fin); } catch (Exception e) { String msg = "Failed to load configuration from {0}"; //$NON-NLS-1$ msg = MessageFormat.format(msg, privilegeXmlFile.getAbsolutePath()); diff --git a/src/main/java/ch/eitchnet/privilege/model/PrivilegeContext.java b/src/main/java/ch/eitchnet/privilege/model/PrivilegeContext.java index 32eef9e6a..95a7a5efd 100644 --- a/src/main/java/ch/eitchnet/privilege/model/PrivilegeContext.java +++ b/src/main/java/ch/eitchnet/privilege/model/PrivilegeContext.java @@ -51,8 +51,8 @@ public class PrivilegeContext { Map policies) { this.userRep = userRep; this.certificate = certificate; - this.privileges = Collections.unmodifiableMap(new HashMap(privileges)); - this.policies = Collections.unmodifiableMap(new HashMap(policies)); + this.privileges = Collections.unmodifiableMap(new HashMap<>(privileges)); + this.policies = Collections.unmodifiableMap(new HashMap<>(policies)); } public UserRep getUserRep() { diff --git a/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeContainerModel.java b/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeContainerModel.java index efc2d7954..cec81e18d 100644 --- a/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeContainerModel.java +++ b/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeContainerModel.java @@ -46,7 +46,7 @@ public class PrivilegeContainerModel { * Default constructor */ public PrivilegeContainerModel() { - this.policies = new HashMap>(); + this.policies = new HashMap<>(); } /** diff --git a/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeImpl.java b/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeImpl.java index 9cfe3bca5..89b67366a 100644 --- a/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeImpl.java +++ b/src/main/java/ch/eitchnet/privilege/model/internal/PrivilegeImpl.java @@ -109,8 +109,8 @@ public final class PrivilegeImpl implements IPrivilege { */ @Override public PrivilegeRep asPrivilegeRep() { - return new PrivilegeRep(this.name, this.policy, this.allAllowed, new HashSet(this.denyList), - new HashSet(this.allowList)); + return new PrivilegeRep(this.name, this.policy, this.allAllowed, new HashSet<>(this.denyList), + new HashSet<>(this.allowList)); } /** diff --git a/src/main/java/ch/eitchnet/privilege/model/internal/Role.java b/src/main/java/ch/eitchnet/privilege/model/internal/Role.java index 6048f672f..bd8acdf8f 100644 --- a/src/main/java/ch/eitchnet/privilege/model/internal/Role.java +++ b/src/main/java/ch/eitchnet/privilege/model/internal/Role.java @@ -86,7 +86,7 @@ public final class Role { } // build privileges from rep - Map privilegeMap = new HashMap(roleRep.getPrivileges().size()); + Map privilegeMap = new HashMap<>(roleRep.getPrivileges().size()); for (PrivilegeRep privilege : roleRep.getPrivileges()) { privilegeMap.put(privilege.getName(), new PrivilegeImpl(privilege)); } @@ -136,7 +136,7 @@ public final class Role { * @return a {@link RoleRep} which is a representation of this object used to serialize and view on clients */ public RoleRep asRoleRep() { - List privileges = new ArrayList(); + List privileges = new ArrayList<>(); for (Entry entry : this.privilegeMap.entrySet()) { privileges.add(entry.getValue().asPrivilegeRep()); } diff --git a/src/main/java/ch/eitchnet/privilege/model/internal/User.java b/src/main/java/ch/eitchnet/privilege/model/internal/User.java index c81ad1ee8..5afe247aa 100644 --- a/src/main/java/ch/eitchnet/privilege/model/internal/User.java +++ b/src/main/java/ch/eitchnet/privilege/model/internal/User.java @@ -116,7 +116,7 @@ public final class User { if (roles == null) this.roles = Collections.emptySet(); else - this.roles = Collections.unmodifiableSet(new HashSet(roles)); + this.roles = Collections.unmodifiableSet(new HashSet<>(roles)); if (locale == null) this.locale = Locale.getDefault(); @@ -126,7 +126,7 @@ public final class User { if (propertyMap == null) this.propertyMap = Collections.emptyMap(); else - this.propertyMap = Collections.unmodifiableMap(new HashMap(propertyMap)); + this.propertyMap = Collections.unmodifiableMap(new HashMap<>(propertyMap)); } /** @@ -234,7 +234,7 @@ public final class User { */ public UserRep asUserRep() { return new UserRep(this.userId, this.username, this.firstname, this.lastname, this.userState, - new HashSet(this.roles), this.locale, new HashMap(this.propertyMap)); + new HashSet<>(this.roles), this.locale, new HashMap<>(this.propertyMap)); } /** diff --git a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java index 660a4544d..421aff46f 100644 --- a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java +++ b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java @@ -32,7 +32,7 @@ import ch.eitchnet.privilege.model.internal.PrivilegeContainerModel; */ public class PrivilegeConfigSaxReader extends DefaultHandler { - private Deque buildersStack = new ArrayDeque(); + private Deque buildersStack = new ArrayDeque<>(); private PrivilegeContainerModel containerModel; @@ -143,7 +143,7 @@ public class PrivilegeConfigSaxReader extends DefaultHandler { // - private Map parameterMap = new HashMap(); + private Map parameterMap = new HashMap<>(); @Override public void startElement(String uri, String localName, String qName, Attributes attributes) diff --git a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java index be05f0b62..438b91d7a 100644 --- a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java +++ b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java @@ -47,7 +47,7 @@ public class PrivilegeModelSaxReader extends DefaultHandler { protected static final Logger logger = LoggerFactory.getLogger(PrivilegeModelSaxReader.class); - private Deque buildersStack = new ArrayDeque(); + private Deque buildersStack = new ArrayDeque<>(); private List users; private List roles; @@ -55,8 +55,8 @@ public class PrivilegeModelSaxReader extends DefaultHandler { private boolean insideUser; public PrivilegeModelSaxReader() { - this.users = new ArrayList(); - this.roles = new ArrayList(); + this.users = new ArrayList<>(); + this.roles = new ArrayList<>(); } /** @@ -147,7 +147,7 @@ public class PrivilegeModelSaxReader extends DefaultHandler { } private void init() { - this.privileges = new HashMap(); + this.privileges = new HashMap<>(); this.text = null; @@ -155,8 +155,8 @@ public class PrivilegeModelSaxReader extends DefaultHandler { this.privilegeName = null; this.privilegePolicy = null; this.allAllowed = false; - this.denyList = new HashSet(); - this.allowList = new HashSet(); + this.denyList = new HashSet<>(); + this.allowList = new HashSet<>(); } @Override @@ -201,8 +201,8 @@ public class PrivilegeModelSaxReader extends DefaultHandler { this.privilegeName = null; this.privilegePolicy = null; this.allAllowed = false; - this.denyList = new HashSet(); - this.allowList = new HashSet(); + this.denyList = new HashSet<>(); + this.allowList = new HashSet<>(); } else if (qName.equals(XmlConstants.XML_ROLE)) { @@ -245,7 +245,7 @@ public class PrivilegeModelSaxReader extends DefaultHandler { Map parameters; public UserParser() { - this.userRoles = new HashSet(); + this.userRoles = new HashSet<>(); } @Override @@ -307,7 +307,7 @@ public class PrivilegeModelSaxReader extends DefaultHandler { // - public Map parameterMap = new HashMap(); + public Map parameterMap = new HashMap<>(); @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { diff --git a/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java b/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java index 0cb60c782..674ccaebb 100644 --- a/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java +++ b/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java @@ -622,7 +622,7 @@ public class PrivilegeTest extends AbstractPrivilegeTest { // testAddUserTedAsBob login(BOB, ArraysHelper.copyOf(PASS_BOB)); // let's add a new user ted - HashSet roles = new HashSet(); + HashSet roles = new HashSet<>(); roles.add(ROLE_USER); userRep = new UserRep(null, TED, "Ted", "Newman", UserState.ENABLED, roles, null, new HashMap()); @@ -738,7 +738,7 @@ public class PrivilegeTest extends AbstractPrivilegeTest { // let's add a new user bob UserRep userRep = new UserRep(null, BOB, "Bob", "Newman", UserState.NEW, - new HashSet(Arrays.asList(ROLE_MY)), null, new HashMap()); + new HashSet<>(Arrays.asList(ROLE_MY)), null, new HashMap()); Certificate certificate = this.ctx.getCertificate(); privilegeHandler.addUser(certificate, userRep, null); logger.info("Added user " + BOB); diff --git a/src/test/java/ch/eitchnet/privilege/test/XmlTest.java b/src/test/java/ch/eitchnet/privilege/test/XmlTest.java index 4dfc029b3..e1ddd7e72 100644 --- a/src/test/java/ch/eitchnet/privilege/test/XmlTest.java +++ b/src/test/java/ch/eitchnet/privilege/test/XmlTest.java @@ -131,9 +131,9 @@ public class XmlTest { @Test public void canWriteConfig() { - Map parameterMap = new HashMap(); - Map encryptionHandlerParameterMap = new HashMap(); - Map persistenceHandlerParameterMap = new HashMap(); + Map parameterMap = new HashMap<>(); + Map encryptionHandlerParameterMap = new HashMap<>(); + Map persistenceHandlerParameterMap = new HashMap<>(); parameterMap.put("autoPersistOnPasswordChange", "true"); encryptionHandlerParameterMap.put("hashAlgorithm", "SHA-256"); @@ -189,7 +189,7 @@ public class XmlTest { assertEquals("en_gb", admin.getLocale().toString()); assertThat(admin.getRoles(), containsInAnyOrder("PrivilegeAdmin", "AppUser")); Map properties = admin.getProperties(); - assertEquals(new HashSet(Arrays.asList("organization", "organizationalUnit")), properties.keySet()); + assertEquals(new HashSet<>(Arrays.asList("organization", "organizationalUnit")), properties.keySet()); assertEquals("eitchnet.ch", properties.get("organization")); assertEquals("Development", properties.get("organizationalUnit")); @@ -233,7 +233,7 @@ public class XmlTest { // AppUser Role appUser = findRole("AppUser", roles); assertEquals("AppUser", appUser.getName()); - assertEquals(new HashSet(Arrays.asList("ch.eitchnet.privilege.test.model.TestRestrictable")), + assertEquals(new HashSet<>(Arrays.asList("ch.eitchnet.privilege.test.model.TestRestrictable")), appUser.getPrivilegeNames()); IPrivilege testRestrictable = appUser.getPrivilege("ch.eitchnet.privilege.test.model.TestRestrictable"); @@ -320,31 +320,31 @@ public class XmlTest { Set userRoles; Map privilegeMap; - List users = new ArrayList(); - propertyMap = new HashMap(); + List users = new ArrayList<>(); + propertyMap = new HashMap<>(); propertyMap.put("prop1", "value1"); - userRoles = new HashSet(); + userRoles = new HashSet<>(); userRoles.add("role1"); users.add(new User("1", "user1", "blabla", "Bob", "White", UserState.DISABLED, userRoles, Locale.ENGLISH, propertyMap)); - propertyMap = new HashMap(); + propertyMap = new HashMap<>(); propertyMap.put("prop2", "value2"); - userRoles = new HashSet(); + userRoles = new HashSet<>(); userRoles.add("role2"); users.add(new User("2", "user2", "haha", "Leonard", "Sheldon", UserState.ENABLED, userRoles, Locale.ENGLISH, propertyMap)); - List roles = new ArrayList(); + List roles = new ArrayList<>(); Set list = Collections.emptySet(); - privilegeMap = new HashMap(); + privilegeMap = new HashMap<>(); privilegeMap.put("priv1", new PrivilegeImpl("priv1", "DefaultPrivilege", true, list, list)); roles.add(new Role("role1", privilegeMap)); - privilegeMap = new HashMap(); - Set denyList = new HashSet(); + privilegeMap = new HashMap<>(); + Set denyList = new HashSet<>(); denyList.add("myself"); - Set allowList = new HashSet(); + Set allowList = new HashSet<>(); allowList.add("other"); privilegeMap.put("priv2", new PrivilegeImpl("priv2", "DefaultPrivilege", false, denyList, allowList)); roles.add(new Role("role2", privilegeMap));