From e5d1570bf4f439d70b1bfbe1d79730bdb48872e6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 28 Jan 2016 17:23:18 +0000
Subject: [PATCH] Remove unecessary context id initializer (Spring Boot 1.3.2)

Also changes default destination name to not contain "topic:" prefix
(this is the default behaviour in stream now).
---
 .../cloud/bus/BusProperties.java              |  9 +---
 ...ontextIdApplicationContextInitializer.java | 44 -------------------
 .../main/resources/META-INF/spring.factories  |  2 -
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 spring-cloud-bus/src/main/java/org/springframework/cloud/bus/context/ContextIdApplicationContextInitializer.java

diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusProperties.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusProperties.java
index dab5477..002f6e6 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusProperties.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusProperties.java
@@ -47,20 +47,13 @@ public class BusProperties {
 	/**
 	 * Name of Spring Cloud Stream destination for messages.
 	 */
-	private String destination = "topic:springCloudBus";
+	private String destination = "springCloudBus";
 
 	/**
 	 * Flag to indicate that the bus is enabled.
 	 */
 	private boolean enabled = true;
 
-	public String getDestination() {
-		if (this.destination.startsWith("topic:")) {
-			return this.destination;
-		}
-		return "topic:" + this.destination;
-	}
-
 	@Data
 	public static class Env {
 		/**
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/context/ContextIdApplicationContextInitializer.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/context/ContextIdApplicationContextInitializer.java
deleted file mode 100644
index bd6efb5..0000000
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/context/ContextIdApplicationContextInitializer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.bus.context;
-
-import org.springframework.core.Ordered;
-
-/**
- * Workaround for poor choice of ordering in the Spring Boot context id initializer. This
- * one prefers a locally provided application name, rather than one provided by the
- * platform. Since Spring Cloud apps send each other events on the Bus addressed by
- * context id, this can be important when the application name doesn't match the one
- * provided in local config.
- *
- * @author Dave Syer
- *
- */
-public class ContextIdApplicationContextInitializer
-		extends org.springframework.boot.context.ContextIdApplicationContextInitializer {
-
-	/**
-	 * Placeholder pattern to resolve for application name.
-	 */
-	private static final String NAME_PATTERN = "${spring.application.name:${spring.config.name:${vcap.application.name:application}}}";
-
-	public ContextIdApplicationContextInitializer() {
-		super(NAME_PATTERN);
-		setOrder(Ordered.LOWEST_PRECEDENCE - 5);
-	}
-
-}
diff --git a/spring-cloud-bus/src/main/resources/META-INF/spring.factories b/spring-cloud-bus/src/main/resources/META-INF/spring.factories
index a050491..086e276 100644
--- a/spring-cloud-bus/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-bus/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.bus.BusAutoConfiguration,\
 org.springframework.cloud.bus.jackson.BusJacksonAutoConfiguration
-org.springframework.context.ApplicationContextInitializer=\
-org.springframework.cloud.bus.context.ContextIdApplicationContextInitializer