From 471b0dceea571e30f2ab70e5a0969dbbf9b34686 Mon Sep 17 00:00:00 2001 From: Akash-R-7 Date: Mon, 29 Aug 2022 14:16:42 +0530 Subject: [PATCH] unifying datatype in generics --- client/src/main/java/zingg/client/Client.java | 2 +- core/src/main/java/zingg/Documenter.java | 2 +- core/src/main/java/zingg/FindAndLabeller.java | 4 ++-- core/src/main/java/zingg/LabelUpdater.java | 2 +- core/src/main/java/zingg/Labeller.java | 2 +- core/src/main/java/zingg/Linker.java | 2 +- core/src/main/java/zingg/Matcher.java | 2 +- core/src/main/java/zingg/Recommender.java | 2 +- core/src/main/java/zingg/TrainMatcher.java | 4 ++-- core/src/main/java/zingg/Trainer.java | 2 +- core/src/main/java/zingg/TrainingDataFinder.java | 2 +- core/src/main/java/zingg/ZinggBase.java | 14 +++++++------- core/src/main/java/zingg/block/Block.java | 2 +- .../main/java/zingg/documenter/DataDocumenter.java | 2 +- .../main/java/zingg/documenter/DocumenterBase.java | 2 +- .../java/zingg/documenter/ModelColDocumenter.java | 2 +- .../java/zingg/documenter/ModelDocumenter.java | 4 ++-- core/src/main/java/zingg/hash/First1Chars.java | 2 +- core/src/main/java/zingg/hash/First2Chars.java | 2 +- core/src/main/java/zingg/hash/First2CharsBox.java | 2 +- core/src/main/java/zingg/hash/First3Chars.java | 2 +- core/src/main/java/zingg/hash/First3CharsBox.java | 2 +- core/src/main/java/zingg/hash/First4Chars.java | 2 +- core/src/main/java/zingg/hash/FirstChars.java | 2 +- core/src/main/java/zingg/hash/HashFunction.java | 12 ++++++------ .../main/java/zingg/hash/HashFunctionRegistry.java | 4 ++-- core/src/main/java/zingg/hash/IdentityInteger.java | 2 +- core/src/main/java/zingg/hash/IdentityString.java | 2 +- core/src/main/java/zingg/hash/IsNullOrEmpty.java | 2 +- core/src/main/java/zingg/hash/Last1Chars.java | 2 +- core/src/main/java/zingg/hash/Last2Chars.java | 2 +- core/src/main/java/zingg/hash/Last3Chars.java | 2 +- core/src/main/java/zingg/hash/LastChars.java | 2 +- core/src/main/java/zingg/hash/LastWord.java | 2 +- core/src/main/java/zingg/hash/Round.java | 2 +- core/src/main/java/zingg/spark/SparkBase.java | 6 +++--- .../src/main/java/zingg/spark/SparkDocumenter.java | 2 +- .../java/zingg/spark/SparkFindAndLabeller.java | 2 +- .../main/java/zingg/spark/SparkLabelUpdater.java | 2 +- core/src/main/java/zingg/spark/SparkLabeller.java | 2 +- core/src/main/java/zingg/spark/SparkLinker.java | 2 +- core/src/main/java/zingg/spark/SparkMatcher.java | 2 +- .../main/java/zingg/spark/SparkTrainMatcher.java | 2 +- core/src/main/java/zingg/spark/SparkTrainer.java | 2 +- .../java/zingg/spark/SparkTrainingDataFinder.java | 2 +- .../java/zingg/spark/hash/SparkFirst3CharsBox.java | 2 +- .../java/zingg/spark/hash/SparkFirstChars.java | 2 +- .../spark/hash/SparkHashFunctionRegistry.java | 10 +++++----- .../zingg/spark/hash/SparkIdentityInteger.java | 2 +- .../java/zingg/spark/hash/SparkIdentityString.java | 2 +- .../java/zingg/spark/hash/SparkIsNullOrEmpty.java | 2 +- .../main/java/zingg/spark/hash/SparkLastChars.java | 2 +- .../main/java/zingg/spark/hash/SparkLastWord.java | 2 +- .../src/main/java/zingg/spark/hash/SparkRound.java | 2 +- .../zingg/spark/util/SparkBlockingTreeUtil.java | 4 ++-- .../main/java/zingg/spark/util/SparkHashUtil.java | 10 +++++----- .../src/main/java/zingg/util/BlockingTreeUtil.java | 4 ++-- core/src/main/java/zingg/util/HashUtil.java | 4 ++-- .../java/zingg/documenter/TestModelDocumenter.java | 2 +- 59 files changed, 87 insertions(+), 87 deletions(-) diff --git a/client/src/main/java/zingg/client/Client.java b/client/src/main/java/zingg/client/Client.java index dc969b826..31203051c 100644 --- a/client/src/main/java/zingg/client/Client.java +++ b/client/src/main/java/zingg/client/Client.java @@ -18,7 +18,7 @@ * @author sgoyal * */ -public class Client implements Serializable { +public class Client implements Serializable { private Arguments arguments; private IZingg zingg; private ClientOptions options; diff --git a/core/src/main/java/zingg/Documenter.java b/core/src/main/java/zingg/Documenter.java index 67bb2d117..2074bf0d8 100644 --- a/core/src/main/java/zingg/Documenter.java +++ b/core/src/main/java/zingg/Documenter.java @@ -21,7 +21,7 @@ import zingg.util.RowAdapter; import zingg.util.RowWrapper; -public abstract class Documenter extends ZinggBase { +public abstract class Documenter extends ZinggBase { protected static String name = "zingg.Documenter"; public static final Log LOG = LogFactory.getLog(Documenter.class); diff --git a/core/src/main/java/zingg/FindAndLabeller.java b/core/src/main/java/zingg/FindAndLabeller.java index 5d04af39f..d521f2c88 100644 --- a/core/src/main/java/zingg/FindAndLabeller.java +++ b/core/src/main/java/zingg/FindAndLabeller.java @@ -6,11 +6,11 @@ import zingg.client.ZinggClientException; import zingg.client.ZinggOptions; -public abstract class FindAndLabeller extends Labeller { +public abstract class FindAndLabeller extends Labeller { protected static String name = "zingg.FindAndLabeller"; public static final Log LOG = LogFactory.getLog(FindAndLabeller.class); - private TrainingDataFinder finder; + private TrainingDataFinder finder; public FindAndLabeller() { setZinggOptions(ZinggOptions.FIND_AND_LABEL); diff --git a/core/src/main/java/zingg/LabelUpdater.java b/core/src/main/java/zingg/LabelUpdater.java index 54bdd5107..efd24c4fa 100644 --- a/core/src/main/java/zingg/LabelUpdater.java +++ b/core/src/main/java/zingg/LabelUpdater.java @@ -20,7 +20,7 @@ import zingg.util.LabelMatchType; import zingg.util.PipeUtilBase; -public abstract class LabelUpdater extends Labeller { +public abstract class LabelUpdater extends Labeller { protected static String name = "zingg.LabelUpdater"; public static final Log LOG = LogFactory.getLog(LabelUpdater.class); diff --git a/core/src/main/java/zingg/Labeller.java b/core/src/main/java/zingg/Labeller.java index 6115563a4..802b6ee2a 100644 --- a/core/src/main/java/zingg/Labeller.java +++ b/core/src/main/java/zingg/Labeller.java @@ -19,7 +19,7 @@ import zingg.client.util.ColValues; import zingg.util.LabelMatchType; -public abstract class Labeller extends ZinggBase { +public abstract class Labeller extends ZinggBase { protected static String name = "zingg.Labeller"; public static final Log LOG = LogFactory.getLog(Labeller.class); diff --git a/core/src/main/java/zingg/Linker.java b/core/src/main/java/zingg/Linker.java index 7e162612c..1027a2270 100644 --- a/core/src/main/java/zingg/Linker.java +++ b/core/src/main/java/zingg/Linker.java @@ -25,7 +25,7 @@ -public abstract class Linker extends Matcher { +public abstract class Linker extends Matcher { protected static String name = "zingg.Linker"; public static final Log LOG = LogFactory.getLog(Linker.class); diff --git a/core/src/main/java/zingg/Matcher.java b/core/src/main/java/zingg/Matcher.java index 9f07cb374..939b4a40a 100644 --- a/core/src/main/java/zingg/Matcher.java +++ b/core/src/main/java/zingg/Matcher.java @@ -18,7 +18,7 @@ import zingg.client.util.ColValues; import zingg.util.Metric; -public abstract class Matcher extends ZinggBase{ +public abstract class Matcher extends ZinggBase{ protected static String name = "zingg.Matcher"; diff --git a/core/src/main/java/zingg/Recommender.java b/core/src/main/java/zingg/Recommender.java index 5db244626..ab3191ed7 100644 --- a/core/src/main/java/zingg/Recommender.java +++ b/core/src/main/java/zingg/Recommender.java @@ -7,7 +7,7 @@ import zingg.client.ZinggOptions; import zingg.recommender.StopWordsRecommender; -public class Recommender extends ZinggBase { +public class Recommender extends ZinggBase { protected static String name = "zingg.Recommender"; public static final Log LOG = LogFactory.getLog(Recommender.class); diff --git a/core/src/main/java/zingg/TrainMatcher.java b/core/src/main/java/zingg/TrainMatcher.java index 8c58ccf9d..e66b57a4f 100644 --- a/core/src/main/java/zingg/TrainMatcher.java +++ b/core/src/main/java/zingg/TrainMatcher.java @@ -6,12 +6,12 @@ import zingg.client.ZinggClientException; import zingg.client.ZinggOptions; -public abstract class TrainMatcher extends Matcher{ +public abstract class TrainMatcher extends Matcher{ protected static String name = "zingg.TrainMatcher"; public static final Log LOG = LogFactory.getLog(TrainMatcher.class); - private Trainer trainer; + private Trainer trainer; public TrainMatcher() { setZinggOptions(ZinggOptions.TRAIN_MATCH); diff --git a/core/src/main/java/zingg/Trainer.java b/core/src/main/java/zingg/Trainer.java index 3c21f9162..a66abb277 100644 --- a/core/src/main/java/zingg/Trainer.java +++ b/core/src/main/java/zingg/Trainer.java @@ -20,7 +20,7 @@ import zingg.util.ModelUtil; import zingg.util.PipeUtilBase; -public abstract class Trainer extends ZinggBase{ +public abstract class Trainer extends ZinggBase{ protected static String name = "zingg.Trainer"; public static final Log LOG = LogFactory.getLog(Trainer.class); diff --git a/core/src/main/java/zingg/TrainingDataFinder.java b/core/src/main/java/zingg/TrainingDataFinder.java index 2d055cc92..e28cafe14 100644 --- a/core/src/main/java/zingg/TrainingDataFinder.java +++ b/core/src/main/java/zingg/TrainingDataFinder.java @@ -17,7 +17,7 @@ import zingg.util.DSUtil; import zingg.util.ModelUtil; -public abstract class TrainingDataFinder extends ZinggBase{ +public abstract class TrainingDataFinder extends ZinggBase{ protected static String name = "zingg.TrainingDataFinder"; public static final Log LOG = LogFactory.getLog(TrainingDataFinder.class); diff --git a/core/src/main/java/zingg/ZinggBase.java b/core/src/main/java/zingg/ZinggBase.java index ebe1b5f55..85c533a59 100644 --- a/core/src/main/java/zingg/ZinggBase.java +++ b/core/src/main/java/zingg/ZinggBase.java @@ -40,7 +40,7 @@ //Dataset //row //column -public abstract class ZinggBase implements Serializable, IZingg { +public abstract class ZinggBase implements Serializable, IZingg { protected Arguments args; @@ -55,11 +55,11 @@ public abstract class ZinggBase implements Serializable, IZing public static final Log LOG = LogFactory.getLog(ZinggBase.class); protected PipeUtilBase pipeUtil; - protected HashUtil hashUtil; + protected HashUtil hashUtil; protected DSUtil dsUtil; protected GraphUtil graphUtil; protected ModelUtil modelUtil; - protected BlockingTreeUtil blockingTreeUtil; + protected BlockingTreeUtil blockingTreeUtil; ZinggBase base; @@ -83,7 +83,7 @@ public ZinggBase() { } - public void setBase(ZinggBase base) { + public void setBase(ZinggBase base) { this.base = base; } @@ -222,11 +222,11 @@ public Long getUnsureMarkedRecordsStat(ZFrame markedRecords){ - public HashUtil getHashUtil() { + public HashUtil getHashUtil() { return base.getHashUtil(); } - public void setHashUtil(HashUtil t) { + public void setHashUtil(HashUtil t) { base.setHashUtil(t); } @@ -269,7 +269,7 @@ public PipeUtilBase getPipeUtil() { return base.pipeUtil; } - public BlockingTreeUtil getBlockingTreeUtil() { + public BlockingTreeUtil getBlockingTreeUtil() { return base.blockingTreeUtil; } diff --git a/core/src/main/java/zingg/block/Block.java b/core/src/main/java/zingg/block/Block.java index 05302bf74..6d31d0f42 100644 --- a/core/src/main/java/zingg/block/Block.java +++ b/core/src/main/java/zingg/block/Block.java @@ -26,7 +26,7 @@ import scala.collection.JavaConversions; import scala.collection.Seq; -public class Block implements Serializable { +public class Block implements Serializable { public static final Log LOG = LogFactory.getLog(Block.class); diff --git a/core/src/main/java/zingg/documenter/DataDocumenter.java b/core/src/main/java/zingg/documenter/DataDocumenter.java index 1f08c9605..f78aaadb1 100644 --- a/core/src/main/java/zingg/documenter/DataDocumenter.java +++ b/core/src/main/java/zingg/documenter/DataDocumenter.java @@ -16,7 +16,7 @@ import zingg.client.ZFrame; import zingg.client.ZinggClientException; -public class DataDocumenter extends DocumenterBase { +public class DataDocumenter extends DocumenterBase { protected static String name = "zingg.DataDocumenter"; protected static String TEMPLATE_TITLE = "Data Documentation"; private final String DATA_DOC_TEMPLATE = "dataDocTemplate.ftlh"; diff --git a/core/src/main/java/zingg/documenter/DocumenterBase.java b/core/src/main/java/zingg/documenter/DocumenterBase.java index 0348ae0e4..f567f6e1d 100644 --- a/core/src/main/java/zingg/documenter/DocumenterBase.java +++ b/core/src/main/java/zingg/documenter/DocumenterBase.java @@ -16,7 +16,7 @@ import zingg.client.util.ColName; import zingg.util.RowWrapper; -class DocumenterBase extends ZinggBase{ +class DocumenterBase extends ZinggBase{ protected static Configuration config; protected SparkSession spark; protected Arguments args; diff --git a/core/src/main/java/zingg/documenter/ModelColDocumenter.java b/core/src/main/java/zingg/documenter/ModelColDocumenter.java index 1d69afc43..77036b549 100644 --- a/core/src/main/java/zingg/documenter/ModelColDocumenter.java +++ b/core/src/main/java/zingg/documenter/ModelColDocumenter.java @@ -14,7 +14,7 @@ import zingg.client.ZFrame; import zingg.client.ZinggClientException; -public class ModelColDocumenter extends DocumenterBase { +public class ModelColDocumenter extends DocumenterBase { protected static String name = "zingg.ModelColDocumenter"; public static final Log LOG = LogFactory.getLog(ModelColDocumenter.class); diff --git a/core/src/main/java/zingg/documenter/ModelDocumenter.java b/core/src/main/java/zingg/documenter/ModelDocumenter.java index 744a00875..bf7321843 100644 --- a/core/src/main/java/zingg/documenter/ModelDocumenter.java +++ b/core/src/main/java/zingg/documenter/ModelDocumenter.java @@ -17,13 +17,13 @@ import zingg.client.ZinggClientException; import zingg.client.util.ColName; -public class ModelDocumenter extends DocumenterBase { +public class ModelDocumenter extends DocumenterBase { protected static String name = "zingg.ModelDocumenter"; public static final Log LOG = LogFactory.getLog(ModelDocumenter.class); private final String MODEL_TEMPLATE = "model.ftlh"; - ModelColDocumenter modelColDoc; + ModelColDocumenter modelColDoc; protected ZFrame markedRecords; public ModelDocumenter(Arguments args) { diff --git a/core/src/main/java/zingg/hash/First1Chars.java b/core/src/main/java/zingg/hash/First1Chars.java index c7a59925b..a2ad03977 100644 --- a/core/src/main/java/zingg/hash/First1Chars.java +++ b/core/src/main/java/zingg/hash/First1Chars.java @@ -1,7 +1,7 @@ package zingg.hash; -public abstract class First1Chars extends FirstChars{ +public abstract class First1Chars extends FirstChars{ public First1Chars() { super(1); diff --git a/core/src/main/java/zingg/hash/First2Chars.java b/core/src/main/java/zingg/hash/First2Chars.java index ed4d26f91..c9cc79fb1 100644 --- a/core/src/main/java/zingg/hash/First2Chars.java +++ b/core/src/main/java/zingg/hash/First2Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class First2Chars extends FirstChars{ +public abstract class First2Chars extends FirstChars{ public First2Chars() { super(2); diff --git a/core/src/main/java/zingg/hash/First2CharsBox.java b/core/src/main/java/zingg/hash/First2CharsBox.java index d47c5b7ca..f2514904a 100644 --- a/core/src/main/java/zingg/hash/First2CharsBox.java +++ b/core/src/main/java/zingg/hash/First2CharsBox.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class First2CharsBoxextends HashFunction implements UDF1{ +public abstract class First2CharsBoxextends HashFunction implements UDF1{ public First2CharsBox() { super("first2CharsBox"); diff --git a/core/src/main/java/zingg/hash/First3Chars.java b/core/src/main/java/zingg/hash/First3Chars.java index 645ed8791..a270535bd 100644 --- a/core/src/main/java/zingg/hash/First3Chars.java +++ b/core/src/main/java/zingg/hash/First3Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class First3Chars extends FirstChars{ +public abstract class First3Chars extends FirstChars{ public First3Chars() { super(3); diff --git a/core/src/main/java/zingg/hash/First3CharsBox.java b/core/src/main/java/zingg/hash/First3CharsBox.java index b42f74ab6..9b26498f7 100644 --- a/core/src/main/java/zingg/hash/First3CharsBox.java +++ b/core/src/main/java/zingg/hash/First3CharsBox.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class First3CharsBox extends HashFunction implements UDF1{ +public abstract class First3CharsBox extends HashFunction implements UDF1{ public First3CharsBox() { super("first3CharsBox"); diff --git a/core/src/main/java/zingg/hash/First4Chars.java b/core/src/main/java/zingg/hash/First4Chars.java index 420706a08..ca8c01462 100644 --- a/core/src/main/java/zingg/hash/First4Chars.java +++ b/core/src/main/java/zingg/hash/First4Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class First4Chars extends FirstChars{ +public abstract class First4Chars extends FirstChars{ public First4Chars() { super(4); diff --git a/core/src/main/java/zingg/hash/FirstChars.java b/core/src/main/java/zingg/hash/FirstChars.java index 9a0f8b01f..ab26331e2 100644 --- a/core/src/main/java/zingg/hash/FirstChars.java +++ b/core/src/main/java/zingg/hash/FirstChars.java @@ -9,7 +9,7 @@ import zingg.block.Canopy; -public abstract class FirstChars extends HashFunction{ +public abstract class FirstChars extends HashFunction{ public static final Log LOG = LogFactory.getLog(FirstChars.class); diff --git a/core/src/main/java/zingg/hash/HashFunction.java b/core/src/main/java/zingg/hash/HashFunction.java index ccb50b2b0..2ccbddce4 100644 --- a/core/src/main/java/zingg/hash/HashFunction.java +++ b/core/src/main/java/zingg/hash/HashFunction.java @@ -4,7 +4,7 @@ import zingg.client.ZFrame; -public abstract class HashFunction implements Serializable{ +public abstract class HashFunction implements Serializable{ /** * */ @@ -12,19 +12,19 @@ public abstract class HashFunction implements Serializable{ protected T dataType; protected String name; protected boolean isUdf = true; - protected T1 returnType; + protected T returnType; public HashFunction(String name) { this.name = name; } - public HashFunction(String name, T cl, T1 returnType) { + public HashFunction(String name, T cl, T returnType) { this.name = name; this.dataType = cl; this.returnType = returnType; } - public HashFunction(String name, T cl, T1 returnType, boolean isUdf) { + public HashFunction(String name, T cl, T returnType, boolean isUdf) { this(name, cl, returnType); this.isUdf = isUdf; } @@ -51,11 +51,11 @@ public void setUdf(boolean isUdf) { this.isUdf = isUdf; } - public T1 getReturnType() { + public T getReturnType() { return returnType; } - public void setReturnType(T1 returnType) { + public void setReturnType(T returnType) { this.returnType = returnType; } diff --git a/core/src/main/java/zingg/hash/HashFunctionRegistry.java b/core/src/main/java/zingg/hash/HashFunctionRegistry.java index b9318596b..2735113bb 100644 --- a/core/src/main/java/zingg/hash/HashFunctionRegistry.java +++ b/core/src/main/java/zingg/hash/HashFunctionRegistry.java @@ -1,6 +1,6 @@ package zingg.hash; -public interface HashFunctionRegistry { +public interface HashFunctionRegistry { //public static HashMap > fns = new HashMap>(); /* @@ -39,6 +39,6 @@ public interface HashFunctionRegistry { init(new RangeBetween1000And10000Dbl()); */ - public void init(HashFunction fn); + public void init(HashFunction fn); } diff --git a/core/src/main/java/zingg/hash/IdentityInteger.java b/core/src/main/java/zingg/hash/IdentityInteger.java index 83830aa8e..78dbdfd13 100644 --- a/core/src/main/java/zingg/hash/IdentityInteger.java +++ b/core/src/main/java/zingg/hash/IdentityInteger.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class IdentityInteger extends HashFunction implements UDF1{ +public abstract class IdentityInteger extends HashFunction implements UDF1{ public IdentityInteger() { super("identityInteger"); diff --git a/core/src/main/java/zingg/hash/IdentityString.java b/core/src/main/java/zingg/hash/IdentityString.java index a563e7f99..d0a62bbd8 100644 --- a/core/src/main/java/zingg/hash/IdentityString.java +++ b/core/src/main/java/zingg/hash/IdentityString.java @@ -3,7 +3,7 @@ import org.apache.spark.sql.Row; import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class IdentityString extends HashFunction implements UDF1{ +public abstract class IdentityString extends HashFunction implements UDF1{ public IdentityString() { super("identityString"); diff --git a/core/src/main/java/zingg/hash/IsNullOrEmpty.java b/core/src/main/java/zingg/hash/IsNullOrEmpty.java index 8bfed5830..7f9d66a49 100644 --- a/core/src/main/java/zingg/hash/IsNullOrEmpty.java +++ b/core/src/main/java/zingg/hash/IsNullOrEmpty.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class IsNullOrEmpty extends HashFunction implements UDF1{ +public abstract class IsNullOrEmpty extends HashFunction implements UDF1{ public IsNullOrEmpty() { super("isNullOrEmpty"); diff --git a/core/src/main/java/zingg/hash/Last1Chars.java b/core/src/main/java/zingg/hash/Last1Chars.java index 72951e27e..e2d3a35f5 100644 --- a/core/src/main/java/zingg/hash/Last1Chars.java +++ b/core/src/main/java/zingg/hash/Last1Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class Last1Chars extends LastChars{ +public abstract class Last1Chars extends LastChars{ public Last1Chars() { super(1); diff --git a/core/src/main/java/zingg/hash/Last2Chars.java b/core/src/main/java/zingg/hash/Last2Chars.java index b2b8bd31c..db817bb15 100644 --- a/core/src/main/java/zingg/hash/Last2Chars.java +++ b/core/src/main/java/zingg/hash/Last2Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class Last2Chars extends LastChars{ +public abstract class Last2Chars extends LastChars{ public Last2Chars() { super(2); diff --git a/core/src/main/java/zingg/hash/Last3Chars.java b/core/src/main/java/zingg/hash/Last3Chars.java index 358f03777..fa1ceff5a 100644 --- a/core/src/main/java/zingg/hash/Last3Chars.java +++ b/core/src/main/java/zingg/hash/Last3Chars.java @@ -1,6 +1,6 @@ package zingg.hash; -public abstract class Last3Chars extends LastChars{ +public abstract class Last3Chars extends LastChars{ public Last3Chars() { super(3); diff --git a/core/src/main/java/zingg/hash/LastChars.java b/core/src/main/java/zingg/hash/LastChars.java index 9784796cd..8412df943 100644 --- a/core/src/main/java/zingg/hash/LastChars.java +++ b/core/src/main/java/zingg/hash/LastChars.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class LastChars extends HashFunction implements UDF1{ +public abstract class LastChars extends HashFunction implements UDF1{ int numChars; public LastChars(int endIndex) { diff --git a/core/src/main/java/zingg/hash/LastWord.java b/core/src/main/java/zingg/hash/LastWord.java index 68eb653d2..f09b7f295 100644 --- a/core/src/main/java/zingg/hash/LastWord.java +++ b/core/src/main/java/zingg/hash/LastWord.java @@ -4,7 +4,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; -public abstract class LastWord extends HashFunction{ +public abstract class LastWord extends HashFunction{ public LastWord() { super("lastWord"); } diff --git a/core/src/main/java/zingg/hash/Round.java b/core/src/main/java/zingg/hash/Round.java index 31e23f80a..4655541d0 100644 --- a/core/src/main/java/zingg/hash/Round.java +++ b/core/src/main/java/zingg/hash/Round.java @@ -6,7 +6,7 @@ import zingg.client.ZFrame; -public abstract class Round extends HashFunction implements UDF1{ +public abstract class Round extends HashFunction implements UDF1{ public Round() { super("round"); diff --git a/core/src/main/java/zingg/spark/SparkBase.java b/core/src/main/java/zingg/spark/SparkBase.java index d032f08c3..c153a9b93 100644 --- a/core/src/main/java/zingg/spark/SparkBase.java +++ b/core/src/main/java/zingg/spark/SparkBase.java @@ -24,7 +24,7 @@ import zingg.spark.util.SparkDSUtil; import zingg.spark.util.SparkGraphUtil; -public class SparkBase extends ZinggBase, Row,Column,DataType,DataType>{ +public class SparkBase extends ZinggBase, Row,Column,DataType>{ JavaSparkContext ctx; public static final Log LOG = LogFactory.getLog(SparkBase.class); @@ -80,7 +80,7 @@ public void execute() throws ZinggClientException { } - public void setHashUtil(HashUtil, Row, Column, DataType, DataType> t) { + public void setHashUtil(HashUtil, Row, Column, DataType> t) { this.hashUtil = t; } @@ -99,7 +99,7 @@ public void setDSUtil(DSUtil, Row, Column> pipeUtil) this.dsUtil = pipeUtil; } - public void setBlokingTreeUtil(BlockingTreeUtil, Row, Column, DataType, DataType> d) { + public void setBlokingTreeUtil(BlockingTreeUtil, Row, Column, DataType> d) { this.blockingTreeUtil = d; } diff --git a/core/src/main/java/zingg/spark/SparkDocumenter.java b/core/src/main/java/zingg/spark/SparkDocumenter.java index c75e377db..fa2fe4aba 100644 --- a/core/src/main/java/zingg/spark/SparkDocumenter.java +++ b/core/src/main/java/zingg/spark/SparkDocumenter.java @@ -37,7 +37,7 @@ import zingg.util.PipeUtilBase; -public class SparkDocumenter extends Documenter, Row, Column,DataType,DataType> { +public class SparkDocumenter extends Documenter, Row, Column,DataType> { public static String name = "zingg.SparkDocumenter"; public static final Log LOG = LogFactory.getLog(SparkDocumenter.class); diff --git a/core/src/main/java/zingg/spark/SparkFindAndLabeller.java b/core/src/main/java/zingg/spark/SparkFindAndLabeller.java index f1da1a260..7db63b1f2 100644 --- a/core/src/main/java/zingg/spark/SparkFindAndLabeller.java +++ b/core/src/main/java/zingg/spark/SparkFindAndLabeller.java @@ -37,7 +37,7 @@ import zingg.util.PipeUtilBase; -public class SparkFindAndLabeller extends FindAndLabeller, Row, Column,DataType,DataType> { +public class SparkFindAndLabeller extends FindAndLabeller, Row, Column,DataType> { public static String name = "zingg.SparkFindAndLabeller"; public static final Log LOG = LogFactory.getLog(SparkFindAndLabeller.class); diff --git a/core/src/main/java/zingg/spark/SparkLabelUpdater.java b/core/src/main/java/zingg/spark/SparkLabelUpdater.java index f13982844..8d66d3ec6 100644 --- a/core/src/main/java/zingg/spark/SparkLabelUpdater.java +++ b/core/src/main/java/zingg/spark/SparkLabelUpdater.java @@ -36,7 +36,7 @@ import zingg.util.PipeUtilBase; -public class SparkLabelUpdater extends LabelUpdater, Row, Column,DataType,DataType> { +public class SparkLabelUpdater extends LabelUpdater, Row, Column,DataType> { public static String name = "zingg.SparkLabelUpdater"; public static final Log LOG = LogFactory.getLog(SparkLabelUpdater.class); diff --git a/core/src/main/java/zingg/spark/SparkLabeller.java b/core/src/main/java/zingg/spark/SparkLabeller.java index 249b92f1c..529aba98a 100644 --- a/core/src/main/java/zingg/spark/SparkLabeller.java +++ b/core/src/main/java/zingg/spark/SparkLabeller.java @@ -36,7 +36,7 @@ import zingg.util.PipeUtilBase; -public class SparkLabeller extends Labeller, Row, Column,DataType,DataType> { +public class SparkLabeller extends Labeller, Row, Column,DataType> { public static String name = "zingg.SparkLabeller"; public static final Log LOG = LogFactory.getLog(SparkLabeller.class); diff --git a/core/src/main/java/zingg/spark/SparkLinker.java b/core/src/main/java/zingg/spark/SparkLinker.java index 6cfc2d499..5945a83ee 100644 --- a/core/src/main/java/zingg/spark/SparkLinker.java +++ b/core/src/main/java/zingg/spark/SparkLinker.java @@ -36,7 +36,7 @@ import zingg.util.PipeUtilBase; -public class SparkLinker extends Linker, Row, Column,DataType,DataType> { +public class SparkLinker extends Linker, Row, Column,DataType> { public static String name = "zingg.SparkLinker"; public static final Log LOG = LogFactory.getLog(SparkLinker.class); diff --git a/core/src/main/java/zingg/spark/SparkMatcher.java b/core/src/main/java/zingg/spark/SparkMatcher.java index e6ee979f2..67a1bb0c0 100644 --- a/core/src/main/java/zingg/spark/SparkMatcher.java +++ b/core/src/main/java/zingg/spark/SparkMatcher.java @@ -38,7 +38,7 @@ import zingg.util.ModelUtil; import zingg.util.PipeUtilBase; -public class SparkMatcher extends Matcher,Row,Column,DataType,DataType>{ +public class SparkMatcher extends Matcher,Row,Column,DataType>{ public static String name = "zingg.Matcher"; diff --git a/core/src/main/java/zingg/spark/SparkTrainMatcher.java b/core/src/main/java/zingg/spark/SparkTrainMatcher.java index 061478096..229b6113e 100644 --- a/core/src/main/java/zingg/spark/SparkTrainMatcher.java +++ b/core/src/main/java/zingg/spark/SparkTrainMatcher.java @@ -37,7 +37,7 @@ import zingg.util.PipeUtilBase; -public class SparkTrainMatcher extends TrainMatcher, Row, Column,DataType,DataType> { +public class SparkTrainMatcher extends TrainMatcher, Row, Column,DataType> { public static String name = "zingg.SparkTrainMatcher"; public static final Log LOG = LogFactory.getLog(SparkTrainMatcher.class); diff --git a/core/src/main/java/zingg/spark/SparkTrainer.java b/core/src/main/java/zingg/spark/SparkTrainer.java index aee97c062..698686b79 100644 --- a/core/src/main/java/zingg/spark/SparkTrainer.java +++ b/core/src/main/java/zingg/spark/SparkTrainer.java @@ -36,7 +36,7 @@ import zingg.util.PipeUtilBase; -public class SparkTrainer extends Trainer, Row, Column,DataType,DataType> { +public class SparkTrainer extends Trainer, Row, Column,DataType> { public static String name = "zingg.SparkTrainer"; public static final Log LOG = LogFactory.getLog(SparkTrainer.class); diff --git a/core/src/main/java/zingg/spark/SparkTrainingDataFinder.java b/core/src/main/java/zingg/spark/SparkTrainingDataFinder.java index 42e815e50..9304fb0e8 100644 --- a/core/src/main/java/zingg/spark/SparkTrainingDataFinder.java +++ b/core/src/main/java/zingg/spark/SparkTrainingDataFinder.java @@ -36,7 +36,7 @@ import zingg.util.PipeUtilBase; -public class SparkTrainingDataFinder extends TrainingDataFinder, Row, Column,DataType,DataType> { +public class SparkTrainingDataFinder extends TrainingDataFinder, Row, Column,DataType> { public static String name = "zingg.SparkTrainingDataFinder"; public static final Log LOG = LogFactory.getLog(SparkTrainingDataFinder.class); diff --git a/core/src/main/java/zingg/spark/hash/SparkFirst3CharsBox.java b/core/src/main/java/zingg/spark/hash/SparkFirst3CharsBox.java index 8eca3ba0b..53a5fb27b 100644 --- a/core/src/main/java/zingg/spark/hash/SparkFirst3CharsBox.java +++ b/core/src/main/java/zingg/spark/hash/SparkFirst3CharsBox.java @@ -11,7 +11,7 @@ import zingg.client.ZFrame; import zingg.hash.First3CharsBox; -public class SparkFirst3CharsBox extends First3CharsBox,Row,Column,DataType,DataType> implements UDF1{ +public class SparkFirst3CharsBox extends First3CharsBox,Row,Column,DataType> implements UDF1{ public SparkFirst3CharsBox() { super(); diff --git a/core/src/main/java/zingg/spark/hash/SparkFirstChars.java b/core/src/main/java/zingg/spark/hash/SparkFirstChars.java index 8de1b66c4..8aa2a3c4a 100644 --- a/core/src/main/java/zingg/spark/hash/SparkFirstChars.java +++ b/core/src/main/java/zingg/spark/hash/SparkFirstChars.java @@ -14,7 +14,7 @@ import zingg.hash.FirstChars; -public class SparkFirstChars extends FirstChars,Row,Column,DataType,DataType> implements UDF1{ +public class SparkFirstChars extends FirstChars,Row,Column,DataType> implements UDF1{ public static final Log LOG = LogFactory.getLog(SparkFirstChars.class); diff --git a/core/src/main/java/zingg/spark/hash/SparkHashFunctionRegistry.java b/core/src/main/java/zingg/spark/hash/SparkHashFunctionRegistry.java index dc660bb95..c354c208b 100644 --- a/core/src/main/java/zingg/spark/hash/SparkHashFunctionRegistry.java +++ b/core/src/main/java/zingg/spark/hash/SparkHashFunctionRegistry.java @@ -10,12 +10,12 @@ import zingg.hash.HashFunction; import zingg.hash.HashFunctionRegistry; -public class SparkHashFunctionRegistry implements HashFunctionRegistry,Row,Column,DataType,DataType>{ +public class SparkHashFunctionRegistry implements HashFunctionRegistry,Row,Column,DataType>{ - public HashMap,Row,Column,DataType,DataType>> fns - = new HashMap,Row,Column,DataType,DataType>>(); + public HashMap,Row,Column,DataType>> fns + = new HashMap,Row,Column,DataType>>(); - public HashFunction,Row,Column,DataType,DataType> getFunction(String key) { + public HashFunction,Row,Column,DataType> getFunction(String key) { return fns.get(key); } @@ -37,7 +37,7 @@ public SparkHashFunctionRegistry() { init(new SparkIsNullOrEmpty()); } - public void init(HashFunction,Row,Column,DataType,DataType> fn) { + public void init(HashFunction,Row,Column,DataType> fn) { fns.put(fn.getName(), fn); } diff --git a/core/src/main/java/zingg/spark/hash/SparkIdentityInteger.java b/core/src/main/java/zingg/spark/hash/SparkIdentityInteger.java index 2c8b1b26f..327b4761c 100644 --- a/core/src/main/java/zingg/spark/hash/SparkIdentityInteger.java +++ b/core/src/main/java/zingg/spark/hash/SparkIdentityInteger.java @@ -10,7 +10,7 @@ import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.DataType; -public class SparkIdentityInteger extends IdentityInteger, Row, Column,DataType,DataType> implements UDF1{ +public class SparkIdentityInteger extends IdentityInteger, Row, Column,DataType> implements UDF1{ public SparkIdentityInteger() { super(); diff --git a/core/src/main/java/zingg/spark/hash/SparkIdentityString.java b/core/src/main/java/zingg/spark/hash/SparkIdentityString.java index 231f71015..f7c88fcb8 100644 --- a/core/src/main/java/zingg/spark/hash/SparkIdentityString.java +++ b/core/src/main/java/zingg/spark/hash/SparkIdentityString.java @@ -12,7 +12,7 @@ import org.apache.spark.sql.types.DataType; -public class SparkIdentityString extends IdentityString, Row, Column,DataType,DataType> implements UDF1{ +public class SparkIdentityString extends IdentityString, Row, Column,DataType> implements UDF1{ public SparkIdentityString() { super(); diff --git a/core/src/main/java/zingg/spark/hash/SparkIsNullOrEmpty.java b/core/src/main/java/zingg/spark/hash/SparkIsNullOrEmpty.java index 043cd9629..bc8f9e870 100644 --- a/core/src/main/java/zingg/spark/hash/SparkIsNullOrEmpty.java +++ b/core/src/main/java/zingg/spark/hash/SparkIsNullOrEmpty.java @@ -11,7 +11,7 @@ import zingg.client.ZFrame; import zingg.hash.IsNullOrEmpty; -public class SparkIsNullOrEmpty extends IsNullOrEmpty,Row,Column,DataType,DataType> implements UDF1{ +public class SparkIsNullOrEmpty extends IsNullOrEmpty,Row,Column,DataType> implements UDF1{ public SparkIsNullOrEmpty() { super(); diff --git a/core/src/main/java/zingg/spark/hash/SparkLastChars.java b/core/src/main/java/zingg/spark/hash/SparkLastChars.java index 8a98f9412..d3ed661bd 100644 --- a/core/src/main/java/zingg/spark/hash/SparkLastChars.java +++ b/core/src/main/java/zingg/spark/hash/SparkLastChars.java @@ -11,7 +11,7 @@ import zingg.client.ZFrame; import zingg.hash.LastChars; -public class SparkLastChars extends LastChars,Row,Column,DataType,DataType> implements UDF1{ +public class SparkLastChars extends LastChars,Row,Column,DataType> implements UDF1{ public SparkLastChars(int endIndex) { super(endIndex); diff --git a/core/src/main/java/zingg/spark/hash/SparkLastWord.java b/core/src/main/java/zingg/spark/hash/SparkLastWord.java index f225b7b40..d3e5e561b 100644 --- a/core/src/main/java/zingg/spark/hash/SparkLastWord.java +++ b/core/src/main/java/zingg/spark/hash/SparkLastWord.java @@ -11,7 +11,7 @@ import zingg.client.ZFrame; import zingg.hash.LastWord; -public class SparkLastWord extends LastWord,Row,Column,DataType,DataType> implements UDF1{ +public class SparkLastWord extends LastWord,Row,Column,DataType> implements UDF1{ public SparkLastWord() { super(); diff --git a/core/src/main/java/zingg/spark/hash/SparkRound.java b/core/src/main/java/zingg/spark/hash/SparkRound.java index 5149ae738..7e03d8fcc 100644 --- a/core/src/main/java/zingg/spark/hash/SparkRound.java +++ b/core/src/main/java/zingg/spark/hash/SparkRound.java @@ -11,7 +11,7 @@ import org.apache.spark.sql.Column; import org.apache.spark.sql.Dataset; -public class SparkRound extends Round,Row,Column,DataType,DataType> implements UDF1{ +public class SparkRound extends Round,Row,Column,DataType> implements UDF1{ public SparkRound() { setDataType(DataTypes.DoubleType); diff --git a/core/src/main/java/zingg/spark/util/SparkBlockingTreeUtil.java b/core/src/main/java/zingg/spark/util/SparkBlockingTreeUtil.java index a0fac35d1..9fda2db41 100644 --- a/core/src/main/java/zingg/spark/util/SparkBlockingTreeUtil.java +++ b/core/src/main/java/zingg/spark/util/SparkBlockingTreeUtil.java @@ -21,7 +21,7 @@ import zingg.spark.SparkBlockFunction; import zingg.util.BlockingTreeUtil; -public class SparkBlockingTreeUtil extends BlockingTreeUtil, Row, Column, DataType, DataType>{ +public class SparkBlockingTreeUtil extends BlockingTreeUtil, Row, Column, DataType>{ public static final Log LOG = LogFactory.getLog(SparkBlockingTreeUtil.class); @@ -29,7 +29,7 @@ public class SparkBlockingTreeUtil extends BlockingTreeUtil, Row, C public ZFrame, Row, Column> getBlockHashes(ZFrame, Row, Column> testData, Tree> tree) { Dataset retDF = testData.df().map(new SparkBlockFunction(tree), RowEncoder.apply( - new Block,Row,Column,DataType,DataType>().appendHashCol(testData.df().schema()))); + new Block,Row,Column,DataType>().appendHashCol(testData.df().schema()))); return new SparkFrame(retDF); } diff --git a/core/src/main/java/zingg/spark/util/SparkHashUtil.java b/core/src/main/java/zingg/spark/util/SparkHashUtil.java index 918ec855f..8781167a9 100644 --- a/core/src/main/java/zingg/spark/util/SparkHashUtil.java +++ b/core/src/main/java/zingg/spark/util/SparkHashUtil.java @@ -19,7 +19,7 @@ import org.apache.spark.sql.api.java.UDF1; -public class SparkHashUtil implements HashUtil, Row, Column,DataType,DataType>{ +public class SparkHashUtil implements HashUtil, Row, Column,DataType>{ /** * Use only those functions which are defined in the conf * All functions exist in the registry @@ -30,10 +30,10 @@ public class SparkHashUtil implements HashUtil, Row, Column,DataTyp */ - public ListMap, Row, Column,DataType,DataType>> getHashFunctionList(String fileName, Object spark) + public ListMap, Row, Column,DataType>> getHashFunctionList(String fileName, Object spark) throws Exception { - ListMap, Row, Column,DataType,DataType>> functions = new ListMap, Row, Column,DataType,DataType>>(); + ListMap, Row, Column,DataType>> functions = new ListMap, Row, Column,DataType>>(); ObjectMapper mapper = new ObjectMapper(); mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true); List scriptArgs = mapper.readValue( @@ -41,7 +41,7 @@ public ListMap, Row, Column,DataType,DataTyp new TypeReference>() { }); for (HashFnFromConf scriptArg : scriptArgs) { - HashFunction, Row, Column,DataType,DataType> fn = new SparkHashFunctionRegistry().getFunction(scriptArg.getName()); + HashFunction, Row, Column,DataType> fn = new SparkHashFunctionRegistry().getFunction(scriptArg.getName()); ((SparkSession)spark).udf().register(fn.getName(), (UDF1) fn, fn.getReturnType()); functions.add(fn.getDataType(), fn); } diff --git a/core/src/main/java/zingg/util/BlockingTreeUtil.java b/core/src/main/java/zingg/util/BlockingTreeUtil.java index ce1625b45..ac3db09e5 100644 --- a/core/src/main/java/zingg/util/BlockingTreeUtil.java +++ b/core/src/main/java/zingg/util/BlockingTreeUtil.java @@ -17,7 +17,7 @@ import zingg.client.util.ListMap; import zingg.client.util.Util; -public abstract class BlockingTreeUtil { +public abstract class BlockingTreeUtil { public final Log LOG = LogFactory.getLog(BlockingTreeUtil.class); @@ -37,7 +37,7 @@ public Tree> createBlockingTree(ZFrame testData, LOG.info("Learning indexing rules for block size " + blockSize); positives = positives.coalesce(1); - Block cblock = new Block(sample, positives, hashFunctions, blockSize); + Block cblock = new Block(sample, positives, hashFunctions, blockSize); Canopy root = new Canopy(sample.collectAsList(), positives.collectAsList()); List fd = new ArrayList (); diff --git a/core/src/main/java/zingg/util/HashUtil.java b/core/src/main/java/zingg/util/HashUtil.java index 32ca5e12c..a5ad40be7 100644 --- a/core/src/main/java/zingg/util/HashUtil.java +++ b/core/src/main/java/zingg/util/HashUtil.java @@ -4,7 +4,7 @@ import zingg.hash.HashFunction; -public interface HashUtil { +public interface HashUtil { /** * Use only those functions which are defined in the conf * All functions exist in the registry @@ -13,6 +13,6 @@ public interface HashUtil { * @return * @throws Exception */ - public ListMap> getHashFunctionList(String fileName, Object spark) + public ListMap> getHashFunctionList(String fileName, Object spark) throws Exception ; } diff --git a/core/src/test/java/zingg/documenter/TestModelDocumenter.java b/core/src/test/java/zingg/documenter/TestModelDocumenter.java index 73afe9190..66bb163ee 100644 --- a/core/src/test/java/zingg/documenter/TestModelDocumenter.java +++ b/core/src/test/java/zingg/documenter/TestModelDocumenter.java @@ -70,7 +70,7 @@ public void testPopulateTemplateDataWhenMarkedRecordsAreAvailable() throws Throw @Test public void testPopulateTemplateDataWhenMarkedRecordsAreNone() throws Throwable { ModelDocumenter modelDoc = new ModelDocumenter(spark, args); - modelDoc.markedRecords = spark.emptyDataFrame();; + modelDoc.markedRecords = spark.emptyDataFrame(); Map root = modelDoc.populateTemplateData(); assertTrue(root.containsKey(TemplateFields.MODEL_ID), "The field does not exist - " + TemplateFields.MODEL_ID);