Merge branch 'fix-knowledgebase-bug' into 'develop'

[improve][core]优化，删除冗余的代码

See merge request galaxy/platform/groot-stream!30

3 files changed, 4 insertions, 19 deletions

diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AbstractKnowledgeBaseHandler.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AbstractKnowledgeBaseHandler.java
index 7daa74e..1c75a78 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AbstractKnowledgeBaseHandler.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AbstractKnowledgeBaseHandler.java
@@ -95,7 +95,6 @@ public abstract class AbstractKnowledgeBaseHandler {
         List<KnowLedgeBaseFileMeta> knowLedgeBaseFileMetaList = new ArrayList<>();
 
         try {
-
             HttpClientPoolUtil httpClientPoolUtil = HttpClientPoolUtil.getInstance();
             String metadate = httpClientPoolUtil.httpGet(URI.create(path + "?kb_id=" + kbId));
             Map metaObject = JSON.parseObject(metadate, Map.class);
@@ -103,7 +102,6 @@ public abstract class AbstractKnowledgeBaseHandler {
             knowLedgeBaseFileMetaList = jsonArray.toJavaList(KnowLedgeBaseFileMeta.class);
             knowLedgeBaseFileMetaList.removeIf(knowLedgeBaseFileMeta -> !"latest".equals(knowLedgeBaseFileMeta.getVersion()));
 
-
         } catch (Exception e) {
             log.error("get file Metadata error! path = " + path + " " + e.getMessage());
             KnowLedgeBaseFileMeta knowLedgeBaseFileMeta = new KnowLedgeBaseFileMeta();
@@ -111,20 +109,7 @@ public abstract class AbstractKnowledgeBaseHandler {
             knowLedgeBaseFileMeta.setPath(path);
             knowLedgeBaseFileMeta.setSha256("");
             knowLedgeBaseFileMetaList.add(knowLedgeBaseFileMeta);
-            return knowLedgeBaseFileMeta;
-        }
-
-        if (!knowLedgeBaseFileMetaList.isEmpty()) {
-
-            return knowLedgeBaseFileMetaList.get(0);
-        } else {
-            log.error("file Metadata is null ! path = " + path + "?kb_id=" + kbId);
-            KnowLedgeBaseFileMeta knowLedgeBaseFileMeta = new KnowLedgeBaseFileMeta();
-            knowLedgeBaseFileMeta.setKb_id(kbId);
-            knowLedgeBaseFileMeta.setPath(path);
-            knowLedgeBaseFileMeta.setSha256("");
-            knowLedgeBaseFileMetaList.add(knowLedgeBaseFileMeta);
-            return knowLedgeBaseFileMeta;
         }
+        return knowLedgeBaseFileMetaList.get(0);
     }
 }
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AsnKnowledgeBaseHandler.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AsnKnowledgeBaseHandler.java
index 7db67d2..84cb1e8 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AsnKnowledgeBaseHandler.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/AsnKnowledgeBaseHandler.java
@@ -90,8 +90,8 @@ public class AsnKnowledgeBaseHandler extends AbstractKnowledgeBaseHandler {
 
         for (KnowLedgeBaseFileMeta knowLedgeEntity : kbInfoForIpLookUp.getKnowLedgeBaseFilesMetas()) {
             KnowLedgeBaseFileMeta metadata = getMetadata(kbInfoForIpLookUp.getKnowledgeConfig().getFsType(), kbInfoForIpLookUp.getKnowledgeConfig().getFsPath(), knowLedgeEntity.getKb_id());
-            if (metadata.getName() != null) {
-                if (!knowLedgeEntity.getSha256().equals(Objects.requireNonNull(metadata).getSha256())) {
+            if (!"".equals(metadata.getSha256())) {
+                if (!knowLedgeEntity.getSha256().equals(metadata.getSha256())) {
                     return true;
                 }
             }
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/GeoIpKnowledgeBaseHandler.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/GeoIpKnowledgeBaseHandler.java
index c84a0b6..37e4e5b 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/GeoIpKnowledgeBaseHandler.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdebase/handler/GeoIpKnowledgeBaseHandler.java
@@ -73,7 +73,7 @@ public class GeoIpKnowledgeBaseHandler extends AbstractKnowledgeBaseHandler {
 
         for (KnowLedgeBaseFileMeta knowLedgeEntity : kbInfoForIpLookUp.getKnowLedgeBaseFilesMetas()) {
             KnowLedgeBaseFileMeta metadata = getMetadata(kbInfoForIpLookUp.getKnowledgeConfig().getFsType(), kbInfoForIpLookUp.getKnowledgeConfig().getFsPath(), knowLedgeEntity.getKb_id());
-            if (metadata.getName() != null) {
+            if (!"".equals(metadata.getSha256())) {
                 if (!knowLedgeEntity.getSha256().equals(Objects.requireNonNull(metadata).getSha256())) {
                     return true;
                 }