Merge branch 'master' into AUS-4140-New-WA-Layers

AuScope · Nov 25, 2024 · 3384b19 · 3384b19
2 parents 569c0fb + e000b68
commit 3384b19
Show file tree

Hide file tree

Showing 15 changed files with 990 additions and 276 deletions.
diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg
diff --git a/.github/coverage/jacoco.csv b/.github/coverage/jacoco.csv
@@ -18,7 +18,7 @@ AuScope-Portal-API,org.auscope.portal.server.web.controllers,GeologicalProvinces
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,BookMarksController,168,0,0,0,44,0,8,0,8,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,UserController,136,0,10,0,34,0,9,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,RemanentAnomaliesAutoSearchController,44,0,0,0,15,0,3,0,3,0
-AuScope-Portal-API,org.auscope.portal.server.web.controllers,IRISController,138,269,4,6,28,53,6,7,3,5
+AuScope-Portal-API,org.auscope.portal.server.web.controllers,IRISController,138,274,4,6,28,54,6,7,3,5
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,GsmlpNameSpaceTable,90,0,4,0,25,0,6,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,MSCLController,303,0,32,0,66,0,19,0,3,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,TIMAController,179,0,10,0,38,0,9,0,4,0
@@ -97,7 +97,7 @@ AuScope-Portal-API,org.auscope.portal.server.config,ExtraVocabularies,111,0,0,0,
 AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.mandRec,16,0,0,0,3,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.config,AppContext.new Runnable() {...},18,0,2,0,3,0,3,0,2,0
 AuScope-Portal-API,org.auscope.portal.server.config,AppContext,567,0,2,0,105,0,46,0,45,0
-AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory,1693,0,152,0,404,0,127,0,40,0
+AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory,1733,0,156,0,414,0,129,0,40,0
 AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.wfsRec,16,0,0,0,3,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.config,ProfilePortalTest,79,0,2,0,18,0,5,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.config,ElasticsearchConfig,65,0,2,0,18,0,4,0,3,0

diff --git a/.github/coverage/percentage.txt b/.github/coverage/percentage.txt
@@ -1 +1 @@
-24.811
+24.7818
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.9</version>
+        <version>3.2.11</version>
     </parent>
 
     <!-- Repositories section -->
@@ -74,24 +74,13 @@
         </repository>
     </repositories>
 
-    <!-- Dependency Management -->
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>1.33</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <!-- Dependencies section -->
     <dependencies>
 		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -186,21 +175,22 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.28</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.2.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
+            <version>42.6.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>apache-jena-libs</artifactId>
-            <version>4.10.0</version>
+            <version>5.0.0</version>
             <type>pom</type>
         </dependency>
 
@@ -220,19 +210,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-imposters</artifactId>
             <version>2.12.0</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-legacy</artifactId>
@@ -244,17 +235,17 @@
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
         <dependency>
-          <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-databind</artifactId>
-          <version>2.13.4.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
-        <version>5.5.0</version>
-      </dependency>
+            <groupId>com.azure.spring</groupId>
+            <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
+            <version>5.14.0</version>
+        </dependency>
     </dependencies>
 
     <!-- Build section -->

diff --git a/src/main/java/org/auscope/portal/server/PortalApplication.java b/src/main/java/org/auscope/portal/server/PortalApplication.java
@@ -1,13 +1,23 @@
 package org.auscope.portal.server;
 
+import java.util.Map;
+
 import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.StringSchema;
+
 
 @SpringBootApplication
 @ComponentScan(
@@ -35,5 +45,13 @@ public void initProperties() {
 	public static void main(String[] args) {
 		SpringApplication.run(PortalApplication.class, args);
 	}
+
+    @Bean
+    public OpenAPI customOpenAPI(@Value("${springdoc.version}") String appVersion) {
+        return new OpenAPI().components(new Components()).info(new Info().title("AuScope API").version(appVersion)
+                .license(new License().name("Apache 2.0").url("http://springdoc.org")))
+                .schema("ParameterMap", new Schema<Map<String, String>>().addProperty("sourceAccountId", 
+                        new StringSchema().example("1")).addProperty("targetAccountId", new StringSchema().example("2")));
+    }
 
 }