From 4037f4ca80102092cd0bd56cf51c07bf92c6f6e2 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 10 Sep 2015 12:59:24 -0600
Subject: [PATCH] Add initialization of JsonXStream back.

fixes gh-535
---
 .../eureka/EurekaClientAutoConfiguration.java        |  7 +++++--
 .../server/EurekaServerInitializerConfiguration.java | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
index 5a741588..62d09e21 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -21,6 +21,8 @@ import java.util.concurrent.ConcurrentMap;
 
 import javax.annotation.PostConstruct;
 
+import lombok.SneakyThrows;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -45,10 +47,9 @@ import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.converters.JsonXStream;
 import com.netflix.discovery.converters.XmlXStream;
 
-import lombok.SneakyThrows;
-
 /**
  * @author Dave Syer
  */
@@ -72,6 +73,8 @@ public class EurekaClientAutoConfiguration implements ApplicationListener<Parent
 		DataCenterAwareJacksonCodec.init();
 		XmlXStream.getInstance().setMarshallingStrategy(
 				new DataCenterAwareMarshallingStrategy());
+		JsonXStream.getInstance().setMarshallingStrategy(
+				new DataCenterAwareMarshallingStrategy());
 	}
 
 	@Bean
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
index 1750d94c..fc03769a 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
@@ -58,6 +58,7 @@ import org.springframework.web.context.ServletContextAware;
 
 import com.netflix.blitz4j.DefaultBlitz4jConfig;
 import com.netflix.blitz4j.LoggingConfiguration;
+import com.netflix.discovery.converters.JsonXStream;
 import com.netflix.discovery.converters.XmlXStream;
 import com.netflix.eureka.AbstractInstanceRegistry;
 import com.netflix.eureka.EurekaBootStrap;
@@ -145,14 +146,13 @@ public class EurekaServerInitializerConfiguration implements ServletContextAware
 								// ignore
 							}
 							LoggingConfiguration.getInstance().configure();
-							EurekaServerConfigurationManager
-									.getInstance()
+							EurekaServerConfigurationManager.getInstance()
 									.setConfiguration(
 											EurekaServerInitializerConfiguration.this.eurekaServerConfig);
-							XmlXStream
-									.getInstance()
-									.setMarshallingStrategy(
-											new DataCenterAwareMarshallingStrategy());
+							XmlXStream.getInstance().setMarshallingStrategy(
+									new DataCenterAwareMarshallingStrategy());
+							JsonXStream.getInstance().setMarshallingStrategy(
+									new DataCenterAwareMarshallingStrategy());
 							DataCenterAwareJacksonCodec.init();
 							EurekaServerInitializerConfiguration.this.applicationContext
 									.publishEvent(new EurekaRegistryAvailableEvent(