修改代码错误

src/main/java/com/keymobile/metadata/metadataRelation/auth/AuthorityChecker.java

 package com.keymobile.metadata.metadataRelation.auth;
 
-import com.keymobile.auth.common.security.GrantedAuthHelper;
+import com.keymobile.authservice.common.security.GrantedAuthHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

src/main/java/com/keymobile/metadata/metadataRelation/auth/AuthorityService.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.auth;
 
 
 import com.google.common.collect.Lists;
-import com.keymobile.auth.common.security.GrantedAuthHelper;
+import com.keymobile.authservice.common.security.GrantedAuthHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.BsonRegularExpression;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/keymobile/metadata/metadataRelation/auth/OptionImpl.java

 package com.keymobile.metadata.metadataRelation.auth;
 
-import com.keymobile.auth.common.conf.Option;
-import com.keymobile.auth.common.conf.OptionProperty;
+import com.keymobile.authservice.common.conf.Option;
+import com.keymobile.authservice.common.conf.OptionProperty;
 
 public class OptionImpl implements Option {
     private String id;

src/main/java/com/keymobile/metadata/metadataRelation/auth/OptionPropertyDataImpl.java

 package com.keymobile.metadata.metadataRelation.auth;
 
-import com.keymobile.auth.common.conf.OptionProperty;
+import com.keymobile.authservice.common.conf.OptionDataFilter;
+import com.keymobile.authservice.common.conf.OptionProperty;
 
 public class OptionPropertyDataImpl implements OptionProperty {
 
@@ -55,4 +56,19 @@ public class OptionPropertyDataImpl implements OptionProperty {
     public String getOptionPropertyType() {
         return optionPropertyType;
     }
+
+    @Override
+    public boolean isSupportDomain() {
+        return false;
+    }
+
+    @Override
+    public boolean isWithFilters() {
+        return false;
+    }
+
+    @Override
+    public OptionDataFilter[] getFilters() {
+        return new OptionDataFilter[0];
+    }
 }

src/main/java/com/keymobile/metadata/metadataRelation/controller/AuthorityApi.java

 package com.keymobile.metadata.metadataRelation.controller;
 
-import com.keymobile.auth.common.conf.OptionProvider;
+import com.keymobile.authservice.common.conf.OptionDataFilter;
+import com.keymobile.authservice.common.conf.OptionProvider;
 import com.keymobile.metadata.metadataRelation.auth.AuthorityService;
 import com.keymobile.metadata.metadataRelation.auth.Feature;
 import com.keymobile.metadata.metadataRelation.auth.OptionImpl;
 import com.keymobile.metadata.metadataRelation.auth.OptionPropertyDataImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
-@Api(value = "授权信息相关", tags = "授权信息相关")
+@Tag(name = "授权信息相关", description = "授权信息相关")
 @RestController
 @RequestMapping(value = "/rest/auth")
 public class AuthorityApi implements OptionProvider<OptionImpl, OptionPropertyDataImpl> {
@@ -22,37 +23,43 @@ public class AuthorityApi implements OptionProvider<OptionImpl, OptionPropertyDa
     private AuthorityService authorityService;
 
     @Override
-    @ApiOperation(value = "获取权限属性", notes = "获取权限属性")
+    @Operation(summary = "获取权限属性", description = "获取权限属性")
     @GetMapping(value = "/getOptionProperties")
     public List<OptionPropertyDataImpl> getOptionProperties(@RequestParam  String range) {
         return authorityService.getOptionProperties(range);
     }
 
     @Override
-    @ApiOperation(value = "获取权限数据", notes = "获取权限数据")
+    public void dataRoleRemovalCallback(Long dataRoleId) {
+
+    }
+
+    @Override
+    @Operation(summary = "获取权限数据", description = "获取权限数据")
     @GetMapping(value = "/getOptions")
-    public List<OptionImpl> getOptions(@RequestParam Long dataRoleId, @RequestParam String range, @RequestParam(required = false) Long domainId) {
+    public List<OptionImpl> getOptions(@RequestParam Long dataRoleId, @RequestParam String range, @RequestParam(required = false) Long domainId,
+            @RequestBody(required = false) OptionDataFilter filter) {
         return authorityService.getOptions(dataRoleId, range,domainId);
     }
 
 
 
     @Override
-    @ApiOperation(value = "保存权限数据", notes = "保存权限数据")
+    @Operation(summary = "保存权限数据", description = "保存权限数据")
     @PostMapping(value = "/saveOptions")
-    public List<OptionImpl> saveOptions(@RequestParam Long dataRoleId, @RequestParam String range, @RequestBody List<OptionImpl> optionList,@RequestParam(required = false) Long domainId) {
+    public List<OptionImpl> saveOptions(@RequestParam Long dataRoleId, @RequestParam String range, @RequestParam(required = false) Long domainId, @RequestBody List<OptionImpl> optionList) {
         return authorityService.saveOptions(dataRoleId, range, optionList,domainId);
     }
 
 
-    @ApiOperation(value = "获取所有的range", notes = "获取所有的range")
+    @Operation(summary = "获取所有的range", description = "获取所有的range")
     @GetMapping(value = "/listAllRanges")
     public List<Map<String, Object>> listAllRanges() {
         return authorityService.listAllRanges();
     }
 
 
-    @ApiOperation(value = "返回可操作按钮权限", notes = "返回可操作按钮权限")
+    @Operation(summary = "返回可操作按钮权限", description = "返回可操作按钮权限")
     @GetMapping(value = "/getAllowButtons")
     public List<Feature> getAllowButtons(@RequestParam String range, @RequestParam String optionId, @RequestParam(required = false) Long domainId) {
         return authorityService.getAllowButtons(range,optionId,domainId);

src/main/java/com/keymobile/metadata/metadataRelation/controller/DataRelationAnalyController.java

@@ -3,8 +3,9 @@ package com.keymobile.metadata.metadataRelation.controller;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnNode;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
 import com.keymobile.metadata.metadataRelation.service.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@Api(value = "元数据的分析", tags = "metadata analysis")
+@Tag(name = "元数据的分析", description = "metadata analysis")
 public class DataRelationAnalyController {
 
     private static final Logger logger = LoggerFactory.getLogger(DataRelationAnalyController.class);
@@ -39,7 +40,7 @@ public class DataRelationAnalyController {
     private ISystemService systemService;
 
 
-    @ApiOperation(tags = "", value = "获取指定表的上下游关系及其字段的上下游关系。")
+    @Operation(summary= "获取指定表的上下游关系及其字段的上下游关系。")
     @RequestMapping(path = "/getTableAndColumnRelation", method = RequestMethod.GET)
     public ReturnReslult getTableAndColumnRelation(String tableId) {
         logger.info("获取指定表的上下游关系及其字段的上下游关系。tableId="+tableId);
@@ -55,20 +56,20 @@ public class DataRelationAnalyController {
      * @return
      *
      */
-    @ApiOperation(tags = "", value = "指定环境id获取系统")
+    @Operation(summary= "指定环境id获取系统")
     @RequestMapping(path = "/getSystemByEnvId", method = RequestMethod.GET)
     public Map<String, ReturnNode> getSystemByEnvId(String envId) {
         logger.info("指定环境id获取系统:"+envId);
         return systemService.getSystemByEnvId(envId);
     }
-    @ApiOperation(tags = "", value = "指定系统id获取schema")
+    @Operation(summary= "指定系统id获取schema")
     @RequestMapping(path = "/getSystemBySystemId", method = RequestMethod.GET)
     public Map<String, ReturnNode> getSchemaBySystemId(String systemId) {
         logger.info("指定系统id获取schema{}",systemId);
         return schemaService.getSchemaBySystemId(systemId);
     }
 
-    @ApiOperation(tags = "", value = "全量查找指定节点下面的孤立点。parentId参数可以为schemaId，sysemId，evnId")
+    @Operation(summary= "全量查找指定节点下面的孤立点。parentId参数可以为schemaId，sysemId，evnId")
     @RequestMapping(path = "/getIsolatedNode", method = RequestMethod.GET)
     public Map<String, ReturnNode> getIsolatedTableBySchema(String parentId,String keyWord) {
 
@@ -83,7 +84,7 @@ public class DataRelationAnalyController {
     }
 
     //搜索
-    @ApiOperation(tags = "", value = "搜索孤立点")
+    @Operation(summary= "搜索孤立点")
     @RequestMapping(path = "/findIsolatedTableByName", method = RequestMethod.GET)
     public  Map<String, ReturnNode> findIsolatedTableByName(String parentId,String keyWord) {
         logger.info("分页查找孤立点的总数:"+parentId);
@@ -97,7 +98,7 @@ public class DataRelationAnalyController {
     }
 
     //总数
-    @ApiOperation(tags = "", value = "查找孤立点的总数")
+    @Operation(summary= "查找孤立点的总数")
     @RequestMapping(path = "/getIsolatedTableTotal", method = RequestMethod.GET)
     public Integer getIsolatedTableTotal(String parentId,String keyWord) {
         logger.info("分页查找孤立点的总数:"+parentId);
@@ -110,7 +111,7 @@ public class DataRelationAnalyController {
         return dataRelationAnalyService.findTableWithoutRelationsTotal(parentId,keyWord);
     }
 
-    @ApiOperation(tags = "", value = "分页查找指定节点的孤立点。parentId参数可以为schemaId，sysemId，evnId")
+    @Operation(summary= "分页查找指定节点的孤立点。parentId参数可以为schemaId，sysemId，evnId")
     @RequestMapping(path = "/getIsolatedTableByPage", method = RequestMethod.GET)
     public Map<String, ReturnNode> getIsolatedTableByPage(String parentId,int start,int size,String keyWord) {
         logger.info("查找指定schema下面的孤立点:"+parentId);
@@ -123,14 +124,14 @@ public class DataRelationAnalyController {
         return dataRelationAnalyService.findTableWithoutRelations(parentId,start,size,keyWord);
     }
 
-    @ApiOperation(tags = "", value = "搜索指定table下面的字段。")
+    @Operation(summary= "搜索指定table下面的字段。")
     @RequestMapping(path = "/findColumnByTableIdAndName", method = RequestMethod.GET)
     public Map<String, List<ReturnNode>>  findColumnByTableIdAndName(String tableId, String columnName) {
         logger.info("查找指定。表id："+tableId +" ，给定名字："+ columnName);
         return tableService.autoMatchBySchemaIdAndInputWord(tableId,columnName);
     }
 
-    @ApiOperation(tags = "", value = "子节点id找出父节点。")
+    @Operation(summary= "子节点id找出父节点。")
     @RequestMapping(path = "/findParentNodeByChildNodeId", method = RequestMethod.GET)
     public Map<String, ReturnNode>  findParentNodeByChildNodeId(String childId) {
         logger.info("子节点id找出父节点。子节点id："+childId );
@@ -138,7 +139,7 @@ public class DataRelationAnalyController {
     }
 
     //解析excel，存入neo4j
-    @ApiOperation(tags = "", value = "从excel生成neo4j的节点与关系。")
+    @Operation(summary= "从excel生成neo4j的节点与关系。")
     @RequestMapping(path = "/generalRelationFromExcel", method = RequestMethod.GET)
     public String generalRelationFromExcel(String filePath) {
         logger.info("从excel生成neo4j的节点与关系："+filePath );
@@ -152,7 +153,7 @@ public class DataRelationAnalyController {
     }
 
     //解析excel，存入neo4j
-    @ApiOperation(tags = "", value = "从excel生成neo4j的节点与关系。")
+    @Operation(summary= "从excel生成neo4j的节点与关系。")
     @RequestMapping(path = "/uploadExcelToNeo4j", method = RequestMethod.POST)
     public String uploadExcelToNeo4j(@RequestParam(value = "excelFile") MultipartFile file) {
         logger.info("上传excel文件节点与关系："+file.getOriginalFilename() );

src/main/java/com/keymobile/metadata/metadataRelation/controller/MetaDataController.java

@@ -18,9 +18,11 @@ import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnNode;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
 import com.keymobile.metadata.metadataRelation.service.*;
 import com.keymobile.metadata.metadataRelation.service.impl.MongoDbServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.slf4j.Logger;
@@ -35,10 +37,9 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 
 @RestController
-@Api(value = "把metadata写入neo4j数据库", tags = "metadata to neo4j")
+@Tag(name = "把metadata写入neo4j数据库", description = "metadata to neo4j")
 public class MetaDataController {
 
 
@@ -89,7 +90,7 @@ public class MetaDataController {
      * 如果是etljob，则查找job的拥有的节点，job的前后关系
      */
     //
-    @ApiOperation(tags = "", value = "按照元数据名称生成图形")
+    @Operation(summary= "按照元数据名称生成图形")
     @RequestMapping(path = "/searchGraphByName", method = RequestMethod.GET)
     public ReturnReslult searchGraphByName(String metadataName,String layer){
         int layerLong = Integer.valueOf(layer);
@@ -108,7 +109,7 @@ public class MetaDataController {
         return  returnReslult ;
     }
 
-    @ApiOperation(tags = "", value = "按照元数据Id生成图形")
+    @Operation(summary= "按照元数据Id生成图形")
     @RequestMapping(path = "/searchGraphByMetadataId", method = RequestMethod.GET)
     public ReturnReslult searchGraphByMetadataId(String metadataId,String layer){
         int layerLong = Integer.valueOf(layer);
@@ -127,7 +128,7 @@ public class MetaDataController {
      * 显示节点的属性，传入元数据id，返回元数据的主要属性（5个），需要调用元数据服务的接口。
      *  路径，别名，描述
      */
-    @ApiOperation(tags = "", value = "根据元数据id获取元数据属性")
+    @Operation(summary= "根据元数据id获取元数据属性")
     @RequestMapping(path = "/getPropertiesById", method = RequestMethod.GET)
     public Map<String,String> getPropertiesById(String metadataId) {
         Map<String,String> attributeMap = new HashMap<>();
@@ -147,7 +148,7 @@ public class MetaDataController {
     /**
      * 搜索的自动匹配接口，按照输入的字符，自动匹配名字，返回前10个匹配到的。
      */
-    @ApiOperation(tags = "", value = "模糊匹配输入结果,不区分大小写")
+    @Operation(summary= "模糊匹配输入结果,不区分大小写")
     @RequestMapping(path = "/autoMatchByInput", method = RequestMethod.GET)
     public Map<String,String> getAutoMatchByInput(String name,String count,String offset) {
         if(count == null || count .equals("")){
@@ -162,7 +163,7 @@ public class MetaDataController {
     /**
      * 返回一个系统级的大图
      */
-    @ApiOperation(tags = "", value = "系统级的大图")
+    @Operation(summary= "系统级的大图")
     @RequestMapping(path = "/result", method = RequestMethod.GET)
     public ReturnReslult getBigGraph(String modelName0,String size) {
         logger.info("传入的元模型名称是："+modelName0);
@@ -359,7 +360,7 @@ public class MetaDataController {
     }
 
 
-    @ApiOperation(tags = "", value = "系统总图")
+    @Operation(summary= "系统总图")
     @RequestMapping(path = "/getSystemGraph", method = RequestMethod.GET)
     public ReturnReslult getSystemGraph(){
         int size = 300;
@@ -367,14 +368,14 @@ public class MetaDataController {
 
     }
 
-    @ApiOperation(tags = "", value = "获取系统总图")
+    @Operation(summary= "获取系统总图")
     @RequestMapping(path = "/getSystemAllGraph", method = RequestMethod.GET)
     public ReturnReslult getSystemAllGraph(){
         return metadataService.getAllSystemGraph();
 
     }
 
-    @ApiOperation(tags = "", value = "获取系统总图")
+    @Operation(summary= "获取系统总图")
     @RequestMapping(path = "/getSystemGraphBySystemId", method = RequestMethod.GET)
     public ReturnReslult getSystemGraphBySystemId(String systemId){
         return systemService.getSystemBySystemId(systemId);
@@ -396,7 +397,7 @@ public class MetaDataController {
      * 传入一个节点与层数，返回指定节点的直接下层节点
      */
 
-    @ApiOperation(tags = "", value = "开始获取直接下层节点")
+    @Operation(summary= "开始获取直接下层节点")
     @RequestMapping(path = "/getNextDrill", method = RequestMethod.GET)
     public ReturnReslult getNextDrill(String dataId,String layer) {
 
@@ -444,9 +445,9 @@ public class MetaDataController {
      * 修改图片的接口，传入元模型id，新图标
      */
 
-    @ApiOperation(tags = "", value = "修改元模型图标的接口")
+    @Operation(summary= "修改元模型图标的接口")
     @PostMapping(value = "/modifyIcon", consumes = "multipart/*", headers = "content-type=multipart/form-date")
-    public String modifyIcon(String modelId, @ApiParam(value = "上传的文件", required = true)
+    public String modifyIcon(String modelId, @Parameter(name = "上传的文件", required = true)
             MultipartFile file) {
         if (file.isEmpty()) {
             logger.info("文件为空空");
@@ -490,7 +491,7 @@ public class MetaDataController {
     /**
      * 获取元模型的图标，
      */
-    @ApiOperation(tags = "", value = "获取元模型的图标")
+    @Operation(summary= "获取元模型的图标")
     @RequestMapping(value = "/getIconByModelId", method = RequestMethod.GET)
     public String getIconByModelId(String modelId) {
         ApplicationHome applicationHome = new ApplicationHome(getClass());
@@ -533,7 +534,7 @@ public class MetaDataController {
     /**
      * 查询所有的关系类型
      */
-    @ApiOperation(tags = "", value = "查询所有的关系类型")
+    @Operation(summary= "查询所有的关系类型")
     @RequestMapping(path = "/listAllRelationType", method = RequestMethod.GET)
     public List<String> getAllRelationType() {
 
@@ -553,7 +554,7 @@ public class MetaDataController {
     /**
      * 查询所有的节点类型
      */
-    @ApiOperation(tags = "", value = "查询所有的节点元模型")
+    @Operation(summary= "查询所有的节点元模型")
     @RequestMapping(path = "/listAllNodeType", method = RequestMethod.GET)
     public List<String> getAllNodeType() {
 
@@ -580,7 +581,7 @@ public class MetaDataController {
     /**
      * 传入元数据id，显示的层数，查找出与该元数据有关系的数据
      */
-    @ApiOperation(tags = "", value = "传入元数据id，显示的层数，查找出与该元数据有关系的数据")
+    @Operation(summary= "传入元数据id，显示的层数，查找出与该元数据有关系的数据")
     @RequestMapping(path = "/getNodeByDataId", method = RequestMethod.GET)
     public ReturnReslult getNodeByDataId(String metadataId, int depth) {
         return metadataService.findNodeByDataId(metadataId, depth);
@@ -602,7 +603,7 @@ public class MetaDataController {
      * 异步处理，
      * @return
      */
-    @ApiOperation(tags = "", value = "同步元数据关系的接口")
+    @Operation(summary= "同步元数据关系的接口")
     @RequestMapping(path = "/syschroRelationFromMongo", method = RequestMethod.POST)
     public String synchroRelationFromMongo(String catalogName) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -615,7 +616,7 @@ public class MetaDataController {
         return flag;
     }
 
-    @ApiOperation(tags = "", value = "根据环境id与jobId同步元数据关系的接口")
+    @Operation(summary= "根据环境id与jobId同步元数据关系的接口")
     @RequestMapping(path = "/synchroRelationByJobId", method = RequestMethod.POST)
     public String synchroRelationByJobId(String catalogName,String jobId) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/com/keymobile/metadata/metadataRelation/respository/BaseRelationshipRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.BaseRelationship;
-import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/keymobile/metadata/metadataRelation/respository/CompositionRelationRespository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.CompositionRelation;
-import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/ExecuteRelationRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.ExecuteRelation;
-import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/InputRelationReRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.InputRelation;
-import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/MetadataRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.MetaData;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/OutputRelationRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.OutputRelation;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/PostRelationRepository.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.respository;
 
 
 import com.keymobile.metadata.metadataRelation.pojo.PostRelation;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/PreRelationRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.PreRelation;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/TempNodeRepository.java

@@ -3,12 +3,12 @@ package com.keymobile.metadata.metadataRelation.respository;
 import java.util.List;
 
 import com.keymobile.metadata.metadataRelation.pojo.TempNode;
+import jakarta.transaction.Transactional;
 import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 
-import javax.transaction.Transactional;
 
 /**
  * @author mahx

src/main/java/com/keymobile/metadata/metadataRelation/respository/TempRelationRepository.java

 package com.keymobile.metadata.metadataRelation.respository;
 
 import com.keymobile.metadata.metadataRelation.pojo.TempRelation;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jColumnRepository.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jColumn;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jETLJobRepository.java

@@ -3,7 +3,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jETLJob;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jFunction;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jETLScriptRepository.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jETLScript;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jFileRepository.java

@@ -3,7 +3,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jETLScript;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jFile;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jSchemaRepository.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSchema;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jSystemRepository.java

@@ -3,7 +3,7 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jETLJob;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSchema;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSystem;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jTableRepository.java

@@ -3,12 +3,11 @@ package com.keymobile.metadata.metadataRelation.respository.metadata;
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jColumn;
 import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jTable;
-import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.Column;
 import java.util.List;
 
 @Repository

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/MetadataRelationServiceImpl.java

@@ -21,6 +21,7 @@ import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.bson.Document;
 import org.neo4j.driver.v1.*;
+import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
 import org.neo4j.driver.v1.types.Relationship;

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/MetadataServiceImpl.java

@@ -25,6 +25,7 @@ import com.mongodb.client.MongoCursor;
 import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
 import org.neo4j.driver.v1.*;
+import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
 import org.neo4j.driver.v1.types.Relationship;
@@ -1124,7 +1125,7 @@ public class MetadataServiceImpl implements IMetadataService {
         }
     }
 
-    private void getResultFromNeo4jRecord(Map<String, MetaModel> metaModelMap, Map<String, ReturnNode> returnNodeMap, Map<String, ReturnEdge> returnEdgeMap, Record record) {
+    private void getResultFromNeo4jRecord(Map<String, MetaModel> metaModelMap, Map<String, ReturnNode> returnNodeMap, Map<String, ReturnEdge> returnEdgeMap, org.neo4j.driver.v1.Record record) {
         List<Value> values = record.values();
         for (Value value : values) {
             if(value.type().name().equals("PATH")){

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/MultiModelServiceImpl.java

@@ -11,6 +11,7 @@ import com.keymobile.metadata.metadataRelation.respository.*;
 import com.keymobile.metadata.metadataRelation.service.MultiModelService;
 import com.keymobile.metadata.metadataRelation.util.Neo4jTool;
 import org.neo4j.driver.v1.*;
+import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.types.Node;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/SchemaServiceImpl.java

@@ -9,7 +9,6 @@ import com.keymobile.metadata.metadataRelation.respository.metadata.Neo4jSchemaR
 import com.keymobile.metadata.metadataRelation.respository.metadata.Neo4jSystemRepository;
 import com.keymobile.metadata.metadataRelation.service.ISchemaService;
 import com.keymobile.metadata.metadataRelation.util.SchemaLayerObject;
-import org.hibernate.loader.custom.Return;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.StatementResult;

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/TableServiceImpl.java

@@ -15,6 +15,7 @@ import com.keymobile.metadata.metadataRelation.respository.metadata.*;
 import com.keymobile.metadata.metadataRelation.service.ITableService;
 import com.keymobile.metadata.metadataRelation.util.Neo4jTool;
 import org.neo4j.driver.v1.*;
+import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
 import org.neo4j.driver.v1.types.Relationship;