Refactoring

ardikars · ardikars · commit 3a32643ad195 · 2018-06-20T06:15:41.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,10 @@
 
 version: 2
 
+dependencies:
+  pre:
+    - source gradle/resources/scipts/gradle-properties.sh && copyEnvVarsToGradleProperties
+
 jobs:
 
   build:
diff --git a/common-annotation/src/main/java/com/ardikars/common/annotation/Helper.java b/common-annotation/src/main/java/com/ardikars/common/annotation/Helper.java
@@ -1,4 +1,4 @@
-package com.ardikars.java.common.annotation;
+package com.ardikars.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/common-annotation/src/main/java/com/ardikars/common/annotation/Immutable.java b/common-annotation/src/main/java/com/ardikars/common/annotation/Immutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.annotation;
+package com.ardikars.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/common-annotation/src/main/java/com/ardikars/common/annotation/Mutable.java b/common-annotation/src/main/java/com/ardikars/common/annotation/Mutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.annotation;
+package com.ardikars.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/common-net/src/main/java/com/ardikars/common/net/Inet4Address.java b/common-net/src/main/java/com/ardikars/common/net/Inet4Address.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.net;
+package com.ardikars.common.net;
 
-import com.ardikars.java.common.annotation.Immutable;
-import com.ardikars.java.common.util.Validate;
+import com.ardikars.common.annotation.Immutable;
+import com.ardikars.common.util.Validate;
 
 import java.util.Arrays;
 
diff --git a/common-net/src/main/java/com/ardikars/common/net/Inet6Address.java b/common-net/src/main/java/com/ardikars/common/net/Inet6Address.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.net;
+package com.ardikars.common.net;
 
-import com.ardikars.java.common.annotation.Immutable;
-import com.ardikars.java.common.util.Validate;
+import com.ardikars.common.annotation.Immutable;
+import com.ardikars.common.util.Validate;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/common-net/src/main/java/com/ardikars/common/net/InetAddress.java b/common-net/src/main/java/com/ardikars/common/net/InetAddress.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.net;
+package com.ardikars.common.net;
 
 /**
  * This class is a abstraction for IP Address.
diff --git a/common-net/src/main/java/com/ardikars/common/net/MacAddress.java b/common-net/src/main/java/com/ardikars/common/net/MacAddress.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.net;
+package com.ardikars.common.net;
 
-import com.ardikars.java.common.annotation.Immutable;
-import com.ardikars.java.common.annotation.Mutable;
-import com.ardikars.java.common.util.NamedNumber;
-import com.ardikars.java.common.util.Validate;
+import com.ardikars.common.annotation.Immutable;
+import com.ardikars.common.annotation.Mutable;
+import com.ardikars.common.util.NamedNumber;
+import com.ardikars.common.util.Validate;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/common-util/src/main/java/com/ardikars/common/util/Arrays.java b/common-util/src/main/java/com/ardikars/common/util/Arrays.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Helper;
+import com.ardikars.common.annotation.Helper;
 
 import java.lang.reflect.Array;
 import java.util.Collections;
diff --git a/common-util/src/main/java/com/ardikars/common/util/AsyncCallback.java b/common-util/src/main/java/com/ardikars/common/util/AsyncCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Asyncronous callback.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Builder.java b/common-util/src/main/java/com/ardikars/common/util/Builder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Builder interface.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Bytes.java b/common-util/src/main/java/com/ardikars/common/util/Bytes.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Helper;
+import com.ardikars.common.annotation.Helper;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/common-util/src/main/java/com/ardikars/common/util/Callback.java b/common-util/src/main/java/com/ardikars/common/util/Callback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Common base callback.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Decoder.java b/common-util/src/main/java/com/ardikars/common/util/Decoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Decoder interface.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Encoder.java b/common-util/src/main/java/com/ardikars/common/util/Encoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Encoder interface.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Factory.java b/common-util/src/main/java/com/ardikars/common/util/Factory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Factory interface.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Hexs.java b/common-util/src/main/java/com/ardikars/common/util/Hexs.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Helper;
+import com.ardikars.common.annotation.Helper;
 
 import java.util.regex.Pattern;
 
diff --git a/common-util/src/main/java/com/ardikars/common/util/IntenalNativeLibrary.java b/common-util/src/main/java/com/ardikars/common/util/IntenalNativeLibrary.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Mutable;
+import com.ardikars.common.annotation.Mutable;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/common-util/src/main/java/com/ardikars/common/util/Loader.java b/common-util/src/main/java/com/ardikars/common/util/Loader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Loader interface
diff --git a/common-util/src/main/java/com/ardikars/common/util/NamedNumber.java b/common-util/src/main/java/com/ardikars/common/util/NamedNumber.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 import java.io.Serializable;
 
diff --git a/common-util/src/main/java/com/ardikars/common/util/NamedTwoKeyMap.java b/common-util/src/main/java/com/ardikars/common/util/NamedTwoKeyMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Common base class for {@code TwoKeyMap}.
diff --git a/common-util/src/main/java/com/ardikars/common/util/Platforms.java b/common-util/src/main/java/com/ardikars/common/util/Platforms.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Helper;
+import com.ardikars.common.annotation.Helper;
 
 /**
  * Platform information.
diff --git a/common-util/src/main/java/com/ardikars/common/util/SyncCallback.java b/common-util/src/main/java/com/ardikars/common/util/SyncCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 /**
  * Syncronous Callback.
diff --git a/common-util/src/main/java/com/ardikars/common/util/TwoKeyMap.java b/common-util/src/main/java/com/ardikars/common/util/TwoKeyMap.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Immutable;
+import com.ardikars.common.annotation.Immutable;
 
 /**
  * An object that maps two key to values. A {@code TwoKeyMap} cannot contain duplicate keys;
diff --git a/common-util/src/main/java/com/ardikars/common/util/Validate.java b/common-util/src/main/java/com/ardikars/common/util/Validate.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.annotation.Helper;
+import com.ardikars.common.annotation.Helper;
 
 /**
  * Static convenience methods that help a method or constructor check whether it was invoked
diff --git a/common-util/src/test/java/com/ardikars/common/util/ArrayTest.java b/common-util/src/test/java/com/ardikars/common/util/ArrayTest.java
@@ -1,4 +1,4 @@
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 import org.junit.Test;
 
diff --git a/common-util/src/test/java/com/ardikars/common/util/BaseTest.java b/common-util/src/test/java/com/ardikars/common/util/BaseTest.java
@@ -1,4 +1,4 @@
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/common-util/src/test/java/com/ardikars/common/util/NamedNumberTest.java b/common-util/src/test/java/com/ardikars/common/util/NamedNumberTest.java
@@ -1,6 +1,6 @@
-package com.ardikars.java.common.util;
+package com.ardikars.common.util;
 
-import com.ardikars.java.common.util.model.HttpStatusCode;
+import com.ardikars.common.util.model.HttpStatusCode;
 import org.junit.Test;
 
 
diff --git a/common-util/src/test/java/com/ardikars/common/util/model/HttpStatusCode.java b/common-util/src/test/java/com/ardikars/common/util/model/HttpStatusCode.java
@@ -1,6 +1,6 @@
-package com.ardikars.java.common.util.model;
+package com.ardikars.common.util.model;
 
-import com.ardikars.java.common.util.NamedNumber;
+import com.ardikars.common.util.NamedNumber;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/configure.gradle b/gradle/configure.gradle
@@ -5,8 +5,8 @@
 
 ext {
 
-	NAME = 'java-common'
-	GROUP = 'com.ardikars.java.common'
+	NAME = 'common'
+	GROUP = 'com.ardikars.common'
 	VERSION = '1.0.0.RC2'
 	DESCRIPTION = 'Java Common is an project focused on all aspects of reusable Java components.';
 
diff --git a/gradle/resources/scripts/gradle-properties.sh b/gradle/resources/scripts/gradle-properties.sh
@@ -0,0 +1,25 @@
+
+#   dependencies:
+#       pre:
+#        - source environmentSetup.sh && copyEnvVarsToGradleProperties
+
+#!/usr/bin/env bash
+
+function copyEnvVarsToGradleProperties {
+    GRADLE_PROPERTIES=$HOME"/.gradle/gradle.properties"
+    export GRADLE_PROPERTIES
+    echo "Gradle Properties should exist at $GRADLE_PROPERTIES"
+
+    if [ ! -f "$GRADLE_PROPERTIES" ]; then
+        echo "Gradle Properties does not exist"
+
+        echo "Creating Gradle Properties file..."
+        touch $GRADLE_PROPERTIES
+
+        echo "Writing TEST_API_KEY to gradle.properties..."
+        echo "sonatypeUser=$SONATYPE_USER" >> $GRADLE_PROPERTIES
+        echo "sonatypePass=$SONATYPE_PASS" >> $GRADLE_PROPERTIES
+        echo "bintrayUser=$BINTRAY_USER" >> $GRADLE_PROPERTIES
+        echo "bintrayPass=$BINTRAY_PASS" >> $GRADLE_PROPERTIES
+    fi
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ardikars.java.common.annotation;`
	`1`	`+package com.ardikars.common.annotation;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.ElementType;`
`4`	`4`	`import java.lang.annotation.Retention;`