Skip to content

Commit d9003a1

Browse files
committed
fix: 修复dms接口data返回为空字典的情况
1 parent b935c8e commit d9003a1

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

  • dss-apps/dss-datapipe-server-webank/src/main/java/com/webank/wedatasphere/dss/datamap/datamap

dss-apps/dss-datapipe-server-webank/src/main/java/com/webank/wedatasphere/dss/datamap/datamap/DataMapDataSource.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public List<String> getTablesName(String dbName, String tableName, Integer isTab
253253
List<String> tablesName = null;
254254

255255
JsonElement data = preGetJsonData(contentStr);
256-
if (null == data || data.isJsonNull()) {
256+
if (null == data || data.isJsonNull() || data.getAsJsonObject().keySet().isEmpty()){
257257
LOG.warn("The data in the datamap return message body is null.");
258258
tablesName = new ArrayList<>();
259259
} else {
@@ -711,7 +711,7 @@ private void getPermissionFromDMS(Map<String, String> param, String nebulaAccoun
711711
String contentStr = requestAndResponse4Nebula(param, permissionMethod, permissionPath, nebulaAccount, headerParam);
712712
JsonElement data = preGetJsonData(contentStr);
713713

714-
if (null == data || data.isJsonNull()) {
714+
if (null == data || data.isJsonNull() || data.getAsJsonObject().keySet().isEmpty()) {
715715
LOG.warn("The data in the datamap return message body is null");
716716
} else {
717717
JsonElement content = data.getAsJsonObject().get("content");
@@ -744,7 +744,7 @@ private void getPermissionFromDMSByPages(Map < String, String > param, String ne
744744
String contentStr = requestAndResponse4Nebula(param, permissionMethod, permissionPath, nebulaAccount, headerParam);
745745
JsonElement data = preGetJsonData(contentStr);
746746

747-
if (null == data || data.isJsonNull()) {
747+
if (null == data || data.isJsonNull() || data.getAsJsonObject().keySet().isEmpty()) {
748748
LOG.warn("The data in the datamap return message body is null");
749749
} else {
750750
JsonElement content = data.getAsJsonObject().get("content");
@@ -781,7 +781,7 @@ public List<CodeMeta> getCodeMeta(String sqlType,String scriptContent) throws Da
781781
List<CodeMeta> metas ;
782782

783783
JsonElement data = preGetJsonData(contentStr);
784-
if (null == data || data.isJsonNull()) {
784+
if (null == data || data.isJsonNull() || data.getAsJsonObject().keySet().isEmpty()) {
785785
LOG.warn("The data in the datamap return message body is null.");
786786
metas = new ArrayList<>();
787787
} else {
@@ -825,11 +825,12 @@ public TableValidateResult validateTable(CodeMeta table) throws DataMapException
825825
return result;
826826
}
827827
JsonElement data = preGetJsonData(contentStr);
828-
if (null == data || data.isJsonNull()) {
828+
if (null == data || data.isJsonNull() || data.getAsJsonObject().keySet().isEmpty()) {
829829
LOG.warn("The data in the datamap return message body is null.");
830830
result.setView(false);
831831

832832
} else {
833+
LOG.info("The data in the datamap key is {}",data.getAsJsonObject().keySet());
833834
String storageType = data.getAsJsonObject().get("storageType").getAsString();
834835
result.setView("View".equalsIgnoreCase(storageType));
835836
}

0 commit comments

Comments
 (0)