From fbb02159b84435cf37221ae8ae5e0045167be15a Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 7 Nov 2022 08:35:37 +0000 Subject: Reduce the number of problems in aai-common by removing unused imports - run mvn spotless:apply across aai-commmon to remove unused imports - run mvn formatter:format across aai-common Issue-ID: AAI-3583 Signed-off-by: Fiete Ostkamp Change-Id: I2dfeb395eafa2824ce8369bba3a18db3e1845522 --- .../aai/schemaif/json/JsonSchemaProviderTest.java | 140 ++++++++------------- .../aai/schemaif/oxm/OxmSchemaProviderTest.java | 49 +++----- .../aai/schemaif/oxm/OxmSchemaServiceSetup.java | 5 +- 3 files changed, 74 insertions(+), 120 deletions(-) (limited to 'aai-schema-abstraction/src/test/java/org/onap') diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java index 332d6672..9011dfa2 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import org.junit.Before; import org.junit.Test; import org.onap.aai.schemaif.SchemaProviderException; @@ -54,7 +55,6 @@ import org.onap.aai.schemaif.json.definitions.JsonPropertySchema; import org.onap.aai.schemaif.json.definitions.JsonSchema; import org.onap.aai.schemaif.json.definitions.JsonVertexSchema; - public class JsonSchemaProviderTest { JsonSchemaProviderConfig config = new JsonSchemaProviderConfig(); @@ -96,8 +96,8 @@ public class JsonSchemaProviderTest { // Test Edge Schema JsonEdgeSchema edgeSchema = null; for (JsonEdgeSchema edge : jsonSchema.getRelationshipTypes()) { - if ( (edge.getFrom().equals("onap.nodes.sdwan.uCPE")) - && (edge.getTo().equals("onap.nodes.sdwan.service.SubscriberService")) ) { + if ((edge.getFrom().equals("onap.nodes.sdwan.uCPE")) + && (edge.getTo().equals("onap.nodes.sdwan.service.SubscriberService"))) { edgeSchema = edge; break; } @@ -109,7 +109,7 @@ public class JsonSchemaProviderTest { // Test Node Schema JsonVertexSchema vertexSchema = null; for (JsonVertexSchema v : jsonSchema.getNodeTypes()) { - if ( (v.getName().equals("org.onap.resource.NetworkRules")) ) { + if ((v.getName().equals("org.onap.resource.NetworkRules"))) { vertexSchema = v; break; } @@ -120,7 +120,7 @@ public class JsonSchemaProviderTest { JsonPropertySchema propSchema = null; for (JsonPropertySchema p : vertexSchema.getProperties()) { - if ( (p.getName().equals("network_policy_entries")) ) { + if ((p.getName().equals("network_policy_entries"))) { propSchema = p; break; } @@ -136,7 +136,7 @@ public class JsonSchemaProviderTest { // Test DataType Schema DataTypeDefinition dataType = null; for (DataTypeDefinition d : jsonSchema.getDataTypes()) { - if ( (d.getName().equals("org.onap.datatypes.network.VlanRequirements")) ) { + if ((d.getName().equals("org.onap.datatypes.network.VlanRequirements"))) { dataType = d; break; } @@ -148,7 +148,7 @@ public class JsonSchemaProviderTest { propSchema = null; for (JsonPropertySchema p : dataType.getProperties()) { - if ( (p.getName().equals("vlan_type")) ) { + if ((p.getName().equals("vlan_type"))) { propSchema = p; break; } @@ -158,8 +158,7 @@ public class JsonSchemaProviderTest { assertEquals(false, propSchema.getRequired()); assertEquals("string", propSchema.getDataType()); assertEquals("", propSchema.getDefaultValue()); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -175,9 +174,8 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - VertexSchema vertSchema = - schemaProvider.getVertexSchema("tosca.nodes.objectstorage", - schemaProvider.getLatestSchemaVersion()); + VertexSchema vertSchema = schemaProvider.getVertexSchema("tosca.nodes.objectstorage", + schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); // Validate vertex schema @@ -204,8 +202,7 @@ public class JsonSchemaProviderTest { assertFalse(propSchema.isRequired()); assertTrue(propSchema.isReserved()); assertEquals(0, propSchema.getDataType().getType().compareTo(Type.STRING)); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -222,8 +219,7 @@ public class JsonSchemaProviderTest { schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("tosca.relationships.hostedOn", - "tosca.nodes.Softwarecomponent", "tosca.nodes.compute", - schemaProvider.getLatestSchemaVersion()); + "tosca.nodes.Softwarecomponent", "tosca.nodes.compute", schemaProvider.getLatestSchemaVersion()); System.out.println(edgeSchema.toString()); // Validate edge schema @@ -233,9 +229,7 @@ public class JsonSchemaProviderTest { assertEquals(edgeSchema.getMultiplicity(), EdgeSchema.Multiplicity.MANY_2_MANY); assertEquals("NONE", edgeSchema.getAnnotationValue("contains-other-v")); - - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -251,9 +245,8 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - Set edgeSchemaList = - schemaProvider.getAdjacentEdgeSchema("tosca.nodes.Database", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("tosca.nodes.Database", + schemaProvider.getLatestSchemaVersion()); // Validate edge schema assertEquals(3, edgeSchemaList.size()); @@ -277,8 +270,7 @@ public class JsonSchemaProviderTest { break; } } - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -294,10 +286,8 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - Set edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("tosca.nodes.LoadBalancer", - "tosca.nodes.Database", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("tosca.nodes.LoadBalancer", + "tosca.nodes.Database", schemaProvider.getLatestSchemaVersion()); // Validate edge schema assertEquals(2, edgeSchemaList.size()); @@ -308,18 +298,15 @@ public class JsonSchemaProviderTest { assertEquals("tosca.nodes.LoadBalancer", es.getSource()); assertEquals("tosca.nodes.Database", es.getTarget()); assertEquals(es.getMultiplicity(), EdgeSchema.Multiplicity.MANY_2_MANY); - } - else if (es.getName().equals("tosca.relationships.RoutesTo")) { + } else if (es.getName().equals("tosca.relationships.RoutesTo")) { assertEquals("tosca.nodes.LoadBalancer", es.getSource()); assertEquals("tosca.nodes.Database", es.getTarget()); assertEquals(es.getMultiplicity(), EdgeSchema.Multiplicity.MANY_2_MANY); - } - else { + } else { fail(); } } - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -335,9 +322,8 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - EdgeSchema edgeSchema = - schemaProvider.getEdgeSchema("amdocs.linkedTo", "service-instance", - "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion()); + EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("amdocs.linkedTo", "service-instance", + "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion()); assertEquals("amdocs.linkedTo", edgeSchema.getName()); assertEquals("service-instance", edgeSchema.getSource()); @@ -348,27 +334,22 @@ public class JsonSchemaProviderTest { assertNull(edgeSchema); - - edgeSchema = - schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "unknown", - "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion()); + edgeSchema = schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "unknown", + "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion()); assertEquals("amdocs.unknownRelationship", edgeSchema.getName()); assertEquals("unknown", edgeSchema.getSource()); assertEquals("onap.nodes.sdwan.ManagementDomain", edgeSchema.getTarget()); - edgeSchema = - schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "onap.nodes.sdwan.ManagementDomain", - "unknown", schemaProvider.getLatestSchemaVersion()); + edgeSchema = schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "onap.nodes.sdwan.ManagementDomain", + "unknown", schemaProvider.getLatestSchemaVersion()); assertEquals("amdocs.unknownRelationship", edgeSchema.getName()); assertEquals("onap.nodes.sdwan.ManagementDomain", edgeSchema.getSource()); assertEquals("unknown", edgeSchema.getTarget()); - Set edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("service-instance", - "onap.nodes.sdwan.ManagementDomain", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("service-instance", + "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion()); assertEquals(1, edgeSchemaList.size()); edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("unknown", "unknown", @@ -379,12 +360,11 @@ public class JsonSchemaProviderTest { schemaProvider.getLatestSchemaVersion()); assertEquals(1, edgeSchemaList.size()); - - edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("service-instance", schemaProvider.getLatestSchemaVersion()); + edgeSchemaList = + schemaProvider.getAdjacentEdgeSchema("service-instance", schemaProvider.getLatestSchemaVersion()); System.out.println("EDGE LIST: \n\n" + edgeSchemaList); assertEquals(8, edgeSchemaList.size()); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -408,12 +388,10 @@ public class JsonSchemaProviderTest { "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); assertNull(edgeSchema); - Set edgeSchemaList = - schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", + schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchemaList.isEmpty()); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -429,18 +407,16 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - VertexSchema vertSchema = - schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", - schemaProvider.getLatestSchemaVersion()); + VertexSchema vertSchema = schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", + schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); // Validate schema PropertySchema propSchema = vertSchema.getPropertySchema("controllers"); assertEquals(0, propSchema.getDataType().getType().compareTo(Type.LIST)); - ListDataType listType = (ListDataType)propSchema.getDataType(); + ListDataType listType = (ListDataType) propSchema.getDataType(); assertEquals(0, listType.getListType().getType().compareTo(Type.STRING)); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -456,18 +432,16 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - VertexSchema vertSchema = - schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", - schemaProvider.getLatestSchemaVersion()); + VertexSchema vertSchema = schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", + schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); // Validate schema PropertySchema propSchema = vertSchema.getPropertySchema("analyticClusters"); assertEquals(0, propSchema.getDataType().getType().compareTo(Type.MAP)); - MapDataType mapType = (MapDataType)propSchema.getDataType(); + MapDataType mapType = (MapDataType) propSchema.getDataType(); assertEquals(0, mapType.getMapType().getType().compareTo(Type.STRING)); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -483,9 +457,8 @@ public class JsonSchemaProviderTest { JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config); schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion()); - VertexSchema vertSchema = - schemaProvider.getVertexSchema("org.onap.resource.extContrailCP", - schemaProvider.getLatestSchemaVersion()); + VertexSchema vertSchema = schemaProvider.getVertexSchema("org.onap.resource.extContrailCP", + schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); System.out.println("\n\nSize: " + vertSchema.getPropertySchemaList().size()); @@ -495,7 +468,7 @@ public class JsonSchemaProviderTest { // Validate property schema PropertySchema propSchema = vertSchema.getPropertySchema("exCP_naming"); assertEquals(0, propSchema.getDataType().getType().compareTo(Type.COMPLEX)); - ComplexDataType complexType = (ComplexDataType)propSchema.getDataType(); + ComplexDataType complexType = (ComplexDataType) propSchema.getDataType(); List complexProps = complexType.getSubProperties(); assertEquals(4, complexProps.size()); @@ -509,8 +482,7 @@ public class JsonSchemaProviderTest { assertNotNull(subProp); assertFalse(subProp.isRequired()); assertEquals(0, subProp.getDataType().getType().compareTo(Type.STRING)); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -532,8 +504,7 @@ public class JsonSchemaProviderTest { System.out.println(jsonSchema.toJson()); assertEquals(1, jsonSchema.getDataTypes().size()); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -548,8 +519,7 @@ public class JsonSchemaProviderTest { String testSchema = readFile("src/test/resources/json/schemaServiceResponse.json"); SchemaServiceResponse schema = SchemaServiceResponse.fromJson(testSchema); schema.getData().validate(); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -565,8 +535,7 @@ public class JsonSchemaProviderTest { try { String testSchema = readFile("src/test/resources/json/badEdgeSchema.json"); schema = SchemaServiceResponse.fromJson(testSchema); - } - catch (Exception ex) { + } catch (Exception ex) { fail(); return; } @@ -581,8 +550,7 @@ public class JsonSchemaProviderTest { try { String testSchema = readFile("src/test/resources/json/badVertexSchema.json"); schema = SchemaServiceResponse.fromJson(testSchema); - } - catch (Exception ex) { + } catch (Exception ex) { fail(); return; } @@ -599,8 +567,7 @@ public class JsonSchemaProviderTest { try { String testSchema = readFile("src/test/resources/json/badTypeSchema.json"); schema = SchemaServiceResponse.fromJson(testSchema); - } - catch (Exception ex) { + } catch (Exception ex) { fail(); return; } @@ -615,8 +582,7 @@ public class JsonSchemaProviderTest { try { String testSchema = readFile("src/test/resources/json/badPropSchema.json"); schema = SchemaServiceResponse.fromJson(testSchema); - } - catch (Exception ex) { + } catch (Exception ex) { fail(); return; } diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java index 6cfb5a7d..21ba985b 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java @@ -21,7 +21,6 @@ package org.onap.aai.schemaif.oxm; - import static org.junit.Assert.assertTrue; import java.io.PrintWriter; @@ -46,7 +45,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - VertexSchema vertSchema = schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion()); + VertexSchema vertSchema = + schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", @@ -80,7 +80,6 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(obj instanceof Boolean); assertTrue(propSchema.getDataType().validateValue("badValue") == null); - propSchema = vertSchema.getPropertySchema("aai-node-type"); assertTrue(propSchema.getName().equals("aai-node-type")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -119,8 +118,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { // Validate 'dependentOn' annotation vertSchema = schemaProvider.getVertexSchema("tenant", schemaProvider.getLatestSchemaVersion()); assertTrue(vertSchema.getAnnotationValue("dependentOn").equals("cloud-region")); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -147,18 +145,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(es.getSource().equals("snapshot")); assertTrue(es.getTarget().equals("cloud-region")); assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE)); - } - else if (es.getName().equals("org.onap.relationships.inventory.Uses")) { + } else if (es.getName().equals("org.onap.relationships.inventory.Uses")) { assertTrue(es.getSource().equals("vserver")); assertTrue(es.getTarget().equals("snapshot")); assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.ONE_2_ONE)); - } - else { + } else { assertTrue(false); } } - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -173,9 +168,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - Set edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", + schemaProvider.getLatestSchemaVersion()); // Validate edge schema assertTrue(edgeSchemaList.size() == 1); @@ -184,9 +178,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(edgeSchemaList.iterator().next().getTarget().equals("customer")); assertTrue(edgeSchemaList.iterator().next().getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY)); - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", - schemaProvider.getLatestSchemaVersion()); + edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", + schemaProvider.getLatestSchemaVersion()); // Validate edge schema assertTrue(edgeSchemaList.size() == 2); @@ -197,25 +190,21 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(es.getSource().equals("cloud-region")); assertTrue(es.getTarget().equals("complex")); assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY)); - } - else if (es.getName().equals("org.onap.relationships.inventory.LocatedIn")) { + } else if (es.getName().equals("org.onap.relationships.inventory.LocatedIn")) { assertTrue(es.getSource().equals("cloud-region")); assertTrue(es.getTarget().equals("complex")); assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE)); - } - else { + } else { assertTrue(false); } } - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", - schemaProvider.getLatestSchemaVersion()); + edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", + schemaProvider.getLatestSchemaVersion()); // Validate edge schema assertTrue(edgeSchemaList.size() == 0); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); @@ -238,12 +227,10 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchema == null); - Set edgeSchemaList = - schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", - schemaProvider.getLatestSchemaVersion()); + Set edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", + schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchemaList.isEmpty()); - } - catch (Exception ex) { + } catch (Exception ex) { StringWriter writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java index b0b76a21..e7055a3f 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -34,9 +35,9 @@ import org.mockito.runners.MockitoJUnitRunner; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.setup.AAIConfigTranslator; +import org.onap.aai.setup.SchemaConfigVersions; import org.onap.aai.setup.SchemaLocationsBean; import org.onap.aai.setup.SchemaVersion; -import org.onap.aai.setup.SchemaConfigVersions; import org.onap.aai.setup.Translator; @RunWith(MockitoJUnitRunner.class) @@ -65,7 +66,7 @@ public class OxmSchemaServiceSetup { Mockito.when(schemaLocationsBean.getNodeDirectory()).thenReturn("src/test/resources/oxm/oxm"); Mockito.when(schemaLocationsBean.getEdgeDirectory()).thenReturn("src/test/resources/oxm/edge-rules"); - AAIConfigTranslator aaiConfigTranslator = new AAIConfigTranslator(schemaLocationsBean, schemaConfigVersions); + AAIConfigTranslator aaiConfigTranslator = new AAIConfigTranslator(schemaLocationsBean, schemaConfigVersions); Set translators = new HashSet<>(); translators.add(aaiConfigTranslator); NodeIngestor nodeIngestor = new NodeIngestor(translators); -- cgit 1.2.3-korg