Merge pull request #7 from mcanoy/dev-services

up quarkus to 2.0.2 and leverage mongo devservices for dev and test

Author: mcanoy

README.md

@@ -36,7 +36,7 @@ See the deployment [readme](./deployment) for information on deploying to a Open
 
 ### MongoDB 
 
-A MongoDB database is needed for development. To spin up a docker MongoDB container run the following
+A MongoDB database is needed for development and is automatically added by Quarkus Devservices. To use a different instance, run in prod mode and point to the mongo instance via properties. To create a docker instance, run the following
 
 ```
 cd deployment

pom.xml

@@ -14,10 +14,10 @@
 		<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>1.13.7.Final</quarkus-plugin.version>
+		<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>1.13.7.Final</quarkus.platform.version>
+		<quarkus.platform.version>2.0.2.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>

src/main/resources/application.properties

@@ -13,16 +13,12 @@ quarkus.package.type=uber-jar
 quarkus.swagger-ui.always-include=true
 
 # Configure your datasource
-mongo.user=${MONGODB_USER:mongouser}
-mongo.password=${MONGODB_PASSWORD:mongopassword}
-mongo.service.name=${DATABASE_SERVICE_NAME:localhost:27017}
+%prod.mongo.user=${MONGODB_USER:mongouser}
+%prod.mongo.password=${MONGODB_PASSWORD:mongopassword}
+%prod.mongo.service.name=${DATABASE_SERVICE_NAME:localhost:27017}
 quarkus.mongodb.database=${MONGODB_DATABASE:artifacts}
 
-quarkus.mongodb.connection-string=mongodb://${mongo.user}:${mongo.password}@${mongo.service.name}/${quarkus.mongodb.database}?uuidRepresentation=javaLegacy
-%dev.quarkus.mongodb.connection-string=mongodb://${mongo.user}:${mongo.password}@${mongo.service.name}/${quarkus.mongodb.database}?uuidRepresentation=javaLegacy&authSource=admin
-
-%test.quarkus.mongodb.connection-string=mongodb://${mongo.service.name}/${quarkus.mongodb.database}?uuidRepresentation=javaLegacy
-%test.quarkus.mongodb.write-concern.journal=false
+%prod.quarkus.mongodb.connection-string=mongodb://${mongo.user}:${mongo.password}@${mongo.service.name}/${quarkus.mongodb.database}?uuidRepresentation=javaLegacy
 
 # GitLab API properties
 gitlab.api/mp-rest/scope=javax.inject.Singleton
@@ -33,7 +29,6 @@ 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
 
-
 gitlab.personal.access.token=${GITLAB_TOKEN:t}
 
 # Application

src/test/java/com/redhat/labs/model/ArtifactTest.java

@@ -13,13 +13,11 @@
 import com.redhat.labs.lodestar.model.Artifact;
 import com.redhat.labs.lodestar.service.ArtifactService;
 import com.redhat.labs.mock.ExternalApiWireMock;
-import com.redhat.labs.mongo.MongoTestResource;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(MongoTestResource.class)
 @QuarkusTestResource(ExternalApiWireMock.class)
 class ArtifactTest {
 

src/test/java/com/redhat/labs/mongo/MongoTestResource.java

@@ -20,15 +20,13 @@
 import com.redhat.labs.lodestar.model.GetListOptions;
 import com.redhat.labs.lodestar.service.ArtifactService;
 import com.redhat.labs.mock.ExternalApiWireMock;
-import com.redhat.labs.mongo.MongoTestResource;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import io.restassured.path.json.JsonPath;
 
 @QuarkusTest
-@QuarkusTestResource(MongoTestResource.class)
 @QuarkusTestResource(ExternalApiWireMock.class)
 class ArtifactResourceTest {
 

src/test/java/com/redhat/labs/resource/ArtifactResourceTest.java

@@ -23,13 +23,11 @@
 import com.redhat.labs.lodestar.service.ArtifactService;
 import com.redhat.labs.mock.ExternalApiWireMock;
 import com.redhat.labs.mock.ResourceLoader;
-import com.redhat.labs.mongo.MongoTestResource;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(MongoTestResource.class)
 @QuarkusTestResource(ExternalApiWireMock.class)
 class ArtifactServiceTest {