From 3c0af4910267b3ed7fb595a6d2b6a0c48049d59c Mon Sep 17 00:00:00 2001 From: Rodrigo Merino Date: Tue, 16 Jan 2018 16:55:22 -0300 Subject: [PATCH] MULE-14446: OAuth Module exports internal classes (#53) --- .../mule/extension/oauth2/OAuthExtension.java | 8 ++----- .../api/RequestAuthenticationException.java | 21 ------------------- .../DefaultAuthorizationCodeGrantType.java | 6 +++++- .../api/authorizationcode/package-info.java | 14 +++++++++++++ .../ClientCredentialsGrantType.java | 6 +++++- .../api/clientcredentials/package-info.java | 14 +++++++++++++ .../tokenmanager/TokenManagerConfig.java | 6 +++++- .../oauth2/api/tokenmanager/package-info.java | 14 +++++++++++++ .../oauth2/internal/AbstractGrantType.java | 2 +- .../oauth2/internal/OAuthOperations.java | 19 ++++++++++------- .../TokenResponseParameterOutputResolver.java | 3 ++- .../AbstractOAuthAuthorizationTestCase.java | 3 +++ ...izationCodeRefreshTokenConfigTestCase.java | 2 +- ...eAuthorizationCustomTokenExprTestCase.java | 6 +++--- ...ationCodeAuthorizationFailureTestCase.java | 6 +++--- ...ationCodeNoTokenManagerConfigTestCase.java | 6 +++--- ...izationCodeRefreshTokenConfigTestCase.java | 2 +- ...RefreshTokenMultitenantConfigTestCase.java | 2 +- ...edentialsNoTokenManagerConfigTestCase.java | 2 +- .../InvalidateOauthContextTestCase.java | 2 +- 20 files changed, 90 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/org/mule/extension/oauth2/api/RequestAuthenticationException.java rename src/main/java/org/mule/extension/oauth2/{internal => api}/authorizationcode/DefaultAuthorizationCodeGrantType.java (98%) create mode 100644 src/main/java/org/mule/extension/oauth2/api/authorizationcode/package-info.java rename src/main/java/org/mule/extension/oauth2/{internal => api}/clientcredentials/ClientCredentialsGrantType.java (95%) create mode 100644 src/main/java/org/mule/extension/oauth2/api/clientcredentials/package-info.java rename src/main/java/org/mule/extension/oauth2/{internal => api}/tokenmanager/TokenManagerConfig.java (96%) create mode 100644 src/main/java/org/mule/extension/oauth2/api/tokenmanager/package-info.java diff --git a/src/main/java/org/mule/extension/oauth2/OAuthExtension.java b/src/main/java/org/mule/extension/oauth2/OAuthExtension.java index d75c4ee6..11acf8da 100644 --- a/src/main/java/org/mule/extension/oauth2/OAuthExtension.java +++ b/src/main/java/org/mule/extension/oauth2/OAuthExtension.java @@ -8,13 +8,10 @@ import org.mule.extension.http.api.request.authentication.HttpRequestAuthentication; import org.mule.extension.http.api.request.proxy.HttpProxyConfig; +import org.mule.extension.oauth2.api.authorizationcode.DefaultAuthorizationCodeGrantType; +import org.mule.extension.oauth2.api.clientcredentials.ClientCredentialsGrantType; import org.mule.extension.oauth2.api.exception.OAuthClientErrors; import org.mule.extension.oauth2.internal.OAuthOperations; -import org.mule.extension.oauth2.internal.authorizationcode.DefaultAuthorizationCodeGrantType; -import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; -import org.mule.extension.oauth2.internal.clientcredentials.ClientCredentialsGrantType; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; -import org.mule.runtime.extension.api.annotation.Export; import org.mule.runtime.extension.api.annotation.Extension; import org.mule.runtime.extension.api.annotation.Import; import org.mule.runtime.extension.api.annotation.Operations; @@ -35,7 +32,6 @@ subTypes = {DefaultAuthorizationCodeGrantType.class, ClientCredentialsGrantType.class}) @ErrorTypes(OAuthClientErrors.class) @Xml(prefix = "oauth") -@Export(classes = {TokenManagerConfig.class, ConfigOAuthContext.class}) public class OAuthExtension { } diff --git a/src/main/java/org/mule/extension/oauth2/api/RequestAuthenticationException.java b/src/main/java/org/mule/extension/oauth2/api/RequestAuthenticationException.java deleted file mode 100644 index c5183abc..00000000 --- a/src/main/java/org/mule/extension/oauth2/api/RequestAuthenticationException.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ -package org.mule.extension.oauth2.api; - -import org.mule.runtime.api.exception.DefaultMuleException; -import org.mule.runtime.api.i18n.I18nMessage; - -/** - * Exception throw when it's not possible to create the authentication request for a given request. - */ -public class RequestAuthenticationException extends DefaultMuleException { - - public RequestAuthenticationException(I18nMessage message) { - super(message); - } - -} diff --git a/src/main/java/org/mule/extension/oauth2/internal/authorizationcode/DefaultAuthorizationCodeGrantType.java b/src/main/java/org/mule/extension/oauth2/api/authorizationcode/DefaultAuthorizationCodeGrantType.java similarity index 98% rename from src/main/java/org/mule/extension/oauth2/internal/authorizationcode/DefaultAuthorizationCodeGrantType.java rename to src/main/java/org/mule/extension/oauth2/api/authorizationcode/DefaultAuthorizationCodeGrantType.java index 18bf83a7..be7d5914 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/authorizationcode/DefaultAuthorizationCodeGrantType.java +++ b/src/main/java/org/mule/extension/oauth2/api/authorizationcode/DefaultAuthorizationCodeGrantType.java @@ -4,13 +4,15 @@ * license, a copy of which has been included with this distribution in the * LICENSE.txt file. */ -package org.mule.extension.oauth2.internal.authorizationcode; +package org.mule.extension.oauth2.api.authorizationcode; import static java.lang.Thread.currentThread; import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.initialiseIfNeeded; import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; +import org.mule.api.annotation.NoExtend; +import org.mule.api.annotation.NoInstantiate; import org.mule.extension.http.api.HttpResponseAttributes; import org.mule.extension.oauth2.internal.AbstractGrantType; import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; @@ -49,6 +51,8 @@ * authentication code and retrieve the access token */ @Alias("authorization-code-grant-type") +@NoExtend +@NoInstantiate public class DefaultAuthorizationCodeGrantType extends AbstractGrantType { /** diff --git a/src/main/java/org/mule/extension/oauth2/api/authorizationcode/package-info.java b/src/main/java/org/mule/extension/oauth2/api/authorizationcode/package-info.java new file mode 100644 index 00000000..ef50a614 --- /dev/null +++ b/src/main/java/org/mule/extension/oauth2/api/authorizationcode/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ + +/** + * Classes in this package are not meant to be part of the Java API for this module, but the DSL definitions generated from this + * are API. The way to enforce the API for the DSL is backwards compatible is by enforcing the compatibility of the Java API. + *

+ * Classes here are not meant to be used directly by a user. + */ +package org.mule.extension.oauth2.api.authorizationcode; diff --git a/src/main/java/org/mule/extension/oauth2/internal/clientcredentials/ClientCredentialsGrantType.java b/src/main/java/org/mule/extension/oauth2/api/clientcredentials/ClientCredentialsGrantType.java similarity index 95% rename from src/main/java/org/mule/extension/oauth2/internal/clientcredentials/ClientCredentialsGrantType.java rename to src/main/java/org/mule/extension/oauth2/api/clientcredentials/ClientCredentialsGrantType.java index 8051f817..2b202ce6 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/clientcredentials/ClientCredentialsGrantType.java +++ b/src/main/java/org/mule/extension/oauth2/api/clientcredentials/ClientCredentialsGrantType.java @@ -4,12 +4,14 @@ * license, a copy of which has been included with this distribution in the * LICENSE.txt file. */ -package org.mule.extension.oauth2.internal.clientcredentials; +package org.mule.extension.oauth2.api.clientcredentials; import static java.lang.Thread.currentThread; import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.initialiseIfNeeded; import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION; +import org.mule.api.annotation.NoExtend; +import org.mule.api.annotation.NoInstantiate; import org.mule.extension.http.api.HttpResponseAttributes; import org.mule.extension.oauth2.internal.AbstractGrantType; import org.mule.extension.oauth2.internal.store.SimpleObjectStoreToMapAdapter; @@ -28,6 +30,8 @@ /** * Authorization element for client credentials oauth grant type */ +@NoExtend +@NoInstantiate public class ClientCredentialsGrantType extends AbstractGrantType { /** diff --git a/src/main/java/org/mule/extension/oauth2/api/clientcredentials/package-info.java b/src/main/java/org/mule/extension/oauth2/api/clientcredentials/package-info.java new file mode 100644 index 00000000..2cf22d5c --- /dev/null +++ b/src/main/java/org/mule/extension/oauth2/api/clientcredentials/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ + +/** + * Classes in this package are not meant to be part of the Java API for this module, but the DSL definitions generated from this + * are API. The way to enforce the API for the DSL is backwards compatible is by enforcing the compatibility of the Java API. + *

+ * Classes here are not meant to be used directly by a user. + */ +package org.mule.extension.oauth2.api.clientcredentials; diff --git a/src/main/java/org/mule/extension/oauth2/internal/tokenmanager/TokenManagerConfig.java b/src/main/java/org/mule/extension/oauth2/api/tokenmanager/TokenManagerConfig.java similarity index 96% rename from src/main/java/org/mule/extension/oauth2/internal/tokenmanager/TokenManagerConfig.java rename to src/main/java/org/mule/extension/oauth2/api/tokenmanager/TokenManagerConfig.java index 88da8c7f..383a431f 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/tokenmanager/TokenManagerConfig.java +++ b/src/main/java/org/mule/extension/oauth2/api/tokenmanager/TokenManagerConfig.java @@ -4,8 +4,10 @@ * license, a copy of which has been included with this distribution in the * LICENSE.txt file. */ -package org.mule.extension.oauth2.internal.tokenmanager; +package org.mule.extension.oauth2.api.tokenmanager; +import org.mule.api.annotation.NoExtend; +import org.mule.api.annotation.NoInstantiate; import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; import org.mule.runtime.api.lifecycle.Disposable; import org.mule.runtime.api.lifecycle.Initialisable; @@ -33,6 +35,8 @@ */ @Alias("token-manager-config") @TypeDsl(allowTopLevelDefinition = true) +@NoExtend +@NoInstantiate public class TokenManagerConfig implements Initialisable, Disposable, MuleContextAware { public static AtomicInteger defaultTokenManagerConfigIndex = new AtomicInteger(0); diff --git a/src/main/java/org/mule/extension/oauth2/api/tokenmanager/package-info.java b/src/main/java/org/mule/extension/oauth2/api/tokenmanager/package-info.java new file mode 100644 index 00000000..00e9c20a --- /dev/null +++ b/src/main/java/org/mule/extension/oauth2/api/tokenmanager/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ + +/** + * Classes in this package are not meant to be part of the Java API for this module, but the SDK exports them when dealing with + * this extension even though there are no way to generate instances of this types from expressions. + *

+ * Classes here are not meant to be used directly by a user. + */ +package org.mule.extension.oauth2.api.tokenmanager; diff --git a/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java b/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java index 497b7bba..8b174e49 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java +++ b/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java @@ -20,7 +20,7 @@ import org.mule.extension.http.api.request.authentication.HttpRequestAuthentication; import org.mule.extension.http.api.request.proxy.HttpProxyConfig; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.runtime.api.exception.MuleException; import org.mule.runtime.api.lifecycle.InitialisationException; import org.mule.runtime.api.lifecycle.Lifecycle; diff --git a/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java b/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java index 13e1ec8e..2f5cad87 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java +++ b/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java @@ -7,9 +7,12 @@ package org.mule.extension.oauth2.internal; import static java.util.Objects.requireNonNull; +import static org.mule.runtime.api.meta.ExpressionSupport.NOT_SUPPORTED; import static org.mule.runtime.extension.api.annotation.param.MediaType.TEXT_PLAIN; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; + +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; +import org.mule.runtime.extension.api.annotation.Expression; import org.mule.runtime.extension.api.annotation.metadata.OutputResolver; import org.mule.runtime.extension.api.annotation.param.MediaType; import org.mule.runtime.extension.api.annotation.param.Optional; @@ -24,11 +27,11 @@ public class OAuthOperations { /** * Clears the oauth context for a token manager and a resource owner id. - * + * * @param tokenManager The token manager which holds the credentials to invalidate. * @param resourceOwnerId The resource owner id to invalidate. This attribute is only allowed for authorization code grant type. */ - public void invalidateOauthContext(TokenManagerConfig tokenManager, + public void invalidateOauthContext(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId) { validateResourceOwnerId(resourceOwnerId); tokenManager.getConfigOAuthContext().clearContextForResourceOwner(resourceOwnerId); @@ -42,7 +45,7 @@ public void invalidateOauthContext(TokenManagerConfig tokenManager, * @return access token of the oauth context retrieved by the token request. */ @MediaType(value = TEXT_PLAIN, strict = false) - public String retrieveAccessToken(TokenManagerConfig tokenManager, + public String retrieveAccessToken(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId) { validateResourceOwnerId(resourceOwnerId); return getContextForResourceOwner(tokenManager, resourceOwnerId).getAccessToken(); @@ -56,7 +59,7 @@ public String retrieveAccessToken(TokenManagerConfig tokenManager, * @return refresh token of the oauth context retrieved by the token request. */ @MediaType(value = TEXT_PLAIN, strict = false) - public String retrieveRefreshToken(TokenManagerConfig tokenManager, + public String retrieveRefreshToken(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId) { return getContextForResourceOwner(tokenManager, resourceOwnerId).getRefreshToken(); } @@ -69,7 +72,7 @@ public String retrieveRefreshToken(TokenManagerConfig tokenManager, * @return the expiration of the oauth context retrieved by the token request. */ @MediaType(value = TEXT_PLAIN, strict = false) - public String retrieveExpiresIn(TokenManagerConfig tokenManager, + public String retrieveExpiresIn(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId) { return getContextForResourceOwner(tokenManager, resourceOwnerId).getExpiresIn(); } @@ -82,7 +85,7 @@ public String retrieveExpiresIn(TokenManagerConfig tokenManager, * @return state of the oauth context retrieved by the token request. */ @MediaType(value = TEXT_PLAIN, strict = false) - public String retrieveState(TokenManagerConfig tokenManager, + public String retrieveState(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId) { return getContextForResourceOwner(tokenManager, resourceOwnerId).getState(); } @@ -97,7 +100,7 @@ public String retrieveState(TokenManagerConfig tokenManager, * @see AbstractGrantType#parameterExtractors */ @OutputResolver(output = TokenResponseParameterOutputResolver.class) - public Object retrieveCustomTokenResponseParam(TokenManagerConfig tokenManager, + public Object retrieveCustomTokenResponseParam(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager, @Optional(defaultValue = DEFAULT_RESOURCE_OWNER_ID) String resourceOwnerId, String key) { return getContextForResourceOwner(tokenManager, resourceOwnerId).getTokenResponseParameters().get(key); diff --git a/src/main/java/org/mule/extension/oauth2/internal/TokenResponseParameterOutputResolver.java b/src/main/java/org/mule/extension/oauth2/internal/TokenResponseParameterOutputResolver.java index 33d9348c..88d8d0a2 100644 --- a/src/main/java/org/mule/extension/oauth2/internal/TokenResponseParameterOutputResolver.java +++ b/src/main/java/org/mule/extension/oauth2/internal/TokenResponseParameterOutputResolver.java @@ -7,7 +7,8 @@ package org.mule.extension.oauth2.internal; import static org.mule.metadata.api.model.MetadataFormat.JAVA; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; + +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.metadata.api.builder.BaseTypeBuilder; import org.mule.metadata.api.model.AnyType; import org.mule.metadata.api.model.MetadataType; diff --git a/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java b/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java index 5e737fc3..728ead75 100644 --- a/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java +++ b/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java @@ -39,10 +39,12 @@ import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER; import static org.mule.service.oauth.internal.OAuthConstants.SCOPE_PARAMETER; +import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; import org.mule.functional.junit4.MuleArtifactFunctionalTestCase; import org.mule.runtime.api.metadata.MediaType; import org.mule.tck.junit4.rule.DynamicPort; import org.mule.tck.junit4.rule.SystemProperty; +import org.mule.test.runner.ArtifactClassLoaderRunnerConfig; import org.junit.Rule; @@ -52,6 +54,7 @@ import java.io.UnsupportedEncodingException; +@ArtifactClassLoaderRunnerConfig(exportPluginClasses = {ConfigOAuthContext.class}) public abstract class AbstractOAuthAuthorizationTestCase extends MuleArtifactFunctionalTestCase { public static final int REQUEST_TIMEOUT = 5000; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java index 8f538382..08147553 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java @@ -25,8 +25,8 @@ import static org.mule.service.oauth.internal.OAuthConstants.GRANT_TYPE_REFRESH_TOKEN; import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; import org.mule.runtime.core.api.event.CoreEvent; import org.mule.runtime.oauth.api.state.DefaultResourceOwnerOAuthContext; import org.mule.tck.junit4.rule.SystemProperty; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java index aa8e4b49..ae01679e 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java @@ -10,8 +10,8 @@ import static org.apache.http.client.fluent.Request.Get; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.appendQueryParam; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; import static org.mule.service.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER; @@ -20,7 +20,7 @@ import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER; import static org.mule.service.oauth.internal.OAuthConstants.STATE_PARAMETER; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.runtime.api.metadata.MediaType; import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext; import org.mule.tck.junit4.rule.DynamicPort; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java index 1fe577d3..fc8a6520 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java @@ -13,8 +13,8 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; import static org.mule.runtime.http.api.HttpConstants.HttpStatus.BAD_REQUEST; import static org.mule.runtime.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR; import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.appendQueryParam; @@ -26,7 +26,7 @@ import static org.mule.service.oauth.internal.OAuthConstants.STATE_PARAMETER; import static org.mule.tck.MuleTestUtils.testWithSystemProperty; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext; import org.mule.tck.junit4.rule.DynamicPort; import org.mule.tck.processor.FlowAssert; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java index 55ca2249..aed9e0e4 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java @@ -8,12 +8,12 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; -import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex; +import static org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig.getTokenManagerConfigByName; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext; import org.apache.http.client.fluent.Request; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenConfigTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenConfigTestCase.java index 4e5605c3..37dcb036 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenConfigTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenConfigTestCase.java @@ -11,7 +11,7 @@ import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; import org.mule.extension.http.api.request.validator.ResponseValidatorTypedException; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.functional.api.exception.ExpectedError; import org.junit.Rule; diff --git a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java index b139a1b4..a25d5e42 100644 --- a/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java @@ -8,8 +8,8 @@ import static org.mule.runtime.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; import org.mule.runtime.oauth.api.state.DefaultResourceOwnerOAuthContext; import org.mule.tck.junit4.rule.SystemProperty; diff --git a/src/test/java/org/mule/test/oauth2/internal/clientcredentials/functional/ClientCredentialsNoTokenManagerConfigTestCase.java b/src/test/java/org/mule/test/oauth2/internal/clientcredentials/functional/ClientCredentialsNoTokenManagerConfigTestCase.java index deec89dd..970728ed 100644 --- a/src/test/java/org/mule/test/oauth2/internal/clientcredentials/functional/ClientCredentialsNoTokenManagerConfigTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/clientcredentials/functional/ClientCredentialsNoTokenManagerConfigTestCase.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertThat; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext; import org.junit.Test; diff --git a/src/test/java/org/mule/test/oauth2/internal/tokenmanager/InvalidateOauthContextTestCase.java b/src/test/java/org/mule/test/oauth2/internal/tokenmanager/InvalidateOauthContextTestCase.java index 79e6d7db..bc44299e 100644 --- a/src/test/java/org/mule/test/oauth2/internal/tokenmanager/InvalidateOauthContextTestCase.java +++ b/src/test/java/org/mule/test/oauth2/internal/tokenmanager/InvalidateOauthContextTestCase.java @@ -12,8 +12,8 @@ import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.initialiseIfNeeded; import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID; +import org.mule.extension.oauth2.api.tokenmanager.TokenManagerConfig; import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext; -import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig; import org.mule.runtime.oauth.api.state.DefaultResourceOwnerOAuthContext; import org.mule.test.oauth2.AbstractOAuthAuthorizationTestCase;