➖ absorbed job-engine-app-core into job-engine-app-web as it was not …

…generic, neither used anywhere else Signed-off-by: dseurotech <davide.salvador@eurotech.com>
dseurotech · May 20, 2024 · 3450f05 · 3450f05
1 parent b2857e5
commit 3450f05
Show file tree

Hide file tree

Showing 23 changed files with 95 additions and 149 deletions.
diff --git a/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java b/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java
@@ -12,9 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.console;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
 import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.ExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.JobAlreadyRunningExceptionInfo;
@@ -35,6 +39,7 @@
 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.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.JobEngineXmlRegistry;
 import org.eclipse.kapua.job.engine.JobStartOptions;
 import org.eclipse.kapua.job.engine.commons.model.JobTargetSublist;
@@ -102,10 +107,6 @@
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 
-import javax.xml.bind.JAXBContext;
-import java.util.HashMap;
-import java.util.Map;
-
 public class ConsoleJAXBContextProvider implements JAXBContextProvider {
 
     private JAXBContext context;
@@ -117,7 +118,7 @@ public JAXBContext getJAXBContext() throws KapuaException {
                 Map<String, Object> properties = new HashMap<String, Object>(1);
                 properties.put(MarshallerProperties.JSON_WRAPPER_AS_ARRAY_NAME, true);
 
-                context = JAXBContextFactory.createContext(new Class<?>[]{
+                context = JAXBContextFactory.createContext(new Class<?>[] {
                         // REST API exception models
                         ThrowableInfo.class,
                         ExceptionInfo.class,

diff --git a/...t/model/IsJobRunningMultipleResponse.java → .../engine/IsJobRunningMultipleResponse.java b/...t/model/IsJobRunningMultipleResponse.java → .../engine/IsJobRunningMultipleResponse.java
@@ -10,15 +10,16 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.rest.model;
+package org.eclipse.kapua.job.engine;
 
-import org.eclipse.kapua.model.id.KapuaId;
-
-import javax.xml.bind.annotation.XmlElementWrapper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlElementWrapper;
+
+import org.eclipse.kapua.model.id.KapuaId;
+
 public class IsJobRunningMultipleResponse {
 
     private List<IsJobRunningResponse> list = new ArrayList<>();

diff --git a/...mons/rest/model/IsJobRunningResponse.java → ...apua/job/engine/IsJobRunningResponse.java b/...mons/rest/model/IsJobRunningResponse.java → ...apua/job/engine/IsJobRunningResponse.java
@@ -10,14 +10,14 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.rest.model;
-
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.model.id.KapuaIdAdapter;
+package org.eclipse.kapua.job.engine;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.model.id.KapuaIdAdapter;
+
 public class IsJobRunningResponse {
 
     private KapuaId jobId;

diff --git a/...mons/rest/model/MultipleJobIdRequest.java → ...apua/job/engine/MultipleJobIdRequest.java b/...mons/rest/model/MultipleJobIdRequest.java → ...apua/job/engine/MultipleJobIdRequest.java
@@ -10,16 +10,17 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.rest.model;
+package org.eclipse.kapua.job.engine;
 
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.model.id.KapuaIdAdapter;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.HashSet;
-import java.util.Set;
+
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.model.id.KapuaIdAdapter;
 
 public class MultipleJobIdRequest {
 

diff --git a/...client/filter/SessionInfoHttpHeaders.java → ...ua/job/engine/SessionInfoHttpHeaders.java b/...client/filter/SessionInfoHttpHeaders.java → ...ua/job/engine/SessionInfoHttpHeaders.java
@@ -10,10 +10,10 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.job.engine.client.filter;
+package org.eclipse.kapua.job.engine;
 
 /**
- * List of headers name used by the {@link SessionInfoFilter}
+ * List of headers name used by the Session
  *
  * @since 1.5.0
  */

diff --git a/job-engine/app/core/pom.xml b/job-engine/app/core/pom.xml
diff --git a/job-engine/app/pom.xml b/job-engine/app/pom.xml
@@ -25,7 +25,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>core</module>
         <module>resources</module>
         <module>web</module>
     </modules>

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
@@ -40,11 +40,6 @@
             <version>${jersey.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-locator-guice</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-device-registry-api</artifactId>
@@ -117,10 +112,6 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-job-internal</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-job-engine-app-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-job-engine-app-resources</artifactId>

diff --git a/...verter/KapuaIdParamConverterProvider.java → ...verter/KapuaIdParamConverterProvider.java b/...verter/KapuaIdParamConverterProvider.java → ...verter/KapuaIdParamConverterProvider.java
diff --git a/...son/deserializer/KapuaIdDeserializer.java → ...ore/deserializer/KapuaIdDeserializer.java b/...son/deserializer/KapuaIdDeserializer.java → ...ore/deserializer/KapuaIdDeserializer.java
@@ -10,17 +10,18 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.job.engine.app.core.jackson.deserializer;
+package org.eclipse.kapua.job.engine.app.core.deserializer;
+
+import java.io.IOException;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdFactory;
 
-import java.io.IOException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 
 public class KapuaIdDeserializer extends JsonDeserializer<KapuaId> {
 

diff --git a/...app/core/filter/RebuildSessionFilter.java → ...app/core/filter/RebuildSessionFilter.java b/...app/core/filter/RebuildSessionFilter.java → ...app/core/filter/RebuildSessionFilter.java
@@ -12,18 +12,18 @@
  *******************************************************************************/
 package org.eclipse.kapua.job.engine.app.core.filter;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
 import org.eclipse.kapua.app.api.core.auth.KapuaTokenAuthenticationFilter;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
 import org.eclipse.kapua.commons.security.KapuaSession;
-import org.eclipse.kapua.job.engine.client.filter.SessionInfoHttpHeaders;
+import org.eclipse.kapua.job.engine.SessionInfoHttpHeaders;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdFactory;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
 public class RebuildSessionFilter extends KapuaTokenAuthenticationFilter {
 
     private final KapuaIdFactory kapuaIdFactory = KapuaLocator.getInstance().getFactory(KapuaIdFactory.class);
@@ -33,14 +33,14 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         String authMode = httpRequest.getHeader(SessionInfoHttpHeaders.AUTH_MODE);
         switch (authMode) {
-            case "trusted":
-                KapuaId scopeId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.SCOPE_ID_HTTP_HEADER));
-                KapuaId userId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.USER_ID_HTTP_HEADER));
-                KapuaSecurityUtils.setSession(KapuaSession.createFrom(scopeId, userId));
-                return true;
-            case "access_token":
-            default:
-                return super.onAccessDenied(request, response);
+        case "trusted":
+            KapuaId scopeId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.SCOPE_ID_HTTP_HEADER));
+            KapuaId userId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.USER_ID_HTTP_HEADER));
+            KapuaSecurityUtils.setSession(KapuaSession.createFrom(scopeId, userId));
+            return true;
+        case "access_token":
+        default:
+            return super.onAccessDenied(request, response);
         }
     }
 

diff --git a/...pp/core/jackson/ObjectMapperProvider.java → ...pp/core/jackson/ObjectMapperProvider.java b/...pp/core/jackson/ObjectMapperProvider.java → ...pp/core/jackson/ObjectMapperProvider.java
@@ -12,18 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.job.engine.app.core.jackson;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+
+import org.eclipse.kapua.job.engine.IsJobRunningResponse;
 import org.eclipse.kapua.job.engine.JobStartOptions;
-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;
-import org.eclipse.kapua.job.engine.app.core.jackson.mixin.KapuaIdMixin;
+import org.eclipse.kapua.job.engine.app.core.mixin.IsJobRunningResponseMixin;
+import org.eclipse.kapua.job.engine.app.core.mixin.JobStartOptionsMixin;
+import org.eclipse.kapua.job.engine.app.core.mixin.JobStepPropertyMixin;
+import org.eclipse.kapua.job.engine.app.core.mixin.KapuaIdMixin;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.job.step.definition.JobStepProperty;
 
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Provider
 public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {

diff --git a/...kson/mixin/IsJobRunningResponseMixin.java → ...core/mixin/IsJobRunningResponseMixin.java b/...kson/mixin/IsJobRunningResponseMixin.java → ...core/mixin/IsJobRunningResponseMixin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.job.engine.app.core.jackson.mixin;
+package org.eclipse.kapua.job.engine.app.core.mixin;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...e/jackson/mixin/JobStartOptionsMixin.java → .../app/core/mixin/JobStartOptionsMixin.java b/...e/jackson/mixin/JobStartOptionsMixin.java → .../app/core/mixin/JobStartOptionsMixin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.job.engine.app.core.jackson.mixin;
+package org.eclipse.kapua.job.engine.app.core.mixin;
 
 import org.eclipse.kapua.job.engine.jbatch.JobStartOptionsImpl;
 
@@ -19,4 +19,6 @@
 
 @JsonDeserialize(as = JobStartOptionsImpl.class)
 @JsonIgnoreProperties("type")
-public interface JobStartOptionsMixin { }
+public interface JobStartOptionsMixin {
+
+}
diff --git a/...e/jackson/mixin/JobStepPropertyMixin.java → .../app/core/mixin/JobStepPropertyMixin.java b/...e/jackson/mixin/JobStepPropertyMixin.java → .../app/core/mixin/JobStepPropertyMixin.java
@@ -10,13 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.job.engine.app.core.jackson.mixin;
+package org.eclipse.kapua.job.engine.app.core.mixin;
+
+import org.eclipse.kapua.service.job.step.definition.internal.JobStepPropertyImpl;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.eclipse.kapua.service.job.step.definition.internal.JobStepPropertyImpl;
 
 @JsonDeserialize(as = JobStepPropertyImpl.class)
 @JsonIgnoreProperties("type")
 public interface JobStepPropertyMixin {
+
 }