Skip to content

Commit 40b9b0f

Browse files
dseurotechdseurotech
committed
cleanup
Signed-off-by: dseurotech <[email protected]>
1 parent a3dc144 commit 40b9b0f

File tree

9 files changed

+21
-169
lines changed

9 files changed

+21
-169
lines changed

‎commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
package org.eclipse.kapua.job.engine.app.core.jackson;
1414

1515
import com.fasterxml.jackson.databind.ObjectMapper;
16-
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
16+
1717
import org.eclipse.kapua.job.engine.JobStartOptions;
18+
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
1819
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.IsJobRunningResponseMixin;
1920
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStartOptionsMixin;
2021
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStepPropertyMixin;

‎job-engine/app/resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212
*******************************************************************************/
1313
package org.eclipse.kapua.job.engine.app.resources;
1414

15-
import org.eclipse.kapua.KapuaException;
16-
import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
17-
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
18-
import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
19-
import org.eclipse.kapua.job.engine.JobEngineService;
20-
import org.eclipse.kapua.job.engine.JobStartOptions;
21-
import org.eclipse.kapua.model.id.KapuaId;
22-
import org.glassfish.jersey.process.internal.RequestScoped;
23-
2415
import javax.inject.Inject;
2516
import javax.ws.rs.Consumes;
2617
import javax.ws.rs.GET;
@@ -29,6 +20,15 @@
2920
import javax.ws.rs.PathParam;
3021
import javax.ws.rs.core.MediaType;
3122

23+
import org.eclipse.kapua.KapuaException;
24+
import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
25+
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
26+
import org.eclipse.kapua.job.engine.JobEngineService;
27+
import org.eclipse.kapua.job.engine.JobStartOptions;
28+
import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
29+
import org.eclipse.kapua.model.id.KapuaId;
30+
import org.glassfish.jersey.process.internal.RequestScoped;
31+
3232
@SuppressWarnings("RestParamTypeInspection")
3333
@Path("/")
3434
@RequestScoped
@@ -69,7 +69,7 @@ public void startJob(@PathParam("scopeId") KapuaId scopeId, @PathParam("jobId")
6969

7070
@POST
7171
@Path("start-with-options/{scopeId}/{jobId}")
72-
@Consumes({MediaType.APPLICATION_JSON})
72+
@Consumes({ MediaType.APPLICATION_JSON })
7373
public void startJob(@PathParam("scopeId") KapuaId scopeId, @PathParam("jobId") KapuaId jobId, JobStartOptions jobStartOptions) throws KapuaException {
7474
jobEngineService.startJob(scopeId, jobId, jobStartOptions);
7575
}

‎job-engine/app/web/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,6 @@
4444
<groupId>org.eclipse.kapua</groupId>
4545
<artifactId>kapua-device-call-kura</artifactId>
4646
</dependency>
47-
<!-- <dependency>-->
48-
<!-- <groupId>org.eclipse.kapua</groupId>-->
49-
<!-- <artifactId>kapua-security-registration-simple</artifactId>-->
50-
<!-- </dependency>-->
51-
<!-- <dependency>-->
52-
<!-- <groupId>org.eclipse.kapua</groupId>-->
53-
<!-- <artifactId>kapua-device-registry-internal</artifactId>-->
54-
<!-- </dependency>-->
55-
<!-- <dependency>-->
56-
<!-- <groupId>org.eclipse.kapua</groupId>-->
57-
<!-- <artifactId>kapua-device-management-all-api</artifactId>-->
58-
<!-- </dependency>-->
59-
<!-- <dependency>-->
60-
<!-- <groupId>org.eclipse.kapua</groupId>-->
61-
<!-- <artifactId>kapua-device-management-all-internal</artifactId>-->
62-
<!-- </dependency>-->
6347
<dependency>
6448
<groupId>org.eclipse.kapua</groupId>
6549
<artifactId>kapua-device-management-all-job</artifactId>

‎job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
import org.eclipse.kapua.KapuaErrorCodes;
3737
import org.eclipse.kapua.KapuaException;
3838
import org.eclipse.kapua.KapuaRuntimeException;
39-
import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
40-
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
41-
import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
4239
import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
4340
import org.eclipse.kapua.commons.rest.model.errors.EntityNotFoundExceptionInfo;
4441
import org.eclipse.kapua.commons.rest.model.errors.ExceptionInfo;
@@ -52,8 +49,11 @@
5249
import org.eclipse.kapua.commons.rest.model.errors.JobStartingExceptionInfo;
5350
import org.eclipse.kapua.commons.rest.model.errors.JobStoppingExceptionInfo;
5451
import org.eclipse.kapua.commons.util.xml.XmlUtil;
52+
import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
53+
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
5554
import org.eclipse.kapua.job.engine.JobEngineService;
5655
import org.eclipse.kapua.job.engine.JobStartOptions;
56+
import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
5757
import org.eclipse.kapua.job.engine.client.filter.SessionInfoFilter;
5858
import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSetting;
5959
import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSettingKeys;

‎rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import org.eclipse.kapua.app.api.core.model.EntityId;
2727
import org.eclipse.kapua.app.api.core.model.ScopeId;
2828
import org.eclipse.kapua.app.api.core.resources.AbstractKapuaResource;
29-
import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
30-
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
31-
import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
29+
import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
30+
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
3231
import org.eclipse.kapua.job.engine.JobEngineService;
3332
import org.eclipse.kapua.job.engine.JobStartOptions;
33+
import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
3434
import org.eclipse.kapua.job.engine.exception.JobNotRunningException;
3535

3636
@Path("{scopeId}/jobs")

‎rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import org.eclipse.kapua.app.api.core.model.device.management.JsonGenericResponseMessage;
2929
import org.eclipse.kapua.app.api.core.model.message.JsonKapuaPayload;
3030
import org.eclipse.kapua.app.api.resources.v1.resources.model.device.management.keystore.DeviceKeystoreCertificateInfo;
31-
import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
32-
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
33-
import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
3431
import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
3532
import org.eclipse.kapua.commons.rest.model.errors.DeviceManagementRequestContentExceptionInfo;
3633
import org.eclipse.kapua.commons.rest.model.errors.DeviceManagementResponseCodeExceptionInfo;
@@ -67,8 +64,11 @@
6764
import org.eclipse.kapua.commons.service.event.store.api.EventStoreXmlRegistry;
6865
import org.eclipse.kapua.commons.util.xml.JAXBContextProvider;
6966
import org.eclipse.kapua.event.ServiceEvent;
67+
import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
68+
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
7069
import org.eclipse.kapua.job.engine.JobEngineXmlRegistry;
7170
import org.eclipse.kapua.job.engine.JobStartOptions;
71+
import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
7272
import org.eclipse.kapua.message.device.data.KapuaDataChannel;
7373
import org.eclipse.kapua.message.device.data.KapuaDataMessage;
7474
import org.eclipse.kapua.message.device.data.KapuaDataPayload;

0 commit comments

Comments
 (0)