Merge pull request #2 from samagra-comms/release-4.1.0

Release 4.1.0

build/Jenkinsfile

@@ -0,0 +1,38 @@
+node('build-slave') {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        ansiColor('xterm') {
+            withEnv(["JAVA_HOME=${JAVA11_HOME}"]) {
+                stage('Checkout') {
+                    if (!env.hub_org) {
+                        println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                        error 'Please resolve the errors and rerun..'
+                    } else
+                        println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
+                }
+
+                cleanWs()
+                checkout scm
+                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+                build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
+                echo "build_tag: " + build_tag
+
+                stage('Build') {
+                    env.NODE_ENV = "build"
+                    print "Environment will be : ${env.NODE_ENV}"
+                    sh 'mvn clean install -DskipTests=true '
+
+                }
+            }
+        }
+    }
+    catch (err) {
+        currentBuild.result = "FAILURE"
+        throw err
+    }
+}

dependency-reduced-pom.xml

@@ -7,7 +7,7 @@
     <relativePath>pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.samagra</groupId>
+  <groupId>com.uci</groupId>
   <artifactId>message-rosa</artifactId>
   <name>message-rosa</name>
   <version>0.0.1-SNAPSHOT</version>

src/main/java/messagerosa/core/model/XMessage.java

@@ -86,13 +86,24 @@ public enum MessageType {
 	private XMessageThread thread;
 	private XMessagePayload payload;
 
+	private static JAXBContext context;
+	private static Marshaller marshaller;
+
+	static {
+		try {
+			context = JAXBContext.newInstance(XMessage.class);
+			marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+		} catch (JAXBException e) {
+			e.printStackTrace();
+		}
+	}
+
+
 	public String toXML() throws JAXBException {
-		JAXBContext context = JAXBContext.newInstance(XMessage.class);
-		Marshaller marshaller = context.createMarshaller();
-		marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-		StringWriter sw = new StringWriter();
-		marshaller.marshal(this, sw);
-		return sw.toString();
+		StringWriter stringWriter = new StringWriter();
+		marshaller.marshal(this, stringWriter);
+		return stringWriter.toString();
 	}
 
 	public void completeTransform() {

src/main/java/messagerosa/xml/XMessageParser.java

@@ -19,9 +19,20 @@
  */
 
 public class XMessageParser {
+
+    public static JAXBContext context;
+    public static Unmarshaller jaxbUnmarshaller;
+
+    static {
+        try {
+            context = JAXBContext.newInstance(XMessage.class);
+            jaxbUnmarshaller = context.createUnmarshaller();
+        } catch (JAXBException e) {
+            e.printStackTrace();
+        }
+    }
+
     public static XMessage parse(InputStream stream) throws JAXBException {
-        JAXBContext context = JAXBContext.newInstance(XMessage.class);
-        Unmarshaller jaxbUnmarshaller = context.createUnmarshaller();
         return (XMessage) jaxbUnmarshaller.unmarshal(stream);
     }
 }