diff --git a/NOTICE b/NOTICE index ba696f91cb313f2802ca9e0b28ef63de2bfeaf64..b6300e1c830abf29109d11bdc9dbbb4bd1fb6ef4 100644 --- a/NOTICE +++ b/NOTICE @@ -91,7 +91,7 @@ The following software have components provided under the terms of this license: - Guava ListenableFuture only (from https://repo1.maven.org/maven2/com/google/guava/listenablefuture) - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) -- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- Hibernate Validator (from http://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) - HikariCP (from https://github.com/brettwooldridge/HikariCP) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) @@ -99,8 +99,6 @@ The following software have components provided under the terms of this license: - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) - J2ObjC Annotations (from https://github.com/google/j2objc/) - JBoss Logging 3 (from http://www.jboss.org) -- JBoss Marshalling API (from https://repo1.maven.org/maven2/org/jboss/marshalling/jboss-marshalling) -- JBoss Marshalling River (from https://repo1.maven.org/maven2/org/jboss/marshalling/jboss-marshalling-river) - JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations) - JJWT :: Legacy Transitive Dependency Jar (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt) - JMES Path Query library (from https://aws.amazon.com/sdkforjava) @@ -133,6 +131,7 @@ The following software have components provided under the terms of this license: - Kotlin Stdlib Common (from https://kotlinlang.org/) - Kotlin Stdlib Jdk7 (from <https://kotlinlang.org/>, https://kotlinlang.org/) - Kotlin Stdlib Jdk8 (from <https://kotlinlang.org/>, https://kotlinlang.org/) +- Lettuce (from http://github.com/lettuce-io/lettuce-core, http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki) - Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core) - Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java) @@ -248,7 +247,6 @@ The following software have components provided under the terms of this license: - javax.inject (from http://code.google.com/p/atinject/, https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject) - jose4j (from https://bitbucket.org/b_c/jose4j/) - json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath) -- lettuce (from http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki) - micrometer-commons (from https://github.com/micrometer-metrics/micrometer) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-jakarta9 (from https://github.com/micrometer-metrics/micrometer) @@ -293,11 +291,12 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Jodd BeanUtil (from http://jodd.org) -- Jodd Core (from http://jodd.org) +- Jodd Util (from https://util.jodd.org) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) +- MinLog (from https://github.com/EsotericSoftware/minlog) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://codehaus-plexus.github.io/plexus-utils/, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - PostgreSQL JDBC Driver +- ReflectASM (from https://github.com/EsotericSoftware/reflectasm) - Stax2 API (from http://github.com/FasterXML/stax2-api) ======================================================================== @@ -324,6 +323,8 @@ The following software have components provided under the terms of this license: - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) +- Kryo (from https://repo1.maven.org/maven2/com/esotericsoftware/kryo) +- MinLog (from https://github.com/EsotericSoftware/minlog) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Old JAXB Core (from <https://eclipse-ee4j.github.io/jaxb-ri/>, https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://codehaus-plexus.github.io/plexus-utils/, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) @@ -332,6 +333,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - RE2/J (from http://github.com/google/re2j) - Redisson (from http://redisson.org) +- ReflectASM (from https://github.com/EsotericSoftware/reflectasm) - Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) - ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp) @@ -358,9 +360,10 @@ The following software have components provided under the terms of this license: - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- Hibernate Validator (from http://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) +- Redisson (from http://redisson.org) - reactive-streams (from http://www.reactive-streams.org/) ======================================================================== diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/config/WebConfiguration.java b/partition-core/src/main/java/org/opengroup/osdu/partition/config/WebConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..69d555e1baffb9b15a32b7dcef76b51a52f966ac --- /dev/null +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/config/WebConfiguration.java @@ -0,0 +1,30 @@ +/* +Copyright 2017-2024 SLB + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package org.opengroup.osdu.partition.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + @Override + public void configurePathMatch(PathMatchConfigurer configurer) { + configurer.setUseTrailingSlashMatch(true); + } + +} diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index 443cd803a331558b2b44a8584d9481f702d0a04e..64583de9e8412c127317121903b4d704c18a6bd7 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -14,7 +14,7 @@ <packaging>jar</packaging> <properties> - <core-lib-azure-spring6.version>0.27.0-rc4</core-lib-azure-spring6.version> + <core-lib-azure-spring6.version>0.27.0-rc6</core-lib-azure-spring6.version> <junit.version>4.13.2</junit.version> <reactor-core.version>3.6.4</reactor-core.version> <reactor-netty.version>1.1.17</reactor-netty.version> @@ -78,6 +78,12 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-azure-spring6</artifactId> <version>${core-lib-azure-spring6.version}</version> + <exclusions> + <exclusion> + <artifactId>redisson</artifactId> + <groupId>org.redisson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -141,7 +147,11 @@ <artifactId>okhttp</artifactId> <version>${okhttp.version}</version> </dependency> - + <dependency> + <groupId>org.redisson</groupId> + <artifactId>redisson</artifactId> + <version>3.33.0</version> + </dependency> <!-- Test dependencies --> <dependency> <groupId>junit</groupId> diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheckApiTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheckApiTest.java index c7f971487692f590b29ad22889602a923d5d6d55..9dcc428be69e7a74b177210f2fd969c679a8705c 100644 --- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheckApiTest.java +++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheckApiTest.java @@ -34,4 +34,11 @@ public abstract class HealthCheckApiTest extends TestBase { TestUtils.send("api/partition/v1/liveness_check", HttpMethod.GET.name(), null, "", "", false); assertEquals(HttpStatus.OK.value(), response.getCode()); } + + @Test + public void should_returnTrailingOk() throws Exception { + CloseableHttpResponse response = + TestUtils.send("api/partition/v1/liveness_check/", HttpMethod.GET.name(), this.testUtils.getAccessToken(), "", "", false); + assertEquals(HttpStatus.OK.value(), response.getCode()); + } }