Patch approval service #154

IsharaSilva · 2022-07-25T13:05:49Z

Purpose

Describe the problems, issues, or needs driving this feature/fix and include links to related issues in the following format: Resolves issue1, issue2, etc.

Goals

Describe the solutions that this feature/fix will introduce to resolve the problems described above

Approach

Describe how you are implementing the solutions. Include an animated GIF or screenshot if the change affects the UI (email [email protected] to review all UI text). Include a link to a Markdown file or Google doc if the feature write-up is too long to paste here.

User stories

Summary of user stories addressed by this change>

Release note

Brief description of the new feature or bug fix as it will appear in the release notes

Documentation

Link(s) to product documentation that addresses the changes of this PR. If no doc impact, enter “N/A” plus brief explanation of why there’s no doc impact

Training

Link to the PR for changes to the training content in https://github.com/wso2/WSO2-Training, if applicable

Certification

Type “Sent” when you have provided new/updated certification questions, plus four answers for each question (correct answer highlighted in bold), based on this change. Certification questions/answers should be sent to [email protected] and NOT pasted in this PR. If there is no impact on certification exams, type “N/A” and explain why.

Marketing

Link to drafts of marketing content that will describe and promote this feature, including product page changes, technical articles, blog posts, videos, etc., if applicable

Automation tests

Unit tests

Code coverage information
Integration tests

Details about the test cases and coverage

Security checks

Followed secure coding standards in http://wso2.com/technical-reports/wso2-secure-engineering-guidelines? yes/no
Ran FindSecurityBugs plugin and verified report? yes/no
Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? yes/no

Samples

Provide high-level details about the samples related to this feature

Related PRs

List any other related PRs

Migrations (if applicable)

Describe migration steps and platforms on which migration has been tested

Test environment

List all JDK versions, operating systems, databases, and browser/versions on which this feature/fix was tested

Learning

Describe the research phase and any blog posts, patterns, libraries, or add-ons you used to solve the problem.

CLAassistant · 2022-07-25T13:05:54Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

chamathns · 2022-07-26T05:27:18Z

...c/main/java/org/wso2/carbon/identity/api/user/approval/common/UserApprovalServiceHolder.java

        UserApprovalServiceHolder.taskOperationService = taskOperationService;
    }

+    public static void setApprovalEventService(ApprovalEventService approvalEventService1) {


add method comments to public methods. Fix other places as well.

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:29:03Z

...c/main/java/org/wso2/carbon/identity/api/user/approval/common/UserApprovalServiceHolder.java

        UserApprovalServiceHolder.taskOperationService = taskOperationService;
    }

+    public static void setApprovalEventService(ApprovalEventService approvalEventService1) {


switch variable name

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:29:32Z

...src/main/java/org/wso2/carbon/identity/api/user/approval/common/factory/OSGIBpelService.java

+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.humantask.core.TaskOperationService;
+
+public class OSGIBpelService extends AbstractFactoryBean<TaskOperationService> {


add class comment

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:30:02Z

...src/main/java/org/wso2/carbon/identity/api/user/approval/common/factory/OSGIBpelService.java

@@ -0,0 +1,30 @@
+package org.wso2.carbon.identity.api.user.approval.common.factory;


add license header

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:30:52Z

...src/main/java/org/wso2/carbon/identity/api/user/approval/common/factory/OSGIBpelService.java

+            if (taskOperationService != null) {
+                this.taskOperationService = taskOperationService;
+            } else {
+                throw new Exception("Unable to retrieve TaskOperationService service.");


change into run time exception

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:32:25Z

.../main/java/org/wso2/carbon/identity/api/user/approval/common/factory/OSGIServiceFactory.java


 /**
 * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
 * instantiate the TaskOperationService type of object inside the container.
 */
-public class OSGIServiceFactory extends AbstractFactoryBean<TaskOperationService> {
+public class OSGIServiceFactory extends AbstractFactoryBean<ApprovalEventService> {


keep this class as it is and add a new class as a OSGI service

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:33:07Z

.../main/java/org/wso2/carbon/identity/api/user/approval/common/factory/OSGIServiceFactory.java

-            if (taskOperationService != null) {
-                this.taskOperationService = taskOperationService;
+        if (this.approvalEventService == null) {
+            ApprovalEventService approvalEventService1 = (ApprovalEventService) PrivilegedCarbonContext.


fix variable name

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:36:47Z

...pproval.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/approval/v1/MeApiService.java

-import org.wso2.carbon.identity.rest.api.user.approval.v1.dto.TaskDataDTO;
-import org.wso2.carbon.identity.rest.api.user.approval.v1.dto.ErrorDTO;
-import org.wso2.carbon.identity.rest.api.user.approval.v1.dto.TaskSummaryDTO;
-import org.wso2.carbon.identity.rest.api.user.approval.v1.dto.StateDTO;


check if these imports can be removed

Yes. no need.

IsharaSilva · 2022-07-26T05:38:13Z

.../src/main/java/org/wso2/carbon/identity/rest/api/user/approval/v1/impl/MeApiServiceImpl.java

@@ -29,25 +32,49 @@
 */
 public class MeApiServiceImpl extends MeApiService {

+    private ApprovalEventService approvalEventService;
+    private UserApprovalService userApprovalService;
+    public static final String SIMPLE_WORKFLOW_ENGINE = "Workflow.SimpleWorkflow.Enable";


check if this can be moved to a constant class

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:39:00Z

.../src/main/java/org/wso2/carbon/identity/rest/api/user/approval/v1/impl/MeApiServiceImpl.java

+    public MeApiServiceImpl() {
+
+    }


remove if not needed

IsharaSilva · 2022-07-26T05:40:03Z

....identity.rest.api.user.approval.v1/src/main/resources/META-INF/cxf/user-approval-v1-cxf.xml

+    </bean>
+    <bean id="approvalEventServiceFactoryBean"
+          class="org.wso2.carbon.identity.api.user.approval.common.factory.OSGIServiceFactory"/>
+    <bean id="UserApprovalServiceHolderBean1" class="org.wso2.carbon.identity.api.user.approval.common.UserApprovalServiceHolder">


fix bean id

Addressed with this commit e7dc2ae

IsharaSilva · 2022-07-26T05:40:38Z

pom.xml

+            <dependency>
+                <groupId>org.wso2.carbon.identity.workflow.engine</groupId>
+                <artifactId>workflow.engine</artifactId>
+                <version>1.0-SNAPSHOT</version>


get the version through a property

Addressed with this commit b89af13

IsharaSilva added 4 commits June 20, 2022 11:37

add new approval service

9f71095

add new approval service

850c4fa

add new approval service

c0a8683

add new approval service

4553925

chamathns reviewed Jul 26, 2022

View reviewed changes

IsharaSilva commented Jul 26, 2022

View reviewed changes

IsharaSilva added 2 commits July 26, 2022 15:03

add new approval service

e7dc2ae

add new approval service

b89af13

chamathns changed the base branch from master to feature-workflow-engine-simple July 27, 2022 05:38

IsharaSilva added 2 commits July 28, 2022 21:46

add new approval service

52008da

add new approval service

4de9b56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Patch approval service #154

Patch approval service #154

IsharaSilva commented Jul 25, 2022

CLAassistant commented Jul 25, 2022

chamathns Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022

IsharaSilva Jul 26, 2022 •

edited

Loading

		@@ -0,0 +1,30 @@
		package org.wso2.carbon.identity.api.user.approval.common.factory;

Patch approval service #154

Are you sure you want to change the base?

Patch approval service #154

Conversation

IsharaSilva commented Jul 25, 2022

Purpose

Goals

Approach

User stories

Release note

Documentation

Training

Certification

Marketing

Automation tests

Security checks

Samples

Related PRs

Migrations (if applicable)

Test environment

Learning

CLAassistant commented Jul 25, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

IsharaSilva Jul 26, 2022 • edited Loading

Choose a reason for hiding this comment

IsharaSilva Jul 26, 2022 •

edited

Loading