[SCB-1971] minor change to fix an issue

apache · Jun 3, 2020 · 79d131b · 79d131b
1 parent 9798ca8
commit 79d131b
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/...y-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/ZeroConfigRegistration.java b/...y-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/ZeroConfigRegistration.java
@@ -48,8 +48,8 @@ public class ZeroConfigRegistration implements Registration {
   private ZeroConfigClient zeroConfigClient = ZeroConfigClient.INSTANCE;
 
   // registration objects
-  private Microservice selfMicroservice;
-  private MicroserviceInstance selfMicroserviceInstance;
+  private static Microservice selfMicroservice;
+  private static MicroserviceInstance selfMicroserviceInstance;
 
   @Override
   public boolean enabled() {
@@ -63,8 +63,8 @@ public void init() {
     MicroserviceDefinition microserviceDefinition = new MicroserviceDefinition(
         loader.getConfigModels());
     MicroserviceFactory microserviceFactory = new MicroserviceFactory();
-    this.selfMicroservice = microserviceFactory.create(microserviceDefinition);
-    this.selfMicroserviceInstance = selfMicroservice.getInstance();
+    selfMicroservice = microserviceFactory.create(microserviceDefinition);
+    selfMicroserviceInstance = selfMicroservice.getInstance();
 
     setServiceIdAndInstanceId();
 
@@ -119,59 +119,59 @@ public String name() {
 
   @Override
   public MicroserviceInstance getMicroserviceInstance() {
-    return this.selfMicroserviceInstance;
+    return selfMicroserviceInstance;
   }
 
   @Override
   public Microservice getMicroservice() {
-    return this.selfMicroservice;
+    return selfMicroservice;
   }
 
   @Override
   public String getAppId() {
-    return this.selfMicroservice.getAppId();
+    return selfMicroservice.getAppId();
   }
 
   @Override
   public boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status) {
-    this.selfMicroserviceInstance.setStatus(status);
+    selfMicroserviceInstance.setStatus(status);
     return true;
   }
 
   @Override
   public void addSchema(String schemaId, String content) {
-    this.selfMicroservice.addSchema(schemaId, content);
+    selfMicroservice.addSchema(schemaId, content);
   }
 
   @Override
   public void addEndpoint(String endpoint) {
-    this.selfMicroserviceInstance.getEndpoints().add(endpoint);
+    selfMicroserviceInstance.getEndpoints().add(endpoint);
   }
 
   @Override
   public void addBasePath(Collection<BasePath> basePaths) {
-    this.selfMicroservice.getPaths().addAll(basePaths);
+    selfMicroservice.getPaths().addAll(basePaths);
   }
 
   // setter/getter
   public Microservice getSelfMicroservice() {
-    return this.selfMicroservice;
+    return selfMicroservice;
   }
 
   public MicroserviceInstance getSelfMicroserviceInstance() {
-    return this.selfMicroserviceInstance;
+    return selfMicroserviceInstance;
   }
 
   @VisibleForTesting
   public void setSelfMicroserviceInstance(
-      MicroserviceInstance selfMicroserviceInstance) {
-    this.selfMicroserviceInstance = selfMicroserviceInstance;
+      MicroserviceInstance microserviceInstanceForUT) {
+     selfMicroserviceInstance = microserviceInstanceForUT;
   }
 
   @VisibleForTesting
   public void setSelfMicroservice(
-      Microservice selfMicroservice) {
-    this.selfMicroservice = selfMicroservice;
+      Microservice selfMicroserviceForUT) {
+     selfMicroservice = selfMicroserviceForUT;
   }
 
 }