From a264cf9117f7bddc164b7dc5000f9edd933b7ea9 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 10 Nov 2014 18:04:25 -0700
Subject: [PATCH] completed master merge accounting for refactor.  Updated
 turbine2 version to one published to repo.spring.io

---
 pom.xml                                                   | 2 +-
 spring-cloud-bus/pom.xml                                  | 5 +++++
 .../springframework/cloud/bus/BusAutoConfiguration.java   | 8 ++++----
 .../cloud/bus/BusAutoConfigurationTests.java              | 0
 .../cloud/bus/endpoint/RefreshBusEndpointTests.java       | 0
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename {src => spring-cloud-bus/src}/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java (100%)
 rename {src => spring-cloud-bus/src}/test/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpointTests.java (100%)

diff --git a/pom.xml b/pom.xml
index ad6d99f..359b3af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
             <dependency>
                 <groupId>com.netflix.turbine</groupId>
                 <artifactId>turbine-core</artifactId>
-                <version>2.0.0-DP.1-SNAPSHOT</version>
+                <version>2.0.0-DP.1.1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.netflix.rxjava</groupId>
diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml
index f3974b7..1699d75 100644
--- a/spring-cloud-bus/pom.xml
+++ b/spring-cloud-bus/pom.xml
@@ -63,6 +63,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
index ae0b9ed..513b054 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
@@ -158,17 +158,17 @@ public class BusAutoConfiguration {
 
 	private boolean isFromSelf(RemoteApplicationEvent event) {
 		String originService = event.getOriginService();
-		String appName = getAppName();
-		return originService.equals(appName);
+		String serviceId = getServiceId();
+		return originService.equals(serviceId);
 	}
 
 	private boolean isForSelf(RemoteApplicationEvent event) {
 		return (event.getDestinationService() == null
 				|| event.getDestinationService().trim().isEmpty() || event
-				.getDestinationService().equals(getAppName()));
+				.getDestinationService().equals(getServiceId()));
 	}
 
-	private String getAppName() {
+	private String getServiceId() {
 		return context.getId();
 	}
 
diff --git a/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java
similarity index 100%
rename from src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java
rename to spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java
diff --git a/src/test/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpointTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpointTests.java
similarity index 100%
rename from src/test/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpointTests.java
rename to spring-cloud-bus/src/test/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpointTests.java