diff options
| author |   Igor Dysko <igor1.dysko@orange.com> | 2020-06-27 23:42:28 +0200 |
|---|---|---|
| committer | Igor Dysko <igor1.dysko@orange.com> | 2020-07-06 14:46:52 +0200 |
| commit | 37a8cab63cef498490f50c0b0262bf0696cabf85 (patch) | |
| tree | c09ac4528d76546ea21d3ddaa70e06fb0f07dcf2 /aai-schema-service/src/test | |
| parent | 95dadba8706ede75a0b39127b40b6430031fa1d3 (diff) | |
Update to spring boot 2
Update of code and dependencies, no changes in functionality
Issue-ID: AAI-2529
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: Ia43601c2990a67c0e8afefa1d54c53d7e606b886
Diffstat (limited to 'aai-schema-service/src/test')
3 files changed, 3 insertions, 3 deletions
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java index 5b24be2..9c214bd 100644 --- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java +++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java @@ -27,8 +27,8 @@ import org.onap.aai.exceptions.AAIException; import org.onap.aai.schemaservice.config.PropertyPasswordConfiguration; import org.onap.aai.util.AAIConfig; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.*; import org.springframework.test.context.ContextConfiguration; diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java index f712b79..ba8ae26 100644 --- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java +++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java @@ -84,7 +84,7 @@ public class SchemaServiceTestConfiguration { .build(); restTemplate = builder - .requestFactory(new HttpComponentsClientHttpRequestFactory(client)) + .requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)) .build(); }else { restTemplate = builder.build(); diff --git a/aai-schema-service/src/test/resources/application-test.properties b/aai-schema-service/src/test/resources/application-test.properties index bad8309..c3d72b5 100644 --- a/aai-schema-service/src/test/resources/application-test.properties +++ b/aai-schema-service/src/test/resources/application-test.properties @@ -1,7 +1,7 @@ spring.application.name=aai-schema-service spring.jersey.type=filter -server.contextPath=${schema.uri.base.path} +server.servlet.context-path=${schema.uri.base.path} spring.autoconfigure.exclude=\ org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\ |