Skip to content
Snippets Groups Projects
Commit 06063aeb authored by VidyaDharani Lokam's avatar VidyaDharani Lokam
Browse files

[MS-44706] fix trailing slash

parent 2ec3c2b3
No related branches found
No related tags found
1 merge request!807[MS-44706] fix trailing slash
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 59 deletions
NOTICE
+ 9
− 40
View file @ 06063aeb
......@@ -16,9 +16,6 @@ Apache-1.1
The following software have components provided under the terms of this license:
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
......@@ -106,8 +103,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 :: API (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-api)
- JJWT :: Extensions :: Jackson (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-jackson)
......@@ -149,9 +144,6 @@ The following software have components provided under the terms of this license:
- 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 Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
......@@ -331,10 +323,11 @@ 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)
- ReflectASM (from https://github.com/EsotericSoftware/reflectasm)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
......@@ -377,15 +370,15 @@ The following software have components provided under the terms of this license:
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
- 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)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- 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)
- 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)
- Protocol Buffer Java API (from http://code.google.com/p/protobuf, https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
- 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)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
- Shaded Protobuf (from https://repo1.maven.org/maven2/io/prometheus/prometheus-metrics-shaded-protobuf)
- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core)
......@@ -404,15 +397,6 @@ The following software have components provided under the terms of this license:
- jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
- org.locationtech.jts.io:jts-io-common (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
========================================================================
Beerware
========================================================================
The following software have components provided under the terms of this license:
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
========================================================================
BouncyCastle
========================================================================
......@@ -430,15 +414,6 @@ The following software have components provided under the terms of this license:
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
========================================================================
CC-BY-4.0
========================================================================
The following software have components provided under the terms of this license:
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
========================================================================
CC0-1.0
========================================================================
......@@ -450,6 +425,7 @@ The following software have components provided under the terms of this license:
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- Redisson (from http://redisson.org)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
......@@ -510,9 +486,6 @@ The following software have components provided under the terms of this license:
- Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core)
- Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson)
- Logback Core Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core)
- org.locationtech.jts.io:jts-io-common (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common)
......@@ -603,6 +576,7 @@ ISC
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)
========================================================================
......@@ -610,15 +584,13 @@ LGPL-2.1-only
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
- Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic)
- Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core)
- Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson)
- Logback Core Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
========================================================================
LGPL-2.1-or-later
......@@ -626,7 +598,6 @@ LGPL-2.1-or-later
The following software have components provided under the terms of this license:
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
......@@ -646,8 +617,6 @@ The following software have components provided under the terms of this license:
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Azure Java Core AMQP Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Java JSON Library (from https://github.com/Azure/azure-sdk-for-java)
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/config/WebConfiguration.java 0 → 100644
+ 14
− 0
View file @ 06063aeb
package org.opengroup.osdu.indexer.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);
}
}
indexer-core/src/test/java/org/opengroup/osdu/indexer/api/HealthCheckApiTest.java
+ 1
− 1
View file @ 06063aeb
......@@ -43,4 +43,4 @@ public class HealthCheckApiTest {
public void should_returnHttp200_when_checkReadiness() {
assertEquals(HttpStatus.OK.value(), this.sut.readinessCheck().getStatusCodeValue());
}
}
\ No newline at end of file
}
provider/indexer-azure/pom.xml
+ 10
− 1
View file @ 06063aeb
......@@ -40,7 +40,7 @@
<nimbus-jose-jwt.version>8.20.2</nimbus-jose-jwt.version>
<indexer-core.version>0.28.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<core-lib-azure-spring6.version>0.27.0-rc3</core-lib-azure-spring6.version>
<core-lib-azure-spring6.version>0.27.0-rc6</core-lib-azure-spring6.version>
<reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
<java-jwt.version>3.8.1</java-jwt.version>
<mockito.version>3.11.2</mockito.version>
......@@ -154,8 +154,17 @@
<artifactId>azure-identity</artifactId>
<groupId>com.azure</groupId>
</exclusion>
<exclusion>
<artifactId>redisson</artifactId>
<groupId>org.redisson</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
<version>3.34.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
......
testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+ 7
− 2
View file @ 06063aeb
......@@ -38,11 +38,16 @@ public class Steps extends InfoSteps {
/******************Inputs being set**************/
@When("^I send get request to version info endpoint")
@When("^I send get request to version info endpoint$")
public void i_send_get_request_to_version_info_endpoint() {
super.i_send_get_request_to_version_info_endpoint();
}
@When("^I send get request to version info endpoint with trailing slash$")
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
super.i_send_get_request_to_version_info_endpoint_with_trailing_slash();
}
/******************Assert final response**************/
@Then("^I should get version info in response$")
......@@ -59,4 +64,4 @@ public class Steps extends InfoSteps {
protected String getApi() {
return Config.getIndexerBaseURL() + "info";
}
}
\ No newline at end of file
}
testing/indexer-test-azure/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+ 7
− 2
View file @ 06063aeb
......@@ -22,11 +22,16 @@ public class Steps extends InfoSteps {
/******************Inputs being set**************/
@When("^I send get request to version info endpoint")
@When("^I send get request to version info endpoint$")
public void i_send_get_request_to_version_info_endpoint() {
super.i_send_get_request_to_version_info_endpoint();
}
@When("^I send get request to version info endpoint with trailing slash$")
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
super.i_send_get_request_to_version_info_endpoint_with_trailing_slash();
}
/******************Assert final response**************/
@Then("^I should get version info in response$")
......@@ -43,4 +48,4 @@ public class Steps extends InfoSteps {
protected String getApi() {
return Config.getIndexerBaseURL() + "info";
}
}
\ No newline at end of file
}
testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+ 7
− 2
View file @ 06063aeb
......@@ -39,11 +39,16 @@ public class Steps extends InfoSteps {
/******************Inputs being set**************/
@When("^I send get request to version info endpoint")
@When("^I send get request to version info endpoint$")
public void i_send_get_request_to_version_info_endpoint() {
super.i_send_get_request_to_version_info_endpoint();
}
@When("^I send get request to version info endpoint with trailing slash$")
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
super.i_send_get_request_to_version_info_endpoint_with_trailing_slash();
}
/******************Assert final response**************/
@Then("^I should get version info in response$")
......@@ -60,4 +65,4 @@ public class Steps extends InfoSteps {
protected String getApi() {
return Config.getIndexerBaseURL() + "info";
}
}
\ No newline at end of file
}
testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/InfoBase.java
+ 11
− 6
View file @ 06063aeb
......@@ -43,12 +43,17 @@ public class InfoBase extends TestsBase {
}
response =
executeQuery(
this.getApi(),
Strings.EMPTY,
headers,
httpClient.getAccessToken(),
InfoResponseMock.class);
executeQuery(
this.getApi(),
Strings.EMPTY,
headers,
httpClient.getAccessToken(),
InfoResponseMock.class);
}
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
response =
executeQuery(getApi()+"/", Strings.EMPTY, headers, httpClient.getAccessToken(), InfoResponseMock.class);
}
public void i_should_get_version_info_in_response() {
......
testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/info/InfoSteps.java
+ 1
− 1
View file @ 06063aeb
......@@ -13,4 +13,4 @@ public class InfoSteps extends InfoBase {
public InfoSteps(HTTPClient httpClient, ElasticUtils elasticUtils) {
super(httpClient, elasticUtils);
}
}
\ No newline at end of file
}
testing/indexer-test-core/src/main/resources/features/info/Info.feature
+ 5
− 0
View file @ 06063aeb
......@@ -4,3 +4,8 @@ Feature: Fetch info about maven build and git repository.
Scenario: Verify version info endpoint content
When I send get request to version info endpoint
Then I should get version info in response
@default
Scenario: Verify version info endpoint content for request with trailing slash
When I send get request to version info endpoint with trailing slash
Then I should get version info in response
testing/indexer-test-gc/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+ 7
− 2
View file @ 06063aeb
......@@ -22,11 +22,16 @@ public class Steps extends InfoSteps {
/******************Inputs being set**************/
@When("^I send get request to version info endpoint")
@When("^I send get request to version info endpoint$")
public void i_send_get_request_to_version_info_endpoint() {
super.i_send_get_request_to_version_info_endpoint();
}
@When("^I send get request to version info endpoint with trailing slash$")
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
super.i_send_get_request_to_version_info_endpoint_with_trailing_slash();
}
/******************Assert final response**************/
@Then("^I should get version info in response$")
......@@ -43,4 +48,4 @@ public class Steps extends InfoSteps {
protected String getApi() {
return Config.getIndexerBaseURL() + "info";
}
}
\ No newline at end of file
}
testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+ 7
− 2
View file @ 06063aeb
......@@ -22,11 +22,16 @@ public class Steps extends InfoSteps {
/******************Inputs being set**************/
@When("^I send get request to version info endpoint")
@When("^I send get request to version info endpoint$")
public void i_send_get_request_to_version_info_endpoint() {
super.i_send_get_request_to_version_info_endpoint();
}
@When("^I send get request to version info endpoint with trailing slash$")
public void i_send_get_request_to_version_info_endpoint_with_trailing_slash() {
super.i_send_get_request_to_version_info_endpoint_with_trailing_slash();
}
/******************Assert final response**************/
@Then("^I should get version info in response$")
......@@ -43,4 +48,4 @@ public class Steps extends InfoSteps {
protected String getApi() {
return Config.getIndexerBaseURL() + "info";
}
}
\ No newline at end of file
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment