Bump com.google.gerrit:gerrit-plugin-api from 2.14.16 to 2.15.21

eiffel-gerrit-plugin-script

@@ -30,7 +30,7 @@ function do_stop {
   echo "########################################"
 
   source target/env.bash
-  docker-compose -f target/docker-compose.yml down
+  docker compose -f target/docker-compose.yml down
   if [ $? -eq 1 ]; then
     echo "Failed to stop docker containers!"
     exit 1
@@ -62,12 +62,13 @@ function do_start {
   echo "########################################"
 
   source target/env.bash
-  docker-compose -f target/docker-compose.yml up -d
+  docker compose -f target/docker-compose.yml up -d
 
-  wait_for_service "RABBITMQ" "target_rabbitmq" "15672"
-  wait_for_service "GERRIT" "target_gerrit" "8080"
-  wait_for_service "REMREM_PUBLISH" "target_publish" "8080"
-  wait_for_service "REMREM_GENERATE" "target_generate" "8080"
+  wait_for_service "RABBITMQ" "target-rabbitmq" "15672"
+  wait_for_service "GERRIT" "target-gerrit" "8080"
+  sleep 60
+  wait_for_service "REMREM_PUBLISH" "target-publish" "8080"
+  wait_for_service "REMREM_GENERATE" "target-generate" "8080"
 }
 
 function do_test {

pom.xml

@@ -11,7 +11,7 @@
 
     <properties>
         <Gerrit-ApiType>plugin</Gerrit-ApiType>
-        <Gerrit-ApiVersion>2.14.16</Gerrit-ApiVersion>
+        <Gerrit-ApiVersion>2.15.21</Gerrit-ApiVersion>
         <Gerrit-PluginName>Eiffel-Integration</Gerrit-PluginName>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <skipTests>false</skipTests>

src/main/docker/Dockerfile

@@ -4,6 +4,11 @@ LABEL maintainer="Eiffel-Community"
 
 ARG JAR_LOCATION
 
+# Update repository URLs to point to the CentOS Vault
+RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
+    sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/*.repo && \
+    sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo
+
 RUN yum -y install openssh-client initscripts sudo
 
 # Add Gerrit packages repository
@@ -12,7 +17,7 @@ RUN rpm -i https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm
 # Install OpenJDK and Gerrit in two subsequent transactions
 # (pre-trans Gerrit script needs to have access to the Java command)
 RUN yum -y install java-1.8.0-openjdk
-RUN yum -y install gerrit-2.14.16-1
+RUN yum -y install gerrit-2.15.21-1
 RUN yum -y install bash
 
 USER gerrit

src/main/docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+#version: '2'
 
 services:
   gerrit:

src/main/java/com/ericsson/gerrit/plugins/eiffel/git/CommitInformation.java

@@ -29,6 +29,7 @@
 import com.google.gerrit.extensions.restapi.IdString;
 import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
+import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.gerrit.server.project.CommitResource;
 import com.google.gerrit.server.project.CommitsCollection;
 import com.google.gerrit.server.project.ProjectResource;
@@ -80,7 +81,7 @@ private List<RevCommit> getParents(final String commitId, final String projectNa
 
         try {
             parents = getParentsFromCommit(commitId, projectName);
-        } catch (final UnprocessableEntityException e) {
+        } catch (final UnprocessableEntityException | PermissionBackendException e) {
             final String message = String.format("Cannot find or load the project %s", projectName);
             LOGGER.error(message, e);
         } catch (final ResourceNotFoundException e) {
@@ -95,15 +96,21 @@ private List<RevCommit> getParents(final String commitId, final String projectNa
     }
 
     private List<RevCommit> getParentsFromCommit(final String commitId, final String projectName)
-            throws UnprocessableEntityException, IOException, ResourceNotFoundException {
-
+       throws UnprocessableEntityException, IOException, ResourceNotFoundException, PermissionBackendException {
+        RevCommit[] parents = null;
+        try{
         final ProjectResource projectResource = projectsCollection.parse(projectName, true);
         final CommitResource commitResource = commitsCollection.parse(projectResource,
                 IdString.fromDecoded(commitId));
         final RevCommit commit = commitResource.getCommit();
-        final RevCommit[] parents = commit.getParents();
-
-        return Arrays.asList(parents);
+         parents = commit.getParents();
+          }
+        catch (PermissionBackendException e) {
+           System.out.println("PermissionBackendException is occured");
+        }
+           return  Arrays.asList(parents);
+
+
     }
 
     private List<String> getSHAs(final List<RevCommit> parents) {

src/main/java/com/ericsson/gerrit/plugins/eiffel/handlers/MessageQueueHandler.java

@@ -17,7 +17,7 @@
 
 package com.ericsson.gerrit.plugins.eiffel.handlers;
 
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ScheduledExecutorService;
 
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.events.LifecycleListener;
@@ -32,7 +32,7 @@ public class MessageQueueHandler implements LifecycleListener {
 
     private final WorkQueue workQueue;
     private final int poolSize;
-    private ScheduledThreadPoolExecutor pool;
+    private ScheduledExecutorService pool;
 
     @Inject
     public MessageQueueHandler(final WorkQueue workQueue, final PluginConfigFactory config,
@@ -54,7 +54,7 @@ public void stop() {
         }
     }
 
-    public ScheduledThreadPoolExecutor getPool() {
+    public ScheduledExecutorService getPool() {
         return this.pool;
     }
 }

src/test/java/com/ericsson/gerrit/plugins/eiffel/git/CommitInformationTest.java

@@ -87,24 +87,24 @@ public void testFetchingParentsShas() throws Exception {
 
     @Test
     public void testFetchingCommitNotFound() throws Exception {
-        logHelper.removeStdoutAppenders();
-
+        logHelper.removeStdoutAppenders(); 
+        
         final CommitsCollection commitsCollection = mock(CommitsCollection.class);
         final ProjectsCollection projectsCollection = mock(ProjectsCollection.class);
         final ProjectResource projectResource = mock(ProjectResource.class);
-
+      
         when(commitsCollection.parse(any(ProjectResource.class), any(IdString.class))).thenThrow(
                 ResourceNotFoundException.class);
         when(projectsCollection.parse(any(String.class), anyBoolean())).thenReturn(projectResource);
-
+         
         final CommitInformation commitInformation = new CommitInformation(commitsCollection,
                 projectsCollection);
         final List<String> expectedParentsSha = Arrays.asList();
         final String commitId = "not found hash";
         final String projectName = "projectName";
 
         final List<String> actualParentSha = commitInformation.getParentsSHAs(commitId, projectName);
-
+       
         assertEquals(expectedParentsSha, actualParentSha);
         logHelper.verifyLoggerCalledTimes(1);