[servicecomb-java-chassis] branch master updated: support kie enable

[liubao]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new be097f4  support kie enable
be097f4 is described below

commit be097f43a9711b1669977c6cda1fc43983f96590
Author: GuoYL <gylg...@gmail.com>
AuthorDate: Sat Mar 28 15:29:39 2020 +0800

    support kie enable
---
 .../servicecomb/config/kie/client/KieUtil.java       |  5 +++++
 .../apache/servicecomb/config/kie/model/KVDoc.java   | 11 ++++++++++-
 .../servicecomb/config/kie/model/KVResponse.java     | 20 --------------------
 .../servicecomb/config/kie/client/TestKieClient.java |  2 +-
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieUtil.java
 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieUtil.java
index fd6fd1a..2e5030d 100644
--- 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieUtil.java
+++ 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieUtil.java
@@ -50,6 +50,8 @@ public class KieUtil {
 
   private static final String LABEL_VERSION = "version";
 
+  private static final String STATUS_ENABLED = "enabled";
+
   public static String encrypt(String dataStr) {
     MessageDigest messageDigest = null;
     String result = "";
@@ -70,6 +72,9 @@ public class KieUtil {
     List<KVDoc> serviceList = new ArrayList<>();
     List<KVDoc> versionList = new ArrayList<>();
     for (KVDoc kvDoc : resp.getData()) {
+      if (!StringUtils.isEmpty(kvDoc.getStatus()) && 
!kvDoc.getStatus().equals(STATUS_ENABLED)) {
+        continue;
+      }
       Map<String, String> labelsMap = kvDoc.getLabels();
       if (labelsMap.containsKey(LABEL_APP) && labelsMap.get(LABEL_APP)
           .equals(KieConfig.INSTANCE.getAppName())
diff --git 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVDoc.java
 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVDoc.java
index 73c02e8..e969442 100644
--- 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVDoc.java
+++ 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVDoc.java
@@ -23,7 +23,6 @@ import java.util.Map;
 
 public class KVDoc {
 
-  @JsonAlias("_id")
   private String id;
 
   private String check;
@@ -44,6 +43,16 @@ public class KVDoc {
   @JsonAlias("value_type")
   private String valueType;
 
+  private String status;
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
   public String getId() {
     return id;
   }
diff --git 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
index 79bc6aa..f67fa00 100644
--- 
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
+++ 
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
@@ -25,28 +25,8 @@ public class KVResponse {
 
   private LabelDocResponse label;
 
-  private Integer num;
-
-  private Integer size;
-
   private Integer total;
 
-  public Integer getNum() {
-    return num;
-  }
-
-  public void setNum(Integer num) {
-    this.num = num;
-  }
-
-  public Integer getSize() {
-    return size;
-  }
-
-  public void setSize(Integer size) {
-    this.size = size;
-  }
-
   public Integer getTotal() {
     return total;
   }
diff --git 
a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieClient.java
 
b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieClient.java
index 2bcd0f1..9a5d81f 100644
--- 
a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieClient.java
+++ 
b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieClient.java
@@ -53,7 +53,7 @@ public class TestKieClient {
   String mockKvResponse = "{\n"
       + "  \"data\": [\n"
       + "    {\n"
-      + "      \"_id\": \"string\",\n"
+      + "      \"id\": \"string\",\n"
       + "      \"check\": \"string\",\n"
       + "      \"domain\": \"string\",\n"
       + "      \"key\": \"string\",\n"