MULE-12406: HTTP, Oauth and Soap services have wrong package name (#6)

mulesoft · May 23, 2017 · a0c4a69 · a0c4a69
1 parent 3fe6fd1
commit a0c4a69
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 80 deletions.
diff --git a/...g/mule/extension/oauth2/internal/authorizationcode/DefaultAuthorizationCodeGrantType.java b/...g/mule/extension/oauth2/internal/authorizationcode/DefaultAuthorizationCodeGrantType.java
@@ -8,8 +8,8 @@
 
 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 static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
 
 import org.mule.extension.http.api.HttpResponseAttributes;
 import org.mule.extension.oauth2.internal.AbstractGrantType;
@@ -25,13 +25,13 @@
 import org.mule.runtime.extension.api.runtime.operation.Result;
 import org.mule.runtime.extension.api.runtime.parameter.Literal;
 import org.mule.runtime.extension.api.runtime.parameter.ParameterResolver;
+import org.mule.runtime.http.api.HttpService;
+import org.mule.runtime.http.api.domain.message.request.HttpRequestBuilder;
+import org.mule.runtime.http.api.server.HttpServer;
+import org.mule.runtime.http.api.server.ServerNotFoundException;
 import org.mule.runtime.oauth.api.AuthorizationCodeOAuthDancer;
 import org.mule.runtime.oauth.api.OAuthService;
 import org.mule.runtime.oauth.api.builder.OAuthAuthorizationCodeDancerBuilder;
-import org.mule.service.http.api.HttpService;
-import org.mule.service.http.api.domain.message.request.HttpRequestBuilder;
-import org.mule.service.http.api.server.HttpServer;
-import org.mule.service.http.api.server.ServerNotFoundException;
 
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/...java/org/mule/extension/oauth2/internal/clientcredentials/ClientCredentialsGrantType.java b/...java/org/mule/extension/oauth2/internal/clientcredentials/ClientCredentialsGrantType.java
@@ -8,7 +8,7 @@
 
 import static java.lang.Thread.currentThread;
 import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.initialiseIfNeeded;
-import static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
+import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION;
 
 import org.mule.extension.http.api.HttpResponseAttributes;
 import org.mule.extension.oauth2.internal.AbstractGrantType;
@@ -20,10 +20,10 @@
 import org.mule.runtime.extension.api.annotation.param.Optional;
 import org.mule.runtime.extension.api.annotation.param.Parameter;
 import org.mule.runtime.extension.api.runtime.operation.Result;
+import org.mule.runtime.http.api.domain.message.request.HttpRequestBuilder;
 import org.mule.runtime.oauth.api.ClientCredentialsOAuthDancer;
 import org.mule.runtime.oauth.api.OAuthService;
 import org.mule.runtime.oauth.api.builder.OAuthClientCredentialsDancerBuilder;
-import org.mule.service.http.api.domain.message.request.HttpRequestBuilder;
 
 import java.util.concurrent.ExecutionException;
 

diff --git a/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java b/src/test/java/org/mule/test/oauth2/AbstractOAuthAuthorizationTestCase.java
@@ -19,23 +19,23 @@
 import static org.apache.commons.codec.binary.Base64.encodeBase64String;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR;
+import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION;
+import static org.mule.runtime.http.api.HttpHeaders.Names.CONTENT_TYPE;
+import static org.mule.runtime.http.api.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.encodeString;
 import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR;
-import static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
-import static org.mule.service.http.api.HttpHeaders.Names.CONTENT_TYPE;
-import static org.mule.service.http.api.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.encodeString;
-import static org.mule.services.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CLIENT_ID_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CLIENT_SECRET_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.GRANT_TYPE_AUTHENTICATION_CODE;
-import static org.mule.services.oauth.internal.OAuthConstants.GRANT_TYPE_CLIENT_CREDENTIALS;
-import static org.mule.services.oauth.internal.OAuthConstants.GRANT_TYPE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.REDIRECT_URI_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.SCOPE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CLIENT_ID_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CLIENT_SECRET_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.GRANT_TYPE_AUTHENTICATION_CODE;
+import static org.mule.service.oauth.internal.OAuthConstants.GRANT_TYPE_CLIENT_CREDENTIALS;
+import static org.mule.service.oauth.internal.OAuthConstants.GRANT_TYPE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.REDIRECT_URI_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.SCOPE_PARAMETER;
 
 import org.mule.functional.junit4.MuleArtifactFunctionalTestCase;
 import org.mule.runtime.api.metadata.MediaType;

diff --git a/src/test/java/org/mule/test/oauth2/asserter/AuthorizationRequestAsserter.java b/src/test/java/org/mule/test/oauth2/asserter/AuthorizationRequestAsserter.java
@@ -8,12 +8,12 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mule.service.http.api.HttpConstants.Method.GET;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.decodeQueryString;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.extractQueryParams;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.runtime.http.api.HttpConstants.Method.GET;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.decodeQueryString;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.extractQueryParams;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
 
-import org.mule.service.http.api.domain.ParameterMap;
+import org.mule.runtime.http.api.domain.ParameterMap;
 
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 

diff --git a/...nal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java b/...nal/authorizationcode/functional/AbstractAuthorizationCodeRefreshTokenConfigTestCase.java
@@ -18,12 +18,12 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
-import static org.mule.services.oauth.internal.OAuthConstants.CLIENT_ID_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CLIENT_SECRET_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.GRANT_TYPE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.GRANT_TYPE_REFRESH_TOKEN;
-import static org.mule.services.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
+import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION;
+import static org.mule.service.oauth.internal.OAuthConstants.CLIENT_ID_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CLIENT_SECRET_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.GRANT_TYPE_PARAMETER;
+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.internal.authorizationcode.state.ConfigOAuthContext;
 import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig;

diff --git a/...l/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java b/...l/authorizationcode/functional/AuthorizationCodeAuthorizationCustomTokenExprTestCase.java
@@ -10,13 +10,13 @@
 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.runtime.http.api.utils.HttpEncoderDecoderUtils.appendQueryParam;
 import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.appendQueryParam;
-import static org.mule.services.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.STATE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
+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.runtime.api.metadata.MediaType;

diff --git a/.../internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java b/.../internal/authorizationcode/functional/AuthorizationCodeAuthorizationFailureTestCase.java
@@ -13,15 +13,15 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.assertThat;
+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;
 import static org.mule.runtime.oauth.api.OAuthAuthorizationStatusCode.NO_AUTHORIZATION_CODE_STATUS;
 import static org.mule.runtime.oauth.api.OAuthAuthorizationStatusCode.TOKEN_NOT_FOUND_STATUS;
 import static org.mule.runtime.oauth.api.OAuthAuthorizationStatusCode.TOKEN_URL_CALL_FAILED_STATUS;
 import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.BAD_REQUEST;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.appendQueryParam;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.STATE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+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;

diff --git a/...est/oauth2/internal/authorizationcode/functional/AuthorizationCodeFullConfigTestCase.java b/...est/oauth2/internal/authorizationcode/functional/AuthorizationCodeFullConfigTestCase.java
@@ -17,24 +17,25 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.Assert.assertThat;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.OK;
-import static org.mule.service.http.api.HttpConstants.Method.GET;
-import static org.mule.service.http.api.HttpConstants.Protocol.HTTPS;
-import static org.mule.service.http.api.HttpHeaders.Names.CONTENT_TYPE;
-import static org.mule.service.http.api.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.encodeQueryString;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.encodeString;
-import static org.mule.services.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.STATE_PARAMETER;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.OK;
+import static org.mule.runtime.http.api.HttpConstants.Method.GET;
+import static org.mule.runtime.http.api.HttpConstants.Protocol.HTTPS;
+import static org.mule.runtime.http.api.HttpHeaders.Names.CONTENT_TYPE;
+import static org.mule.runtime.http.api.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.encodeQueryString;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.encodeString;
+import static org.mule.service.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.STATE_PARAMETER;
+
 import org.mule.runtime.api.exception.MuleRuntimeException;
 import org.mule.runtime.api.lifecycle.CreateException;
 import org.mule.runtime.api.tls.TlsContextFactory;
-import org.mule.service.http.api.HttpService;
-import org.mule.service.http.api.domain.message.request.HttpRequest;
-import org.mule.services.http.TestHttpClient;
+import org.mule.runtime.http.api.HttpService;
+import org.mule.runtime.http.api.domain.message.request.HttpRequest;
+import org.mule.service.http.TestHttpClient;
 import org.mule.tck.junit4.rule.SystemProperty;
 import org.mule.test.oauth2.AbstractOAuthAuthorizationTestCase;
 import org.mule.test.oauth2.asserter.AuthorizationRequestAsserter;

diff --git a/...2/internal/authorizationcode/functional/AuthorizationCodeLocalCallbackConfigTestCase.java b/...2/internal/authorizationcode/functional/AuthorizationCodeLocalCallbackConfigTestCase.java
@@ -6,7 +6,7 @@
  */
 package org.mule.test.oauth2.internal.authorizationcode.functional;
 
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
 
 import org.apache.http.client.fluent.Request;
 import org.junit.Test;

diff --git a/.../oauth2/internal/authorizationcode/functional/AuthorizationCodeMinimalConfigTestCase.java b/.../oauth2/internal/authorizationcode/functional/AuthorizationCodeMinimalConfigTestCase.java
@@ -6,7 +6,8 @@
  */
 package org.mule.test.oauth2.internal.authorizationcode.functional;
 
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+
 import org.apache.http.client.fluent.Request;
 import org.junit.Ignore;
 import org.junit.Test;

diff --git a/...st/oauth2/internal/authorizationcode/functional/AuthorizationCodeMultitenantTestCase.java b/...st/oauth2/internal/authorizationcode/functional/AuthorizationCodeMultitenantTestCase.java
@@ -15,14 +15,14 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static java.lang.String.format;
 import static org.apache.http.client.fluent.Request.Get;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.OK;
-import static org.mule.service.http.api.HttpHeaders.Names.CONTENT_TYPE;
-import static org.mule.service.http.api.utils.HttpEncoderDecoderUtils.encodeQueryString;
-import static org.mule.services.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
-import static org.mule.services.oauth.internal.OAuthConstants.STATE_PARAMETER;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.OK;
+import static org.mule.runtime.http.api.HttpHeaders.Names.CONTENT_TYPE;
+import static org.mule.runtime.http.api.utils.HttpEncoderDecoderUtils.encodeQueryString;
+import static org.mule.service.oauth.internal.OAuthConstants.ACCESS_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.EXPIRES_IN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.REFRESH_TOKEN_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.STATE_PARAMETER;
 
 import org.mule.runtime.api.metadata.MediaType;
 import org.mule.tck.junit4.rule.SystemProperty;

diff --git a/.../internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java b/.../internal/authorizationcode/functional/AuthorizationCodeNoTokenManagerConfigTestCase.java
@@ -10,7 +10,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig.defaultTokenManagerConfigIndex;
 import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID;
-import static org.mule.services.oauth.internal.OAuthConstants.CODE_PARAMETER;
+import static org.mule.service.oauth.internal.OAuthConstants.CODE_PARAMETER;
 
 import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig;
 import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext;

diff --git a/.../authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java b/.../authorizationcode/functional/AuthorizationCodeRefreshTokenMultitenantConfigTestCase.java
@@ -6,7 +6,7 @@
  */
 package org.mule.test.oauth2.internal.authorizationcode.functional;
 
-import static org.mule.service.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.INTERNAL_SERVER_ERROR;
 
 import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext;
 import org.mule.extension.oauth2.internal.tokenmanager.TokenManagerConfig;

diff --git a/.../oauth2/internal/clientcredentials/functional/AbstractClientCredentialsBasicTestCase.java b/.../oauth2/internal/clientcredentials/functional/AbstractClientCredentialsBasicTestCase.java
@@ -12,10 +12,10 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
-import static org.mule.service.http.api.HttpHeaders.Names.WWW_AUTHENTICATE;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.OK;
-import static org.mule.service.http.api.HttpConstants.HttpStatus.UNAUTHORIZED;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.OK;
+import static org.mule.runtime.http.api.HttpConstants.HttpStatus.UNAUTHORIZED;
+import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION;
+import static org.mule.runtime.http.api.HttpHeaders.Names.WWW_AUTHENTICATE;
 
 import org.mule.tck.junit4.rule.SystemProperty;
 import org.mule.test.oauth2.AbstractOAuthAuthorizationTestCase;

diff --git a/...est/oauth2/internal/clientcredentials/functional/ClientCredentialsFullConfigTestCase.java b/...est/oauth2/internal/clientcredentials/functional/ClientCredentialsFullConfigTestCase.java
@@ -15,10 +15,11 @@
 import static java.lang.String.format;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
+import static org.mule.runtime.http.api.HttpConstants.Protocol.HTTPS;
+import static org.mule.runtime.http.api.HttpHeaders.Names.AUTHORIZATION;
+import static org.mule.runtime.http.api.HttpHeaders.Names.WWW_AUTHENTICATE;
 import static org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext.DEFAULT_RESOURCE_OWNER_ID;
-import static org.mule.service.http.api.HttpConstants.Protocol.HTTPS;
-import static org.mule.service.http.api.HttpHeaders.Names.AUTHORIZATION;
-import static org.mule.service.http.api.HttpHeaders.Names.WWW_AUTHENTICATE;
+
 import org.mule.runtime.core.util.store.SimpleMemoryObjectStore;
 import org.mule.runtime.oauth.api.state.ResourceOwnerOAuthContext;
 import org.mule.tck.junit4.rule.SystemProperty;

diff --git a/...t/oauth2/internal/clientcredentials/functional/ClientCredentialsTokenRequestTestCase.java b/...t/oauth2/internal/clientcredentials/functional/ClientCredentialsTokenRequestTestCase.java
@@ -11,7 +11,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
-import org.mule.service.http.api.HttpHeaders;
+import org.mule.runtime.http.api.HttpHeaders;
 import org.mule.tck.junit4.rule.SystemProperty;
 import org.mule.test.oauth2.AbstractOAuthAuthorizationTestCase;