diff options
Diffstat (limited to 'plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security')
11 files changed, 23 insertions, 23 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OAuthUtil.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OAuthUtil.java index f60f8d9aaa5..9100614869d 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OAuthUtil.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OAuthUtil.java @@ -166,7 +166,7 @@ public final class OAuthUtil { private static final String SUBJECT_OSEE_GUID = "osee.guid"; public static UserSubject newUserSubject(OseePrincipal subject) { - List<String> roles = new ArrayList<String>(); + List<String> roles = new ArrayList<>(); for (String role : subject.getRoles()) { roles.add(role); } @@ -175,7 +175,7 @@ public final class OAuthUtil { data.setLogin(subject.getUserName()); data.setRoles(roles); - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put(SUBJECT_USERNAME, subject.getUserName()); String displayName = subject.getDisplayName(); if (displayName.contains(",")) { @@ -193,7 +193,7 @@ public final class OAuthUtil { public static OseePrincipal newOseePrincipal(UserSubject subject) { Long id = getUserSubjectUuid(subject); - Set<String> roles = new LinkedHashSet<String>(); + Set<String> roles = new LinkedHashSet<>(); List<String> sRoles = subject.getRoles(); if (sRoles != null) { roles.addAll(sRoles); @@ -228,7 +228,7 @@ public final class OAuthUtil { String name = principal != null ? principal.getName() : "UNKNOWN"; List<String> roleNames = Collections.emptyList(); if (securityContext instanceof LoginSecurityContext) { - roleNames = new ArrayList<String>(); + roleNames = new ArrayList<>(); Set<Principal> roles = ((LoginSecurityContext) securityContext).getUserRoles(); for (Principal p : roles) { roleNames.add(p.getName()); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java index 4c2ebaca36e..c5ed666f75f 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java @@ -111,7 +111,7 @@ public class OseeOAuthContextProvider implements ContextProvider<OseeOAuthContex List<OseePermission> perms = Collections.emptyList(); List<OAuthPermission> permissions = ctx.getPermissions(); if (permissions != null && !permissions.isEmpty()) { - perms = new ArrayList<OseePermission>(); + perms = new ArrayList<>(); for (OAuthPermission permission : permissions) { perms.add(newPermission(permission)); } diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java index 5003b2fdf09..926ccb0db78 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2ServerProvider.java @@ -72,7 +72,7 @@ public class OAuth2ServerProvider { private static final String OAUTH2_APPLICATION_COMPONENT_NAME = qualify("application"); - private final Set<String> registeredProviders = new HashSet<String>(); + private final Set<String> registeredProviders = new HashSet<>(); private List<String> audiences; private OAuth2DataProvider dataProvider; private NonceVerifier nonceVerifier; @@ -154,7 +154,7 @@ public class OAuth2ServerProvider { filter = new OAuth2RequestFilter(logger, resourceManager, subjectProvider); bind(filter, dataProvider); - endpoints = new HashSet<Object>(); + endpoints = new HashSet<>(); endpoints.add(bind(new AccessTokenService(), dataProvider)); endpoints.add(bind(new TokenRevocationService(), dataProvider)); @@ -175,13 +175,13 @@ public class OAuth2ServerProvider { application = new OAuth2Application(endpoints); - grantHandlers = new ArrayList<AccessTokenGrantHandler>(); + grantHandlers = new ArrayList<>(); grantHandlers.add(bind(new AuthorizationCodeGrantHandler(), dataProvider, new DigestCodeVerifier())); grantHandlers.add(bind(new ClientCredentialsGrantHandler(), dataProvider)); grantHandlers.add(bind(new ResourceOwnerGrantHandler(), dataProvider, subjectProvider)); grantHandlers.add(bind(new RefreshTokenGrantHandler(), dataProvider)); - tokenValidators = new ArrayList<AccessTokenValidator>(); + tokenValidators = new ArrayList<>(); if (config.isHawkTokenSupported()) { NonceVerifierImpl nonceVerifier = new NonceVerifierImpl(); NonceStore nonceStore = null; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAnnotationsInterceptor.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAnnotationsInterceptor.java index a72f1b6138d..9a67bdfd516 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAnnotationsInterceptor.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAnnotationsInterceptor.java @@ -35,7 +35,7 @@ public class OseeAnnotationsInterceptor extends SecureAnnotationsInterceptor { } private void initRoles(Class<?> clazz) { - Map<String, String> rolesMap = new HashMap<String, String>(); + Map<String, String> rolesMap = new HashMap<>(); findRoles(clazz, rolesMap); super.setMethodRolesMap(rolesMap); } diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java index 42093f3ad52..6101ab893c7 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java @@ -144,7 +144,7 @@ public class OAuthEncryption { } private static Map<String, String> parseSimpleMap(String mapStr) { - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); List<String> entries = parseSimpleList(mapStr); for (String entry : entries) { String[] pair = entry.split("="); @@ -204,7 +204,7 @@ public class OAuthEncryption { // Permissions if (!parts[9].trim().isEmpty()) { - List<OAuthPermission> perms = new LinkedList<OAuthPermission>(); + List<OAuthPermission> perms = new LinkedList<>(); String[] allPermParts = parts[9].split("&"); for (int i = 0; i + 4 < allPermParts.length; i = i + 5) { OAuthPermission perm = new OAuthPermission(allPermParts[i], allPermParts[i + 1]); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientFormData.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientFormData.java index c57814439d8..0a763c110c3 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientFormData.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientFormData.java @@ -29,7 +29,7 @@ public class ClientFormData extends BaseIdentity<String> implements Named { private String description; private String webUri; private String logoUri; - private List<String> certificates = new LinkedList<String>(); + private List<String> certificates = new LinkedList<>(); private List<String> redirectUris; @@ -37,11 +37,11 @@ public class ClientFormData extends BaseIdentity<String> implements Named { private Map<String, String> logoParameters; private boolean isConfidential; - private List<String> allowedGrantTypes = new LinkedList<String>(); - private List<String> allowedScopes = new LinkedList<String>(); - private List<String> allowedAudiences = new LinkedList<String>(); + private List<String> allowedGrantTypes = new LinkedList<>(); + private List<String> allowedScopes = new LinkedList<>(); + private List<String> allowedAudiences = new LinkedList<>(); - private Map<String, String> properties = new HashMap<String, String>(); + private Map<String, String> properties = new HashMap<>(); public ClientFormData(String id) { super(id); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientRegistrationEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientRegistrationEndpoint.java index 1f6076338da..c0bd749c0d3 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientRegistrationEndpoint.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientRegistrationEndpoint.java @@ -164,7 +164,7 @@ public class ClientRegistrationEndpoint extends AbstractClientService { private List<String> parseMultilined(String rawData) { List<String> toReturn = Collections.emptyList(); if (Strings.isValid(rawData)) { - toReturn = new ArrayList<String>(); + toReturn = new ArrayList<>(); String[] entries = rawData.split("\\s+"); for (String entry : entries) { entry = entry.trim(); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServer.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServer.java index 3fb6c86650d..d3e1914ee64 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServer.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServer.java @@ -31,7 +31,7 @@ public class OAuth2ResourceServer { private JaxRsApplicationRegistry registry; - private final Set<String> registeredProviders = new HashSet<String>(); + private final Set<String> registeredProviders = new HashSet<>(); private final AtomicBoolean wasRegistered = new AtomicBoolean(); private volatile JaxRsOAuthResourceServerFilter filter; private volatile List<String> audiences; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/CustomSecurityContextImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/CustomSecurityContextImpl.java index f66bace8001..8cfe41ad37d 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/CustomSecurityContextImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/CustomSecurityContextImpl.java @@ -93,7 +93,7 @@ public class CustomSecurityContextImpl implements SecurityContext, Serializable Set<String> roles; String allRoles = in.readUTF(); if (Strings.isValid(allRoles)) { - roles = new LinkedHashSet<String>(); + roles = new LinkedHashSet<>(); for (String role : allRoles.split(",")) { roles.add(role); } @@ -117,7 +117,7 @@ public class CustomSecurityContextImpl implements SecurityContext, Serializable Map<String, String> props; String allProps = in.readUTF(); if (Strings.isValid(allProps)) { - props = new LinkedHashMap<String, String>(); + props = new LinkedHashMap<>(); String key = null; for (String value : allProps.split(",")) { if (key == null) { diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/HiddenFormFields.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/HiddenFormFields.java index fd07f49e520..63f6b20d45e 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/HiddenFormFields.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/HiddenFormFields.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; */ public final class HiddenFormFields { - private final Map<String, String> data = new HashMap<String, String>(); + private final Map<String, String> data = new HashMap<>(); public static HiddenFormFields newForm() { return new HiddenFormFields(); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/InputFields.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/InputFields.java index 825fdc60803..2101527f020 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/InputFields.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/InputFields.java @@ -64,7 +64,7 @@ public final class InputFields { return new InputFields(ContainerType.FORM_GROUP, false); } - private final Map<String, Data> data = new LinkedHashMap<String, Data>(); + private final Map<String, Data> data = new LinkedHashMap<>(); private final ContainerType containerType; private final boolean wrapInContainer; |