From 4a2c754ec6e7d2be96605858bb43fea9478dc490 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 2 Mar 2016 09:22:03 -0700
Subject: [PATCH] Move o.s.c.util to o.s.c.commons.util

fixes gh-92
---
 .../cloud/client/HostInfoEnvironmentPostProcessor.java        | 2 +-
 .../circuitbreaker/EnableCircuitBreakerImportSelector.java    | 2 +-
 .../client/discovery/EnableDiscoveryClientImportSelector.java | 2 +-
 .../org/springframework/cloud/{ => commons}/util/IdUtils.java | 2 +-
 .../springframework/cloud/{ => commons}/util/InetUtils.java   | 2 +-
 .../cloud/{ => commons}/util/InetUtilsProperties.java         | 2 +-
 .../cloud/{ => commons}/util/SpringFactoryImportSelector.java | 2 +-
 .../cloud/{ => commons}/util/UtilAutoConfiguration.java       | 2 +-
 .../src/main/resources/META-INF/spring.factories              | 2 +-
 .../cloud/{ => commons}/util/IdUtilsTests.java                | 2 +-
 .../cloud/{ => commons}/util/InetUtilsTests.java              | 4 ++--
 .../{ => commons}/util/SpringFactoryImportSelectorTests.java  | 4 ++--
 12 files changed, 14 insertions(+), 14 deletions(-)
 rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => commons}/util/IdUtils.java (96%)
 rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => commons}/util/InetUtils.java (99%)
 rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => commons}/util/InetUtilsProperties.java (95%)
 rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => commons}/util/SpringFactoryImportSelector.java (98%)
 rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => commons}/util/UtilAutoConfiguration.java (94%)
 rename spring-cloud-commons/src/test/java/org/springframework/cloud/{ => commons}/util/IdUtilsTests.java (98%)
 rename spring-cloud-commons/src/test/java/org/springframework/cloud/{ => commons}/util/InetUtilsTests.java (95%)
 rename spring-cloud-commons/src/test/java/org/springframework/cloud/{ => commons}/util/SpringFactoryImportSelectorTests.java (93%)

diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java
index 56b8596f..394e2544 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java
@@ -5,7 +5,7 @@ import java.util.LinkedHashMap;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.config.ConfigFileApplicationListener;
 import org.springframework.boot.env.EnvironmentPostProcessor;
-import org.springframework.cloud.util.InetUtils;
+import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
index f86dcae9..bba53d58 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.client.circuitbreaker;
 
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.cloud.util.SpringFactoryImportSelector;
+import org.springframework.cloud.commons.util.SpringFactoryImportSelector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
index c04769f8..84700a77 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.client.discovery;
 
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.cloud.util.SpringFactoryImportSelector;
+import org.springframework.cloud.commons.util.SpringFactoryImportSelector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/IdUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java
similarity index 96%
rename from spring-cloud-commons/src/main/java/org/springframework/cloud/util/IdUtils.java
rename to spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java
index 16af3dae..21a77faf 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/IdUtils.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.core.env.PropertyResolver;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java
similarity index 99%
rename from spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java
rename to spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java
index 660c8c8e..778ed706 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtilsProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtilsProperties.java
similarity index 95%
rename from spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtilsProperties.java
rename to spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtilsProperties.java
index 99771b76..774df8b5 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtilsProperties.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtilsProperties.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SpringFactoryImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java
similarity index 98%
rename from spring-cloud-commons/src/main/java/org/springframework/cloud/util/SpringFactoryImportSelector.java
rename to spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java
index 39a71de8..3e72e5f9 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SpringFactoryImportSelector.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java
similarity index 94%
rename from spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java
rename to spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java
index f61acbf8..4532d875 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/spring-cloud-commons/src/main/resources/META-INF/spring.factories b/spring-cloud-commons/src/main/resources/META-INF/spring.factories
index da8a7d3f..2f8e25f5 100644
--- a/spring-cloud-commons/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-commons/src/main/resources/META-INF/spring.factories
@@ -4,7 +4,7 @@ org.springframework.cloud.client.CommonsClientAutoConfiguration,\
 org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration,\
 org.springframework.cloud.client.hypermedia.CloudHypermediaAutoConfiguration,\
 org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration,\
-org.springframework.cloud.util.UtilAutoConfiguration
+org.springframework.cloud.commons.util.UtilAutoConfiguration
 
 
 # Environment Post Processors
diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/IdUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java
similarity index 98%
rename from spring-cloud-commons/src/test/java/org/springframework/cloud/util/IdUtilsTests.java
rename to spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java
index d3633284..59c53886 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/IdUtilsTests.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/InetUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java
similarity index 95%
rename from spring-cloud-commons/src/test/java/org/springframework/cloud/util/InetUtilsTests.java
rename to spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java
index 810cf912..988074e3 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/InetUtilsTests.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import java.net.InetAddress;
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.springframework.cloud.util.InetUtils.HostInfo;
+import org.springframework.cloud.commons.util.InetUtils.HostInfo;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/SpringFactoryImportSelectorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java
similarity index 93%
rename from spring-cloud-commons/src/test/java/org/springframework/cloud/util/SpringFactoryImportSelectorTests.java
rename to spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java
index 90ba5ee9..225e2d6f 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/util/SpringFactoryImportSelectorTests.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.util;
+package org.springframework.cloud.commons.util;
 
 import org.junit.Test;
 
@@ -32,7 +32,7 @@ public class SpringFactoryImportSelectorTests {
 				selector.getAnnotationClass());
 	}
 
-	public static @interface MyAnnotation {
+	public @interface MyAnnotation {
 	}
 
 	public static class MyAnnotationImportSelector extends