From 3450f056cb0500111706143d0aa26aaa6a28c333 Mon Sep 17 00:00:00 2001 From: dseurotech Date: Tue, 14 May 2024 11:29:36 +0200 Subject: [PATCH] :heavy_minus_sign: absorbed job-engine-app-core into job-engine-app-web as it was not generic, neither used anywhere else Signed-off-by: dseurotech --- .../console/ConsoleJAXBContextProvider.java | 13 ++--- .../engine}/IsJobRunningMultipleResponse.java | 9 ++-- .../job/engine}/IsJobRunningResponse.java | 8 +-- .../job/engine}/MultipleJobIdRequest.java | 11 ++-- .../job/engine}/SessionInfoHttpHeaders.java | 4 +- job-engine/app/core/pom.xml | 53 ------------------- job-engine/app/pom.xml | 1 - .../app/resources/JobEngineResource.java | 20 +++---- job-engine/app/web/pom.xml | 9 ---- .../KapuaIdParamConverterProvider.java | 0 .../deserializer/KapuaIdDeserializer.java | 13 ++--- .../app/core/filter/RebuildSessionFilter.java | 26 ++++----- .../core/jackson/ObjectMapperProvider.java | 17 +++--- .../mixin/IsJobRunningResponseMixin.java | 2 +- .../app/core}/mixin/JobStartOptionsMixin.java | 6 ++- .../app/core}/mixin/JobStepPropertyMixin.java | 6 ++- .../engine/app/core}/mixin/KapuaIdMixin.java | 10 ++-- .../core}/serializer/KapuaIdSerializer.java | 2 +- .../engine/client/JobEngineServiceClient.java | 6 +-- .../client/filter/SessionInfoFilter.java | 11 ++-- pom.xml | 5 -- .../api/resources/v1/resources/JobEngine.java | 6 +-- .../api/web/RestApiJAXBContextProvider.java | 6 +-- 23 files changed, 95 insertions(+), 149 deletions(-) rename {commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model => job-engine/api/src/main/java/org/eclipse/kapua/job/engine}/IsJobRunningMultipleResponse.java (96%) rename {commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model => job-engine/api/src/main/java/org/eclipse/kapua/job/engine}/IsJobRunningResponse.java (96%) rename {commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model => job-engine/api/src/main/java/org/eclipse/kapua/job/engine}/MultipleJobIdRequest.java (96%) rename job-engine/{client/src/main/java/org/eclipse/kapua/job/engine/client/filter => api/src/main/java/org/eclipse/kapua/job/engine}/SessionInfoHttpHeaders.java (86%) delete mode 100644 job-engine/app/core/pom.xml rename job-engine/app/{core => web}/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java (100%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/deserializer/KapuaIdDeserializer.java (95%) rename job-engine/app/{core => web}/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java (72%) rename job-engine/app/{core => web}/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java (79%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/mixin/IsJobRunningResponseMixin.java (91%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/mixin/JobStartOptionsMixin.java (88%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/mixin/JobStepPropertyMixin.java (93%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/mixin/KapuaIdMixin.java (74%) rename job-engine/app/{core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson => web/src/main/java/org/eclipse/kapua/job/engine/app/core}/serializer/KapuaIdSerializer.java (93%) 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 index 0bdd7251e84..cb51b02305a 100644 --- 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 properties = new HashMap(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/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/IsJobRunningMultipleResponse.java similarity index 96% rename from commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java rename to job-engine/api/src/main/java/org/eclipse/kapua/job/engine/IsJobRunningMultipleResponse.java index 5e01b91b31b..5d7a06fc8a4 100644 --- a/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningMultipleResponse.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/job/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 list = new ArrayList<>(); diff --git a/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/IsJobRunningResponse.java similarity index 96% rename from commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java rename to job-engine/api/src/main/java/org/eclipse/kapua/job/engine/IsJobRunningResponse.java index 0d81f0fceee..fac28cf0ce5 100644 --- a/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/IsJobRunningResponse.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/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/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/MultipleJobIdRequest.java similarity index 96% rename from commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java rename to job-engine/api/src/main/java/org/eclipse/kapua/job/engine/MultipleJobIdRequest.java index a2c2a81da81..6bd81f464cc 100644 --- a/commons-rest/model/src/main/java/org/eclipse/kapua/commons/rest/model/MultipleJobIdRequest.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/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/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoHttpHeaders.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/SessionInfoHttpHeaders.java similarity index 86% rename from job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoHttpHeaders.java rename to job-engine/api/src/main/java/org/eclipse/kapua/job/engine/SessionInfoHttpHeaders.java index 820ba258b97..66f28d891c5 100644 --- a/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoHttpHeaders.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/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 deleted file mode 100644 index 144a6281231..00000000000 --- a/job-engine/app/core/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - - kapua-job-engine-app - org.eclipse.kapua - 2.1.0-SNAPSHOT - - - kapua-job-engine-app-core - - - - javax.servlet - javax.servlet-api - - - org.eclipse.kapua - kapua-job-engine-client - - - org.eclipse.kapua - kapua-job-engine-jbatch - - - org.eclipse.kapua - kapua-job-internal - - - org.eclipse.kapua - kapua-rest-api-core - - - org.eclipse.kapua - kapua-service-api - - - diff --git a/job-engine/app/pom.xml b/job-engine/app/pom.xml index d07e6b2083d..a402a683ed6 100644 --- a/job-engine/app/pom.xml +++ b/job-engine/app/pom.xml @@ -25,7 +25,6 @@ pom - core resources web diff --git a/job-engine/app/resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java b/job-engine/app/resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java index bd1da06e560..848663b9261 100644 --- a/job-engine/app/resources/src/main/java/org/eclipse/kapua/job/engine/app/resources/JobEngineResource.java +++ b/job-engine/app/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 index 927ba567304..b0faa19c539 100644 --- a/job-engine/app/web/pom.xml +++ b/job-engine/app/web/pom.xml @@ -40,11 +40,6 @@ ${jersey.version} - - org.eclipse.kapua - kapua-locator-guice - - org.eclipse.kapua kapua-device-registry-api @@ -117,10 +112,6 @@ org.eclipse.kapua kapua-job-internal - - org.eclipse.kapua - kapua-job-engine-app-core - org.eclipse.kapua kapua-job-engine-app-resources diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java similarity index 100% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/deserializer/KapuaIdDeserializer.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/deserializer/KapuaIdDeserializer.java similarity index 95% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/deserializer/KapuaIdDeserializer.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/deserializer/KapuaIdDeserializer.java index ea392e42d39..07d53b7f491 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/deserializer/KapuaIdDeserializer.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/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 { diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java similarity index 72% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java index 78a06080562..f8580ee59f7 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/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/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java similarity index 79% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java index ff768bc14a4..1585abc825d 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/ObjectMapperProvider.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/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 { diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/IsJobRunningResponseMixin.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/IsJobRunningResponseMixin.java similarity index 91% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/IsJobRunningResponseMixin.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/IsJobRunningResponseMixin.java index 6f1043b6c5b..a465798d966 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/IsJobRunningResponseMixin.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/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/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStartOptionsMixin.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/JobStartOptionsMixin.java similarity index 88% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStartOptionsMixin.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/JobStartOptionsMixin.java index a5a7ac3e95f..e8461ac656f 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStartOptionsMixin.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/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/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStepPropertyMixin.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/JobStepPropertyMixin.java similarity index 93% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStepPropertyMixin.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/JobStepPropertyMixin.java index 65d9cf685ef..28667079bed 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStepPropertyMixin.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/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 { + } diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/KapuaIdMixin.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/KapuaIdMixin.java similarity index 74% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/KapuaIdMixin.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/KapuaIdMixin.java index f1271916492..bd3228be82c 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/KapuaIdMixin.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/KapuaIdMixin.java @@ -10,14 +10,16 @@ * 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.app.core.jackson.deserializer.KapuaIdDeserializer; -import org.eclipse.kapua.job.engine.app.core.jackson.serializer.KapuaIdSerializer; +import org.eclipse.kapua.job.engine.app.core.deserializer.KapuaIdDeserializer; +import org.eclipse.kapua.job.engine.app.core.serializer.KapuaIdSerializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonDeserialize(using = KapuaIdDeserializer.class) @JsonSerialize(using = KapuaIdSerializer.class) -public interface KapuaIdMixin { } +public interface KapuaIdMixin { + +} diff --git a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/serializer/KapuaIdSerializer.java b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/serializer/KapuaIdSerializer.java similarity index 93% rename from job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/serializer/KapuaIdSerializer.java rename to job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/serializer/KapuaIdSerializer.java index 96c2aea2189..5cebfc3276f 100644 --- a/job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/serializer/KapuaIdSerializer.java +++ b/job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/serializer/KapuaIdSerializer.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech - initial API and implementation *******************************************************************************/ -package org.eclipse.kapua.job.engine.app.core.jackson.serializer; +package org.eclipse.kapua.job.engine.app.core.serializer; import java.io.IOException; diff --git a/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java b/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java index 8245c4fd019..7910427f847 100644 --- a/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java +++ b/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/JobEngineServiceClient.java @@ -34,9 +34,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; @@ -50,8 +47,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/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoFilter.java b/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoFilter.java index 0ac80a56b01..f3bf63a513b 100644 --- a/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoFilter.java +++ b/job-engine/client/src/main/java/org/eclipse/kapua/job/engine/client/filter/SessionInfoFilter.java @@ -12,16 +12,19 @@ *******************************************************************************/ package org.eclipse.kapua.job.engine.client.filter; -import com.google.common.net.HttpHeaders; +import java.io.IOException; + +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; + import org.eclipse.kapua.commons.security.KapuaSecurityUtils; import org.eclipse.kapua.commons.security.KapuaSession; +import org.eclipse.kapua.job.engine.SessionInfoHttpHeaders; import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSetting; import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSettingKeys; import org.eclipse.kapua.locator.KapuaLocator; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import java.io.IOException; +import com.google.common.net.HttpHeaders; /** * {@link ClientRequestFilter} used to populate HTTP request headers with information about the current {@link KapuaSession}. diff --git a/pom.xml b/pom.xml index c02ec5bc145..99a20c9e3b1 100644 --- a/pom.xml +++ b/pom.xml @@ -1335,11 +1335,6 @@ kapua-job-engine-app ${project.version} - - org.eclipse.kapua - kapua-job-engine-app-core - ${project.version} - org.eclipse.kapua kapua-job-engine-app-resources diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java index 937e60455f5..4ffee54fe08 100644 --- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/JobEngine.java +++ b/rest-api/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 index 1e87eb97c20..4e46eb614fd 100644 --- 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;