Skip to content

Commit 5c1ea8c

Browse files
ashanthamaraashanthamara
authored
Merge pull request #2724 from ashanthamara/package-refactor
Fix import paths of action execution component classes
2 parents 35cbaff + e9f7143 commit 5c1ea8c

File tree

12 files changed

+73
-73
lines changed

12 files changed

+73
-73
lines changed

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilder.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
import com.nimbusds.jwt.JWTClaimsSet;
2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;
24-
import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder;
25-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionRequestBuilderException;
26-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionRequest;
27-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionRequestContext;
28-
import org.wso2.carbon.identity.action.execution.model.ActionType;
29-
import org.wso2.carbon.identity.action.execution.model.AllowedOperation;
30-
import org.wso2.carbon.identity.action.execution.model.Event;
31-
import org.wso2.carbon.identity.action.execution.model.FlowContext;
32-
import org.wso2.carbon.identity.action.execution.model.Operation;
33-
import org.wso2.carbon.identity.action.execution.model.Organization;
34-
import org.wso2.carbon.identity.action.execution.model.Request;
35-
import org.wso2.carbon.identity.action.execution.model.Tenant;
36-
import org.wso2.carbon.identity.action.execution.model.User;
37-
import org.wso2.carbon.identity.action.execution.model.UserStore;
24+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionRequestBuilderException;
25+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionRequest;
26+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionRequestContext;
27+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
28+
import org.wso2.carbon.identity.action.execution.api.model.AllowedOperation;
29+
import org.wso2.carbon.identity.action.execution.api.model.Event;
30+
import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
31+
import org.wso2.carbon.identity.action.execution.api.model.Operation;
32+
import org.wso2.carbon.identity.action.execution.api.model.Organization;
33+
import org.wso2.carbon.identity.action.execution.api.model.Request;
34+
import org.wso2.carbon.identity.action.execution.api.model.Tenant;
35+
import org.wso2.carbon.identity.action.execution.api.model.User;
36+
import org.wso2.carbon.identity.action.execution.api.model.UserStore;
37+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutionRequestBuilder;
3838
import org.wso2.carbon.identity.application.authentication.framework.exception.UserIdNotFoundException;
3939
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
4040
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenResponseProcessor.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
import org.apache.commons.httpclient.HttpStatus;
2525
import org.apache.commons.logging.Log;
2626
import org.apache.commons.logging.LogFactory;
27-
import org.wso2.carbon.identity.action.execution.ActionExecutionLogConstants;
28-
import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor;
29-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionResponseProcessorException;
30-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionResponseContext;
31-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionStatus;
32-
import org.wso2.carbon.identity.action.execution.model.ActionInvocationErrorResponse;
33-
import org.wso2.carbon.identity.action.execution.model.ActionInvocationFailureResponse;
34-
import org.wso2.carbon.identity.action.execution.model.ActionInvocationSuccessResponse;
35-
import org.wso2.carbon.identity.action.execution.model.ActionType;
36-
import org.wso2.carbon.identity.action.execution.model.Error;
37-
import org.wso2.carbon.identity.action.execution.model.ErrorStatus;
38-
import org.wso2.carbon.identity.action.execution.model.FailedStatus;
39-
import org.wso2.carbon.identity.action.execution.model.Failure;
40-
import org.wso2.carbon.identity.action.execution.model.FlowContext;
41-
import org.wso2.carbon.identity.action.execution.model.PerformableOperation;
42-
import org.wso2.carbon.identity.action.execution.model.Success;
43-
import org.wso2.carbon.identity.action.execution.model.SuccessStatus;
27+
import org.wso2.carbon.identity.action.execution.api.constant.ActionExecutionLogConstants;
28+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionResponseProcessorException;
29+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionResponseContext;
30+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionStatus;
31+
import org.wso2.carbon.identity.action.execution.api.model.ActionInvocationErrorResponse;
32+
import org.wso2.carbon.identity.action.execution.api.model.ActionInvocationFailureResponse;
33+
import org.wso2.carbon.identity.action.execution.api.model.ActionInvocationSuccessResponse;
34+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
35+
import org.wso2.carbon.identity.action.execution.api.model.Error;
36+
import org.wso2.carbon.identity.action.execution.api.model.ErrorStatus;
37+
import org.wso2.carbon.identity.action.execution.api.model.FailedStatus;
38+
import org.wso2.carbon.identity.action.execution.api.model.Failure;
39+
import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
40+
import org.wso2.carbon.identity.action.execution.api.model.PerformableOperation;
41+
import org.wso2.carbon.identity.action.execution.api.model.Success;
42+
import org.wso2.carbon.identity.action.execution.api.model.SuccessStatus;
43+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutionResponseProcessor;
4444
import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
4545
import org.wso2.carbon.identity.oauth.action.model.AccessToken;
4646
import org.wso2.carbon.identity.oauth.action.model.ClaimPathInfo;

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/model/OperationExecutionResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.wso2.carbon.identity.oauth.action.model;
2020

21-
import org.wso2.carbon.identity.action.execution.model.PerformableOperation;
21+
import org.wso2.carbon.identity.action.execution.api.model.PerformableOperation;
2222

2323
/**
2424
* This class represents the result of the execution of an operation.

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/model/PreIssueAccessTokenEvent.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
package org.wso2.carbon.identity.oauth.action.model;
2020

21-
import org.wso2.carbon.identity.action.execution.model.Event;
22-
import org.wso2.carbon.identity.action.execution.model.Organization;
23-
import org.wso2.carbon.identity.action.execution.model.Request;
24-
import org.wso2.carbon.identity.action.execution.model.Tenant;
25-
import org.wso2.carbon.identity.action.execution.model.User;
26-
import org.wso2.carbon.identity.action.execution.model.UserStore;
21+
import org.wso2.carbon.identity.action.execution.api.model.Event;
22+
import org.wso2.carbon.identity.action.execution.api.model.Organization;
23+
import org.wso2.carbon.identity.action.execution.api.model.Request;
24+
import org.wso2.carbon.identity.action.execution.api.model.Tenant;
25+
import org.wso2.carbon.identity.action.execution.api.model.User;
26+
import org.wso2.carbon.identity.action.execution.api.model.UserStore;
2727

2828
/**
2929
* This class models the event at a pre issue access token trigger.
3030
* PreIssueAccessTokenEvent is the entity that represents the event that is sent to the Action
31-
* over {@link org.wso2.carbon.identity.action.execution.model.ActionExecutionRequest}.
31+
* over {@link org.wso2.carbon.identity.action.execution.api.model.ActionExecutionRequest}.
3232
*/
3333
public class PreIssueAccessTokenEvent extends Event {
3434

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/model/TokenRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
package org.wso2.carbon.identity.oauth.action.model;
2020

21-
import org.wso2.carbon.identity.action.execution.model.Header;
22-
import org.wso2.carbon.identity.action.execution.model.Param;
23-
import org.wso2.carbon.identity.action.execution.model.Request;
21+
import org.wso2.carbon.identity.action.execution.api.model.Header;
22+
import org.wso2.carbon.identity.action.execution.api.model.Param;
23+
import org.wso2.carbon.identity.action.execution.api.model.Request;
2424

2525
import java.util.ArrayList;
2626
import java.util.List;
2727

2828
/**
2929
* This class models the request at a pre issue access token trigger.
3030
* TokenRequest is the entity that represents the request that is sent to Action
31-
* over {@link org.wso2.carbon.identity.action.execution.model.ActionExecutionRequest}.
31+
* over {@link org.wso2.carbon.identity.action.execution.api.model.ActionExecutionRequest}.
3232
*/
3333
public class TokenRequest extends Request {
3434

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/internal/OAuthComponentServiceHolder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.apache.commons.logging.Log;
2222
import org.apache.commons.logging.LogFactory;
23-
import org.wso2.carbon.identity.action.execution.ActionExecutorService;
23+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutorService;
2424
import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
2525
import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
2626
import org.wso2.carbon.identity.configuration.mgt.core.ConfigurationManager;

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/internal/OAuthServiceComponent.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.osgi.service.component.annotations.Reference;
2727
import org.osgi.service.component.annotations.ReferenceCardinality;
2828
import org.osgi.service.component.annotations.ReferencePolicy;
29-
import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder;
30-
import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor;
31-
import org.wso2.carbon.identity.action.execution.ActionExecutorService;
29+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutionRequestBuilder;
30+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutionResponseProcessor;
31+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutorService;
3232
import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
3333
import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
3434
import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/AbstractAuthorizationGrantHandler.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
2727
import org.apache.oltu.oauth2.common.message.types.GrantType;
2828
import org.wso2.carbon.context.PrivilegedCarbonContext;
29-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException;
30-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionStatus;
31-
import org.wso2.carbon.identity.action.execution.model.ActionType;
32-
import org.wso2.carbon.identity.action.execution.model.Error;
33-
import org.wso2.carbon.identity.action.execution.model.Failure;
34-
import org.wso2.carbon.identity.action.execution.model.FlowContext;
29+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionException;
30+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionStatus;
31+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
32+
import org.wso2.carbon.identity.action.execution.api.model.Error;
33+
import org.wso2.carbon.identity.action.execution.api.model.Failure;
34+
import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
3535
import org.wso2.carbon.identity.application.authentication.framework.exception.UserIdNotFoundException;
3636
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
3737
import org.wso2.carbon.identity.base.IdentityConstants;

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/RefreshGrantHandler.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.apache.commons.logging.Log;
2525
import org.apache.commons.logging.LogFactory;
2626
import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
27-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException;
28-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionStatus;
29-
import org.wso2.carbon.identity.action.execution.model.ActionType;
30-
import org.wso2.carbon.identity.action.execution.model.Error;
31-
import org.wso2.carbon.identity.action.execution.model.Failure;
32-
import org.wso2.carbon.identity.action.execution.model.FlowContext;
27+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionException;
28+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionStatus;
29+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
30+
import org.wso2.carbon.identity.action.execution.api.model.Error;
31+
import org.wso2.carbon.identity.action.execution.api.model.Failure;
32+
import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
3333
import org.wso2.carbon.identity.application.authentication.framework.exception.FrameworkException;
3434
import org.wso2.carbon.identity.application.authentication.framework.exception.UserIdNotFoundException;
3535
import org.wso2.carbon.identity.application.authentication.framework.inbound.FrameworkClientException;

‎components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/action/execution/PreIssueAccessTokenRequestBuilderTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
import org.testng.annotations.AfterClass;
2525
import org.testng.annotations.BeforeClass;
2626
import org.testng.annotations.Test;
27-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionRequestBuilderException;
28-
import org.wso2.carbon.identity.action.execution.model.ActionExecutionRequest;
29-
import org.wso2.carbon.identity.action.execution.model.ActionType;
30-
import org.wso2.carbon.identity.action.execution.model.AllowedOperation;
31-
import org.wso2.carbon.identity.action.execution.model.FlowContext;
32-
import org.wso2.carbon.identity.action.execution.model.Header;
33-
import org.wso2.carbon.identity.action.execution.model.Operation;
34-
import org.wso2.carbon.identity.action.execution.model.Param;
35-
import org.wso2.carbon.identity.action.execution.model.Tenant;
27+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionRequestBuilderException;
28+
import org.wso2.carbon.identity.action.execution.api.model.ActionExecutionRequest;
29+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
30+
import org.wso2.carbon.identity.action.execution.api.model.AllowedOperation;
31+
import org.wso2.carbon.identity.action.execution.api.model.FlowContext;
32+
import org.wso2.carbon.identity.action.execution.api.model.Header;
33+
import org.wso2.carbon.identity.action.execution.api.model.Operation;
34+
import org.wso2.carbon.identity.action.execution.api.model.Param;
35+
import org.wso2.carbon.identity.action.execution.api.model.Tenant;
3636
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
3737
import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
3838
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;

‎components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/AbstractAuthorizationGrantHandlerTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import org.testng.annotations.Test;
3030
import org.wso2.carbon.base.MultitenantConstants;
3131
import org.wso2.carbon.context.PrivilegedCarbonContext;
32-
import org.wso2.carbon.identity.action.execution.ActionExecutorService;
33-
import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException;
34-
import org.wso2.carbon.identity.action.execution.model.ActionType;
35-
import org.wso2.carbon.identity.action.execution.model.SuccessStatus;
32+
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionException;
33+
import org.wso2.carbon.identity.action.execution.api.model.ActionType;
34+
import org.wso2.carbon.identity.action.execution.api.model.SuccessStatus;
35+
import org.wso2.carbon.identity.action.execution.api.service.ActionExecutorService;
3636
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
3737
import org.wso2.carbon.identity.base.IdentityException;
3838
import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@
967967
<carbon.kernel.registry.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version.range>
968968

969969
<!-- Carbon Identity Framework version -->
970-
<carbon.identity.framework.version>7.8.2</carbon.identity.framework.version>
970+
<carbon.identity.framework.version>7.8.3</carbon.identity.framework.version>
971971
<carbon.identity.framework.imp.pkg.version.range>[5.25.234, 8.0.0)
972972
</carbon.identity.framework.imp.pkg.version.range>
973973
<identity.oauth.xacml.version.range>[2.0.0, 3.0.0)</identity.oauth.xacml.version.range>

0 commit comments

Comments
 (0)