Skip to content

Commit 821d6b3

Browse files
PastorGLPastorGL
authored
Merge pull request #16 from PastorGL/experimental-java_17
Release 4.1
2 parents 8d96a32 + 5e4c41e commit 821d6b3

File tree

127 files changed

+575
-1130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+575
-1130
lines changed

‎cli/pom.xml‎

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,43 @@
2020
</properties>
2121

2222
<dependencies>
23+
<dependency>
24+
<groupId>org.burningwave</groupId>
25+
<artifactId>core</artifactId>
26+
<version>12.62.7</version>
27+
</dependency>
28+
29+
<dependency>
30+
<groupId>org.glassfish.jersey.core</groupId>
31+
<artifactId>jersey-client</artifactId>
32+
<version>3.1.3</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.glassfish.jersey.core</groupId>
36+
<artifactId>jersey-server</artifactId>
37+
<version>3.1.3</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.fasterxml.jackson.core</groupId>
41+
<artifactId>jackson-databind</artifactId>
42+
<version>2.15.2</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>com.fasterxml.jackson.module</groupId>
46+
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
47+
<version>2.15.2</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.glassfish.jersey.media</groupId>
51+
<artifactId>jersey-media-json-jackson</artifactId>
52+
<version>3.1.3</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.logz</groupId>
56+
<artifactId>guice-jersey</artifactId>
57+
<version>2.0.0</version>
58+
</dependency>
59+
2360
<dependency>
2461
<groupId>io.github.pastorgl.datacooker</groupId>
2562
<artifactId>commons</artifactId>
@@ -108,11 +145,11 @@
108145
</dependency>
109146
<!-- end -->
110147

111-
<!-- EMR 6.15 -->
148+
<!-- EMR 7.2 -->
112149
<dependency>
113150
<groupId>com.amazonaws</groupId>
114151
<artifactId>aws-java-sdk-s3</artifactId>
115-
<version>1.12.569</version>
152+
<version>1.12.705</version>
116153
</dependency>
117154
<dependency>
118155
<groupId>commons-cli</groupId>
@@ -132,53 +169,17 @@
132169
<version>3.23.0</version>
133170
</dependency>
134171

135-
<dependency>
136-
<groupId>org.glassfish.jersey.containers</groupId>
137-
<artifactId>jersey-container-servlet</artifactId>
138-
<version>2.40</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>org.glassfish.jersey.inject</groupId>
142-
<artifactId>jersey-hk2</artifactId>
143-
<version>2.40</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>io.logz</groupId>
147-
<artifactId>guice-jersey</artifactId>
148-
<version>1.1.05</version>
149-
<exclusions>
150-
<exclusion>
151-
<groupId>org.glassfish.jersey.inject</groupId>
152-
<artifactId>jersey-hk2</artifactId>
153-
</exclusion>
154-
<exclusion>
155-
<groupId>org.glassfish.jersey.containers</groupId>
156-
<artifactId>jersey-container-servlet</artifactId>
157-
</exclusion>
158-
</exclusions>
159-
</dependency>
160-
<dependency>
161-
<groupId>com.fasterxml.jackson.module</groupId>
162-
<artifactId>jackson-module-jaxb-annotations</artifactId>
163-
<version>2.14.2</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.glassfish.jersey.media</groupId>
167-
<artifactId>jersey-media-json-jackson</artifactId>
168-
<version>2.40</version>
169-
<exclusions>
170-
<exclusion>
171-
<groupId>com.fasterxml.jackson.module</groupId>
172-
<artifactId>jackson-module-jaxb-annotations</artifactId>
173-
</exclusion>
174-
</exclusions>
175-
</dependency>
176-
177172
<dependency>
178173
<groupId>org.apache.velocity</groupId>
179174
<artifactId>velocity-engine-core</artifactId>
180175
<version>2.3</version>
181176
<scope>test</scope>
177+
<exclusions>
178+
<exclusion>
179+
<groupId>org.apache.commons</groupId>
180+
<artifactId>commons-lang3</artifactId>
181+
</exclusion>
182+
</exclusions>
182183
</dependency>
183184
<dependency>
184185
<groupId>com.openhtmltopdf</groupId>
@@ -313,6 +314,8 @@
313314
<include>com.google.inject</include>
314315
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
315316
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
317+
<include>org.burningwave</include>
318+
<include>io.github.toolfactory</include>
316319
</includes>
317320
</artifactSet>
318321
</configuration>

‎cli/src/main/java/io/github/pastorgl/datacooker/cli/BatchRunner.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@
1010
import io.github.pastorgl.datacooker.scripting.TDL4ErrorListener;
1111
import io.github.pastorgl.datacooker.scripting.TDL4Interpreter;
1212
import org.apache.spark.api.java.JavaSparkContext;
13-
import org.apache.spark.scheduler.SparkListener;
14-
import org.apache.spark.scheduler.SparkListenerStageCompleted;
15-
import org.apache.spark.scheduler.StageInfo;
16-
import org.apache.spark.storage.RDDInfo;
17-
import scala.collection.JavaConverters;
18-
19-
import java.util.*;
20-
import java.util.stream.Collectors;
13+
14+
import java.util.Map;
2115

2216
public class BatchRunner {
2317
private final Configuration config;

‎cli/src/main/java/io/github/pastorgl/datacooker/cli/Helper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.jar.Manifest;
2121

2222
import static io.github.pastorgl.datacooker.cli.Main.LOG;
23+
import static org.burningwave.core.assembler.StaticComponentContainer.Modules;
2324

2425
public class Helper {
2526
static public void populateEntities() {
@@ -168,4 +169,8 @@ public static String getVersion() {
168169
return "unknown";
169170
}
170171
}
172+
173+
public static void exportAllToAll() {
174+
Modules.exportAllToAll();
175+
}
171176
}

‎cli/src/main/java/io/github/pastorgl/datacooker/cli/Main.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public static void main(String[] args) {
3232
new Main().run(args);
3333
}
3434

35+
public Main() {
36+
Helper.exportAllToAll();
37+
}
38+
3539
public void run(String[] args) {
3640
Configuration config = new Configuration();
3741

‎cli/src/main/java/io/github/pastorgl/datacooker/cli/repl/remote/Requester.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
*/
55
package io.github.pastorgl.datacooker.cli.repl.remote;
66

7+
import jakarta.ws.rs.client.Entity;
8+
import jakarta.ws.rs.core.MediaType;
79
import org.glassfish.jersey.client.JerseyClient;
810
import org.glassfish.jersey.client.JerseyClientBuilder;
911
import org.glassfish.jersey.client.JerseyWebTarget;
1012
import org.glassfish.jersey.jackson.JacksonFeature;
1113

12-
import javax.ws.rs.client.Entity;
13-
import javax.ws.rs.core.MediaType;
1414
import java.util.Map;
1515

1616
public class Requester {

‎cli/src/main/java/io/github/pastorgl/datacooker/rest/DataEndpoint.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import io.github.pastorgl.datacooker.data.DataContext;
88
import io.github.pastorgl.datacooker.data.StreamLineage;
99
import io.github.pastorgl.datacooker.scripting.StreamInfo;
10+
import jakarta.inject.Inject;
11+
import jakarta.inject.Singleton;
12+
import jakarta.validation.constraints.NotEmpty;
13+
import jakarta.validation.constraints.NotNull;
14+
import jakarta.validation.constraints.Positive;
15+
import jakarta.ws.rs.*;
16+
import jakarta.ws.rs.core.MediaType;
1017

11-
import javax.inject.Inject;
12-
import javax.inject.Singleton;
13-
import javax.validation.constraints.NotEmpty;
14-
import javax.validation.constraints.NotNull;
15-
import javax.validation.constraints.Positive;
16-
import javax.ws.rs.*;
17-
import javax.ws.rs.core.MediaType;
1818
import java.util.ArrayList;
1919
import java.util.List;
2020
import java.util.stream.Collectors;

‎cli/src/main/java/io/github/pastorgl/datacooker/rest/EntityEndpoint.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import io.github.pastorgl.datacooker.scripting.Operations;
1414
import io.github.pastorgl.datacooker.scripting.Operators;
1515
import io.github.pastorgl.datacooker.storage.Adapters;
16+
import jakarta.inject.Singleton;
17+
import jakarta.validation.constraints.NotEmpty;
18+
import jakarta.ws.rs.GET;
19+
import jakarta.ws.rs.Path;
20+
import jakarta.ws.rs.Produces;
21+
import jakarta.ws.rs.QueryParam;
22+
import jakarta.ws.rs.core.MediaType;
1623

17-
import javax.inject.Singleton;
18-
import javax.validation.constraints.NotEmpty;
19-
import javax.ws.rs.GET;
20-
import javax.ws.rs.Path;
21-
import javax.ws.rs.Produces;
22-
import javax.ws.rs.QueryParam;
23-
import javax.ws.rs.core.MediaType;
2424
import java.util.ArrayList;
2525
import java.util.List;
2626

‎cli/src/main/java/io/github/pastorgl/datacooker/rest/ExecutorEndpoint.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
import io.github.pastorgl.datacooker.scripting.TDL4ErrorListener;
1010
import io.github.pastorgl.datacooker.scripting.TDL4Interpreter;
1111
import io.github.pastorgl.datacooker.scripting.VariablesContext;
12-
13-
import javax.inject.Inject;
14-
import javax.inject.Singleton;
15-
import javax.ws.rs.*;
16-
import javax.ws.rs.core.MediaType;
12+
import jakarta.inject.Inject;
13+
import jakarta.inject.Singleton;
14+
import jakarta.ws.rs.*;
15+
import jakarta.ws.rs.core.MediaType;
1716

1817
@Singleton
1918
@Path("exec")

‎cli/src/main/java/io/github/pastorgl/datacooker/rest/MetaEndpoint.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import io.github.pastorgl.datacooker.Options;
88
import io.github.pastorgl.datacooker.cli.repl.OptionsInfo;
99
import io.github.pastorgl.datacooker.scripting.OptionsContext;
10+
import jakarta.inject.Inject;
11+
import jakarta.inject.Named;
12+
import jakarta.inject.Singleton;
13+
import jakarta.ws.rs.GET;
14+
import jakarta.ws.rs.Path;
15+
import jakarta.ws.rs.Produces;
16+
import jakarta.ws.rs.QueryParam;
17+
import jakarta.ws.rs.core.MediaType;
1018

11-
import javax.inject.Inject;
12-
import javax.inject.Named;
13-
import javax.inject.Singleton;
14-
import javax.ws.rs.GET;
15-
import javax.ws.rs.Path;
16-
import javax.ws.rs.Produces;
17-
import javax.ws.rs.QueryParam;
18-
import javax.ws.rs.core.MediaType;
1919
import java.util.ArrayList;
2020
import java.util.Arrays;
2121
import java.util.List;

‎cli/src/main/java/io/github/pastorgl/datacooker/rest/VariableEndpoint.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
import io.github.pastorgl.datacooker.scripting.VariableInfo;
88
import io.github.pastorgl.datacooker.scripting.VariablesContext;
9+
import jakarta.inject.Inject;
10+
import jakarta.inject.Singleton;
11+
import jakarta.validation.constraints.NotEmpty;
12+
import jakarta.ws.rs.GET;
13+
import jakarta.ws.rs.Path;
14+
import jakarta.ws.rs.Produces;
15+
import jakarta.ws.rs.QueryParam;
16+
import jakarta.ws.rs.core.MediaType;
917

10-
import javax.inject.Inject;
11-
import javax.inject.Singleton;
12-
import javax.validation.constraints.NotEmpty;
13-
import javax.ws.rs.GET;
14-
import javax.ws.rs.Path;
15-
import javax.ws.rs.Produces;
16-
import javax.ws.rs.QueryParam;
17-
import javax.ws.rs.core.MediaType;
1818
import java.util.ArrayList;
1919
import java.util.List;
2020

0 commit comments

Comments
 (0)