Merge pull request #199 from lvhuichao/develop

Update isJavaDatasourcePlugin method and change T to object

Author: neon-balcony

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java

@@ -158,8 +158,7 @@ public List<DatasourceMetaInfo> getJavaBasedSupportedDatasourceMetaInfos() {
 
     @Override
     public boolean isJavaDatasourcePlugin(String type) {
-        return "majiangInternal".equals(type)
-                || "openblocksApi".equals(type)
+        return "openblocksApi".equals(type)
                 || getJavaBasedSupportedDatasourceMetaInfos()
                 .stream()
                 .anyMatch(datasourceMetaInfo -> datasourceMetaInfo.getType().equals(type));

server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java

@@ -157,7 +157,7 @@ public Mono<Folder> delete(@Nonnull String folderId) {
         return checkManagePermission(folderId)
                 .flatMap(orgMember -> buildFolderTree(orgMember.getOrgId()))
                 .flatMap(tree -> {
-                    FolderNode<?, Folder> folderNode = tree.get(folderId);
+                    FolderNode<Object, Folder> folderNode = tree.get(folderId);
                     if (folderNode == null) {
                         return Mono.error(new BizException(FOLDER_NOT_EXIST, "FOLDER_NOT_EXIST", folderId));
                     }
@@ -260,7 +260,7 @@ public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType
                 });
     }
 
-    private <T> Mono<Tree<T, Folder>> buildFolderTree(String orgId) {
+    private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
         return folderService.findByOrganizationId(orgId)
                 .collectList()
                 .map(folders -> new Tree<>(folders, Folder::getId, Folder::getParentFolderId, Collections.emptyList(), null, null));