Reverted back the way we read files (#20)

- Revert back the way we read files
- Add .travis file for travis tests.
- Update to README

Author: Anders Breid

.travis.yml

@@ -0,0 +1,54 @@
+sudo: required
+
+dist: xenial
+
+language: java
+
+# services:
+#   - docker 
+
+env:
+  - JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+
+# Run before every job
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y openjdk-8-jdk
+  - PATH=$(echo "$PATH" | sed -e 's/:\/usr\/local\/lib\/jvm\/openjdk11\/bin//')
+  - java -version
+  - uname -a
+  - chmod +x pom.xml
+
+
+# This is only run before integrationTests job
+# To ensure docker containers are fully up and running we sleep 20s
+# before_script:
+#   - cd src/main/docker/
+#   - source env.bash
+#   - docker-compose up -d
+#   - sleep 60
+#   - cd ../../../
+
+
+# Generate site documentation using mvn site plugin
+# before_deploy:
+#   - rm -rf docs
+#   - mvn site -B
+
+
+# Using default stage 'test' for all our test jobs, and only running deploy stage
+# (after merge) to master branch
+stages:
+  - test
+#   - name: deploy
+#     if: branch = master
+
+
+# List of jobs to run, tied to specific stages
+jobs:
+  include:
+    - stage: test
+      name: AllTests
+      before_script: skip
+      script:
+        - mvn test -B

README.md

@@ -18,7 +18,10 @@
 <img src="./images/logo.png" alt="Eiffel Shared Java" width="350"/>
 
 # Eiffel Commons
-** To be added **
+## Java Library
+* Jenkins Manager
+* RegExProvider
+* Subsceription object
 
 # About this repository
 The contents of this repository are licensed under the [Apache License 2.0](./LICENSE).

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-commons-java</artifactId>
-    <version>0.0.10</version>
+    <version>0.0.11</version>
 
     <name>eiffel commons java</name>
     <description>A shared library for eiffel components</description>

src/main/java/com/ericsson/eiffelcommons/helpers/JenkinsXmlData.java

@@ -35,7 +35,7 @@
  */
 public class JenkinsXmlData {
 
-    private static final String JENKINS_TEMPLATE_FILE_NAME = "/jenkinsJobTemplate.xml";
+    private static final String JENKINS_TEMPLATE_FILE_NAME = "jenkinsJobTemplate.xml";
     private static final String XML_VERSION = "<?xml version='1.1' encoding='UTF-8'?>";
     private static final String HUDSON_PARAMETERS_DEFINITION_KEY = "hudson.model.ParametersDefinitionProperty";
     private static final String PARAMETER_DEFINITION_KEY = "parameterDefinitions";

src/main/java/com/ericsson/eiffelcommons/utils/RegExProvider.java renamed to src/main/java/com/ericsson/eiffelcommons/helpers/RegExProvider.java

@@ -1,9 +1,9 @@
-package com.ericsson.eiffelcommons.utils;
+package com.ericsson.eiffelcommons.helpers;
 
 public final class RegExProvider {
 
-  public static final String SUBSCRIPTION_NAME = "(\\W)";
-    public static final String NOTIFICATION_META = "^(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$";;
+    public static final String SUBSCRIPTION_NAME = "(\\W)";
+    public static final String NOTIFICATION_META = "^(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$";
 
     private RegExProvider() {
         throw new AssertionError();

src/main/java/com/ericsson/eiffelcommons/subscriptionobject/SubscriptionObject.java

@@ -10,7 +10,7 @@
 import lombok.Getter;
 
 public abstract class SubscriptionObject {
-    private static final String SUBSCRIPTION_TEMPLATE_PATH = "/subscriptionsTemplate.json";
+    private static final String SUBSCRIPTION_TEMPLATE_PATH = "subscriptionsTemplate.json";
 
     @Getter
     protected JSONObject subscriptionJson;

src/main/java/com/ericsson/eiffelcommons/utils/Utils.java

@@ -36,7 +36,8 @@ public class Utils {
      * @throws FileNotFoundException
      */
     public static String getResourceFileAsString(String fileName) throws FileNotFoundException {
-        InputStream inputStream = Utils.class.getResourceAsStream(fileName);
+        ClassLoader classLoader = ClassLoader.getSystemClassLoader();
+        InputStream inputStream = classLoader.getResourceAsStream(fileName);
         if (inputStream != null) {
             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
             return reader.lines()

src/test/java/com/ericsson/eiffelcommons/Utilstest/RegExProviderTest.java

@@ -4,7 +4,7 @@
 
 import org.junit.Test;
 
-import com.ericsson.eiffelcommons.utils.RegExProvider;
+import com.ericsson.eiffelcommons.helpers.RegExProvider;
 
 public class RegExProviderTest {