Renamed classes and import refactors

zinggAI · Jul 13, 2024 · bed9924 · bed9924
1 parent 268595c
commit bed9924
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 70 deletions.
diff --git a/common/client/src/main/java/zingg/common/client/util/DFObjectUtil.java b/common/client/src/main/java/zingg/common/client/util/DFObjectUtil.java
@@ -6,6 +6,12 @@
 
 public abstract class DFObjectUtil<S, D, R, C> {
 
+    protected final IWithSession<S> iWithSession;
+
+    protected DFObjectUtil(IWithSession<S> iWithSession) {
+        this.iWithSession = iWithSession;
+    }
+
     public abstract ZFrame<D, R, C> getDFFromObjectList(List objList, Class objClass) throws Exception;
 
 }
diff --git a/common/client/src/test/java/zingg/common/client/TestZFrameBase.java b/common/client/src/test/java/zingg/common/client/TestZFrameBase.java
@@ -22,15 +22,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static zingg.common.client.data.Constant.createEmptySampleData;
-import static zingg.common.client.data.Constant.createSampleDataCluster;
-import static zingg.common.client.data.Constant.createSampleDataClusterWithNull;
-import static zingg.common.client.data.Constant.createSampleDataInput;
-import static zingg.common.client.data.Constant.createSampleDataList;
-import static zingg.common.client.data.Constant.createSampleDataListDistinct;
-import static zingg.common.client.data.Constant.createSampleDataListWithDistinctSurnameAndPostcode;
-import static zingg.common.client.data.Constant.createSampleDataListWithMixedDataType;
-import static zingg.common.client.data.Constant.createSampleDataZScore;
+import static zingg.common.client.data.TestData.createEmptySampleData;
+import static zingg.common.client.data.TestData.createSampleDataCluster;
+import static zingg.common.client.data.TestData.createSampleDataClusterWithNull;
+import static zingg.common.client.data.TestData.createSampleDataInput;
+import static zingg.common.client.data.TestData.createSampleDataList;
+import static zingg.common.client.data.TestData.createSampleDataListDistinct;
+import static zingg.common.client.data.TestData.createSampleDataListWithDistinctSurnameAndPostcode;
+import static zingg.common.client.data.TestData.createSampleDataListWithMixedDataType;
+import static zingg.common.client.data.TestData.createSampleDataZScore;
 
 public abstract class TestZFrameBase<S, D, R, C, T> {
 

diff --git a/...va/zingg/common/client/data/Constant.java → ...va/zingg/common/client/data/TestData.java b/...va/zingg/common/client/data/Constant.java → ...va/zingg/common/client/data/TestData.java
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class Constant {
+public class TestData {
 
     //sample data classes to be used for testing
     public static List<Person> createEmptySampleData() {

diff --git a/common/core/src/test/java/zingg/common/core/block/TestBlockBase.java b/common/core/src/test/java/zingg/common/core/block/TestBlockBase.java
@@ -52,7 +52,8 @@ public void testTree() throws Throwable {
 	}
 
 	private IArguments getArguments() throws ZinggClientException {
-
+		String configFilePath = Objects.requireNonNull(getClass().getResource("../../../../testFebrl/config.json")).getFile();
+
 		IArguments args = argumentsUtil.createArgumentsFromJSON(configFilePath, "trainMatch");
 
 		List<FieldDefinition> fdList = getFieldDefList();

diff --git a/common/infra/src/main/java/zingg/common/infra/util/PojoToArrayConverter.java b/common/infra/src/main/java/zingg/common/infra/util/PojoToArrayConverter.java
diff --git a/spark/client/src/main/java/zingg/spark/client/util/SparkDFObjectUtil.java b/spark/client/src/main/java/zingg/spark/client/util/SparkDFObjectUtil.java
@@ -16,10 +16,9 @@
 
 public class SparkDFObjectUtil extends DFObjectUtil<SparkSession, Dataset<Row>, Row, Column> {
 
-    private final IWithSession<SparkSession> withSparkSession;
 
     public SparkDFObjectUtil(IWithSession<SparkSession> withSparkSession) {
-        this.withSparkSession = withSparkSession;
+        super(withSparkSession);
     }
 
     @Override
@@ -30,7 +29,7 @@ public ZFrame<Dataset<Row>, Row, Column> getDFFromObjectList(List objList, Class
 
         List<Row> rows = Arrays.asList(RowsFromObjectList.getRows(objList));
         StructType structType = stpc.getStructType(objClass);
-        return new SparkFrame(withSparkSession.getSession().createDataFrame(rows, structType));
+        return new SparkFrame(iWithSession.getSession().createDataFrame(rows, structType));
     }
 
 }
diff --git a/spark/client/src/main/java/zingg/spark/client/util/WithSparkSession.java b/spark/client/src/main/java/zingg/spark/client/util/WithSparkSession.java
diff --git a/spark/client/src/test/java/zingg/client/TestSparkFrame.java b/spark/client/src/test/java/zingg/client/TestSparkFrame.java
@@ -20,10 +20,10 @@
 import zingg.common.client.IArguments;
 import zingg.common.client.TestZFrameBase;
 import zingg.common.client.ZFrame;
+import zingg.common.client.util.IWithSession;
 import zingg.common.client.util.WithSession;
 import zingg.spark.client.SparkFrame;
 import zingg.spark.client.util.SparkDFObjectUtil;
-import zingg.spark.client.util.WithSparkSession;
 
 import java.util.Arrays;
 
@@ -34,10 +34,10 @@ public class TestSparkFrame extends TestZFrameBase<SparkSession, Dataset<Row>, R
     public static IArguments args;
     public static JavaSparkContext ctx;
     public static SparkSession spark;
-    public static WithSession<SparkSession> withSession;
+    public static IWithSession<SparkSession> iWithSession;
 
     public TestSparkFrame() {
-        super(new SparkDFObjectUtil(withSession));
+        super(new SparkDFObjectUtil(iWithSession));
     }
 
     @BeforeAll
@@ -53,8 +53,8 @@ protected static void setUpSpark() {
                     .appName("Zingg" + "Junit")
                     .getOrCreate();
             ctx = new JavaSparkContext(spark.sparkContext());
-            withSession = new WithSparkSession();
-            withSession.setSession(spark);
+            iWithSession = new WithSession<>();
+            iWithSession.setSession(spark);
         } catch (Throwable e) {
             if (LOG.isDebugEnabled())
                 e.printStackTrace();