diff options
author | donald.g.dunne | 2015-12-23 19:54:49 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2015-12-23 19:54:49 +0000 |
commit | 82b1c027fa407dcdeaae4676c91681e3cdd9fa6c (patch) | |
tree | 2c235ec876df29269b683ed69ecf2ef432375ec9 /plugins/org.eclipse.osee.jaxrs.server | |
parent | ad0d071519a7e37e8d6f81906c4c9690a3de3a31 (diff) | |
download | org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.gz org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.xz org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.zip |
refinement: Re-Organize, Format and Cleanup source
Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d
Diffstat (limited to 'plugins/org.eclipse.osee.jaxrs.server')
25 files changed, 48 insertions, 39 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsConfiguration.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsConfiguration.java index 53e0c65eec8..b0de365b865 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsConfiguration.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsConfiguration.java @@ -50,7 +50,8 @@ public class JaxRsConfiguration { } public JaxRsConfigurationBuilder properties(Map<String, Object> props) { - baseContext(JaxRsUtils.get(props, JaxRsConstants.JAXRS_BASE_CONTEXT, JaxRsConstants.DEFAULT_JAXRS_BASE_CONTEXT)); + baseContext( + JaxRsUtils.get(props, JaxRsConstants.JAXRS_BASE_CONTEXT, JaxRsConstants.DEFAULT_JAXRS_BASE_CONTEXT)); return this; } diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsProvidersManager.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsProvidersManager.java index 66ad9587d17..21269fbba7f 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsProvidersManager.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsProvidersManager.java @@ -39,8 +39,8 @@ public final class JaxRsProvidersManager extends JaxRsDynamicServiceManager<Obje } private boolean isJaxRsProvider(Object service) { - return service != null && (hasRegisterableAnnotation(service) || // - service instanceof Feature || service instanceof DynamicFeature); + return service != null && (hasRegisterableAnnotation(service) || // + service instanceof Feature || service instanceof DynamicFeature); } private boolean hasRegisterableAnnotation(Object service) { diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java index 4cc6398ae5b..ae758eaad08 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java @@ -44,7 +44,7 @@ import org.osgi.framework.BundleListener; * * Example: * <b>Osee-JaxRs-Resource:</b> <i>/web/js/*<i><b>;path=</b><i>/lib</i> - * + * * Make all files in <b>/web/js/</b> available through <b>/lib/</b>. * Therefore, if we have a file - /web/js/script.js it will be available at /lib/script.js * </pre> @@ -204,9 +204,9 @@ public final class JaxRsResourceManager implements BundleListener { boolean isActive = false; boolean isStopping = false; if (state == Bundle.ACTIVE // - || state == Bundle.STARTING // - || state == Bundle.INSTALLED // - || state == Bundle.RESOLVED) { + || state == Bundle.STARTING // + || state == Bundle.INSTALLED // + || state == Bundle.RESOLVED) { isActive = true; } else if (state == Bundle.STOPPING) { isStopping = true; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsUtils.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsUtils.java index 4ff56496f50..8ccfbf3d8d8 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsUtils.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsUtils.java @@ -34,8 +34,8 @@ public final class JaxRsUtils { } public static final String UTF_8_ENCODING = "UTF-8"; - public static final List<MediaType> HTML_MEDIA_TYPES = Collections.unmodifiableList(Arrays.asList( - MediaType.TEXT_HTML_TYPE, MediaType.APPLICATION_XHTML_XML_TYPE)); + public static final List<MediaType> HTML_MEDIA_TYPES = + Collections.unmodifiableList(Arrays.asList(MediaType.TEXT_HTML_TYPE, MediaType.APPLICATION_XHTML_XML_TYPE)); public static boolean isHtmlSupported(List<MediaType> acceptableMediaTypes) { return !JAXRSUtils.intersectMimeTypes(acceptableMediaTypes, HTML_MEDIA_TYPES, false).isEmpty(); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/applications/JaxRsContainerProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/applications/JaxRsContainerProviderImpl.java index 9724a4e966a..d6d3ca155eb 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/applications/JaxRsContainerProviderImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/applications/JaxRsContainerProviderImpl.java @@ -19,7 +19,7 @@ import org.eclipse.osee.jaxrs.server.internal.applications.JaxRsApplicationRegis /** * @author Roberto E. Escobar */ -public final class JaxRsContainerProviderImpl extends LazyObject<JaxRsContainer> implements JaxRsContainerProvider { +public final class JaxRsContainerProviderImpl extends LazyObject<JaxRsContainer>implements JaxRsContainerProvider { private final JaxRsFactory factory; private final String contextName; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/exceptions/JaxRsExceptions.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/exceptions/JaxRsExceptions.java index 06b553ad1c1..133b12da0c8 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/exceptions/JaxRsExceptions.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/exceptions/JaxRsExceptions.java @@ -115,9 +115,8 @@ public final class JaxRsExceptions { @Override protected String getMessage(NotFoundException ex) { String baseMessage = super.getMessage(ex); - String message = - String.format("%sUnable to find resource at [%s]", Strings.isValid(baseMessage) ? baseMessage + " - " : "", - getUriInfo().getRequestUri().toASCIIString()); + String message = String.format("%sUnable to find resource at [%s]", + Strings.isValid(baseMessage) ? baseMessage + " - " : "", getUriInfo().getRequestUri().toASCIIString()); return message; } } @@ -149,10 +148,10 @@ public final class JaxRsExceptions { OseeWebApplicationException exception; if (throwable instanceof OseeWebApplicationException) { logMessage = OSEE_APPLICATION_EXCEPTION_TYPE; - exception = ((OseeWebApplicationException) throwable); + exception = (OseeWebApplicationException) throwable; } else if (throwable instanceof WebApplicationException) { logMessage = APPLICATION_EXCEPTION_TYPE; - WebApplicationException webAppException = ((WebApplicationException) throwable); + WebApplicationException webAppException = (WebApplicationException) throwable; Response response = webAppException.getResponse(); int statusCode = response.getStatus(); String message = webAppException.getMessage(); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java index 38d73577f70..3a0f789b1e7 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java @@ -72,7 +72,7 @@ public final class CxfJaxRsFactory implements JaxRsFactory { public void start(Map<String, Object> props) { logger.debug("Starting [%s]...", getClass().getSimpleName()); - // Ensure CXF JAX-RS implementation is loaded + // Ensure CXF JAX-RS implementation is loaded RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl(); RuntimeDelegate.setInstance(runtimeDelegate); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java index 7aec6fba6b1..cde27888cd3 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.ext; +import com.google.common.io.InputSupplier; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -21,7 +22,6 @@ import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Lib; -import com.google.common.io.InputSupplier; /** * @author David W. Miller 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 c5ed666f75f..0526d923fc7 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 @@ -146,7 +146,7 @@ public class OseeOAuthContextProvider implements ContextProvider<OseeOAuthContex return new OseePermissionImpl(id, permission); } - private static final class OseePermissionImpl extends BaseIdentity<Long> implements OseePermission { + private static final class OseePermissionImpl extends BaseIdentity<Long>implements OseePermission { private final OAuthPermission permission; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java index ac351880532..69669c13198 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider; +import com.google.common.io.InputSupplier; import java.io.InputStream; import javax.ws.rs.core.UriInfo; import org.apache.cxf.rs.security.oauth2.common.Client; import org.eclipse.osee.framework.jdk.core.type.OseePrincipal; import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints.ClientFormData; -import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java index eb77c37831a..e034d62c5b7 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java @@ -88,7 +88,7 @@ public class OAuth2RequestFilter extends OAuthRequestFilter { boolean isSecurePath = isPathSecure(context); UriInfo uriInfo = context.getUriInfo(); String path = uriInfo.getAbsolutePath().getPath(); - if (isSecurePath && (path.contains("oauth2")) || path.contains("accounts/self")) { + if (isSecurePath && path.contains("oauth2") || path.contains("accounts/self")) { if (isResourceOwnerRequest(context)) { handleResourceOwnerRequest(context); } else { diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java index b365cd18211..e9879ee0db8 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java @@ -40,7 +40,8 @@ public class OseeAuthorizingFilter extends SimpleAuthorizingFilter { Message currentMessage = JAXRSUtils.getCurrentMessage(); @SuppressWarnings("unchecked") TreeMap<String, List<String>> protocolHeaders = - (TreeMap<String, List<String>>) currentMessage.getContextualProperty("org.apache.cxf.message.Message.PROTOCOL_HEADERS"); + (TreeMap<String, List<String>>) currentMessage.getContextualProperty( + "org.apache.cxf.message.Message.PROTOCOL_HEADERS"); List<String> referers = protocolHeaders.get("Referer"); if (resource != null && referers != null && !referers.toString().contains("coverage")) { diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java index 096c8d96e1e..4fdb25fa0dc 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters; +import com.google.common.io.InputSupplier; import java.io.InputStream; import org.apache.cxf.rs.security.oauth2.common.Client; import org.eclipse.osee.framework.jdk.core.type.Identity; import org.eclipse.osee.jaxrs.server.security.OAuthClient; -import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar @@ -54,7 +54,7 @@ public class ApplicationClient extends Client implements OAuthClient { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((guid == null) ? 0 : guid.hashCode()); + result = prime * result + (guid == null ? 0 : guid.hashCode()); return result; } diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java index 84921906575..eaa9b84e669 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java @@ -10,6 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.io.InputSupplier; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -32,10 +36,6 @@ import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.SubjectPr import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints.ClientFormData; import org.eclipse.osee.jaxrs.server.security.JaxRsOAuthStorage; import org.eclipse.osee.jaxrs.server.security.OAuthClient; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar @@ -127,7 +127,7 @@ public class ClientProviderImpl implements ClientProvider { /** * <pre> * Additional Security options: - * - restrict resource server + * - restrict resource server * - restrict allowed grant types * - register allowed scopes/permissions * - restrict redirect/callback URIs 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 6101ab893c7..9808899936a 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 @@ -194,6 +194,11 @@ public class OAuthEncryption { final ServerAccessToken newToken = new ServerAccessToken(provider.getClient(parts[4]), parts[1], newTokenKey == null ? parts[0] : newTokenKey, Long.valueOf(parts[2]), Long.valueOf(parts[3])) { + + /** + * + */ + private static final long serialVersionUID = 7381031812625396582L; // }; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java index 6a6f8a35f81..d434267a425 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/AuthorizationCodeEndpoint.java @@ -54,7 +54,7 @@ public class AuthorizationCodeEndpoint extends AuthorizationCodeGrantService { * - only confidential clients should have a client secret * - if they are not confidential they should not have a client secret. * - * If desired, add the following: + * If desired, add the following: * && !c.isConfidential() && c.getClientSecret() == null * </pre> */ diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java index 4e4d75f8252..1d1a81217b9 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints; +import com.google.common.io.InputSupplier; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -24,7 +25,6 @@ import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.UriInfo; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.logger.Log; -import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar 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 0a763c110c3..0e4558e8b99 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 @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.Named; /** * @author Roberto E. Escobar */ -public class ClientFormData extends BaseIdentity<String> implements Named { +public class ClientFormData extends BaseIdentity<String>implements Named { private UserSubject userSubject; private String name; 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 c0bd749c0d3..d37f4883b5b 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 @@ -83,7 +83,7 @@ public class ClientRegistrationEndpoint extends AbstractClientService { @Path("/complete") @Consumes(MediaType.MULTIPART_FORM_DATA) public Response finishRegistration(@Context UriInfo uriInfo, // - MultipartBody multiPart) { + MultipartBody multiPart) { SecurityContext securityContext = getAndValidateSecurityContext(); UserSubject userSubject = createUserSubject(securityContext); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/ClientRegistrationDataHtmlWriter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/ClientRegistrationDataHtmlWriter.java index abc6e2d359a..aa295d14bee 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/ClientRegistrationDataHtmlWriter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/ClientRegistrationDataHtmlWriter.java @@ -45,7 +45,8 @@ public class ClientRegistrationDataHtmlWriter extends AbstractHtmlWriter<ClientR ViewModel model = new ViewModel(CLIENT_REG_FORM__TEMPLATE); model.param(CLIENT_REG_FORM__REPLY_TO_TAG, asTemplateValue(data.getReplyTo())); model.param(CLIENT_REG_FORM__REGISTRATION_DECISION, ClientConstants.CLIENT_REGISTRATION__DECISION_KEY); - model.param(CLIENT_REG_FORM__REGISTRATION_DECISION_ACCEPT, ClientConstants.CLIENT_REGISTRATION__DECISION_REGISTER); + model.param(CLIENT_REG_FORM__REGISTRATION_DECISION_ACCEPT, + ClientConstants.CLIENT_REGISTRATION__DECISION_REGISTER); model.param(CLIENT_REG_FORM__REGISTRATION_DECISION_CANCEL, ClientConstants.CLIENT_REGISTRATION__DECISION_CANCEL); model.param(CLIENT_REG_FORM__HIDDEN_FIELDS_SECTION_TAG, HiddenFormFields.newForm() // .add(CLIENT_REGISTRATION__APPLICATION_GUID, data.getClientGuid()) // diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServerConfig.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServerConfig.java index a3cf8a256e8..b84f6957eb0 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServerConfig.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/rs/OAuth2ResourceServerConfig.java @@ -69,7 +69,8 @@ public class OAuth2ResourceServerConfig { } public boolean isAudienceIsEndpointAddress() { - return getBoolean(props, OAUTH2_RS__AUDIENCE_IS_ENDPOINT_ADDRESS, DEFAULT_OAUTH2_RS__AUDIENCE_IS_ENDPOINT_ADDRESS); + return getBoolean(props, OAUTH2_RS__AUDIENCE_IS_ENDPOINT_ADDRESS, + DEFAULT_OAUTH2_RS__AUDIENCE_IS_ENDPOINT_ADDRESS); } public boolean isFilterChecksFormDataForToken() { 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 63f6b20d45e..094ca86eb84 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 @@ -34,7 +34,8 @@ public final class HiddenFormFields { private void write(StringBuilder writer, String name, String value) { if (Strings.isValid(value)) { - writer.append(String.format("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n", name, asTemplateValue(value))); + writer.append( + String.format("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n", name, asTemplateValue(value))); } } diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/OseePrincipalImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/OseePrincipalImpl.java index 37a09558d8c..2d272836f52 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/OseePrincipalImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/util/OseePrincipalImpl.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Roberto E. Escobar */ -public class OseePrincipalImpl extends BaseIdentity<Long> implements OseePrincipal { +public class OseePrincipalImpl extends BaseIdentity<Long>implements OseePrincipal { private final String displayName; private final String email; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java index 95feba8dcd3..845f12bb35c 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthResourceServerFilter.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.security; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -32,8 +34,6 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.jaxrs.client.JaxRsClient; import org.eclipse.osee.jaxrs.client.JaxRsWebTarget; import org.eclipse.osee.jaxrs.server.internal.security.oauth2.OAuthUtil; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; /** * Filter used to protect resource server end-points. This filter is used when the resource server is not located in the diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java index 1d7c67cd341..4517c801b54 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.security; +import com.google.common.io.InputSupplier; import java.io.InputStream; import java.util.List; import java.util.Map; import org.eclipse.osee.framework.jdk.core.type.Identity; -import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar |