Skip to content

Commit e01ed91

Browse files
juripetersenjuripetersen
committed
Move Parameters.scala util to wayang-api-util package
1 parent faa73d4 commit e01ed91

5 files changed

Lines changed: 172 additions & 4 deletions

File tree

‎wayang-api/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<module>wayang-api-python</module>
4141
<module>wayang-api-sql</module>
4242
<module>wayang-api-json</module>
43+
<module>wayang-api-utils</module>
4344
</modules>
4445

4546
</project>

‎wayang-api/wayang-api-sql/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>org.apache.wayang</groupId>
54-
<artifactId>wayang-api-scala-java</artifactId>
54+
<artifactId>wayang-api-utils</artifactId>
5555
<version>1.0.1-SNAPSHOT</version>
56+
<scope>compile</scope>
5657
</dependency>
5758
<dependency>
5859
<groupId>org.apache.wayang</groupId>

‎wayang-api/wayang-api-sql/src/main/java/org/apache/wayang/api/sql/context/SqlContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.wayang.basic.data.Record;
3838
import org.apache.wayang.core.api.Configuration;
3939
import org.apache.wayang.core.plugin.Plugin;
40-
import org.apache.wayang.api.util.Parameters;
40+
import org.apache.wayang.api.utils.Parameters;
4141
import org.apache.wayang.core.api.WayangContext;
4242
import org.apache.wayang.core.util.ReflectionUtils;
4343
import org.apache.wayang.core.plan.wayangplan.WayangPlan;
@@ -164,7 +164,7 @@ public static void main(final String[] args) throws Exception {
164164
List.of(Java.channelConversionPlugin(), Postgres.conversionPlugin()));
165165

166166
List<Plugin> plugins = JavaConversions.seqAsJavaList(Parameters.loadPlugins(cmd.getOptionValue("p")));
167-
plugins.stream().forEach(plug -> context.register(plug));
167+
plugins.stream().forEach(context::register);
168168

169169
final Collection<Record> result = context.executeSql(query);
170170

‎wayang-api/wayang-api-utils/pom.xml‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<artifactId>wayang-api</artifactId>
25+
<groupId>org.apache.wayang</groupId>
26+
<version>1.0.1-SNAPSHOT</version>
27+
</parent>
28+
29+
<artifactId>wayang-api-utils</artifactId>
30+
<version>1.0.1-SNAPSHOT</version>
31+
32+
<name>Wayang API Utils</name>
33+
<description>Wayang implementation of an API of Scala-Java to be enable to work in functional style</description>
34+
35+
<properties>
36+
<java-module-name>org.apache.wayang.api</java-module-name>
37+
<tensorflow.version>1.0.0</tensorflow.version>
38+
</properties>
39+
40+
<dependencyManagement>
41+
<dependencies>
42+
<dependency>
43+
<groupId>org.apache.wayang</groupId>
44+
<artifactId>wayang-commons</artifactId>
45+
<version>1.0.1-SNAPSHOT</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
51+
52+
<dependencies>
53+
<dependency>
54+
<groupId>org.apache.wayang</groupId>
55+
<artifactId>wayang-core</artifactId>
56+
<version>1.0.1-SNAPSHOT</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.wayang</groupId>
60+
<artifactId>wayang-basic</artifactId>
61+
<version>1.0.1-SNAPSHOT</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.wayang</groupId>
65+
<artifactId>wayang-utils-profile-db</artifactId>
66+
<version>1.0.1-SNAPSHOT</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.wayang</groupId>
70+
<artifactId>wayang-api-python</artifactId>
71+
<version>1.0.1-SNAPSHOT</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.apache.commons</groupId>
75+
<artifactId>commons-lang3</artifactId>
76+
<version>3.12.0</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.apache.wayang</groupId>
80+
<artifactId>wayang-java</artifactId>
81+
<version>1.0.1-SNAPSHOT</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.apache.wayang</groupId>
85+
<artifactId>wayang-sqlite3</artifactId>
86+
<version>1.0.1-SNAPSHOT</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.wayang</groupId>
90+
<artifactId>wayang-postgres</artifactId>
91+
<version>1.0.1-SNAPSHOT</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.hadoop</groupId>
95+
<artifactId>hadoop-common</artifactId>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.apache.hadoop</groupId>
100+
<artifactId>hadoop-hdfs</artifactId>
101+
<scope>test</scope>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.apache.wayang</groupId>
105+
<artifactId>wayang-spark</artifactId>
106+
<version>1.0.1-SNAPSHOT</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.apache.wayang</groupId>
110+
<artifactId>wayang-tensorflow</artifactId>
111+
<version>1.0.1-SNAPSHOT</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.apache.spark</groupId>
115+
<artifactId>spark-core_2.12</artifactId>
116+
<version>${spark.version}</version>
117+
<scope>test</scope>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.apache.spark</groupId>
121+
<artifactId>spark-graphx_2.12</artifactId>
122+
<version>${spark.version}</version>
123+
<scope>test</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.apache.spark</groupId>
127+
<artifactId>spark-mllib_2.12</artifactId>
128+
<version>${spark.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.scala-lang</groupId>
132+
<artifactId>scala-library</artifactId>
133+
<version>${scala.version}</version>
134+
<scope>provided</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>io.netty</groupId>
138+
<artifactId>netty-all</artifactId>
139+
<version>4.1.89.Final</version>
140+
</dependency>
141+
<dependency>
142+
<groupId>com.google.protobuf</groupId>
143+
<artifactId>protobuf-java</artifactId>
144+
<version>3.25.5</version>
145+
</dependency>
146+
<dependency>
147+
<groupId>com.fasterxml.jackson.core</groupId>
148+
<artifactId>jackson-databind</artifactId>
149+
<version>2.15.4</version>
150+
</dependency>
151+
<dependency>
152+
<groupId>com.fasterxml.jackson.module</groupId>
153+
<artifactId>jackson-module-scala_2.12</artifactId>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.tensorflow</groupId>
157+
<artifactId>tensorflow-core-platform</artifactId>
158+
<version>${tensorflow.version}</version>
159+
</dependency>
160+
<dependency>
161+
<groupId>org.tensorflow</groupId>
162+
<artifactId>tensorflow-framework</artifactId>
163+
<version>${tensorflow.version}</version>
164+
</dependency>
165+
</dependencies>
166+
</project>

wayang-api/wayang-api-scala-java/src/main/scala/org/apache/wayang/api/util/Parameters.scala renamed to wayang-api/wayang-api-utils/src/main/scala/Parameters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.wayang.api.util
19+
package org.apache.wayang.api.utils
2020

2121
import org.apache.wayang.commons.util.profiledb.model.Experiment
2222
import org.apache.wayang.basic.WayangBasics

0 commit comments

Comments
 (0)