Session wrapper and license interface

common/client/src/main/java/zingg/common/client/Client.java

@@ -5,6 +5,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import zingg.common.client.license.IZinggLicense;
 import zingg.common.client.util.Email;
 import zingg.common.client.util.EmailBody;
 
@@ -223,11 +224,12 @@ else if (options.get(ClientOptions.CONF).value.endsWith("env")) {
 	}
 
 	public void init() throws ZinggClientException {
-		zingg.init(getArguments(), options.get(ClientOptions.LICENSE).value.trim());
+		zingg.init(getArguments(), getLicense(options.get(ClientOptions.LICENSE).value.trim()));
 		if (session != null) zingg.setSession(session);
 		zingg.setClientOptions(options);
 	}
-
+
+	protected abstract IZinggLicense getLicense(String license)  throws ZinggClientException ;
 
 	/**
 	 * Stop the Spark job running context

common/client/src/main/java/zingg/common/client/IZingg.java

@@ -1,8 +1,10 @@
 package zingg.common.client;
 
+import zingg.common.client.license.IZinggLicense;
+
 public interface IZingg<S,D,R,C> {
 
-	public void init(Arguments args, String license)
+	public void init(Arguments args, IZinggLicense license)
 			throws ZinggClientException;
 
 	public void execute() throws ZinggClientException;

common/client/src/main/java/zingg/common/client/ZSession.java

@@ -0,0 +1,16 @@
+package zingg.common.client;
+
+import zingg.common.client.license.IZinggLicense;
+
+public interface ZSession<S> {
+
+	public S getSession();
+
+	public void setSession(S session);
+
+	public IZinggLicense getLicense();
+
+	public void setLicense(IZinggLicense license);
+
+
+}

common/client/src/main/java/zingg/common/client/license/ILicenseValidator.java

@@ -0,0 +1,9 @@
+package zingg.common.client.license;
+
+public interface ILicenseValidator {
+
+	public String getName();
+
+	public boolean validate();
+
+}

common/client/src/main/java/zingg/common/client/license/IZinggLicense.java

@@ -0,0 +1,8 @@
+package zingg.common.client.license;
+
+public interface IZinggLicense {
+
+	public ILicenseValidator getValidator(String name);
+
+
+}

common/core/src/main/java/zingg/common/core/Context.java

@@ -3,6 +3,7 @@
 import java.io.Serializable;
 
 import zingg.common.client.ZinggClientException;
+import zingg.common.client.license.IZinggLicense;
 import zingg.common.core.util.BlockingTreeUtil;
 import zingg.common.core.util.DSUtil;
 import zingg.common.core.util.GraphUtil;
@@ -29,7 +30,7 @@ public interface Context <S,D, R, C,T> extends Serializable {
     public PipeUtilBase<S,D,R,C> getPipeUtil();
     public BlockingTreeUtil<S, D,R,C,T> getBlockingTreeUtil() ;
 
-    public void init(String license)
+    public void init(IZinggLicense license)
         throws ZinggClientException;
 
     public void cleanup();

common/core/src/main/java/zingg/common/core/documenter/DocumenterBase.java

@@ -8,7 +8,6 @@
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
-// import org.apache.spark.sql.SparkSession;
 import freemarker.template.Version;
 import zingg.common.client.Arguments;
 import zingg.common.client.ZinggClientException;
@@ -17,6 +16,7 @@
 import zingg.common.core.executor.ZinggBase;
 
 public abstract class DocumenterBase<S,D,R,C,T> extends ZinggBase<S,D,R,C,T>{
+	private static final long serialVersionUID = 1L;
 	protected static Configuration config;
 
 	public DocumenterBase(Context<S,D,R,C,T> context, Arguments args) {

common/core/src/main/java/zingg/common/core/executor/FindAndLabeller.java

@@ -6,6 +6,7 @@
 import zingg.common.client.Arguments;
 import zingg.common.client.ZinggClientException;
 import zingg.common.client.ZinggOptions;
+import zingg.common.client.license.IZinggLicense;
 
 public abstract class FindAndLabeller<S, D, R, C, T> extends Labeller<S, D, R, C, T> {
 	private static final long serialVersionUID = 1L;
@@ -19,7 +20,7 @@ public FindAndLabeller() {
 	}
 
 	@Override
-	public void init(Arguments args, String license) throws ZinggClientException {
+	public void init(Arguments args, IZinggLicense license) throws ZinggClientException {
 		finder.init(args, license);
 		super.init(args, license);
 	}

common/core/src/main/java/zingg/common/core/executor/TrainMatcher.java

@@ -5,6 +5,7 @@
 import zingg.common.client.Arguments;
 import zingg.common.client.ZinggClientException;
 import zingg.common.client.ZinggOptions;
+import zingg.common.client.license.IZinggLicense;
 
 public abstract class TrainMatcher<S,D,R,C,T> extends Matcher<S,D,R,C,T>{
 
@@ -18,7 +19,7 @@ public TrainMatcher() {
     }
 
 	@Override
-	public void init(Arguments args, String license)
+	public void init(Arguments args, IZinggLicense license)
         throws ZinggClientException {
 			trainer.init(args, license);
 			super.init(args, license);			

common/core/src/main/java/zingg/common/core/executor/ZinggBase.java

@@ -14,6 +14,7 @@
 import zingg.common.client.ZFrame;
 import zingg.common.client.ZinggClientException;
 import zingg.common.client.ZinggOptions;
+import zingg.common.client.license.IZinggLicense;
 import zingg.common.client.util.ColName;
 import zingg.common.client.util.ColValues;
 import zingg.common.core.Context;
@@ -62,7 +63,7 @@ public ZinggBase() {
 
 
 
-    public void init(Arguments args, String license)
+    public void init(Arguments args, IZinggLicense license)
         throws ZinggClientException {
             startTime = System.currentTimeMillis();
             this.args = args;

spark/client/src/main/java/zingg/spark/client/SparkClient.java

@@ -1,22 +1,26 @@
 package zingg.spark.client;
 
 import java.io.Serializable;
-import org.apache.spark.api.java.JavaSparkContext;
+
 import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataType;
 
-import zingg.common.client.*;
+import zingg.common.client.Arguments;
+import zingg.common.client.Client;
+import zingg.common.client.ClientOptions;
+import zingg.common.client.IZinggFactory;
+import zingg.common.client.ZinggClientException;
+import zingg.common.client.license.IZinggLicense;
 
 /**
  * This is the main point of interface with the Zingg matching product.
  * 
  * @author sgoyal
  *
  */
-public class SparkClient extends Client<SparkSession, Dataset<Row>, Row, Column, DataType>  implements Serializable {
+public class SparkClient extends Client<ZSparkSession, Dataset<Row>, Row, Column, DataType>  implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -25,7 +29,7 @@ public SparkClient(Arguments args, ClientOptions options) throws ZinggClientExce
 
 	}
 
-	public SparkClient(Arguments args, ClientOptions options, SparkSession s) throws ZinggClientException {
+	public SparkClient(Arguments args, ClientOptions options, ZSparkSession s) throws ZinggClientException {
 		super(args, options, s);
 	}
 
@@ -47,7 +51,7 @@ public IZinggFactory getZinggFactory() throws InstantiationException, IllegalAcc
 
 
 	@Override
-	public Client<SparkSession, Dataset<Row>, Row, Column, DataType> getClient(Arguments args, 
+	public Client<ZSparkSession, Dataset<Row>, Row, Column, DataType> getClient(Arguments args, 
 		ClientOptions options) throws ZinggClientException {
 		// TODO Auto-generated method stub
 		SparkClient client = null;
@@ -67,5 +71,10 @@ public static void main(String... args) {
 		client.mainMethod(args);
 	}
 
+	@Override
+	protected IZinggLicense getLicense(String license) throws ZinggClientException {
+		return null;
+	}
+
 
 }

spark/client/src/main/java/zingg/spark/client/ZSparkSession.java

@@ -0,0 +1,39 @@
+package zingg.spark.client;
+import org.apache.spark.sql.SparkSession;
+
+import zingg.common.client.ZSession;
+import zingg.common.client.license.IZinggLicense;
+
+public class ZSparkSession implements ZSession<SparkSession> {
+
+	private SparkSession session;
+
+	private IZinggLicense license;
+
+	public ZSparkSession(SparkSession session, IZinggLicense license) {
+		super();
+		this.session = session;
+		this.license = license;
+	}	
+
+	@Override
+	public SparkSession getSession() {
+		return session;
+	}
+
+	@Override
+	public void setSession(SparkSession session) {
+		this.session = session;
+	}
+
+	@Override
+	public IZinggLicense getLicense() {
+		return license;
+	}
+
+	@Override
+	public void setLicense(IZinggLicense license) {
+		this.license = license;
+	}
+
+}

spark/core/src/main/java/zingg/spark/core/documenter/SparkDataColDocumenter.java

@@ -3,24 +3,24 @@
 import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataType;
 
 import freemarker.template.Version;
 import zingg.common.client.Arguments;
 import zingg.common.core.Context;
 import zingg.common.core.documenter.DataColDocumenter;
 import zingg.common.core.documenter.RowWrapper;
+import zingg.spark.client.ZSparkSession;
 
 /**
  * Spark specific implementation of DataColDocumenter
  *
  */
-public class SparkDataColDocumenter extends DataColDocumenter<SparkSession, Dataset<Row>, Row, Column,DataType> {
+public class SparkDataColDocumenter extends DataColDocumenter<ZSparkSession, Dataset<Row>, Row, Column,DataType> {
 
 	private static final long serialVersionUID = 1L;
 
-	public SparkDataColDocumenter(Context<SparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
+	public SparkDataColDocumenter(Context<ZSparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
 		super(context, args);
 	}
 

spark/core/src/main/java/zingg/spark/core/documenter/SparkDataDocumenter.java

@@ -3,24 +3,24 @@
 import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataType;
 
 import freemarker.template.Version;
 import zingg.common.client.Arguments;
 import zingg.common.core.Context;
 import zingg.common.core.documenter.DataDocumenter;
 import zingg.common.core.documenter.RowWrapper;
+import zingg.spark.client.ZSparkSession;
 
 /**
  * Spark specific implementation of DataDocumenter
  *
  */
-public class SparkDataDocumenter extends DataDocumenter<SparkSession, Dataset<Row>, Row, Column,DataType> {
+public class SparkDataDocumenter extends DataDocumenter<ZSparkSession, Dataset<Row>, Row, Column,DataType> {
 
 	private static final long serialVersionUID = 1L;
 
-	public SparkDataDocumenter(Context<SparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
+	public SparkDataDocumenter(Context<ZSparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
 		super(context, args);
 	}
 

spark/core/src/main/java/zingg/spark/core/documenter/SparkModelColDocumenter.java

@@ -3,25 +3,25 @@
 import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataType;
 
 import freemarker.template.Version;
 import zingg.common.client.Arguments;
 import zingg.common.core.Context;
 import zingg.common.core.documenter.ModelColDocumenter;
 import zingg.common.core.documenter.RowWrapper;
+import zingg.spark.client.ZSparkSession;
 
 /**
  * Spark specific implementation of ModelColDocumenter
  * 
  *
  */
-public class SparkModelColDocumenter extends ModelColDocumenter<SparkSession, Dataset<Row>, Row, Column,DataType> {
+public class SparkModelColDocumenter extends ModelColDocumenter<ZSparkSession, Dataset<Row>, Row, Column,DataType> {
 
 	private static final long serialVersionUID = 1L;
 
-	public SparkModelColDocumenter(Context<SparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
+	public SparkModelColDocumenter(Context<ZSparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
 		super(context, args);
 	}
 

spark/core/src/main/java/zingg/spark/core/documenter/SparkModelDocumenter.java

@@ -3,24 +3,24 @@
 import org.apache.spark.sql.Column;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataType;
 
 import freemarker.template.Version;
 import zingg.common.client.Arguments;
 import zingg.common.core.Context;
 import zingg.common.core.documenter.ModelDocumenter;
 import zingg.common.core.documenter.RowWrapper;
+import zingg.spark.client.ZSparkSession;
 
 /**
  * Spark specific implementation of ModelDocumenter
  *
  */
-public class SparkModelDocumenter extends ModelDocumenter<SparkSession, Dataset<Row>, Row, Column,DataType> {
+public class SparkModelDocumenter extends ModelDocumenter<ZSparkSession, Dataset<Row>, Row, Column,DataType> {
 
 	private static final long serialVersionUID = 1L;
 
-	public SparkModelDocumenter(Context<SparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
+	public SparkModelDocumenter(Context<ZSparkSession, Dataset<Row>, Row, Column,DataType> context, Arguments args) {
 		super(context, args);
 		super.modelColDoc = new SparkModelColDocumenter(context,args);
 	}