Move o.s.c.util to o.s.c.commons.util
fixes gh-92
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.springframework.cloud.util;
|
||||
package org.springframework.cloud.commons.util;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.springframework.cloud.util;
|
||||
package org.springframework.cloud.commons.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user