Merge "License header is not correct"

diff --git a/common-util/src/main/java/org/openo/baseservice/bus/util/RegisterService.java b/common-util/src/main/java/org/openo/baseservice/bus/util/RegisterService.java
index 3a84781..d1926c7 100644 (file)
--- a/common-util/src/main/java/org/openo/baseservice/bus/util/RegisterService.java
+++ b/common-util/src/main/java/org/openo/baseservice/bus/util/RegisterService.java
@@ -127,7 +127,7 @@ public class RegisterService {
      * @throws IOException
      * @since
      */
-    private static String getBusAdderss() throws IOException {
+    private static String getBusAddress() throws IOException {
 
         LOGGER.info("begin to get the bus baseurl.");
         FileInputStream busFile = null;
@@ -169,7 +169,7 @@ public class RegisterService {
         providers.add(jacksonJsonProvider);
 
         if (busPath == null) {
-            busPath = getBusAdderss();
+            busPath = getBusAddress();
         }
 
         return WebClient.create(busPath, providers);

diff --git a/rest-client/src/test/resources/etc/conf/restclient.json b/rest-client/src/test/resources/etc/conf/restclient.json
index 96b749a..1ab1aaf 100644 (file)
--- a/rest-client/src/test/resources/etc/conf/restclient.json
+++ b/rest-client/src/test/resources/etc/conf/restclient.json
@@ -1,5 +1,5 @@
 {
-    "defaulServer":
+    "defaultServer":
     {
         "host":"127.0.0.1",
         "port":"8080",

diff --git a/rest-client/src/test/resources/rest-client-test.json b/rest-client/src/test/resources/rest-client-test.json
index 230ff36..0bdd9cd 100644 (file)
--- a/rest-client/src/test/resources/rest-client-test.json
+++ b/rest-client/src/test/resources/rest-client-test.json
@@ -1,5 +1,5 @@
 {
-    "defaulServer":
+    "defaultServer":
     {
         "host":"10.10.10.10",
         "port":"443",