From 592c3c17b24cd88da5bbd8d0dcfeec4eba18d112 Mon Sep 17 00:00:00 2001 From: heyangya Date: Thu, 24 Jan 2019 16:10:39 +0800 Subject: [PATCH 1/2] Update PropertiesFactory.java get class name for default --- .../cloud/netflix/ribbon/PropertiesFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java index 3e26ee31f3..44888a252c 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java @@ -39,6 +39,9 @@ public String getClassName(Class clazz, String name) { if (this.classToProperty.containsKey(clazz)) { String classNameProperty = this.classToProperty.get(clazz); String className = environment.getProperty(name + "." + NAMESPACE + "." + classNameProperty); + if(StringUtils.hasText(className)){ + className = environment.getProperty(NAMESPACE + "." + classNameProperty); + } return className; } return null; From 2fc4191550533a7f226eaa717fc85ed060325120 Mon Sep 17 00:00:00 2001 From: heyangya Date: Thu, 24 Jan 2019 16:14:33 +0800 Subject: [PATCH 2/2] Update PropertiesFactory.java --- .../springframework/cloud/netflix/ribbon/PropertiesFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java index 44888a252c..41d72ea146 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java @@ -39,7 +39,7 @@ public String getClassName(Class clazz, String name) { if (this.classToProperty.containsKey(clazz)) { String classNameProperty = this.classToProperty.get(clazz); String className = environment.getProperty(name + "." + NAMESPACE + "." + classNameProperty); - if(StringUtils.hasText(className)){ + if(!StringUtils.hasText(className)){ className = environment.getProperty(NAMESPACE + "." + classNameProperty); } return className;