Generated Event specific Meta classes (#41)

* Generated Event specific Meta classes

* added comments in build.gradle and modified class files

* modified comments in build.gradle

* modified runJava task execution phase in build.gradle

Author: xdurvak

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.3
+- Implemented event specific meta class generation functionality
+
 ## 0.2.2
 - Implemented family and type functionality for creating RoutingKey in REMREM Semantics.
 

build.gradle

@@ -34,18 +34,23 @@ allprojects {
 
 jar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.2.2'
+    version =  '0.2.3'
     manifest {
         attributes('remremVersionKey': 'semanticsVersion')
         attributes('semanticsVersion': version)
         attributes('isEndpointVersion': 'true')
     }
     from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
+	{
+		//excluding unwanted files in jar generation these are generated by eclipse jgit api
+		exclude "META-INF/*.SF"
+		exclude "META-INF/*.RSA"
+  }
 }
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.2.1'
+    version =  '0.2.3'
     classifier = ''
 }
 
@@ -96,23 +101,37 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'org.eclipse.jgit:org.eclipse.jgit.archive:4.5.0.201609210915-r'
 }
-/**
- * Gradle task to execute  java class based on input flag value
- */
+
+//compileSourceCode task to compile the source code 
+task compileSourceCode (type: JavaCompile) {
+	source = sourceSets.main.java.srcDirs
+	classpath = sourceSets.main.compileClasspath
+	destinationDir = sourceSets.main.output.classesDir
+}
+
+//runJava task to clone schemas from github and modify the schema's for generate pojo's
 task runJava(type:JavaExec){
+	doFirst{
+	// remote repository URL to clone
 	def remoteURL='https://github.com/Ericsson/eiffel.git'
+	//specific branch name to clone
 	def branch='topic-drop4'
-	//this property is used to clone the repo, set value to "true" to clone.
-	def isClonable = "false" 
 	main 'com.ericsson.eiffel.remrem.semantics.clone.PrepareLocalEiffelSchemas'
 	classpath sourceSets.main.runtimeClasspath
-	args=	[remoteURL,branch,isClonable]
+	args=	[remoteURL,branch]
+	}
 }
 
-jar.dependsOn runJava
-/**
- * This task is used to generate Eiffel events from json schema using jsonschema2pojo plugin.
- */
+//please set 'runJava.enabled= true' to execute the :runJava task if needed only.
+runJava.enabled=false;
+
+//To execute the task compileSourceCode first in gradle build.
+compileSourceCode.execute()
+
+//To execute the runJava task before jsonSchema2pojo plugin execution .
+generateJsonSchema2Pojo.dependsOn runJava
+
+//This task is used to generate Eiffel events from json schema using jsonschema2pojo plugin.
 jsonSchema2Pojo {
     source = files("${sourceSets.main.output.resourcesDir}/schemas/input")
     targetDirectory = file("src/main/java")

src/main/java/com/ericsson/eiffel/remrem/semantics/EiffelEventType.java

@@ -4,26 +4,26 @@
 
 
 public enum EiffelEventType {
-    ARTIFACT_PUBLISHED("EiffelArtifactPublishedEvent"),
-    ACTIVITY_FINISHED("EiffelActivityFinishedEvent"),
-    ACTIVITY_CANCELED("EiffelActivityCanceledEvent"),
-    ARTIFACT_CREATED("EiffelArtifactCreatedEvent"),
-    ACTIVITY_TRIGGERED("EiffelActivityTriggeredEvent"),
-    CONFIDENCELEVEL_MODIFIED("EiffelConfidenceLevelModifiedEvent"),
-    ACTIVITY_STARTED("EiffelActivityStartedEvent"),
-    ANNOUNCEMENT_PUBLISHED("EiffelAnnouncementPublishedEvent"),
-    COMPOSITION_DEFINED("EiffelCompositionDefinedEvent"),
-    CONFIGURATION_APPLIED("EiffelConfigurationAppliedEvent"),
-    ENVIRONMENT_DEFINED("EiffelEnvironmentDefinedEvent"),
-    FLOWCONTEXT_DEFINED("EiffelFlowContextDefinedEvent"),
-    SOURCECHANGE_CREATED("EiffelSourceChangeCreatedEvent"),
-    SOURCECHANGE_SUBMITTED("EiffelSourceChangeSubmittedEvent"),
-    TESTCASE_FINISHED("EiffelTestCaseFinishedEvent"),
-    TESTCASE_STARTED("EiffelTestCaseStartedEvent"),
-    TESTSUITE_FINISHED("EiffelTestSuiteFinishedEvent"),
-    TESTSUITE_STARTED("EiffelTestSuiteStartedEvent"),
-    ISSUE_VERIFIED("EiffelIssueVerifiedEvent"),
-    ARTIFACT_REUSED("EiffelArtifactReusedEvent");
+    ARTIFACT_PUBLISHED("eiffelartifactpublished"),
+    ACTIVITY_FINISHED("eiffelactivityfinished"),
+    ACTIVITY_CANCELED("eiffelactivitycanceled"),
+    ARTIFACT_CREATED("eiffelartifactcreated"),
+    ACTIVITY_TRIGGERED("eiffelactivitytriggered"),
+    CONFIDENCELEVEL_MODIFIED("eiffelconfidencelevelmodified"),
+    ACTIVITY_STARTED("eiffelactivitystarted"),
+    ANNOUNCEMENT_PUBLISHED("eiffelannouncementpublished"),
+    COMPOSITION_DEFINED("eiffelcompositiondefined"),
+    CONFIGURATION_APPLIED("eiffelconfigurationapplied"),
+    ENVIRONMENT_DEFINED("eiffelenvironmentdefined"),
+    FLOWCONTEXT_DEFINED("eiffelflowcontextdefined"),
+    SOURCECHANGE_CREATED("eiffelsourcechangecreated"),
+    SOURCECHANGE_SUBMITTED("eiffelsourcechangesubmitted"),
+    TESTCASE_FINISHED("eiffeltestcasefinished"),
+    TESTCASE_STARTED("eiffeltestcasestarted"),
+    TESTSUITE_FINISHED("eiffeltestsuitefinished"),
+    TESTSUITE_STARTED("eiffeltestsuitestarted"),
+    ISSUE_VERIFIED("eiffelissueverified"),
+    ARTIFACT_REUSED("eiffelartifactreused");
 
     private String id;
 

src/main/java/com/ericsson/eiffel/remrem/semantics/RoutingKeyTypes.java

@@ -4,27 +4,27 @@
 
 public enum RoutingKeyTypes {    
 
-    EiffelActivityCanceledEvent(EiffelConstants.ACTIVITY, "canceled"),
-    EiffelActivityFinishedEvent(EiffelConstants.ACTIVITY,"finished"),
-    EiffelActivityStartedEvent(EiffelConstants.ACTIVITY,"started"),
-    EiffelActivityTriggeredEvent(EiffelConstants.ACTIVITY,"triggered"),
-    EiffelAnnouncementPublishedEvent(EiffelConstants.INFO,"announcement"),
-    EiffelArtifactCreatedEvent(EiffelConstants.ARTIFACT,"created"),
-    EiffelArtifactPublishedEvent(EiffelConstants.ARTIFACT,"published"),
-    EiffelArtifactReusedEvent(EiffelConstants.ARTIFACT,"reused"),
-    EiffelCompositionDefinedEvent(EiffelConstants.CM,"composition"),
-    EiffelConfidenceLevelModifiedEvent(EiffelConstants.ARTIFACT,"modified"),
-    EiffelConfigurationAppliedEvent(EiffelConstants.CONFIGURATION,"applied"),
-    EiffelEnvironmentDefinedEvent(EiffelConstants.CM,"environment"),
-    EiffelFlowContextDefinedEvent(EiffelConstants.FLOWCONTEXT,"defined"),
-    EiffelIssueVerifiedEvent(EiffelConstants.TEST,"issueverified"),
-    EiffelSourceChangeCreatedEvent(EiffelConstants.CM,"scmchange"),
-    EiffelSourceChangeSubmittedEvent(EiffelConstants.CM,"scmproposedchange"),
-    EiffelTestCaseFinishedEvent(EiffelConstants.TEST,"casestarted"),
-    EiffelTestCaseStartedEvent(EiffelConstants.TEST,"casefinished"),
-    EiffelTestSuiteFinishedEvent(EiffelConstants.TEST,"suitefinished"),
-    EiffelTestSuiteStartedEvent(EiffelConstants.TEST,"suitestarted"),
-    EiffelTestExecutionRecipeCollectionCreatedEvent(EiffelConstants.TEST,"execution");
+    eiffelactivitycanceled(EiffelConstants.ACTIVITY, "canceled"),
+    eiffelactivityfinished(EiffelConstants.ACTIVITY,"finished"),
+    eiffelactivitystarted(EiffelConstants.ACTIVITY,"started"),
+    eiffelactivitytriggered(EiffelConstants.ACTIVITY,"triggered"),
+    eiffelannouncementpublished(EiffelConstants.INFO,"announcement"),
+    eiffelartifactcreated(EiffelConstants.ARTIFACT,"created"),
+    eiffelartifactpublished(EiffelConstants.ARTIFACT,"published"),
+    eiffelartifactreused(EiffelConstants.ARTIFACT,"reused"),
+    eiffelcompositiondefined(EiffelConstants.CM,"composition"),
+    eiffelconfidencelevelmodified(EiffelConstants.ARTIFACT,"modified"),
+    eiffelconfigurationapplied(EiffelConstants.CONFIGURATION,"applied"),
+    eiffelenvironmentdefined(EiffelConstants.CM,"environment"),
+    eiffelflowcontextdefined(EiffelConstants.FLOWCONTEXT,"defined"),
+    eiffelissueverified(EiffelConstants.TEST,"issueverified"),
+    eiffelsourcechangecreated(EiffelConstants.CM,"scmchange"),
+    eiffelsourcechangesubmitted(EiffelConstants.CM,"scmproposedchange"),
+    eiffeltestcasefinished(EiffelConstants.TEST,"casefinished"),
+    eiffeltestcasestarted(EiffelConstants.TEST,"casestarted"),
+    eiffeltestsuitefinished(EiffelConstants.TEST,"suitefinished"),
+    eiffeltestsuitestarted(EiffelConstants.TEST,"suitestarted"),
+    eiffeltestexecutionrecipecollectioncreated(EiffelConstants.TEST,"execution");
 
     private final String family;   // family
      private final String type; // type

src/main/java/com/ericsson/eiffel/remrem/semantics/SemanticsService.java

@@ -127,9 +127,9 @@ public String generateMsg(String msgType, JsonObject bodyJson){
     }
     private static Event eventCreation(String msgType, Class<? extends Event> eventType, JsonObject msgNodes,
             JsonObject eventNodes) {
+    	eventNodes.add("meta", msgNodes.get("meta"));
         Event event = createEvent(eventNodes, eventType);
-        event.generateMeta(msgType, msgNodes);
-        event.setMeta(event.meta);
+        event.setMeta(event.generateMeta(event.getMeta()));
         return event;
     }
 

src/main/java/com/ericsson/eiffel/remrem/semantics/clone/PrepareLocalEiffelSchemas.java

@@ -4,71 +4,89 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.jgit.api.Git;
-
+import org.eclipse.jgit.api.ListBranchCommand.ListMode;
+import org.eclipse.jgit.lib.Ref;
 import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;
 import com.ericsson.eiffel.remrem.semantics.schemas.LocalRepo;
 import com.ericsson.eiffel.remrem.semantics.schemas.SchemaFile;
 
 /**
- * This class is used to Clone the Eiffel Repo from github
+ * This class is used to Clone the eiffel repo from github
  * 
  * @author xdurvak
  */
 
 public class PrepareLocalEiffelSchemas {
 
 	/**
-	 * This method is used to clone Eiffel repository from github.
+	 * This method is used to clone repository from github using the URL and
+	 * branch to local destination folder.
 	 * 
-	 * @param repoURL-
-	 *            repository url to clone as an input parameter
-	 * @param branch-
-	 *            specific branch name as an input parameter
+	 * @param repoURL
+	 *            repository url to clone.
+	 * @param branch
+	 *            specific branch name of the repository to clone
 	 * @param localEiffelRepoPath
-	 *            - destination path to place the cloned repo as an input
-	 *            parameter
+	 *            destination path to clone the repo.
 	 */
 	private static void cloneEiffelRepo(String repoURL, String branch, File localEiffelRepoPath) {
-		try {
-			System.out.println("Latest Schema's Updating...");
-			if (!localEiffelRepoPath.exists()) {
-				Git.cloneRepository().setURI(repoURL).setBranch(branch).setDirectory(localEiffelRepoPath).call();
+		Git localGitRepo = null;
+		// checking for repository exists or not in the localEiffelRepoPath
+		if (!localEiffelRepoPath.exists()) {
+			try {
+				// cloning github repository by using URL,branch name into local
+				localGitRepo = Git.cloneRepository().setURI(repoURL).setBranch(branch).setDirectory(localEiffelRepoPath)
+						.call();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		} else {
+			// If required repository already exists
+			try {
+				localGitRepo = Git.open(localEiffelRepoPath);
+				
+				//adding complete remote reference to the branch name
+				String remoteBranch = EiffelConstants.REMOTE_REFERENCES.concat(branch);
+				
+				// To fetch if any changes are available on remote repository.
+				localGitRepo.fetch().call();
+				
+				// checkout to input branch
+				localGitRepo.checkout().setName(remoteBranch).call();
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-		} catch (Exception e) {
-			e.printStackTrace();
 		}
 	}
 
 	public static void main(String[] args) throws IOException {
+		// Read arguments from the Gradle Task.
+		String eiffelRepoUrl = args[0];
+		String eiffelRepoBranch = args[1];
+		File localEiffelRepoPath = new File(
+				System.getProperty(EiffelConstants.USER_HOME) + File.separator + EiffelConstants.EIFFEL);
 
-		// IsClonable checking from build.gradle
-		if (Boolean.parseBoolean(args[2])) {
-
-			File localEiffelRepoPath = new File(System.getProperty(EiffelConstants.USER_HOME) + "\\" + EiffelConstants.EIFFEL);
+		// Clone Repo from GitHub
+		cloneEiffelRepo(eiffelRepoUrl, eiffelRepoBranch, localEiffelRepoPath);
 
-			// Clone Repo from GitHub
-			cloneEiffelRepo(args[0], args[1], localEiffelRepoPath);
+		// Read and Load JsonSchemas from Cloned Directory
+		LocalRepo localRepo = new LocalRepo(localEiffelRepoPath);
+		localRepo.readSchemas();
 
-			// Read and Load JsonSchemas from Cloned Directory
-			LocalRepo localRepo = new LocalRepo(localEiffelRepoPath);
-			localRepo.readSchemas();
-			
-			ArrayList<String> jsonEventNames = localRepo.getJsonEventNames();
-			ArrayList<File> jsonEventSchemas = localRepo.getJsonEventSchemas();
-
-			// Schema changes
-			SchemaFile schemaFile = new SchemaFile(jsonEventNames.toString());
-			// Iterate the Each jsonSchema file for Add and Modify properties
-			if (jsonEventNames != null && jsonEventSchemas != null) {
-				for (int i = 0; i < jsonEventNames.size(); i++) {
-					schemaFile.modify(jsonEventSchemas.get(i), jsonEventNames.get(i));
-				}
+		ArrayList<String> jsonEventNames = localRepo.getJsonEventNames();
+		ArrayList<File> jsonEventSchemas = localRepo.getJsonEventSchemas();
+		
+		//Schema changes
+		SchemaFile schemaFile = new SchemaFile();
+		
+		// Iterate the Each jsonSchema file to Add and Modify the necessary
+		// properties
+		if (jsonEventNames != null && jsonEventSchemas != null) {
+			for (int i = 0; i < jsonEventNames.size(); i++) {
+				schemaFile.modify(jsonEventSchemas.get(i), jsonEventNames.get(i));
 			}
-
-		} else {
-			System.out.println("Please specify the clone property in build.gradle as an argument");
 		}
+
 	}
 }

src/main/java/com/ericsson/eiffel/remrem/semantics/schemas/EiffelConstants.java

@@ -17,11 +17,11 @@ public final class EiffelConstants {
 	public static String DATA = "data";
 	public static String META = "meta";
 	public static String EXTENDS_JAVA_CLASS = "extendsJavaClass";
-	public static String COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS_EVENT = "\"com.ericsson.eiffel.semantics.events.Event\"";
+	public static String COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS_EVENT = "com.ericsson.eiffel.semantics.events.Event";
 	public static String JAVA_TYPE = "javaType";
 	public static String FORMAT = "format";
 	public static String UTC_MILLISEC = "utc-millisec";
-	public static String COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS = "\"com.ericsson.eiffel.semantics.events.";
+	public static String COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS = "com.ericsson.eiffel.semantics.events.";
 	public static String TYPE = "type";
 	public static String OBJECTTYPE = "object";
 	public static String INPUT_EIFFEL_SCHEMAS = "src\\main\\resources\\schemas\\input";
@@ -30,11 +30,18 @@ public final class EiffelConstants {
 	public static String SCHEMA_LOCATION = "\\schemas";
 	public static String JSON_MIME_TYPE = ".json";
 	public static String USER_HOME = "user.home";
-	public static final String ACTIVITY = "activity";
-	public static final String ARTIFACT = "artifact";
-	public static final String CM = "cm";
-	public static final String INFO = "info";
-	public static final String CONFIGURATION = "configuration";
-	public static final String FLOWCONTEXT = "flowcontext";
-    public static final String TEST = "test";
+	public static String ACTIVITY = "activity";
+	public static String ARTIFACT = "artifact";
+	public static String CM = "cm";
+	public static String INFO = "info";
+	public static String CONFIGURATION = "configuration";
+	public static String FLOWCONTEXT = "flowcontext";
+	public static String TEST = "test";
+	public static String REMOTE_REFERENCES = "refs/remotes/origin/";
+	public static String JAVA_INTERFACES = "javaInterfaces";
+	public static String DEPENDENCY = "dependency";
+	public static String BATCH = "batch";
+	public static String PROPERTY = "property";
+	public static String ANYOF = "anyOf";
+	public static String STRING = "string";
 }

src/main/java/com/ericsson/eiffel/remrem/semantics/schemas/LocalRepo.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 
@@ -30,7 +29,7 @@ public LocalRepo(File localSchemasPath) {
 
 	public void readSchemas() {
 		try {
-			FileUtils.cleanDirectory(new File(EiffelConstants.USER_DIR + "\\" + EiffelConstants.INPUT_EIFFEL_SCHEMAS));
+			FileUtils.cleanDirectory(new File(EiffelConstants.USER_DIR + File.separator + EiffelConstants.INPUT_EIFFEL_SCHEMAS));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}