SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename package that was missing 'cloud'

Browse Source
This commit is contained in:
Dave Syer
2015-01-29 16:00:26 +00:00
parent e100207e8a
commit fe08762f50
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/Constants.java → spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConstants.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.cloud.netflix;
package org.springframework.cloud.netflix.hystrix;
/**
* @author Spencer Gibb
*/
public interface Constants {
public interface HystrixConstants {
String HYSTRIX_STREAM_NAME = "spring.cloud.hystrix.stream";

2
spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java → spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.netflix.hystrix.amqp;
package org.springframework.cloud.netflix.hystrix.amqp;
import lombok.Data;

8
spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java → spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.netflix.hystrix.amqp;
package org.springframework.cloud.netflix.hystrix.amqp;
import javax.annotation.PostConstruct;
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.netflix.Constants;
import org.springframework.cloud.netflix.hystrix.HystrixConstants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.annotation.IntegrationComponentScan;
@@ -78,7 +78,7 @@ public class HystrixStreamAutoConfiguration {
@Bean
public DirectExchange hystrixStreamExchange() {
DirectExchange exchange = new DirectExchange(Constants.HYSTRIX_STREAM_NAME);
DirectExchange exchange = new DirectExchange(HystrixConstants.HYSTRIX_STREAM_NAME);
return exchange;
}
@@ -94,7 +94,7 @@ public class HystrixStreamAutoConfiguration {
* spec.header("content-type", "application/json", true); } })
*/
.handle(Amqp.outboundAdapter(this.amqpTemplate).exchangeName(
Constants.HYSTRIX_STREAM_NAME)).get();
HystrixConstants.HYSTRIX_STREAM_NAME)).get();
}
private Jackson2JsonMessageConverter messageConverter() {

2
spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamChannel.java → spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamChannel.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.netflix.hystrix.amqp;
package org.springframework.cloud.netflix.hystrix.amqp;
import org.springframework.integration.annotation.Gateway;
import org.springframework.integration.annotation.MessagingGateway;

2
spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java → spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamTask.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.netflix.hystrix.amqp;
package org.springframework.cloud.netflix.hystrix.amqp;
import java.io.IOException;
import java.io.StringWriter;

6
spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java
View File

@@ -32,7 +32,7 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.netflix.Constants;
import org.springframework.cloud.netflix.hystrix.HystrixConstants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.dsl.IntegrationFlow;
@@ -66,7 +66,7 @@ public class TurbineAmqpAutoConfiguration {
@Bean
public DirectExchange hystrixStreamExchange() {
DirectExchange exchange = new DirectExchange(Constants.HYSTRIX_STREAM_NAME);
DirectExchange exchange = new DirectExchange(HystrixConstants.HYSTRIX_STREAM_NAME);
return exchange;
}
@@ -80,7 +80,7 @@ public class TurbineAmqpAutoConfiguration {
public Queue hystrixStreamQueue() {
Map<String, Object> args = new HashMap<>();
args.put("x-message-ttl", 60000); // TODO: configure TTL
Queue queue = new Queue(Constants.HYSTRIX_STREAM_NAME, false, false, false, args);
Queue queue = new Queue(HystrixConstants.HYSTRIX_STREAM_NAME, false, false, false, args);
return queue;
}