diff options
23 files changed, 99 insertions, 147 deletions
@@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.6.10</version> + <version>1.7.0-SNAPSHOT</version> </parent> <groupId>org.onap.aai.graphadmin</groupId> <artifactId>aai-graphadmin</artifactId> @@ -35,7 +35,7 @@ <properties> <!-- Start of Compiler Related Properties --> - <mockito.core.version>1.10.19</mockito.core.version> + <mockito.core.version>1.10.19</mockito.core.version> <java.version>1.8</java.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> @@ -55,14 +55,14 @@ <!-- This value should be overwritten at runtime to wherever need to be pushed to --> <docker.push.registry>localhost:5000</docker.push.registry> <aai.docker.version>1.0.0</aai.docker.version> - <aai.schema.version>1.6.6</aai.schema.version> + <aai.schema.version>1.6.6</aai.schema.version> <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> <!-- base image for aai-common --> <aai.base.image>alpine</aai.base.image> <!-- aai-common image version --> - <aai.base.image.version>1.6.0</aai.base.image.version> + <aai.base.image.version>1.7.0-SNAPSHOT</aai.base.image.version> <!-- End of Docker Related Properties --> <license.goal.type>check</license.goal.type> @@ -87,8 +87,6 @@ <snapshot.file>${project.basedir}/snapshots/int1-data.graphson</snapshot.file> <jacoco.line.coverage.limit>0.46</jacoco.line.coverage.limit> - <aai.common.version>1.6.10</aai.common.version> - <!-- Start of Default ONAP Schema Properties --> <schema.source.name>onap</schema.source.name> <schema.configuration.location>N/A</schema.configuration.location> @@ -336,19 +334,60 @@ </profile> </profiles> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>${spring.boot.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>javax.jms-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <!-- Start of Logback Dependencies --> <dependency> <groupId>com.att.eelf</groupId> @@ -371,55 +410,7 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <!-- Start of Janus Graph Dependencies --> - <dependency> - <groupId>org.janusgraph</groupId> - <artifactId>janusgraph-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.janusgraph</groupId> - <artifactId>janusgraph-cassandra</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- - indirect janusgraph-cassandra dependency - need to be newer than default one - in order to support multiple cpu archs - --> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jnr-ffi</artifactId> - </dependency> - <dependency> - <groupId>org.janusgraph</groupId> - <artifactId>janusgraph-cql</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- End of Janus Graph Dependencies --> + <!-- Start of Tinkerpop Dependencies --> <dependency> <groupId>org.apache.tinkerpop</groupId> @@ -486,40 +477,6 @@ <artifactId>activemq-client</artifactId> </dependency> <dependency> - <groupId>org.onap.aai.aai-common</groupId> - <artifactId>aai-core</artifactId> - <exclusions> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> </dependency> diff --git a/src/main/java/org/onap/aai/dataexport/DataExportTasks.java b/src/main/java/org/onap/aai/dataexport/DataExportTasks.java index 028c729..143312b 100644 --- a/src/main/java/org/onap/aai/dataexport/DataExportTasks.java +++ b/src/main/java/org/onap/aai/dataexport/DataExportTasks.java @@ -76,7 +76,8 @@ import org.apache.commons.io.filefilter.RegexFileFilter; public class DataExportTasks { private static final Logger LOGGER; - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); + + private final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); static { System.setProperty("aai.service.name", DataExportTasks.class.getSimpleName()); @@ -160,7 +161,7 @@ public class DataExportTasks { if ( "false".equalsIgnoreCase(enableMultipleSnapshots)){ // find the second to latest data snapshot snapshot = findSnapshot(); - snapshotFilePath = snapshot.getAbsolutePath(); + snapshotFilePath = snapshot != null ?snapshot.getAbsolutePath() : null; if ( "true".equalsIgnoreCase (enablePartialGraph) ) { String[] command = new String[2]; command[0] = AAIConstants.AAI_HOME + AAIConstants.AAI_FILESEP + "bin" + AAIConstants.AAI_FILESEP + "dynamicPayloadPartial.sh"; diff --git a/src/main/java/org/onap/aai/datagrooming/DataGroomingTasks.java b/src/main/java/org/onap/aai/datagrooming/DataGroomingTasks.java index 4309ece..21f3172 100644 --- a/src/main/java/org/onap/aai/datagrooming/DataGroomingTasks.java +++ b/src/main/java/org/onap/aai/datagrooming/DataGroomingTasks.java @@ -51,7 +51,7 @@ public class DataGroomingTasks { private AaiScheduledTaskAuditLog auditLog; private static final Logger LOGGER = LoggerFactory.getLogger(DataGroomingTasks.class); - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); + private final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); @Autowired private LoaderFactory loaderFactory; diff --git a/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java b/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java index 12b3099..ff6835b 100644 --- a/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java +++ b/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java @@ -74,11 +74,10 @@ public class PrintVertexDetails implements Runnable{ if (debugOn) { // This is much slower, but sometimes we need to find out which single line is // causing a failure - try { + try(FileOutputStream subFileStr = new FileOutputStream(fname)) { int okCount = 0; int failCount = 0; Long debugDelayMsL = new Long(debugDelayMs); - FileOutputStream subFileStr = new FileOutputStream(fname); GraphWriter graphWriter = null; if ("gryo".equalsIgnoreCase(snapshotType)) { @@ -117,12 +116,10 @@ public class PrintVertexDetails implements Runnable{ + "], aai-uri = [" + aaiUri + "]. "; System.out.println(fmsg); LOGGER.debug(" PrintVertexDetails " + fmsg); - // e.printStackTrace(); } } System.out.println(" -- Printed " + okCount + " vertexes out to " + fname + ", with " + failCount + " failed."); - subFileStr.close(); } catch (Exception e) { AAIException ae = new AAIException("AAI_6128", e , "Error running PrintVertexDetails in debugon"); ErrorLogHelper.logException(ae); @@ -136,16 +133,14 @@ public class PrintVertexDetails implements Runnable{ vtxList.add(gt.next()); } - try { + try(FileOutputStream subFileStr = new FileOutputStream(fname)) { int count = vtxList.size(); Iterator<Vertex> vSubItr = vtxList.iterator(); - FileOutputStream subFileStr = new FileOutputStream(fname); if ("gryo".equalsIgnoreCase(snapshotType)) { jg.io(IoCore.gryo()).writer().create().writeVertices(subFileStr, vSubItr, Direction.BOTH); } else { jg.io(IoCore.graphson()).writer().create().writeVertices(subFileStr, vSubItr, Direction.BOTH); } - subFileStr.close(); String pmsg = " -- Printed " + count + " vertexes out to " + fname; System.out.println(pmsg); LOGGER.debug(" PrintVertexDetails " + pmsg); diff --git a/src/main/java/org/onap/aai/db/schema/AuditOXM.java b/src/main/java/org/onap/aai/db/schema/AuditOXM.java index e976bed..9c5ef4d 100644 --- a/src/main/java/org/onap/aai/db/schema/AuditOXM.java +++ b/src/main/java/org/onap/aai/db/schema/AuditOXM.java @@ -153,7 +153,7 @@ public class AuditOXM extends Auditor { if (namespace == null) { namespace = ""; } - boolean isTopLevel = namespace != ""; + boolean isTopLevel = !namespace.isEmpty(); List<String> unique = Arrays.asList(uniqueProps.split(",")); Set<String> indexed = temp.getIndexedProperties(); Set<String> keys = temp.getKeys(); diff --git a/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java b/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java index 79b988d..91f62f9 100644 --- a/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java +++ b/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java @@ -243,9 +243,9 @@ public class UpdatePropertyToolInternal { if (filePath != null && !filePath.isEmpty()) { // Add vertex Ids listed from the given file name - try { + try(BufferedReader br = new BufferedReader(new FileReader(filePath))) { logAndPrint("Loading file at: " + filePath); - BufferedReader br = new BufferedReader(new FileReader(filePath)); + StringBuilder sb = new StringBuilder(); String nextLine = br.readLine(); @@ -261,7 +261,6 @@ public class UpdatePropertyToolInternal { } String allVertexIdsString = sb.toString(); logAndPrint("All vertex IDs from file " + filePath + ":\n" + allVertexIdsString); - br.close(); } catch (IOException ioe) { logErrorAndPrint("ERROR reading in text file failed.", ioe); } diff --git a/src/main/java/org/onap/aai/migration/v12/DeletePInterface.java b/src/main/java/org/onap/aai/migration/v12/DeletePInterface.java index 1089b2f..8d306c4 100644 --- a/src/main/java/org/onap/aai/migration/v12/DeletePInterface.java +++ b/src/main/java/org/onap/aai/migration/v12/DeletePInterface.java @@ -70,7 +70,7 @@ public class DeletePInterface extends Migrator { if (cousins == null || cousins.isEmpty()) { if (children == null || children.isEmpty()) { logger.info("Delete p-interface: " + getVertexURI(pInterfV)); - pInterfV.remove(); + if(pInterfV != null) pInterfV.remove(); count++; } else { skipCount++; diff --git a/src/main/java/org/onap/aai/migration/v12/MigrateDataFromASDCToConfiguration.java b/src/main/java/org/onap/aai/migration/v12/MigrateDataFromASDCToConfiguration.java index 819c7d4..39224ad 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigrateDataFromASDCToConfiguration.java +++ b/src/main/java/org/onap/aai/migration/v12/MigrateDataFromASDCToConfiguration.java @@ -92,7 +92,7 @@ public class MigrateDataFromASDCToConfiguration extends Migrator { logger.error("Found Exception" , a); } finally { try { - br.close(); + if(br !=null) br.close(); } catch (IOException e) { success = false; logger.error("Found Exception" , e); diff --git a/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java b/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java index e05999d..a24d21a 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java +++ b/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java @@ -430,7 +430,7 @@ public class MigrateSAREvcInventory extends Migrator { private Vertex createNewConfigurationFromSARData(Map<String, String> sarColValues, Vertex forwardingPathVtx, int lineNumber) { Vertex configurationVtx = null; - String forwardingPathId = forwardingPathVtx.value(this.FOWARDING_PATH_ID); + String forwardingPathId = forwardingPathVtx !=null ? forwardingPathVtx.value(this.FOWARDING_PATH_ID) : ""; try { List<Vertex> configList = g.V(forwardingPathVtx).out("org.onap.relationships.inventory.Uses").has("aai-node-type","configuration") @@ -470,7 +470,7 @@ public class MigrateSAREvcInventory extends Migrator { try { Introspector evc = loader.introspectorFromName(EVC_NODE_TYPE); evcVtx = serializer.createNewVertex(evc); - evcId = configurationVtx.value(this.PROPERTY_CONFIGURATION_ID); + evcId = configurationVtx != null ? configurationVtx.value(this.PROPERTY_CONFIGURATION_ID) : ""; String cir = sarColValues.get("evcAccessCIR"); int length = cir.length(); 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/v13/MigrateModelVer.java b/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java index 7bc9a7d..1e0ef5e 100644 --- a/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java +++ b/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java @@ -142,8 +142,8 @@ public class MigrateModelVer extends Migrator{ String uri = String.format("/service-design-and-creation/models/model/%s/model-vers/model-ver/%s", currrentValueModelInvariantID, currentValueModelVersionID); String propertyKey = NODETYPEKEYMAP.get(nodeTypeString); - String propertyValue = vertex.value(propertyKey).toString(); - logger.info("Processing "+nodeTypeString+ " vertex with key "+vertex.value(propertyKey).toString()); + String propertyValue = vertex != null ? vertex.value(propertyKey).toString() : ""; + logger.info("Processing "+nodeTypeString+ " vertex with key "+ propertyValue); Vertex modelVerVertex = null; if (modelVerUriVtxIdMap.containsKey(uri)){ diff --git a/src/main/java/org/onap/aai/migration/v13/MigratePserverAndPnfEquipType.java b/src/main/java/org/onap/aai/migration/v13/MigratePserverAndPnfEquipType.java index 61c488c..94b85b1 100644 --- a/src/main/java/org/onap/aai/migration/v13/MigratePserverAndPnfEquipType.java +++ b/src/main/java/org/onap/aai/migration/v13/MigratePserverAndPnfEquipType.java @@ -70,7 +70,7 @@ public class MigratePserverAndPnfEquipType extends Migrator{ currentValueOfEquipType = getEquipTypeNodeValue(vertex); hostName = getHostNameNodeValue(vertex); if("Server".equals(currentValueOfEquipType) ||"server".equals(currentValueOfEquipType) ){ - vertex.property(EQUIP_TYPE_PROPERTY, "SERVER"); + if(vertex != null) vertex.property(EQUIP_TYPE_PROPERTY, "SERVER"); this.touchVertexProperties(vertex, false); logger.info("changed Pserver equip-type from " + currentValueOfEquipType + " to SERVER having hostname : " + hostName); pserverCount++; @@ -89,7 +89,7 @@ public class MigratePserverAndPnfEquipType extends Migrator{ currentValueOfEquipType = getEquipTypeNodeValue(vertex); pnfName = getPnfNameNodeValue(vertex); if("Switch".equals(currentValueOfEquipType)||"switch".equals(currentValueOfEquipType)){ - vertex.property(EQUIP_TYPE_PROPERTY, "SWITCH"); + if(vertex != null) vertex.property(EQUIP_TYPE_PROPERTY, "SWITCH"); this.touchVertexProperties(vertex, false); logger.info("changed Pnf equip-type from "+ currentValueOfEquipType +" to SWITCH having pnf-name :" + pnfName); pnfCount++; 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 54ed12c..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; @@ -119,7 +120,7 @@ public class PserverDedupWithDifferentSourcesOfTruth extends EdgeSwingMigrator { @Override public Optional<String[]> getAffectedNodeTypes() { - return null; + return Optional.empty(); } @Override @@ -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/rest/search/GenericQueryProcessor.java b/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java index 9bcd843..85573fc 100644 --- a/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java +++ b/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java @@ -115,10 +115,10 @@ public abstract class GenericQueryProcessor { Map<String, Object> params = new HashMap<>(); String query = ""; if (this.isGremlin) { - query = gremlin.get(); + query = gremlin.isPresent() ? gremlin.get() : ""; }else if (this.isDsl) { - String dslUserQuery = dsl.get(); + String dslUserQuery = dsl.isPresent() ? dsl.get() : ""; if(dslQueryProcessorOptional.isPresent()){ String dslQuery = dslQueryProcessorOptional.get().parseAaiQuery(dslUserQuery); query = groovyQueryBuilder.executeTraversal(dbEngine, dslQuery, params); 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/util/UniquePropertyCheck.java b/src/main/java/org/onap/aai/util/UniquePropertyCheck.java index 8ef5139..20432e6 100644 --- a/src/main/java/org/onap/aai/util/UniquePropertyCheck.java +++ b/src/main/java/org/onap/aai/util/UniquePropertyCheck.java @@ -73,11 +73,10 @@ public class UniquePropertyCheck { String propertyName = args[0]; Graph graph = null; - try { + try(JanusGraph tGraph = JanusGraphFactory.open(new AAIGraphConfig.Builder(AAIConstants.REALTIME_DB_CONFIG).forService(UniquePropertyCheck.class.getSimpleName()).withGraphType("realtime").buildConfiguration())) { AAIConfig.init(); System.out.println(" ---- NOTE --- about to open graph (takes a little while)--------\n"); - JanusGraph tGraph = JanusGraphFactory.open(new AAIGraphConfig.Builder(AAIConstants.REALTIME_DB_CONFIG).forService(UniquePropertyCheck.class.getSimpleName()).withGraphType("realtime").buildConfiguration()); - + if( tGraph == null ) { logAndPrint(logger, " Error: Could not get JanusGraph "); System.exit(1); 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() { |