cleanup

Signed-off-by: dseurotech <[email protected]>
eclipse · May 21, 2024 · 8b30561 · 8b30561
1 parent a3dc144
commit 8b30561
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 2,998 deletions.
diff --git a/...odel/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java b/...odel/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java
diff --git a/...s-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java b/...s-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java
diff --git a/...s-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java b/...s-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java
diff --git a/graph.svg b/graph.svg
diff --git a/...ore/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java b/...ore/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java
@@ -13,8 +13,9 @@
 package org.eclipse.kapua.job.engine.app.core.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
+
 import org.eclipse.kapua.job.engine.JobStartOptions;
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.app.core.jackson.mixin.IsJobRunningResponseMixin;
 import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStartOptionsMixin;
 import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStepPropertyMixin;

diff --git a/...resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java b/...resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java
@@ -12,15 +12,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.job.engine.app.resources;
 
-import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
-import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
-import org.eclipse.kapua.job.engine.JobEngineService;
-import org.eclipse.kapua.job.engine.JobStartOptions;
-import org.eclipse.kapua.model.id.KapuaId;
-import org.glassfish.jersey.process.internal.RequestScoped;
-
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -29,6 +20,15 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
+import org.eclipse.kapua.job.engine.JobEngineService;
+import org.eclipse.kapua.job.engine.JobStartOptions;
+import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.glassfish.jersey.process.internal.RequestScoped;
+
 @SuppressWarnings("RestParamTypeInspection")
 @Path("/")
 @RequestScoped
@@ -69,7 +69,7 @@ public void startJob(@PathParam("scopeId") KapuaId scopeId, @PathParam("jobId")
 
     @POST
     @Path("start-with-options/{scopeId}/{jobId}")
-    @Consumes({MediaType.APPLICATION_JSON})
+    @Consumes({ MediaType.APPLICATION_JSON })
     public void startJob(@PathParam("scopeId") KapuaId scopeId, @PathParam("jobId") KapuaId jobId, JobStartOptions jobStartOptions) throws KapuaException {
         jobEngineService.startJob(scopeId, jobId, jobStartOptions);
     }

diff --git a/job-engine/app/web/pom.xml b/job-engine/app/web/pom.xml
@@ -44,22 +44,6 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-device-call-kura</artifactId>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.eclipse.kapua</groupId>-->
-        <!--            <artifactId>kapua-security-registration-simple</artifactId>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.eclipse.kapua</groupId>-->
-        <!--            <artifactId>kapua-device-registry-internal</artifactId>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.eclipse.kapua</groupId>-->
-        <!--            <artifactId>kapua-device-management-all-api</artifactId>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.eclipse.kapua</groupId>-->
-        <!--            <artifactId>kapua-device-management-all-internal</artifactId>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-device-management-all-job</artifactId>

diff --git a/...gine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java b/...gine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java
@@ -36,9 +36,6 @@
 import org.eclipse.kapua.KapuaErrorCodes;
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.KapuaRuntimeException;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
-import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
 import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.EntityNotFoundExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.ExceptionInfo;
@@ -52,8 +49,11 @@
 import org.eclipse.kapua.commons.rest.model.errors.JobStartingExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.JobStoppingExceptionInfo;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.JobEngineService;
 import org.eclipse.kapua.job.engine.JobStartOptions;
+import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
 import org.eclipse.kapua.job.engine.client.filter.SessionInfoFilter;
 import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSetting;
 import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSettingKeys;

diff --git a/...i/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java b/...i/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java
@@ -26,11 +26,11 @@
 import org.eclipse.kapua.app.api.core.model.EntityId;
 import org.eclipse.kapua.app.api.core.model.ScopeId;
 import org.eclipse.kapua.app.api.core.resources.AbstractKapuaResource;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
-import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
+import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.JobEngineService;
 import org.eclipse.kapua.job.engine.JobStartOptions;
+import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
 import org.eclipse.kapua.job.engine.exception.JobNotRunningException;
 
 @Path("{scopeId}/jobs")

diff --git a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java
@@ -28,9 +28,6 @@
 import org.eclipse.kapua.app.api.core.model.device.management.JsonGenericResponseMessage;
 import org.eclipse.kapua.app.api.core.model.message.JsonKapuaPayload;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.device.management.keystore.DeviceKeystoreCertificateInfo;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningMultipleResponse;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
-import org.eclipse.kapua.commons.rest.model.MultipleJobIdRequest;
 import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.DeviceManagementRequestContentExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.DeviceManagementResponseCodeExceptionInfo;
@@ -67,8 +64,11 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreXmlRegistry;
 import org.eclipse.kapua.commons.util.xml.JAXBContextProvider;
 import org.eclipse.kapua.event.ServiceEvent;
+import org.eclipse.kapua.job.engine.IsJobRunningMultipleResponse;
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.JobEngineXmlRegistry;
 import org.eclipse.kapua.job.engine.JobStartOptions;
+import org.eclipse.kapua.job.engine.MultipleJobIdRequest;
 import org.eclipse.kapua.message.device.data.KapuaDataChannel;
 import org.eclipse.kapua.message.device.data.KapuaDataMessage;
 import org.eclipse.kapua.message.device.data.KapuaDataPayload;