Restructure of packages (#43)

Author: Christoffer-Cortes

src/main/java/com/ericsson/eiffelcommons/helpers/MediaType.java renamed to src/main/java/com/ericsson/eiffelcommons/constants/MediaType.java

@@ -14,15 +14,16 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-package com.ericsson.eiffelcommons.helpers;
+package com.ericsson.eiffelcommons.constants;
 
 public class MediaType {
 
     public final static String APPLICATION_XML = "application/xml";
-
     public final static String APPLICATION_JSON = "application/json";
-
     public final static String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
-
     public static final String TEXT_XML = "text/xml";
+
+    private MediaType() {
+        throw new AssertionError();
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.ericsson.eiffelcommons.helpers;
+package com.ericsson.eiffelcommons.constants;
 
 public final class RegExProvider {
 

src/main/java/com/ericsson/eiffelcommons/JenkinsManager.java renamed to src/main/java/com/ericsson/eiffelcommons/jenkins/JenkinsManager.java

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-package com.ericsson.eiffelcommons;
+package com.ericsson.eiffelcommons.jenkins;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -29,7 +29,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.ericsson.eiffelcommons.helpers.MediaType;
+import com.ericsson.eiffelcommons.constants.MediaType;
 import com.ericsson.eiffelcommons.http.HttpRequest;
 import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;

src/main/java/com/ericsson/eiffelcommons/helpers/JenkinsXmlData.java renamed to src/main/java/com/ericsson/eiffelcommons/jenkins/JenkinsXmlData.java

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-package com.ericsson.eiffelcommons.helpers;
+package com.ericsson.eiffelcommons.jenkins;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -25,7 +25,7 @@
 import org.json.JSONObject;
 import org.json.XML;
 
-import com.ericsson.eiffelcommons.utils.Utils;
+import com.ericsson.eiffelcommons.utils.FileUtils;
 
 /**
  * This class is a builder for jenkins xml data string.
@@ -59,7 +59,7 @@ public class JenkinsXmlData {
      * @throws IOException
      */
     public JenkinsXmlData() throws FileNotFoundException {
-        String xmlJsonDataString = Utils.getResourceFileAsString(JENKINS_TEMPLATE_FILE_NAME);
+        String xmlJsonDataString = FileUtils.getResourceFileAsString(JENKINS_TEMPLATE_FILE_NAME);
         xmlJsonData = XML.toJSONObject(xmlJsonDataString);
         builders = new JSONObject();
         properties = new JSONObject();

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

@@ -5,7 +5,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import com.ericsson.eiffelcommons.utils.Utils;
+import com.ericsson.eiffelcommons.utils.FileUtils;
 
 import lombok.Getter;
 
@@ -25,7 +25,7 @@ public abstract class SubscriptionObject<T extends SubscriptionObject<?>> {
      * @throws IOException
      */
     public SubscriptionObject(final Class<T> selfClass, String subscriptionName) throws IOException {
-        subscriptionJson = Utils.getResourceFileAsJsonObject(SUBSCRIPTION_TEMPLATE_PATH);
+        subscriptionJson = FileUtils.getResourceFileAsJsonObject(SUBSCRIPTION_TEMPLATE_PATH);
         subscriptionJson.put("subscriptionName", subscriptionName);
         this.self = selfClass.cast(this);
     }

src/main/java/com/ericsson/eiffelcommons/utils/Utils.java renamed to src/main/java/com/ericsson/eiffelcommons/utils/FileUtils.java

@@ -26,7 +26,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-public class Utils {
+public class FileUtils {
 
     /**
      * Return a resource file in string format.

src/test/java/com/ericsson/eiffelcommons/utilstest/RegExProviderTest.java renamed to src/test/java/com/ericsson/eiffelcommons/constants/RegExProviderTest.java

@@ -1,10 +1,10 @@
-package com.ericsson.eiffelcommons.utilstest;
+package com.ericsson.eiffelcommons.constants;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.ericsson.eiffelcommons.helpers.RegExProvider;
+import com.ericsson.eiffelcommons.constants.RegExProvider;
 
 public class RegExProviderTest {
 

src/test/java/com/ericsson/eiffelcommons/httptest/HttpExecutorTest.java renamed to src/test/java/com/ericsson/eiffelcommons/http/HttpExecutorTest.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffelcommons.httptest;
+package com.ericsson.eiffelcommons.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

src/test/java/com/ericsson/eiffelcommons/httptest/HttpRequestTest.java renamed to src/test/java/com/ericsson/eiffelcommons/http/HttpRequestTest.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffelcommons.httptest;
+package com.ericsson.eiffelcommons.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

src/test/java/com/ericsson/eiffelcommons/httptest/ResponseEntityTest.java renamed to src/test/java/com/ericsson/eiffelcommons/http/ResponseEntityTest.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffelcommons.httptest;
+package com.ericsson.eiffelcommons.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;