From 855c2c0512d91e15ba3dc54c29f1e08c560e1acf Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Tue, 27 Aug 2024 18:53:34 +0300
Subject: [PATCH] fixed errors

---
 .drone.yml                                    | 12 ++++---
 .idea/workspace.xml                           | 32 ++++++++++++++++---
 .../sdk/gitlab/core/GitlabSdkManager.java     |  4 +--
 .../sdk/gitlab/domain/GitlabUrl.java          |  2 +-
 pom.xml                                       |  2 +-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e1ce14b..1ecede4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,8 @@ volumes:
 
 steps:
   - name: publish
-    image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+    # https://hub.docker.com/_/maven
+    image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
     privileged: true
     volumes:
       - name: m2
@@ -44,7 +45,8 @@ volumes:
 
 steps:
   - name: publish maven central
-    image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+    # https://hub.docker.com/_/maven
+    image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
     privileged: true
     volumes:
       - name: m2
@@ -81,7 +83,8 @@ volumes:
 
 steps:
   - name: publish struchkov nexus
-    image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+    # https://hub.docker.com/_/maven
+    image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
     privileged: true
     volumes:
       - name: m2
@@ -102,11 +105,10 @@ steps:
 
 image_pull_secrets:
   - DOCKER_AUTH
-  -
 
 # drone sign --save SDK/gitlab-sdk
 ---
 kind: signature
-hmac: 8decd4f4dd2989517600b941df5de21ce78535082985355021bcaea31a31ba97
+hmac: 40b1cf1fb637bef3db3b5ee8601533a2977c8c5bb170e5e6a835efe9e20ad135
 
 ...
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6c6717..9cb9377 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="eb949ca5-8296-4076-affc-3ae964f31755" name="Changes" comment="init commit" />
+    <list default="true" id="eb949ca5-8296-4076-affc-3ae964f31755" name="Changes" comment="update cicd">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java" beforeDir="false" afterPath="$PROJECT_DIR$/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -18,6 +22,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectColorInfo">{
@@ -37,7 +46,7 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;SONARLINT_PRECOMMIT_ANALYSIS&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;develop&quot;,
     &quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-21&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;/Users/struchkov/Documents/IdeaProjects/struchkov/sdk/gitlab-sdk/gitlab-sdk/gitlab-sdk-spring-boot-starter/src/main/resources/META-INF.spring&quot;,
@@ -116,6 +125,12 @@
       <option name="presentableId" value="Default" />
       <updated>1724441351469</updated>
       <workItem from="1724441352586" duration="4477000" />
+      <workItem from="1724502149656" duration="375000" />
+      <workItem from="1724502577836" duration="649000" />
+      <workItem from="1724561042494" duration="606000" />
+      <workItem from="1724584609933" duration="1237000" />
+      <workItem from="1724654695347" duration="830000" />
+      <workItem from="1724685913809" duration="696000" />
     </task>
     <task id="LOCAL-00001" summary="init commit">
       <option name="closed" value="true" />
@@ -125,7 +140,15 @@
       <option name="project" value="LOCAL" />
       <updated>1724445478405</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="update cicd">
+      <option name="closed" value="true" />
+      <created>1724502447621</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1724502447621</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -144,6 +167,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="init commit" />
-    <option name="LAST_COMMIT_MESSAGE" value="init commit" />
+    <MESSAGE value="update cicd" />
+    <option name="LAST_COMMIT_MESSAGE" value="update cicd" />
   </component>
 </project>
\ No newline at end of file
diff --git a/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java b/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
index d820f78..6727933 100644
--- a/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
+++ b/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
@@ -172,8 +172,8 @@ public class GitlabSdkManager {
         return pullTaskResults(tasks);
     }
 
-    public List<DiscussionJson> getDiscussionForMergeRequest(Long projectId, Long mergeRequestIdForProject, int pageNumber) {
-        return HttpParse.request(MessageFormat.format(gitlabUrl.getDiscussions(), projectId, mergeRequestIdForProject, pageNumber, pageNumber))
+    public List<DiscussionJson> getDiscussionForMergeRequest(Long projectId, Long mergeRequestIdForProject, int pageNumber, int pageSize) {
+        return HttpParse.request(MessageFormat.format(gitlabUrl.getDiscussions(), projectId, mergeRequestIdForProject, pageNumber, pageSize))
                 .header(ACCEPT)
                 .header(StringUtils.H_PRIVATE_TOKEN, gitlabProperty.getAccessToken())
                 .executeList(DiscussionJson.class);
diff --git a/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java b/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
index 2e8a1e6..ce71807 100644
--- a/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
+++ b/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
@@ -34,7 +34,7 @@ public class GitlabUrl {
         this.mergeRequest = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}";
         this.mergeRequestApproval = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}/approvals";
         this.projectAdd = baseUrl + "/api/v4/projects/";
-        this.note = baseUrl + "{0}#note_{1,number,#}";
+        this.note = "{0}#note_{1,number,#}";
         this.noteOfMergeRequest = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}/notes/{2,number,#}";
         this.pipelines = baseUrl + "/api/v4/projects/{0,number,#}/pipelines?&page={1,number,#}&per_page={2,number,#}";
         this.pipeline = baseUrl + "/api/v4/projects/{0,number,#}/pipelines/{1,number,#}";
diff --git a/pom.xml b/pom.xml
index 1eaebc3..38650fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>