Merge pull request #12 from mcanoy/legacy

mcanoy · web-flow · commit b51b33c3b8e2 · 2021-11-03T15:07:50.000-07:00
schedule. change package structure
diff --git a/pom.xml b/pom.xml
@@ -14,10 +14,9 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<quarkus-plugin.version>2.0.2.Final</quarkus-plugin.version>
 		<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
 		<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-		<quarkus.platform.version>2.0.2.Final</quarkus.platform.version>
+		<quarkus.platform.version>2.3.1.Final</quarkus.platform.version>
 		<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 		<wiremock.version>2.28.1</wiremock.version>
 		<javers.core.version>6.2.2</javers.core.version>
@@ -78,6 +77,10 @@
 			<artifactId>quarkus-smallrye-health</artifactId>
 		</dependency>
 		<!-- Other -->
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-scheduler</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.quarkus</groupId>
 			<artifactId>quarkus-jacoco</artifactId>
@@ -103,6 +106,11 @@
 			<artifactId>quarkus-junit5</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-junit5-mockito</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>io.rest-assured</groupId>
 			<artifactId>rest-assured</artifactId>
@@ -125,7 +133,7 @@
 			<plugin>
 				<groupId>io.quarkus</groupId>
 				<artifactId>quarkus-maven-plugin</artifactId>
-				<version>${quarkus-plugin.version}</version>
+				<version>${quarkus.platform.version}</version>
 				<extensions>true</extensions>
 				<executions>
 					<execution>
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/config/JsonConfig.java b/src/main/java/com/redhat/labs/lodestar/artifacts/config/JsonConfig.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.config;
+package com.redhat.labs.lodestar.artifacts.config;
 
 import javax.inject.Singleton;
 import javax.json.bind.JsonbConfig;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/Artifact.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/Artifact.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/ArtifactCount.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/ArtifactCount.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/Engagement.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/Engagement.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import javax.json.bind.annotation.JsonbProperty;
 
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/GetListOptions.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/GetListOptions.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import javax.ws.rs.*;
 
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/GetOptions.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/GetOptions.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/Action.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/Action.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model.gitlab;
+package com.redhat.labs.lodestar.artifacts.model.gitlab;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/Commit.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/Commit.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model.gitlab;
+package com.redhat.labs.lodestar.artifacts.model.gitlab;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/File.java b/src/main/java/com/redhat/labs/lodestar/artifacts/model/gitlab/File.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.model.gitlab;
+package com.redhat.labs.lodestar.artifacts.model.gitlab;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/resource/ArtifactResource.java b/src/main/java/com/redhat/labs/lodestar/artifacts/resource/ArtifactResource.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.resource;
+package com.redhat.labs.lodestar.artifacts.resource;
 
 import java.util.*;
 
@@ -15,16 +15,16 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import com.redhat.labs.lodestar.artifacts.model.GetListOptions;
+import com.redhat.labs.lodestar.artifacts.service.ArtifactService;
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 
-import com.redhat.labs.lodestar.model.Artifact;
-import com.redhat.labs.lodestar.model.ArtifactCount;
-import com.redhat.labs.lodestar.model.GetListOptions;
-import com.redhat.labs.lodestar.model.GetOptions;
-import com.redhat.labs.lodestar.service.ArtifactService;
+import com.redhat.labs.lodestar.artifacts.model.Artifact;
+import com.redhat.labs.lodestar.artifacts.model.ArtifactCount;
+import com.redhat.labs.lodestar.artifacts.model.GetOptions;
 
 @Path("/api/artifacts")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/EngagementApiRestClient.java b/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/EngagementApiRestClient.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.rest.client;
+package com.redhat.labs.lodestar.artifacts.rest.client;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import com.redhat.labs.lodestar.model.Engagement;
+import com.redhat.labs.lodestar.artifacts.model.Engagement;
 
 @Produces("application/json")
 @RegisterRestClient(configKey = "engagement.api")
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitLabApiExceptionMapper.java b/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitLabApiExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.rest.client;
+package com.redhat.labs.lodestar.artifacts.rest.client;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitlabRestClient.java b/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitlabRestClient.java
@@ -1,15 +1,15 @@
-package com.redhat.labs.lodestar.rest.client;
+package com.redhat.labs.lodestar.artifacts.rest.client;
 
 import javax.ws.rs.*;
 
-import com.redhat.labs.lodestar.model.gitlab.Commit;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.Commit;
 import org.apache.http.NoHttpResponseException;
 import org.eclipse.microprofile.faulttolerance.Retry;
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import com.redhat.labs.lodestar.model.gitlab.File;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.File;
 
 @Retry(maxRetries = 5, delay = 1200, retryOn = NoHttpResponseException.class, abortOn = WebApplicationException.class)
 @Path("/api/v4")
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitlabTokenFactory.java b/src/main/java/com/redhat/labs/lodestar/artifacts/rest/client/GitlabTokenFactory.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.rest.client;
+package com.redhat.labs.lodestar.artifacts.rest.client;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.ws.rs.core.MultivaluedMap;
diff --git a/src/main/java/com/redhat/labs/lodestar/artifacts/service/ArtifactService.java b/src/main/java/com/redhat/labs/lodestar/artifacts/service/ArtifactService.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.lodestar.service;
+package com.redhat.labs.lodestar.artifacts.service;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -13,9 +13,12 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.redhat.labs.lodestar.model.gitlab.Action;
-import com.redhat.labs.lodestar.model.gitlab.Commit;
+import com.redhat.labs.lodestar.artifacts.model.GetListOptions;
+import com.redhat.labs.lodestar.artifacts.rest.client.EngagementApiRestClient;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.Action;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.Commit;
 import io.quarkus.panache.common.Sort;
+import io.quarkus.scheduler.Scheduled;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.javers.core.ChangesByObject;
@@ -26,14 +29,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.redhat.labs.lodestar.model.Artifact;
-import com.redhat.labs.lodestar.model.ArtifactCount;
-import com.redhat.labs.lodestar.model.Engagement;
-import com.redhat.labs.lodestar.model.GetListOptions;
-import com.redhat.labs.lodestar.model.GetOptions;
-import com.redhat.labs.lodestar.model.gitlab.File;
-import com.redhat.labs.lodestar.rest.client.EngagementApiRestClient;
-import com.redhat.labs.lodestar.rest.client.GitlabRestClient;
+import com.redhat.labs.lodestar.artifacts.model.Artifact;
+import com.redhat.labs.lodestar.artifacts.model.ArtifactCount;
+import com.redhat.labs.lodestar.artifacts.model.Engagement;
+import com.redhat.labs.lodestar.artifacts.model.GetOptions;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.File;
+import com.redhat.labs.lodestar.artifacts.rest.client.GitlabRestClient;
 
 @ApplicationScoped
 public class ArtifactService {
@@ -70,6 +71,17 @@ public class ArtifactService {
     private static final Javers JAVERS = JaversBuilder.javers()
             .withListCompareAlgorithm(ListCompareAlgorithm.LEVENSHTEIN_DISTANCE).build();
 
+
+    @Scheduled(every = "5m")
+    void checkDBPopulated() {
+        long count = Artifact.count();
+        LOGGER.info("There are {} artifacts in the db", count);
+
+        if(count == 0) {
+            LOGGER.debug("Refreshing empty db");
+            refresh();
+        }
+    }
     /**
      * Remove all {@link Artifact}s from the database.
      */
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -30,6 +30,8 @@ engagement.api/mp-rest/url=${ENGAGEMENT_API_URL:http://git-api:8080}
 mp.openapi.extensions.smallrye.info.title=LodeStar Artifacts API
 quarkus.swagger-ui.theme=muted
 
+%test.quarkus.scheduler.enabled=false
+
 gitlab.personal.access.token=${GITLAB_TOKEN:t}
 
 # Application
diff --git a/src/test/java/com/redhat/labs/lodestar/artifacts/mock/ExternalApiWireMock.java b/src/test/java/com/redhat/labs/lodestar/artifacts/mock/ExternalApiWireMock.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.mock;
+package com.redhat.labs.lodestar.artifacts.mock;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/com/redhat/labs/lodestar/artifacts/mock/ResourceLoader.java b/src/test/java/com/redhat/labs/lodestar/artifacts/mock/ResourceLoader.java
@@ -1,9 +1,9 @@
-package com.redhat.labs.mock;
+package com.redhat.labs.lodestar.artifacts.mock;
 
 import com.google.gson.Gson;
+import com.redhat.labs.lodestar.artifacts.model.gitlab.File;
 import org.apache.commons.io.IOUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -20,7 +20,7 @@ public static String load(String resourceName) {
     public static String loadGitlabFile(String gitlabResourceName) {
         String content = load(gitlabResourceName);
 
-        com.redhat.labs.lodestar.model.gitlab.File f = com.redhat.labs.lodestar.model.gitlab.File.builder()
+        File f = File.builder()
                 .filePath("a.json").content(content).build();
         f.encodeFileAttributes();
 
diff --git a/src/test/java/com/redhat/labs/lodestar/artifacts/model/ArtifactTest.java b/src/test/java/com/redhat/labs/lodestar/artifacts/model/ArtifactTest.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.model;
+package com.redhat.labs.lodestar.artifacts.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -7,13 +7,12 @@
 
 import javax.inject.Inject;
 
+import com.redhat.labs.lodestar.artifacts.mock.ExternalApiWireMock;
 import io.quarkus.panache.common.Sort;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.labs.lodestar.model.Artifact;
-import com.redhat.labs.lodestar.service.ArtifactService;
-import com.redhat.labs.mock.ExternalApiWireMock;
+import com.redhat.labs.lodestar.artifacts.service.ArtifactService;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/src/test/java/com/redhat/labs/lodestar/artifacts/resource/ArtifactResourceTest.java b/src/test/java/com/redhat/labs/lodestar/artifacts/resource/ArtifactResourceTest.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.resource;
+package com.redhat.labs.lodestar.artifacts.resource;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -13,13 +13,13 @@
 import javax.inject.Inject;
 import javax.json.bind.Jsonb;
 
+import com.redhat.labs.lodestar.artifacts.mock.ExternalApiWireMock;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.labs.lodestar.model.Artifact;
-import com.redhat.labs.lodestar.model.GetListOptions;
-import com.redhat.labs.lodestar.service.ArtifactService;
-import com.redhat.labs.mock.ExternalApiWireMock;
+import com.redhat.labs.lodestar.artifacts.model.Artifact;
+import com.redhat.labs.lodestar.artifacts.model.GetListOptions;
+import com.redhat.labs.lodestar.artifacts.service.ArtifactService;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/src/test/java/com/redhat/labs/lodestar/artifacts/service/ArtifactServiceTest.java b/src/test/java/com/redhat/labs/lodestar/artifacts/service/ArtifactServiceTest.java
@@ -1,4 +1,4 @@
-package com.redhat.labs.service;
+package com.redhat.labs.lodestar.artifacts.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -14,16 +14,15 @@
 import javax.json.bind.Jsonb;
 import javax.ws.rs.WebApplicationException;
 
+import com.redhat.labs.lodestar.artifacts.mock.ExternalApiWireMock;
+import com.redhat.labs.lodestar.artifacts.mock.ResourceLoader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.labs.lodestar.model.Artifact;
-import com.redhat.labs.lodestar.model.ArtifactCount;
-import com.redhat.labs.lodestar.model.GetListOptions;
-import com.redhat.labs.lodestar.model.GetOptions;
-import com.redhat.labs.lodestar.service.ArtifactService;
-import com.redhat.labs.mock.ExternalApiWireMock;
-import com.redhat.labs.mock.ResourceLoader;
+import com.redhat.labs.lodestar.artifacts.model.Artifact;
+import com.redhat.labs.lodestar.artifacts.model.ArtifactCount;
+import com.redhat.labs.lodestar.artifacts.model.GetListOptions;
+import com.redhat.labs.lodestar.artifacts.model.GetOptions;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -44,6 +43,24 @@ void setUp() {
         artifactService.refresh();
     }
 
+    @Test
+    void testPopulatedDB() {
+        artifactService.purge();
+
+
+        ArtifactCount count = artifactService.countArtifacts(new GetListOptions());
+        assertEquals(0, count.getCount());
+
+        artifactService.checkDBPopulated();
+        count = artifactService.countArtifacts(new GetListOptions());
+        assertEquals(2, count.getCount());
+
+        artifactService.checkDBPopulated();
+        count = artifactService.countArtifacts(new GetListOptions());
+        assertEquals(2, count.getCount());
+
+    }
+
     @Test
     void testRefresh() {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.redhat.labs.lodestar.config;`
	`1`	`+package com.redhat.labs.lodestar.artifacts.config;`
`2`	`2`
`3`	`3`	`import javax.inject.Singleton;`
`4`	`4`	`import javax.json.bind.JsonbConfig;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.redhat.labs.lodestar.model;`
	`1`	`+package com.redhat.labs.lodestar.artifacts.model;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.List;`