Procházet zdrojové kódy

fix: long project id

Azure před 2 roky
rodič
revize
7ddc9aa166

+ 19 - 19
seecoder-gitlab-server/src/main/java/com/nju/edu/gitlab/service/impl/ProjectServiceImpl.java

@@ -88,7 +88,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public boolean deleteProject(Integer projectId) throws GitLabApiException {
-        gitlabApi.getProjectApi().deleteProject(projectId);
+        gitlabApi.getProjectApi().deleteProject(new Long(projectId));
         return true;
     }
 
@@ -145,7 +145,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public Set<DiffVO> compare(Integer projectId, String fromBash, String toBash) throws GitLabApiException {
-        CompareResults compareResults = gitlabApi.getRepositoryApi().compare(projectId, fromBash, toBash);
+        CompareResults compareResults = gitlabApi.getRepositoryApi().compare(new Long(projectId), fromBash, toBash);
         List<Diff> diffs=compareResults.getDiffs();
         Set<DiffVO> res=diffs.stream().map(diff -> DiffVO.builder()
                 .a_mode(diff.getAMode())
@@ -168,7 +168,7 @@ public class ProjectServiceImpl implements ProjectService {
         boolean doIssueEvents=webHookDTO.isDoIssueEvents();
         boolean doMergeRequestsEvents=webHookDTO.isDoMergeRequestsEvents();
         log.info("给项目{}添加webhook,url是{}",projectId,url);
-        gitlabApi.getProjectApi().addHook((long)projectId, url, doPushEvents, doIssueEvents, doMergeRequestsEvents);
+        gitlabApi.getProjectApi().addHook(new Long(projectId), url, doPushEvents, doIssueEvents, doMergeRequestsEvents);
         return true;
     }
 
@@ -182,7 +182,7 @@ public class ProjectServiceImpl implements ProjectService {
     public String getProjectFile(Integer projectId, ProjectFileDTO projectFileDTO) throws UnsupportedEncodingException, GitLabApiException {
         String branch=projectFileDTO.getBranch();
         String path=projectFileDTO.getPath();
-        RepositoryFile repositoryFile = gitlabApi.getRepositoryFileApi().getFile(path, (long) projectId,branch);
+        RepositoryFile repositoryFile = gitlabApi.getRepositoryFileApi().getFile(path, new Long(projectId),branch);
         if(repositoryFile!=null){
             return new String(Base64.getDecoder().decode(repositoryFile.getContent()), "UTF-8");
         }
@@ -193,7 +193,7 @@ public class ProjectServiceImpl implements ProjectService {
     public String getProjectRawFile(Integer projectId, ProjectRawFileDTO projectRawFileDTO) throws GitLabApiException, IOException {
         String commitOrBranchName = projectRawFileDTO.getCommitOrBranchName();
         String path=projectRawFileDTO.getPath();
-        InputStream inputStream=gitlabApi.getRepositoryFileApi().getRawFile(projectId,commitOrBranchName,path);
+        InputStream inputStream=gitlabApi.getRepositoryFileApi().getRawFile(new Long(projectId),commitOrBranchName,path);
         if (inputStream==null){
             return null;
         }
@@ -216,7 +216,7 @@ public class ProjectServiceImpl implements ProjectService {
         String username=commitDTO.getUsername();
         String email=commitDTO.getEmail();
         List<CommitAction> actions=commitDTO.getActions();
-        Commit commit=gitlabApi.getCommitsApi().createCommit(projectId,branch,commitMsg,null,email,username,actions);
+        Commit commit=gitlabApi.getCommitsApi().createCommit(new Long(projectId),branch,commitMsg,null,email,username,actions);
         return castCommitToVO(commit,branch);
     }
 
@@ -224,10 +224,10 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public List<CommitVO> getAllCommitMessage(Integer projectId, String commitHash) throws GitLabApiException {
-        Commit commit=gitlabApi.getCommitsApi().getCommit(projectId,commitHash);
-        List<Branch> branches=gitlabApi.getRepositoryApi().getBranches(projectId);
+        Commit commit=gitlabApi.getCommitsApi().getCommit(new Long(projectId),commitHash);
+        List<Branch> branches=gitlabApi.getRepositoryApi().getBranches(new Long(projectId));
         for (Branch branch:branches){
-            List<Commit> commits=gitlabApi.getCommitsApi().getCommits(projectId,branch.getName(),null,null);
+            List<Commit> commits=gitlabApi.getCommitsApi().getCommits(new Long(projectId),branch.getName(),null,null);
             if (commits.contains(commit)){
                 return commits.stream()
                         .map(com -> castCommitToVO(commit,branch.getName()))
@@ -239,7 +239,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public CommitVO getCommitByHash(Integer projectId, String commitHash) throws GitLabApiException {
-        Commit commit=gitlabApi.getCommitsApi().getCommit(projectId,commitHash);
+        Commit commit=gitlabApi.getCommitsApi().getCommit(new Long(projectId),commitHash);
         return castCommitToVO(commit);
     }
 
@@ -247,7 +247,7 @@ public class ProjectServiceImpl implements ProjectService {
     public List<CommitVO> getCommitsByBranch(Integer projectId, String branchName) throws GitLabApiException {
         try {
             String branchNameDecode = URLDecoder.decode(branchName, "UTF-8");
-            List<Commit> commits=gitlabApi.getCommitsApi().getCommits(projectId, branchName,null,null);
+            List<Commit> commits=gitlabApi.getCommitsApi().getCommits(new Long(projectId), branchName,null,null);
             if (commits.size() != 0){
                 return commits.stream()
                         .map(com -> castCommitToVO(com,branchNameDecode))
@@ -306,7 +306,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public List<BranchVO> getProjectBranches(Integer projectId) throws GitLabApiException {
-        return gitlabApi.getRepositoryApi().getBranches(projectId).stream()
+        return gitlabApi.getRepositoryApi().getBranches(new Long(projectId)).stream()
                 .map(branch -> castBranchToVO(branch))
                 .collect(Collectors.toList());
     }
@@ -317,7 +317,7 @@ public class ProjectServiceImpl implements ProjectService {
         int userId = updateMemberDTO.getUserId();
         GitlabUser gitlabUser = getGitlabUser(userId);
         AccessLevel accessLevel = updateMemberDTO.getAccessLevel();
-        gitlabApi.getProjectApi().addMember(projectId, Long.valueOf(gitlabUser.getGitlabUserId()),accessLevel);
+        gitlabApi.getProjectApi().addMember(new Long(projectId), Long.valueOf(gitlabUser.getGitlabUserId()),accessLevel);
         return true;
     }
 
@@ -332,7 +332,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public List<Integer> getProjectJoinedUserId(Integer projectId) throws GitLabApiException {
-        List<Integer> gitlabUserIds = gitlabApi.getProjectApi().getMembers(projectId).stream().map(Member::getId).map(l -> Math.toIntExact(l)).collect(Collectors.toList());
+        List<Integer> gitlabUserIds = gitlabApi.getProjectApi().getMembers(new Long(projectId)).stream().map(Member::getId).map(l -> Math.toIntExact(l)).collect(Collectors.toList());
         return gitlabUserRepository.findAllByGitlabUserIdIn(gitlabUserIds).stream()
                 .map(GitlabUser::getUserId)
                 .collect(Collectors.toList());
@@ -342,7 +342,7 @@ public class ProjectServiceImpl implements ProjectService {
     public List<String> getFilePaths(Integer projectId, String basePath, String branch) throws GitLabApiException {
         RepositoryApi repositoryApi = gitlabApi.getRepositoryApi();
         List<TreeItem> treeItems = new ArrayList<>();
-        Pager<TreeItem> tree = repositoryApi.getTree(projectId, basePath, branch, true, 100);
+        Pager<TreeItem> tree = repositoryApi.getTree(new Long(projectId), basePath, branch, true, 100);
         for (int page = 1; page <= tree.getTotalPages(); page++) {
             treeItems.addAll(tree.page(page));
         }
@@ -358,21 +358,21 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public List<TreeItem> getRepositoryTree(Integer projectId, String filePath, String branch) throws GitLabApiException {
         RepositoryApi repositoryApi = gitlabApi.getRepositoryApi();
-        List<TreeItem> treeItems = repositoryApi.getTree(projectId, filePath, branch);
+        List<TreeItem> treeItems = repositoryApi.getTree(new Long(projectId), filePath, branch);
         return treeItems;
     }
 
     @Override
     public MergeRequest mergeBranch(Integer projectId, String sourceBranch, String targetBranch, String title, String description, Integer reviewerId) throws GitLabApiException {
         MergeRequestApi mergeRequestApi = gitlabApi.getMergeRequestApi();
-        MergeRequest mergeRequest = mergeRequestApi.createMergeRequest(projectId, sourceBranch, targetBranch, title, description, Long.valueOf(reviewerId));
-        return mergeRequestApi.acceptMergeRequest(projectId, mergeRequest.getIid());
+        MergeRequest mergeRequest = mergeRequestApi.createMergeRequest(new Long(projectId), sourceBranch, targetBranch, title, description, Long.valueOf(reviewerId));
+        return mergeRequestApi.acceptMergeRequest(new Long(projectId), mergeRequest.getIid());
     }
 
     @Override
     public VisibilityVO getProjectVisibility(Integer projectId) throws GitLabApiException {
         ProjectApi projectApi = gitlabApi.getProjectApi();
-        Project project = projectApi.getProject((long)projectId);
+        Project project = projectApi.getProject(new Long(projectId));
         return new VisibilityVO(projectId, project.getVisibility().toString());
     }