From 48b99fe5add8e59789b74d49eca6732813d2ae97 Mon Sep 17 00:00:00 2001 From: Igor Dysko Date: Wed, 22 Jul 2020 14:29:21 +0200 Subject: Update to spring boot 2 Update of code and dependencies Issue-ID: AAI-2530 Signed-off-by: Igor Dysko Change-Id: Iff78a028c237586a285c410a7522744f8a488b58 --- pom.xml | 159 ++++++++------------- .../org/onap/aai/migration/v12/UriMigration.java | 3 +- .../v14/MigrateSameSourcedRCTROPserverData.java | 3 +- .../PserverDedupWithDifferentSourcesOfTruth.java | 3 +- src/main/java/org/onap/aai/schema/GenTester.java | 2 +- .../java/org/onap/aai/schema/GenTester4Hist.java | 2 +- .../java/org/onap/aai/web/JerseyConfiguration.java | 7 +- .../java/org/onap/aai/web/LocalHostAccessLog.java | 10 +- src/main/resources/application.properties | 3 +- .../java/org/onap/aai/AAIGremlinQueryTest.java | 2 +- .../org/onap/aai/GraphAdminTestConfiguration.java | 2 +- 11 files changed, 77 insertions(+), 119 deletions(-) diff --git a/pom.xml b/pom.xml index fa58349..5c39095 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.6.10 + 1.7.0-SNAPSHOT org.onap.aai.graphadmin aai-graphadmin @@ -35,7 +35,7 @@ - 1.10.19 + 1.10.19 1.8 1.8 1.8 @@ -55,14 +55,14 @@ localhost:5000 1.0.0 - 1.6.6 + 1.6.6 ${project.build.directory}/${project.artifactId}-${project.version}-build/ onap alpine - 1.6.0 + 1.7.0-SNAPSHOT check @@ -87,8 +87,6 @@ ${project.basedir}/snapshots/int1-data.graphson 0.46 - 1.6.10 - onap N/A @@ -336,19 +334,60 @@ - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - import - pom - - - - + + javax.jms + javax.jms-api + 2.0.1 + + + org.onap.aai.aai-common + aai-core + + + com.sun.jersey + jersey-core + + + org.slf4j + slf4j-log4j12 + + + org.apache.cxf + cxf-core + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.springframework + spring-web + + + + + javax.ws.rs + javax.ws.rs-api + 2.1 + + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-impl + + + com.sun.xml.bind + jaxb-core + + com.att.eelf @@ -371,55 +410,7 @@ com.google.guava guava - - - org.janusgraph - janusgraph-core - - - org.slf4j - slf4j-log4j12 - - - dom4j - dom4j - - - - - org.janusgraph - janusgraph-cassandra - - - org.slf4j - slf4j-log4j12 - - - dom4j - dom4j - - - - - - com.github.jnr - jnr-ffi - - - org.janusgraph - janusgraph-cql - - - org.slf4j - slf4j-log4j12 - - - - + org.apache.tinkerpop @@ -485,40 +476,6 @@ org.apache.activemq activemq-client - - org.onap.aai.aai-common - aai-core - - - com.sun.jersey - jersey-core - - - org.slf4j - slf4j-log4j12 - - - org.apache.cxf - cxf-core - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-server - - - org.springframework - spring-web - - - org.codehaus.jackson - jackson-mapper-asl - - - com.sun.jersey jersey-client diff --git a/src/main/java/org/onap/aai/migration/v12/UriMigration.java b/src/main/java/org/onap/aai/migration/v12/UriMigration.java index cc8ba55..ed3b84d 100644 --- a/src/main/java/org/onap/aai/migration/v12/UriMigration.java +++ b/src/main/java/org/onap/aai/migration/v12/UriMigration.java @@ -19,6 +19,7 @@ */ package org.onap.aai.migration.v12; +import java.nio.charset.UnsupportedCharsetException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -158,7 +159,7 @@ public class UriMigration extends Migrator { private static String encodeProp(String s) { try { return UriUtils.encode(s, "UTF-8"); - } catch (UnsupportedEncodingException e) { + } catch (UnsupportedCharsetException e) { return ""; } } diff --git a/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java b/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java index cfc8c74..a3085c9 100644 --- a/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java +++ b/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java @@ -19,6 +19,7 @@ */ package org.onap.aai.migration.v14; +import java.nio.charset.UnsupportedCharsetException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.*; @@ -568,7 +569,7 @@ public class MigrateSameSourcedRCTROPserverData extends EdgeSwingMigrator { private static String encodeProp(String s) { try { return UriUtils.encode(s, "UTF-8"); - } catch (UnsupportedEncodingException e) { + } catch (UnsupportedCharsetException e) { return ""; } } diff --git a/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java b/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java index 11f7bd5..b2d964b 100644 --- a/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java +++ b/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java @@ -19,6 +19,7 @@ */ package org.onap.aai.migration.v14; +import java.nio.charset.UnsupportedCharsetException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.P; @@ -350,7 +351,7 @@ public class PserverDedupWithDifferentSourcesOfTruth extends EdgeSwingMigrator { private static String encodeProp(String s) { try { return UriUtils.encode(s, "UTF-8"); - } catch (UnsupportedEncodingException e) { + } catch (UnsupportedCharsetException e) { return ""; } } diff --git a/src/main/java/org/onap/aai/schema/GenTester.java b/src/main/java/org/onap/aai/schema/GenTester.java index 160ec22..defe8bb 100644 --- a/src/main/java/org/onap/aai/schema/GenTester.java +++ b/src/main/java/org/onap/aai/schema/GenTester.java @@ -145,7 +145,7 @@ public class GenTester { imsg = "-- Loading new schema elements into JanusGraph --"; System.out.println(imsg); LOGGER.debug(imsg); - SchemaGenerator.loadSchemaIntoJanusGraph(graph, graphMgt, null); + SchemaGenerator.loadSchemaIntoJanusGraph(graphMgt, null); if( graph != null ){ imsg = "-- graph commit"; diff --git a/src/main/java/org/onap/aai/schema/GenTester4Hist.java b/src/main/java/org/onap/aai/schema/GenTester4Hist.java index 05478e2..cbe82e4 100644 --- a/src/main/java/org/onap/aai/schema/GenTester4Hist.java +++ b/src/main/java/org/onap/aai/schema/GenTester4Hist.java @@ -147,7 +147,7 @@ public class GenTester4Hist { imsg = "-- Loading new schema elements into JanusGraph --"; System.out.println(imsg); LOGGER.debug(imsg); - SchemaGenerator4Hist.loadSchemaIntoJanusGraph(graph, graphMgt, null); + SchemaGenerator4Hist.loadSchemaIntoJanusGraph(graphMgt, null); if( graph != null ){ imsg = "-- graph commit"; diff --git a/src/main/java/org/onap/aai/web/JerseyConfiguration.java b/src/main/java/org/onap/aai/web/JerseyConfiguration.java index f193b8c..a5c2cb4 100644 --- a/src/main/java/org/onap/aai/web/JerseyConfiguration.java +++ b/src/main/java/org/onap/aai/web/JerseyConfiguration.java @@ -19,17 +19,14 @@ */ package org.onap.aai.web; +import com.sun.jersey.api.client.filter.LoggingFilter; import java.util.List; import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; - import javax.annotation.Priority; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseFilter; - -import org.apache.tinkerpop.gremlin.structure.T; -import org.glassfish.jersey.filter.LoggingFilter; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletProperties; import org.onap.aai.rest.AuditSqlDbConsumer; @@ -68,7 +65,7 @@ public class JerseyConfiguration extends ResourceConfig { // Following registers the request headers and response headers // If the LoggingFilter second argument is set to true, it will print response value as well if ("true".equalsIgnoreCase(env.getProperty("aai.request.logging.enabled"))) { - register(new LoggingFilter(log, false)); + register(new LoggingFilter(log, 0)); } } diff --git a/src/main/java/org/onap/aai/web/LocalHostAccessLog.java b/src/main/java/org/onap/aai/web/LocalHostAccessLog.java index 4e28562..eaee501 100644 --- a/src/main/java/org/onap/aai/web/LocalHostAccessLog.java +++ b/src/main/java/org/onap/aai/web/LocalHostAccessLog.java @@ -24,9 +24,9 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.jetty.JettyServerCustomizer; +import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer; +import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; +import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,11 +36,11 @@ import java.util.Arrays; public class LocalHostAccessLog { @Bean - public EmbeddedServletContainerFactory jettyConfigBean( + public AbstractServletWebServerFactory jettyConfigBean( @Value("${jetty.threadPool.maxThreads:200}") final String maxThreads, @Value("${jetty.threadPool.minThreads:8}") final String minThreads ){ - JettyEmbeddedServletContainerFactory jef = new JettyEmbeddedServletContainerFactory(); + JettyServletWebServerFactory jef = new JettyServletWebServerFactory(); jef.addServerCustomizers((JettyServerCustomizer) server -> { HandlerCollection handlers = new HandlerCollection(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 82780f7..ba59da9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,8 @@ spring.application.name=GraphAdmin +spring.main.allow-bean-definition-overriding=true -server.contextPath=/ +server.servlet.context-path=/ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration spring.profiles.active=production,one-way-ssl diff --git a/src/test/java/org/onap/aai/AAIGremlinQueryTest.java b/src/test/java/org/onap/aai/AAIGremlinQueryTest.java index 3115b87..55506a9 100644 --- a/src/test/java/org/onap/aai/AAIGremlinQueryTest.java +++ b/src/test/java/org/onap/aai/AAIGremlinQueryTest.java @@ -28,7 +28,7 @@ import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; import org.onap.aai.util.AAIConfig; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.http.*; diff --git a/src/test/java/org/onap/aai/GraphAdminTestConfiguration.java b/src/test/java/org/onap/aai/GraphAdminTestConfiguration.java index 3c68006..c53a0d4 100644 --- a/src/test/java/org/onap/aai/GraphAdminTestConfiguration.java +++ b/src/test/java/org/onap/aai/GraphAdminTestConfiguration.java @@ -81,7 +81,7 @@ public class GraphAdminTestConfiguration { .build(); RestTemplate restTemplate = builder - .requestFactory(new HttpComponentsClientHttpRequestFactory(client)) + .requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)) .build(); restTemplate.setErrorHandler(new ResponseErrorHandler() { -- cgit