Skip to content

Commit e1ee094

Browse files
os-cibos-cib
committed
chore(): fix review results
1 parent 3842242 commit e1ee094

16 files changed

+27
-146
lines changed

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/providers/BpmProvider.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ default Collection<Task> findTasksByProcessInstanceAsignee(Optional<String> proc
148148
* @throws NoObjectFoundException when the task searched for could not be found.
149149
* @throws SystemException in case of any other error.
150150
*/
151-
default Task findTaskById(String id, CIBUser user) throws SystemException {
152-
return getTaskProvider().findTaskById(id, user);
151+
default Task findTaskById(String taskId, CIBUser user) throws SystemException {
152+
return getTaskProvider().findTaskById(taskId, user);
153153
}
154154

155155
/**
@@ -195,7 +195,6 @@ default void submit(String taskId, CIBUser user) throws SystemException, SubmitD
195195
*/
196196
default void submit(Task task, List<Variable> formResult, CIBUser user) throws SystemException, SubmitDeniedException {
197197
getTaskProvider().submit(task, formResult, user);
198-
;
199198
}
200199

201200
/**
@@ -309,7 +308,7 @@ default Collection<IdentityLink> findIdentityLink(String taskId, Optional<String
309308
* Create identity links, e.g., to set the candidates user or groups of a task.
310309
*
311310
* @param taskId the ID of the task.
312-
* @param type a map containing the type of the identity link and group or user ID.
311+
* @param data a map containing the type of the identity link and group or user ID.
313312
* @param user the user performing the operation.
314313
* @throws SystemException in case of any other error.
315314
*/

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/providers/SevenProvider.java‎

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818

1919
import org.springframework.beans.factory.annotation.Autowired;
2020

21+
import lombok.Getter;
22+
23+
@Getter
2124
public class SevenProvider extends SevenProviderBase implements BpmProvider {
22-
@Autowired private IDeploymentProvider deploymentProvider;
25+
@Autowired private IDeploymentProvider deploymentProvider;
2326
@Autowired private IVariableProvider variableProvider;
2427
@Autowired private IVariableInstanceProvider variableInstanceProvider;
2528
@Autowired private IHistoricVariableInstanceProvider historicVariableInstanceProvider;
@@ -38,83 +41,4 @@ public class SevenProvider extends SevenProviderBase implements BpmProvider {
3841
@Autowired private ITenantProvider tenantProvider;
3942
@Autowired private IExternalTaskProvider externalTaskProvider;
4043
@Autowired private IEngineProvider engineProvider;
41-
42-
43-
@Override
44-
public IDeploymentProvider getDeploymentProvider() {
45-
return deploymentProvider;
46-
}
47-
@Override
48-
public IVariableProvider getVariableProvider() {
49-
return variableProvider;
50-
}
51-
@Override
52-
public IVariableInstanceProvider getVariableInstanceProvider() {
53-
return variableInstanceProvider;
54-
}
55-
@Override
56-
public IHistoricVariableInstanceProvider getHistoricVariableInstanceProvider() {
57-
return historicVariableInstanceProvider;
58-
}
59-
@Override
60-
public ITaskProvider getTaskProvider() {
61-
return taskProvider;
62-
}
63-
@Override
64-
public IProcessProvider getProcessProvider() {
65-
return processProvider;
66-
}
67-
@Override
68-
public IActivityProvider getActivityProvider() {
69-
return activityProvider;
70-
}
71-
@Override
72-
public IFilterProvider getFilterProvider() {
73-
return filterProvider;
74-
}
75-
@Override
76-
public IUtilsProvider getUtilsProvider() {
77-
return utilsProvider;
78-
}
79-
@Override
80-
public IIncidentProvider getIncidentProvider() {
81-
return incidentProvider;
82-
}
83-
@Override
84-
public IJobDefinitionProvider getJobDefinitionProvider() {
85-
return jobDefinitionProvider;
86-
}
87-
@Override
88-
public IUserProvider getUserProvider() {
89-
return userProvider;
90-
}
91-
@Override
92-
public IDecisionProvider getDecisionProvider() {
93-
return decisionProvider;
94-
}
95-
@Override
96-
public IJobProvider getJobProvider() {
97-
return jobProvider;
98-
}
99-
@Override
100-
public IBatchProvider getBatchProvider() {
101-
return batchProvider;
102-
}
103-
@Override
104-
public ISystemProvider getSystemProvider() {
105-
return systemProvider;
106-
}
107-
@Override
108-
public ITenantProvider getTenantProvider() {
109-
return tenantProvider;
110-
}
111-
@Override
112-
public IExternalTaskProvider getExternalTaskProvider() {
113-
return externalTaskProvider;
114-
}
115-
@Override
116-
public IEngineProvider getEngineProvider() {
117-
return engineProvider;
118-
}
119-
12044
}

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/AnalyticsService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.cibseven.webapp.providers.BpmProvider;
3030
import org.cibseven.webapp.providers.IProcessProvider;
3131
import org.cibseven.webapp.providers.PermissionConstants;
32-
import org.cibseven.webapp.providers.SevenProvider;
3332
import org.cibseven.webapp.rest.model.Analytics;
3433
import org.cibseven.webapp.rest.model.AnalyticsInfo;
3534
import org.cibseven.webapp.rest.model.Decision;
@@ -58,8 +57,6 @@ public class AnalyticsService extends BaseService implements InitializingBean {
5857
@Autowired
5958
IProcessProvider processProvider;
6059

61-
SevenProvider sevenProvider;
62-
6360
public void afterPropertiesSet() {
6461
}
6562

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/BatchService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.cibseven.webapp.auth.SevenResourceType;
2525
import org.cibseven.webapp.providers.BpmProvider;
2626
import org.cibseven.webapp.providers.PermissionConstants;
27-
import org.cibseven.webapp.providers.SevenProvider;
2827
import org.cibseven.webapp.rest.model.Batch;
2928
import org.springframework.beans.factory.InitializingBean;
3029
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,6 @@
3635
public class BatchService extends BaseService implements InitializingBean {
3736

3837
@Autowired BpmProvider bpmProvider;
39-
SevenProvider sevenProvider;
4038

4139
public void afterPropertiesSet() {
4240
}

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/DecisionService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.cibseven.webapp.auth.CIBUser;
2727
import org.cibseven.webapp.auth.SevenResourceType;
2828
import org.cibseven.webapp.providers.PermissionConstants;
29-
import org.cibseven.webapp.providers.SevenProvider;
3029
import org.cibseven.webapp.rest.model.Decision;
3130
import org.springframework.beans.factory.InitializingBean;
3231
import org.springframework.http.ResponseEntity;
@@ -65,8 +64,6 @@
6564
@RestController("WebclientDecisionService") @RequestMapping("${cibseven.webclient.services.basePath:/services/v1}" + "/decision")
6665
public class DecisionService extends BaseService implements InitializingBean {
6766

68-
SevenProvider sevenProvider;
69-
7067
public void afterPropertiesSet() {
7168
}
7269

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/ExternalTaskService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Map;
2222

2323
import org.cibseven.webapp.auth.CIBUser;
24-
import org.cibseven.webapp.providers.SevenProvider;
2524
import org.cibseven.webapp.rest.model.ExternalTask;
2625
import org.springframework.beans.factory.InitializingBean;
2726
import org.springframework.web.bind.annotation.*;
@@ -32,7 +31,6 @@
3231
@RequestMapping("${cibseven.webclient.services.basePath:/services/v1}" + "/external-tasks")
3332
public class ExternalTaskService extends BaseService implements InitializingBean {
3433

35-
SevenProvider sevenProvider;
3634

3735
public void afterPropertiesSet() {
3836
}

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/HistoricVariableInstanceService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.cibseven.webapp.auth.CIBUser;
2020
import org.cibseven.webapp.auth.SevenResourceType;
2121
import org.cibseven.webapp.providers.PermissionConstants;
22-
import org.cibseven.webapp.providers.SevenProvider;
2322
import org.cibseven.webapp.rest.model.VariableHistory;
2423
import org.springframework.beans.factory.InitializingBean;
2524
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,8 +50,6 @@
5150
@RequestMapping("${cibseven.webclient.services.basePath:/services/v1}" + "/history/variable-instance")
5251
public class HistoricVariableInstanceService extends BaseService implements InitializingBean {
5352

54-
SevenProvider sevenProvider;
55-
5653
public void afterPropertiesSet() {
5754
}
5855

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/HistoryBatchService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.cibseven.webapp.auth.SevenResourceType;
2525
import org.cibseven.webapp.providers.BpmProvider;
2626
import org.cibseven.webapp.providers.PermissionConstants;
27-
import org.cibseven.webapp.providers.SevenProvider;
2827
import org.cibseven.webapp.rest.model.HistoryBatch;
2928
import org.springframework.beans.factory.InitializingBean;
3029
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,6 @@
3837
public class HistoryBatchService extends BaseService implements InitializingBean {
3938

4039
@Autowired BpmProvider bpmProvider;
41-
SevenProvider sevenProvider;
4240

4341
public void afterPropertiesSet() {
4442
}

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/IncidentService.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.cibseven.webapp.auth.SevenResourceType;
2525
import org.cibseven.webapp.providers.BpmProvider;
2626
import org.cibseven.webapp.providers.PermissionConstants;
27-
import org.cibseven.webapp.providers.SevenProvider;
2827
import org.cibseven.webapp.rest.model.Incident;
2928
import org.springframework.beans.factory.InitializingBean;
3029
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +52,6 @@ public class IncidentService extends BaseService implements InitializingBean {
5352

5453
@Autowired
5554
BpmProvider bpmProvider;
56-
SevenProvider sevenProvider;
5755

5856
public void afterPropertiesSet() {
5957
}
@@ -64,7 +62,7 @@ public void afterPropertiesSet() {
6462
public Long countIncident(@RequestParam Map<String, Object> params, HttpServletRequest rq) {
6563
CIBUser user = checkAuthorization(rq, true);
6664
checkPermission(user, SevenResourceType.PROCESS_INSTANCE, PermissionConstants.READ_ALL);
67-
return sevenProvider.countIncident(params, user);
65+
return bpmProvider.countIncident(params, user);
6866
}
6967

7068
@Operation(summary = "Get number of historic incidents", description = "<strong>Return: Number of incidents")
@@ -73,7 +71,7 @@ public Long countIncident(@RequestParam Map<String, Object> params, HttpServletR
7371
public Long countHistoricIncident(@RequestParam Map<String, Object> params, HttpServletRequest rq) {
7472
CIBUser user = checkAuthorization(rq, true);
7573
checkPermission(user, SevenResourceType.HISTORIC_PROCESS_INSTANCE, PermissionConstants.READ_ALL);
76-
return sevenProvider.countHistoricIncident(params, user);
74+
return bpmProvider.countHistoricIncident(params, user);
7775
}
7876

7977
@Operation(summary = "Get incident/s", description = "<strong>Return: Collection of incident/s")
@@ -82,7 +80,7 @@ public Long countHistoricIncident(@RequestParam Map<String, Object> params, Http
8280
public Collection<Incident> findIncident(@RequestParam Map<String, Object> params, HttpServletRequest rq) {
8381
CIBUser user = checkAuthorization(rq, true);
8482
checkPermission(user, SevenResourceType.PROCESS_INSTANCE, PermissionConstants.READ_ALL);
85-
return sevenProvider.findIncident(params, user);
83+
return bpmProvider.findIncident(params, user);
8684
}
8785

8886
@Operation(summary = "Get stack trace", description = "<strong>Return: Stacktrace")
@@ -95,7 +93,7 @@ public String findStacktrace(
9593
// checkPermission(user, SevenResourceType.JOB_DEFINITION,
9694
// PermissionConstants.READ_ALL);
9795

98-
return sevenProvider.findStacktrace(jobId, user);
96+
return bpmProvider.findStacktrace(jobId, user);
9997
}
10098

10199
@Operation(summary = "Get external task error details", description = "<strong>Return: Error details")
@@ -105,7 +103,7 @@ public String findExternalTaskErrorDetails(
105103
@Parameter(description = "External Task Id") @PathVariable String externalTaskId,
106104
Locale loc, HttpServletRequest rq) {
107105
CIBUser user = checkAuthorization(rq, true);
108-
return sevenProvider.findExternalTaskErrorDetails(externalTaskId, user);
106+
return bpmProvider.findExternalTaskErrorDetails(externalTaskId, user);
109107
}
110108

111109
@Operation(summary = "Get historic external task error details", description = "<strong>Return: Historic error details")
@@ -115,7 +113,7 @@ public String findHistoricExternalTaskErrorDetails(
115113
@Parameter(description = "External Task Id") @PathVariable String externalTaskId,
116114
Locale loc, HttpServletRequest rq) {
117115
CIBUser user = checkAuthorization(rq, true);
118-
return sevenProvider.findHistoricExternalTaskErrorDetails(externalTaskId, user);
116+
return bpmProvider.findHistoricExternalTaskErrorDetails(externalTaskId, user);
119117
}
120118

121119
@Operation(summary = "Get historic incidents", description = "<strong>Return: Collection of historic incidents")
@@ -124,7 +122,7 @@ public String findHistoricExternalTaskErrorDetails(
124122
public Collection<Incident> findHistoricIncidents(@RequestParam Map<String, Object> params, HttpServletRequest rq) {
125123
CIBUser user = checkAuthorization(rq, true);
126124
checkPermission(user, SevenResourceType.PROCESS_INSTANCE, PermissionConstants.READ_ALL);
127-
return sevenProvider.findHistoricIncidents(params, user);
125+
return bpmProvider.findHistoricIncidents(params, user);
128126
}
129127

130128
@Operation(summary = "Get historic stack trace by job id", description = "<strong>Return: Historic stacktrace")
@@ -134,7 +132,7 @@ public String findHistoricStacktraceByJobId(
134132
@Parameter(description = "Job Id") @PathVariable String jobId,
135133
Locale loc, HttpServletRequest rq) {
136134
CIBUser user = checkAuthorization(rq, true);
137-
return sevenProvider.findHistoricStacktraceByJobId(jobId, user);
135+
return bpmProvider.findHistoricStacktraceByJobId(jobId, user);
138136
}
139137

140138
@Operation(summary = "Increment job retries by job id", description = "<strong>Return: void")
@@ -147,7 +145,7 @@ public ResponseEntity<Void> retryJobByID(
147145
CIBUser user = checkAuthorization(rq, true);
148146
// checkPermission(user, SevenResourceType.JOB_DEFINITION,
149147
// PermissionConstants.UPDATE_ALL);
150-
sevenProvider.retryJobById(jobId, data, user);
148+
bpmProvider.retryJobById(jobId, data, user);
151149
// return 204 No Content, no body
152150
return ResponseEntity.noContent().build();
153151
}
@@ -161,7 +159,7 @@ public ResponseEntity<Void> retryExternalTask(
161159
Locale loc, HttpServletRequest rq) {
162160
CIBUser user = checkAuthorization(rq, true);
163161
checkPermission(user, SevenResourceType.PROCESS_INSTANCE, PermissionConstants.UPDATE_ALL);
164-
sevenProvider.retryExternalTask(externalTaskId, data, user);
162+
bpmProvider.retryExternalTask(externalTaskId, data, user);
165163
// return 204 No Content, no body
166164
return ResponseEntity.noContent().build();
167165
}

‎cibseven-webclient-core/src/main/java/org/cibseven/webapp/rest/JobDefinitionService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.cibseven.webapp.exception.AccessDeniedException;
2525
import org.cibseven.webapp.providers.BpmProvider;
2626
import org.cibseven.webapp.providers.PermissionConstants;
27-
import org.cibseven.webapp.providers.SevenProvider;
2827
import org.cibseven.webapp.rest.model.JobDefinition;
2928
import org.springframework.beans.factory.InitializingBean;
3029
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +49,6 @@
5049
public class JobDefinitionService extends BaseService implements InitializingBean {
5150

5251
@Autowired BpmProvider bpmProvider;
53-
SevenProvider sevenProvider;
5452

5553
public void afterPropertiesSet() {
5654
}

0 commit comments

Comments
 (0)