Merge branch 'develop'

oneteme · Feb 2, 2023 · bf5e429 · bf5e429
2 parents 249751b + 5e4f538
commit bf5e429
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 82 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: CI/CD
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches: [ "main" ]
+    paths-ignore: [ "README.md"]
+  push:
+    branches: [ "main", "develop" ]
+    paths-ignore: [ "README.md"]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+    - name: Build & Scan Project
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: mvn --batch-mode --no-transfer-progress verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=oneteme_${{ github.event.repository.name }}
diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,15 @@
 			<organizationUrl>https://oneteme.github.io/</organizationUrl>
 		</developer>
 	</developers>
+	<scm>
+		<url>https://github.com/oneteme/assertapi-server</url>
+	</scm>
+	<licenses>
+		<license>
+			<name>Apache License 2.0</name>
+			<url>https://github.com/oneteme/assertapi-server/blob/main/LICENSE</url>
+		</license>
+	</licenses>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
@@ -61,41 +70,32 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.7</version>
+				<executions>
+					<execution>
+						<id>prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<goals>
+							<goal>report</goal>
+						</goals>
+						<configuration>
+							<formats>
+								<format>XML</format>
+							</formats>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>deploy</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.7</version>
-						<executions>
-							<execution>
-								<id>prepare-agent</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>report</id>
-								<goals>
-									<goal>report</goal>
-								</goals>
-								<configuration>
-									<formats>
-										<format>XML</format>
-									</formats>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 	<repositories>
 		<repository>
 			<id>ossrh</id>

diff --git a/src/main/java/org/usf/assertapi/server/controller/MainController.java b/src/main/java/org/usf/assertapi/server/controller/MainController.java
@@ -27,9 +27,9 @@
 import org.usf.assertapi.core.ApiAssertionExecutor;
 import org.usf.assertapi.core.ApiAssertionFactory;
 import org.usf.assertapi.core.ApiRequest;
-import org.usf.assertapi.core.CompareStage;
-import org.usf.assertapi.core.CompareStatus;
-import org.usf.assertapi.core.ContentComparator;
+import org.usf.assertapi.core.ComparisonStage;
+import org.usf.assertapi.core.ComparisonStatus;
+import org.usf.assertapi.core.DataComparator;
 import org.usf.assertapi.core.ResponseComparatorProxy;
 import org.usf.assertapi.core.RestTemplateBuilder;
 import org.usf.assertapi.core.RuntimeEnvironement;
@@ -154,14 +154,14 @@ public void assertStatusCode(int expectedStatusCode, int actualStatusCode) {
 					}
 
 					@Override
-					public void assertJsonContent(String expectedContent, String actualContent, ContentComparator<?> strict) {
+					public void assertJsonContent(String expectedContent, String actualContent, DataComparator<?> strict) {
 						responseComparator.getExp().setResponse(expectedContent);
 						responseComparator.getAct().setResponse(actualContent);
 						super.assertJsonContent(expectedContent, actualContent, strict);
 					}
 
 					@Override
-					public void finish(CompareStatus status) {
+					public void finish(ComparisonStatus status) {
 						responseComparator.setStatus(status); 
 						responseComparator.setStep(getCurrentStage());
 					}
@@ -187,7 +187,7 @@ public static final class Configuration {
 	public static final class ResponseComparator {
 		private ApiResponseServer exp;
 		private ApiResponseServer act;
-		private CompareStatus status;
-		private CompareStage step;
+		private ComparisonStatus status;
+		private ComparisonStage step;
 	}
 }
diff --git a/src/main/java/org/usf/assertapi/server/dao/TraceDaoImpl.java b/src/main/java/org/usf/assertapi/server/dao/TraceDaoImpl.java
@@ -62,8 +62,8 @@ public List<AssertionResultServer> select(long[] ids, List<String> status) {
 //                    rs.getLong("ID_ASR"),
                     expConf,
                     actConf,
-                    rs.getString("VA_REQ_STT") != null ? CompareStatus.valueOf(rs.getString("VA_REQ_STT")) : null,
-                    rs.getString("VA_REQ_STP") != null ? CompareStage.valueOf(rs.getString("VA_REQ_STP")) : null
+                    rs.getString("VA_REQ_STT") != null ? ComparisonStatus.valueOf(rs.getString("VA_REQ_STT")) : null,
+                    rs.getString("VA_REQ_STP") != null ? ComparisonStage.valueOf(rs.getString("VA_REQ_STP")) : null
             );
             var req = new ApiRequest(
                     rs.getLong("ID_REQ"),

diff --git a/src/main/java/org/usf/assertapi/server/model/ApiTraceStatistic.java b/src/main/java/org/usf/assertapi/server/model/ApiTraceStatistic.java
@@ -1,15 +1,14 @@
 package org.usf.assertapi.server.model;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
-import static org.usf.assertapi.core.CompareStatus.ERROR;
-import static org.usf.assertapi.core.CompareStatus.FAIL;
-import static org.usf.assertapi.core.CompareStatus.OK;
+import static org.usf.assertapi.core.ComparisonStatus.ERROR;
+import static org.usf.assertapi.core.ComparisonStatus.FAIL;
+import static org.usf.assertapi.core.ComparisonStatus.OK;
 
 import java.util.List;
 
 import org.usf.assertapi.core.ApiRequest;
-import org.usf.assertapi.core.HttpRequest;
-import org.usf.assertapi.core.CompareStatus;
+import org.usf.assertapi.core.ComparisonStatus;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -28,7 +27,7 @@ public class ApiTraceStatistic {
     private int nbTestOk;
     private int nbTestKo;
 
-    public void append(CompareStatus ts){
+    public void append(ComparisonStatus ts){
         if (ts == OK) {
             nbTestOk++;
         } else if (ts == FAIL || ts == ERROR) {
@@ -46,7 +45,7 @@ public static final ApiTraceStatistic from(List<ApiRequest> reqList) {
 
 	public static final ApiTraceStatistic NO_STAT = new ApiTraceStatistic(0, 0) {
 		@Override
-		public void append(CompareStatus ts) {
+		public void append(ComparisonStatus ts) {
 			throw new UnsupportedOperationException();
 		}