Skip to content

Commit a3dc144

Browse files
dseurotechdseurotech
committed
Revert ":heavy_minus_sign: absorbed job-engine-app-core into job-engine-app-web as it was not generic, neither used anywhere else"
This reverts commit 3450f05.
1 parent 9b32ac0 commit a3dc144

File tree

22 files changed

+258
-81
lines changed

22 files changed

+258
-81
lines changed

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
3+
*
4+
* This program and the accompanying materials are made
5+
* available under the terms of the Eclipse Public License 2.0
6+
* which is available at https://www.eclipse.org/legal/epl-2.0/
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
* Contributors:
11+
* Eurotech - initial API and implementation
12+
*******************************************************************************/
13+
package org.eclipse.kapua.commons.rest.model;
14+
15+
import org.eclipse.kapua.model.id.KapuaId;
16+
17+
import javax.xml.bind.annotation.XmlElementWrapper;
18+
import java.util.ArrayList;
19+
import java.util.List;
20+
import java.util.Map;
21+
22+
public class IsJobRunningMultipleResponse {
23+
24+
private List<IsJobRunningResponse> list = new ArrayList<>();
25+
26+
public IsJobRunningMultipleResponse() {
27+
}
28+
29+
public IsJobRunningMultipleResponse(Map<KapuaId, Boolean> map) {
30+
map.forEach((key, value) -> list.add(new IsJobRunningResponse(key, value)));
31+
}
32+
33+
@XmlElementWrapper
34+
public List<IsJobRunningResponse> getList() {
35+
return list;
36+
}
37+
38+
public void setMap(List<IsJobRunningResponse> list) {
39+
this.list = list;
40+
}
41+
42+
}

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
3+
*
4+
* This program and the accompanying materials are made
5+
* available under the terms of the Eclipse Public License 2.0
6+
* which is available at https://www.eclipse.org/legal/epl-2.0/
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
* Contributors:
11+
* Eurotech - initial API and implementation
12+
*******************************************************************************/
13+
package org.eclipse.kapua.commons.rest.model;
14+
15+
import org.eclipse.kapua.model.id.KapuaId;
16+
import org.eclipse.kapua.model.id.KapuaIdAdapter;
17+
18+
import javax.xml.bind.annotation.XmlElement;
19+
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
20+
21+
public class IsJobRunningResponse {
22+
23+
private KapuaId jobId;
24+
private Boolean isRunning;
25+
26+
public IsJobRunningResponse() {
27+
}
28+
29+
public IsJobRunningResponse(KapuaId jobId, Boolean isRunning) {
30+
this.jobId = jobId;
31+
this.isRunning = isRunning;
32+
}
33+
34+
@XmlJavaTypeAdapter(KapuaIdAdapter.class)
35+
public KapuaId getJobId() {
36+
return jobId;
37+
}
38+
39+
public void setJobId(KapuaId jobId) {
40+
this.jobId = jobId;
41+
}
42+
43+
@XmlElement(name = "isRunning")
44+
public Boolean isRunning() {
45+
return isRunning;
46+
}
47+
48+
public void setRunning(Boolean isRunning) {
49+
this.isRunning = isRunning;
50+
}
51+
52+
}

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
3+
*
4+
* This program and the accompanying materials are made
5+
* available under the terms of the Eclipse Public License 2.0
6+
* which is available at https://www.eclipse.org/legal/epl-2.0/
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
* Contributors:
11+
* Eurotech - initial API and implementation
12+
*******************************************************************************/
13+
package org.eclipse.kapua.commons.rest.model;
14+
15+
import org.eclipse.kapua.model.id.KapuaId;
16+
import org.eclipse.kapua.model.id.KapuaIdAdapter;
17+
18+
import javax.xml.bind.annotation.XmlElement;
19+
import javax.xml.bind.annotation.XmlElementWrapper;
20+
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
21+
import java.util.HashSet;
22+
import java.util.Set;
23+
24+
public class MultipleJobIdRequest {
25+
26+
private Set<KapuaId> jobIds = new HashSet<>();
27+
28+
@XmlElementWrapper(name = "jobIds")
29+
@XmlElement(name = "jobId")
30+
@XmlJavaTypeAdapter(KapuaIdAdapter.class)
31+
public Set<KapuaId> getJobIds() {
32+
return jobIds;
33+
}
34+
35+
public void setJobIds(Set<KapuaId> jobIds) {
36+
this.jobIds = jobIds;
37+
}
38+
39+
}

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
4+
5+
This program and the accompanying materials are made
6+
available under the terms of the Eclipse Public License 2.0
7+
which is available at https://www.eclipse.org/legal/epl-2.0/
8+
9+
SPDX-License-Identifier: EPL-2.0
10+
11+
Contributors:
12+
Eurotech - initial API and implementation
13+
-->
14+
<project xmlns="http://maven.apache.org/POM/4.0.0"
15+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<modelVersion>4.0.0</modelVersion>
18+
19+
<parent>
20+
<artifactId>kapua-job-engine-app</artifactId>
21+
<groupId>org.eclipse.kapua</groupId>
22+
<version>2.1.0-SNAPSHOT</version>
23+
</parent>
24+
25+
<artifactId>kapua-job-engine-app-core</artifactId>
26+
27+
<dependencies>
28+
<dependency>
29+
<groupId>javax.servlet</groupId>
30+
<artifactId>javax.servlet-api</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.eclipse.kapua</groupId>
34+
<artifactId>kapua-job-engine-client</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.eclipse.kapua</groupId>
38+
<artifactId>kapua-job-engine-jbatch</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.eclipse.kapua</groupId>
42+
<artifactId>kapua-job-internal</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.eclipse.kapua</groupId>
46+
<artifactId>kapua-rest-api-core</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.eclipse.kapua</groupId>
50+
<artifactId>kapua-service-api</artifactId>
51+
</dependency>
52+
</dependencies>
53+
</project>

‎job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java‎ renamed to ‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/converter/KapuaIdParamConverterProvider.java‎

File renamed without changes.

‎job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java‎ renamed to ‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/filter/RebuildSessionFilter.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
*******************************************************************************/
1313
package org.eclipse.kapua.job.engine.app.core.filter;
1414

15-
import javax.servlet.ServletRequest;
16-
import javax.servlet.ServletResponse;
17-
import javax.servlet.http.HttpServletRequest;
18-
1915
import org.eclipse.kapua.app.api.core.auth.KapuaTokenAuthenticationFilter;
2016
import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
2117
import org.eclipse.kapua.commons.security.KapuaSession;
22-
import org.eclipse.kapua.job.engine.SessionInfoHttpHeaders;
18+
import org.eclipse.kapua.job.engine.client.filter.SessionInfoHttpHeaders;
2319
import org.eclipse.kapua.locator.KapuaLocator;
2420
import org.eclipse.kapua.model.id.KapuaId;
2521
import org.eclipse.kapua.model.id.KapuaIdFactory;
2622

23+
import javax.servlet.ServletRequest;
24+
import javax.servlet.ServletResponse;
25+
import javax.servlet.http.HttpServletRequest;
26+
2727
public class RebuildSessionFilter extends KapuaTokenAuthenticationFilter {
2828

2929
private final KapuaIdFactory kapuaIdFactory = KapuaLocator.getInstance().getFactory(KapuaIdFactory.class);
@@ -33,14 +33,14 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons
3333
HttpServletRequest httpRequest = (HttpServletRequest) request;
3434
String authMode = httpRequest.getHeader(SessionInfoHttpHeaders.AUTH_MODE);
3535
switch (authMode) {
36-
case "trusted":
37-
KapuaId scopeId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.SCOPE_ID_HTTP_HEADER));
38-
KapuaId userId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.USER_ID_HTTP_HEADER));
39-
KapuaSecurityUtils.setSession(KapuaSession.createFrom(scopeId, userId));
40-
return true;
41-
case "access_token":
42-
default:
43-
return super.onAccessDenied(request, response);
36+
case "trusted":
37+
KapuaId scopeId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.SCOPE_ID_HTTP_HEADER));
38+
KapuaId userId = kapuaIdFactory.newKapuaId(httpRequest.getHeader(SessionInfoHttpHeaders.USER_ID_HTTP_HEADER));
39+
KapuaSecurityUtils.setSession(KapuaSession.createFrom(scopeId, userId));
40+
return true;
41+
case "access_token":
42+
default:
43+
return super.onAccessDenied(request, response);
4444
}
4545
}
4646

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@
1212
*******************************************************************************/
1313
package org.eclipse.kapua.job.engine.app.core.jackson;
1414

15-
import javax.ws.rs.ext.ContextResolver;
16-
import javax.ws.rs.ext.Provider;
17-
18-
import org.eclipse.kapua.job.engine.IsJobRunningResponse;
15+
import com.fasterxml.jackson.databind.ObjectMapper;
16+
import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
1917
import org.eclipse.kapua.job.engine.JobStartOptions;
20-
import org.eclipse.kapua.job.engine.app.core.mixin.IsJobRunningResponseMixin;
21-
import org.eclipse.kapua.job.engine.app.core.mixin.JobStartOptionsMixin;
22-
import org.eclipse.kapua.job.engine.app.core.mixin.JobStepPropertyMixin;
23-
import org.eclipse.kapua.job.engine.app.core.mixin.KapuaIdMixin;
18+
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.IsJobRunningResponseMixin;
19+
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStartOptionsMixin;
20+
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.JobStepPropertyMixin;
21+
import org.eclipse.kapua.job.engine.app.core.jackson.mixin.KapuaIdMixin;
2422
import org.eclipse.kapua.model.id.KapuaId;
2523
import org.eclipse.kapua.service.job.step.definition.JobStepProperty;
2624

27-
import com.fasterxml.jackson.databind.ObjectMapper;
25+
import javax.ws.rs.ext.ContextResolver;
26+
import javax.ws.rs.ext.Provider;
2827

2928
@Provider
3029
public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {

‎job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/deserializer/KapuaIdDeserializer.java‎ renamed to ‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/deserializer/KapuaIdDeserializer.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010
* Contributors:
1111
* Eurotech - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.kapua.job.engine.app.core.deserializer;
14-
15-
import java.io.IOException;
16-
17-
import org.eclipse.kapua.locator.KapuaLocator;
18-
import org.eclipse.kapua.model.id.KapuaId;
19-
import org.eclipse.kapua.model.id.KapuaIdFactory;
13+
package org.eclipse.kapua.job.engine.app.core.jackson.deserializer;
2014

2115
import com.fasterxml.jackson.core.JsonParser;
2216
import com.fasterxml.jackson.core.JsonProcessingException;
2317
import com.fasterxml.jackson.databind.DeserializationContext;
2418
import com.fasterxml.jackson.databind.JsonDeserializer;
19+
import org.eclipse.kapua.locator.KapuaLocator;
20+
import org.eclipse.kapua.model.id.KapuaId;
21+
import org.eclipse.kapua.model.id.KapuaIdFactory;
22+
23+
import java.io.IOException;
2524

2625
public class KapuaIdDeserializer extends JsonDeserializer<KapuaId> {
2726

‎job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/IsJobRunningResponseMixin.java‎ renamed to ‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/IsJobRunningResponseMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Eurotech - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.kapua.job.engine.app.core.mixin;
13+
package org.eclipse.kapua.job.engine.app.core.jackson.mixin;
1414

1515
import com.fasterxml.jackson.annotation.JsonProperty;
1616

‎job-engine/app/web/src/main/java/org/eclipse/kapua/job/engine/app/core/mixin/JobStartOptionsMixin.java‎ renamed to ‎job-engine/app/core/src/main/java/org/eclipse/kapua/job/engine/app/core/jackson/mixin/JobStartOptionsMixin.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Eurotech - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.kapua.job.engine.app.core.mixin;
13+
package org.eclipse.kapua.job.engine.app.core.jackson.mixin;
1414

1515
import org.eclipse.kapua.job.engine.jbatch.JobStartOptionsImpl;
1616

@@ -19,6 +19,4 @@
1919

2020
@JsonDeserialize(as = JobStartOptionsImpl.class)
2121
@JsonIgnoreProperties("type")
22-
public interface JobStartOptionsMixin {
23-
24-
}
22+
public interface JobStartOptionsMixin { }

0 commit comments

Comments
 (0)