Replace all tab characters in java files with two spaces to remove linter warning

Issue-ID: AAI-3525

Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Change-Id: I36cf7b83dd33c3b69de51e56e00bbd93a79c5ec4

6 files changed, 327 insertions, 327 deletions

diff --git a/aai-queries/src/main/java/org/onap/aai/queries/CustomQueryConfig.java b/aai-queries/src/main/java/org/onap/aai/queries/CustomQueryConfig.java
index 5a58923..664c9ca 100644
--- a/aai-queries/src/main/java/org/onap/aai/queries/CustomQueryConfig.java
+++ b/aai-queries/src/main/java/org/onap/aai/queries/CustomQueryConfig.java
@@ -22,32 +22,32 @@ package org.onap.aai.queries;
 import java.util.List;
 
 public class CustomQueryConfig {
-	public CustomQueryConfig() {
-		// used by GetCustomQueryConfig
-	}
+  public CustomQueryConfig() {
+    // used by GetCustomQueryConfig
+  }
 
 
-	private String query;
-	private List<String> queryOptionalProperties;
-	private List<String> queryRequiredProperties;
+  private String query;
+  private List<String> queryOptionalProperties;
+  private List<String> queryRequiredProperties;
 
-	public void setQuery(String query) {
-		this.query = query;
-	}
-	public String getQuery() {
-		return this.query;
-	}
+  public void setQuery(String query) {
+    this.query = query;
+  }
+  public String getQuery() {
+    return this.query;
+  }
 
-	public void setQueryOptionalProperties( List<String> queryOptionalProperties) {
-		this.queryOptionalProperties = queryOptionalProperties;
-	}
-	public List<String> getQueryOptionalProperties( ) {
-		return queryOptionalProperties;
-	}
-	public void setQueryRequiredProperties( List<String> queryRequiredProperties) {
-		this.queryRequiredProperties = queryRequiredProperties;
-	}
-	public List<String> getQueryRequiredProperties( ) {
-		return queryRequiredProperties;
-	}
+  public void setQueryOptionalProperties( List<String> queryOptionalProperties) {
+    this.queryOptionalProperties = queryOptionalProperties;
+  }
+  public List<String> getQueryOptionalProperties( ) {
+    return queryOptionalProperties;
+  }
+  public void setQueryRequiredProperties( List<String> queryRequiredProperties) {
+    this.queryRequiredProperties = queryRequiredProperties;
+  }
+  public List<String> getQueryRequiredProperties( ) {
+    return queryRequiredProperties;
+  }
 }
diff --git a/aai-queries/src/main/java/org/onap/aai/queries/GetCustomQueryConfig.java b/aai-queries/src/main/java/org/onap/aai/queries/GetCustomQueryConfig.java
index ed4ff99..c726c76 100644
--- a/aai-queries/src/main/java/org/onap/aai/queries/GetCustomQueryConfig.java
+++ b/aai-queries/src/main/java/org/onap/aai/queries/GetCustomQueryConfig.java
@@ -28,121 +28,121 @@ import java.util.List;
 
 public class GetCustomQueryConfig {
 
-	private JsonArray storedQueries = null;
-	private CustomQueryConfig customQueryConfig;
-
-
-	private final static String QUERY_CONFIG = "query";
-	private final static String REQUIRED_CONFIG = "required-properties";
-	private final static String OPTIONAL_CONFIG = "optional-properties";
-	private final static String STORED_QUERIES_CONFIG = "stored-queries";
-	private final static String STORED_QUERY_CONFIG = "stored-query";
-
-//	public static final String AAI_HOME_ETC_QUERY_JSON = AAIConstants.AAI_HOME_ETC + "query" + AAIConstants.AAI_FILESEP + "stored-queries.json";
-
-	public GetCustomQueryConfig(String customQueryJson ) {
-		init(customQueryJson);
-	}
-
-	private void init( String customQueryJson) {
-		JsonParser parser = new JsonParser();
-		JsonObject queriesObject = parser.parse(customQueryJson).getAsJsonObject();
-		if (queriesObject.has(STORED_QUERIES_CONFIG)) {
-
-			storedQueries = queriesObject.getAsJsonArray(STORED_QUERIES_CONFIG);
-		}
-	}
-
-	private List<String> toStringList(JsonArray array) {
-	   Gson converter = new Gson();
-	   Type listType = new TypeToken<List<String>>() {}.getType();
-	   return converter.fromJson(array, listType);
-	}
-
-	private List<String> getPropertyList(JsonObject configObject, String config ) {
-		JsonElement subqueryConfig;
-		JsonArray props;
-
-		if ( configObject.has(config)) {
-			subqueryConfig = configObject.get(config);
-			if ( subqueryConfig != null && !subqueryConfig.isJsonNull() ) {
-				props = subqueryConfig.getAsJsonArray();
-				if ( props != null ) {
-					return toStringList(props);
-				}
-			}
-		}
-		return toStringList(null);
-	}
-
-	private String getPropertyString(JsonObject configObject, String config) {
-		JsonElement subqueryConfig;
-
-		if ( configObject.has(config)) {
-			subqueryConfig = configObject.get(config);
-			if ( subqueryConfig != null && !subqueryConfig.isJsonNull() ) {
-				return subqueryConfig.getAsString();
-			}
-		}
-		return null;
-	}
-
-	private void getStoredQueryBlock( JsonObject configObject, String config ) {
-		if ( !configObject.has(config)) {
-			customQueryConfig.setQueryRequiredProperties( new ArrayList<String>() );
-			customQueryConfig.setQueryOptionalProperties( new ArrayList<String>()  );
-			return;
-		}
-
-		JsonElement queryConfig;
-		JsonObject subObject;
-		String multipleStartNodes;
-		List<String> propertyList;
-
-		queryConfig = configObject.get(config);
-		subObject = queryConfig.getAsJsonObject();
-		propertyList = getPropertyList(subObject, REQUIRED_CONFIG);
-		if ( propertyList == null ) {
-			propertyList = new ArrayList<String>();
-		}
-		customQueryConfig.setQueryRequiredProperties( propertyList );
-		propertyList = getPropertyList(subObject, OPTIONAL_CONFIG);
-		if ( propertyList == null ) {
-			propertyList = new ArrayList<String>();
-		}
-		customQueryConfig.setQueryOptionalProperties( propertyList );
-
-	}
-
-
-	public CustomQueryConfig getStoredQuery(String queryName ) {
-
-		customQueryConfig = null;
-		JsonObject configObject;
-		JsonElement query;
-		JsonElement queryConfig;
-		String queryString;
-
-		for (JsonElement storedQuery : storedQueries) {
-			if (storedQuery.isJsonObject()) {
-				JsonObject queryObject = storedQuery.getAsJsonObject();
-				query = queryObject.get(queryName);
-				if ( query != null ) {
-					customQueryConfig = new CustomQueryConfig();
-					configObject = query.getAsJsonObject();
-					getStoredQueryBlock(configObject, QUERY_CONFIG);
-					if ( configObject.has(STORED_QUERY_CONFIG)) {
-						queryConfig = configObject.get(STORED_QUERY_CONFIG);
-						customQueryConfig.setQuery(queryConfig.getAsString());
-					}
-					break;
-				}
-			}
-		}
-
-		return customQueryConfig;
-
-	}
+  private JsonArray storedQueries = null;
+  private CustomQueryConfig customQueryConfig;
+
+
+  private final static String QUERY_CONFIG = "query";
+  private final static String REQUIRED_CONFIG = "required-properties";
+  private final static String OPTIONAL_CONFIG = "optional-properties";
+  private final static String STORED_QUERIES_CONFIG = "stored-queries";
+  private final static String STORED_QUERY_CONFIG = "stored-query";
+
+//  public static final String AAI_HOME_ETC_QUERY_JSON = AAIConstants.AAI_HOME_ETC + "query" + AAIConstants.AAI_FILESEP + "stored-queries.json";
+
+  public GetCustomQueryConfig(String customQueryJson ) {
+    init(customQueryJson);
+  }
+
+  private void init( String customQueryJson) {
+    JsonParser parser = new JsonParser();
+    JsonObject queriesObject = parser.parse(customQueryJson).getAsJsonObject();
+    if (queriesObject.has(STORED_QUERIES_CONFIG)) {
+
+      storedQueries = queriesObject.getAsJsonArray(STORED_QUERIES_CONFIG);
+    }
+  }
+
+  private List<String> toStringList(JsonArray array) {
+     Gson converter = new Gson();
+     Type listType = new TypeToken<List<String>>() {}.getType();
+     return converter.fromJson(array, listType);
+  }
+
+  private List<String> getPropertyList(JsonObject configObject, String config ) {
+    JsonElement subqueryConfig;
+    JsonArray props;
+
+    if ( configObject.has(config)) {
+      subqueryConfig = configObject.get(config);
+      if ( subqueryConfig != null && !subqueryConfig.isJsonNull() ) {
+        props = subqueryConfig.getAsJsonArray();
+        if ( props != null ) {
+          return toStringList(props);
+        }
+      }
+    }
+    return toStringList(null);
+  }
+
+  private String getPropertyString(JsonObject configObject, String config) {
+    JsonElement subqueryConfig;
+
+    if ( configObject.has(config)) {
+      subqueryConfig = configObject.get(config);
+      if ( subqueryConfig != null && !subqueryConfig.isJsonNull() ) {
+        return subqueryConfig.getAsString();
+      }
+    }
+    return null;
+  }
+
+  private void getStoredQueryBlock( JsonObject configObject, String config ) {
+    if ( !configObject.has(config)) {
+      customQueryConfig.setQueryRequiredProperties( new ArrayList<String>() );
+      customQueryConfig.setQueryOptionalProperties( new ArrayList<String>()  );
+      return;
+    }
+
+    JsonElement queryConfig;
+    JsonObject subObject;
+    String multipleStartNodes;
+    List<String> propertyList;
+
+    queryConfig = configObject.get(config);
+    subObject = queryConfig.getAsJsonObject();
+    propertyList = getPropertyList(subObject, REQUIRED_CONFIG);
+    if ( propertyList == null ) {
+      propertyList = new ArrayList<String>();
+    }
+    customQueryConfig.setQueryRequiredProperties( propertyList );
+    propertyList = getPropertyList(subObject, OPTIONAL_CONFIG);
+    if ( propertyList == null ) {
+      propertyList = new ArrayList<String>();
+    }
+    customQueryConfig.setQueryOptionalProperties( propertyList );
+
+  }
+
+
+  public CustomQueryConfig getStoredQuery(String queryName ) {
+
+    customQueryConfig = null;
+    JsonObject configObject;
+    JsonElement query;
+    JsonElement queryConfig;
+    String queryString;
+
+    for (JsonElement storedQuery : storedQueries) {
+      if (storedQuery.isJsonObject()) {
+        JsonObject queryObject = storedQuery.getAsJsonObject();
+        query = queryObject.get(queryName);
+        if ( query != null ) {
+          customQueryConfig = new CustomQueryConfig();
+          configObject = query.getAsJsonObject();
+          getStoredQueryBlock(configObject, QUERY_CONFIG);
+          if ( configObject.has(STORED_QUERY_CONFIG)) {
+            queryConfig = configObject.get(STORED_QUERY_CONFIG);
+            customQueryConfig.setQuery(queryConfig.getAsString());
+          }
+          break;
+        }
+      }
+    }
+
+    return customQueryConfig;
+
+  }
 
 
 
diff --git a/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java b/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
index 3b4a406..509aa88 100644
--- a/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
+++ b/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
@@ -62,29 +62,29 @@ public class GremlinServerSingleton {
     @PostConstruct
     public void init() {
 
-		try {
-			String filepath = storedQueriesLocation + AAIConstants.AAI_FILESEP + "stored-queries.json";
-			Path path = Paths.get(filepath);
-			String customQueryConfigJson = new String(Files.readAllBytes(path));
+    try {
+      String filepath = storedQueriesLocation + AAIConstants.AAI_FILESEP + "stored-queries.json";
+      Path path = Paths.get(filepath);
+      String customQueryConfigJson = new String(Files.readAllBytes(path));
 
 
-			queryConfig = new GetCustomQueryConfig(customQueryConfigJson);
-		} catch (IOException e) {
-			logger.error("Error occurred during the processing of query json file: " + LogFormatTools.getStackTop(e));
-		}
+      queryConfig = new GetCustomQueryConfig(customQueryConfigJson);
+    } catch (IOException e) {
+      logger.error("Error occurred during the processing of query json file: " + LogFormatTools.getStackTop(e));
+    }
 
 
         TimerTask task = new FileWatcher(new File(storedQueriesLocation)) {
             @Override
             protected void onChange(File file) {
-        		try {
-        			String filepath = storedQueriesLocation;
-        			Path path = Paths.get(filepath);
-        			String customQueryConfigJson = new String(Files.readAllBytes(path));
-        			queryConfig = new GetCustomQueryConfig(customQueryConfigJson);
-        		} catch (IOException e) {
-        			logger.error("Error occurred during the processing of query json file: " + LogFormatTools.getStackTop(e));
-        		}
+            try {
+              String filepath = storedQueriesLocation;
+              Path path = Paths.get(filepath);
+              String customQueryConfigJson = new String(Files.readAllBytes(path));
+              queryConfig = new GetCustomQueryConfig(customQueryConfigJson);
+            } catch (IOException e) {
+              logger.error("Error occurred during the processing of query json file: " + LogFormatTools.getStackTop(e));
+            }
             }
         };
 
@@ -102,15 +102,15 @@ public class GremlinServerSingleton {
      * @return
      */
     public String getStoredQueryFromConfig(String key){
-    	CustomQueryConfig customQueryConfig = queryConfig.getStoredQuery(key);
-    	if ( customQueryConfig == null ) {
-    		return null;
-    	}
-    	return customQueryConfig.getQuery();
+      CustomQueryConfig customQueryConfig = queryConfig.getStoredQuery(key);
+      if ( customQueryConfig == null ) {
+        return null;
+      }
+      return customQueryConfig.getQuery();
     }
 
     public CustomQueryConfig getCustomQueryConfig(String key) {
-    	return queryConfig.getStoredQuery(key);
+      return queryConfig.getStoredQuery(key);
     }
 
 
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java b/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
index 551c10d..15943b7 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/AAISetup.java
@@ -50,51 +50,51 @@ import java.util.Map;
 import static org.junit.Assert.assertNotNull;
 
 @ContextConfiguration(classes = {
-		SchemaLocationsBean.class,
+    SchemaLocationsBean.class,
         SchemaVersions.class,
-		AAIConfigTranslator.class,
+    AAIConfigTranslator.class,
         EdgeIngestor.class,
         EdgeSerializer.class,
         NodeIngestor.class,
         SpringContextAware.class,
         IntrospectionConfig.class ,
         RestBeanConfig.class,
-		GremlinServerSingleton.class
+    GremlinServerSingleton.class
 })
 @TestPropertySource(properties = {
-		"schema.uri.base.path = /aai",
-		"schema.ingest.file = src/test/resources/application-test.properties"
+    "schema.uri.base.path = /aai",
+    "schema.ingest.file = src/test/resources/application-test.properties"
 })
 public abstract class AAISetup {
-	@Autowired
-	protected NodeIngestor nodeIngestor;
+  @Autowired
+  protected NodeIngestor nodeIngestor;
 
-	@Autowired
-	protected LoaderFactory loaderFactory;
+  @Autowired
+  protected LoaderFactory loaderFactory;
 
-	@Autowired
-	protected  Map<SchemaVersion, MoxyLoader>  moxyLoaderInstance;
+  @Autowired
+  protected  Map<SchemaVersion, MoxyLoader>  moxyLoaderInstance;
 
-	@Autowired
-	protected HttpEntry traversalHttpEntry;
+  @Autowired
+  protected HttpEntry traversalHttpEntry;
 
-	@Autowired
-	protected HttpEntry traversalUriHttpEntry;
+  @Autowired
+  protected HttpEntry traversalUriHttpEntry;
 
-	@Autowired
-	protected EdgeSerializer edgeSer;
+  @Autowired
+  protected EdgeSerializer edgeSer;
 
-	@Autowired
-	protected EdgeIngestor edgeIngestor;
+  @Autowired
+  protected EdgeIngestor edgeIngestor;
 
-	@Autowired
-	protected SchemaVersions schemaVersions;
+  @Autowired
+  protected SchemaVersions schemaVersions;
 
-	@Autowired
-	protected GremlinServerSingleton gremlinServerSingleton;
+  @Autowired
+  protected GremlinServerSingleton gremlinServerSingleton;
 
-	@Value("${schema.uri.base.path}")
-	protected String basePath;
+  @Value("${schema.uri.base.path}")
+  protected String basePath;
 
     @ClassRule
     public static final SpringClassRule springClassRule = new SpringClassRule();
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
index 8e890a1..25591e7 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
@@ -80,9 +80,9 @@ import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
 @ContextConfiguration(classes = {
-	SchemaLocationsBean.class,
+  SchemaLocationsBean.class,
     SchemaConfigVersions.class,
-	AAIConfigTranslator.class,
+  AAIConfigTranslator.class,
     EdgeIngestor.class,
     EdgeSerializer.class,
     NodeIngestor.class,
@@ -91,48 +91,48 @@ import static org.mockito.Mockito.when;
     IntrospectionConfig.class
 })
 @TestPropertySource(properties = {
-	"schema.uri.base.path = /aai",
+  "schema.uri.base.path = /aai",
     "schema.source.name = onap",
     "schema.ingest.file = src/test/resources/application-test.properties"
 })
 public abstract class OnapQueryTest {
 
-	@ClassRule
+  @ClassRule
     public static final SpringClassRule springClassRule = new SpringClassRule();
 
     @Rule
     public final SpringMethodRule springMethodRule = new SpringMethodRule();
 
-	protected Logger logger;
-	protected Graph graph;
-	protected GremlinGroovyShell shell;
-	@Mock protected TransactionalGraphEngine dbEngine;
-	protected final List<Vertex> expectedResult = new ArrayList<>();
+  protected Logger logger;
+  protected Graph graph;
+  protected GremlinGroovyShell shell;
+  @Mock protected TransactionalGraphEngine dbEngine;
+  protected final List<Vertex> expectedResult = new ArrayList<>();
 
-	@Autowired
-	protected EdgeIngestor edgeRules;
+  @Autowired
+  protected EdgeIngestor edgeRules;
 
-	@Autowired
-	protected EdgeSerializer rules;
+  @Autowired
+  protected EdgeSerializer rules;
 
-	@Autowired
-	protected LoaderFactory loaderFactory;
+  @Autowired
+  protected LoaderFactory loaderFactory;
 
-	@Autowired
-	protected SchemaVersions schemaVersions;
+  @Autowired
+  protected SchemaVersions schemaVersions;
 
-	protected Loader loader;
-	protected GraphTraversalSource gts;
+  protected Loader loader;
+  protected GraphTraversalSource gts;
 
-	@Autowired
-	protected GremlinServerSingleton gremlinServerSingleton;
+  @Autowired
+  protected GremlinServerSingleton gremlinServerSingleton;
 
-	@Parameterized.Parameter(value = 0)
-	public SchemaVersion version;
+  @Parameterized.Parameter(value = 0)
+  public SchemaVersion version;
 
-	@Parameterized.Parameters(name = "Version.{0}")
-	public static Collection<Object[]> data() {
-		return Arrays.asList(new Object[][]{
+  @Parameterized.Parameters(name = "Version.{0}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][]{
             {new SchemaVersion("v11")},
             {new SchemaVersion("v12")},
             {new SchemaVersion("v13")},
@@ -143,89 +143,89 @@ public abstract class OnapQueryTest {
             {new SchemaVersion("v18")},
             {new SchemaVersion("v19")},
             {new SchemaVersion("v20")}
-		});
-	}
-
-	protected String query;
-
-	LinkedHashMap <String, Object> params;
-
-	@Autowired
-	private Environment env;
-
-	@BeforeClass
-	public static void setupBundleconfig() {
-		System.setProperty("AJSC_HOME", "./");
-		System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
-	}
-
-	@Before
-	public void setUp() throws AAIException, NoEdgeRuleFoundException, EdgeRuleNotFoundException, AmbiguousRuleChoiceException, IOException {
-		System.setProperty("AJSC_HOME", ".");
-		System.setProperty("BUNDLECONFIG_DIR", "src/main/resources");
-		logger = LoggerFactory.getLogger(getClass());
-		MockitoAnnotations.initMocks(this);
-		graph = TinkerGraph.open();
-		gts = graph.traversal();
-		createGraph();
-		shell = new GremlinGroovyShell();
-		loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, version);
+    });
+  }
+
+  protected String query;
+
+  LinkedHashMap <String, Object> params;
+
+  @Autowired
+  private Environment env;
+
+  @BeforeClass
+  public static void setupBundleconfig() {
+    System.setProperty("AJSC_HOME", "./");
+    System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
+  }
+
+  @Before
+  public void setUp() throws AAIException, NoEdgeRuleFoundException, EdgeRuleNotFoundException, AmbiguousRuleChoiceException, IOException {
+    System.setProperty("AJSC_HOME", ".");
+    System.setProperty("BUNDLECONFIG_DIR", "src/main/resources");
+    logger = LoggerFactory.getLogger(getClass());
+    MockitoAnnotations.initMocks(this);
+    graph = TinkerGraph.open();
+    gts = graph.traversal();
+    createGraph();
+    shell = new GremlinGroovyShell();
+    loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, version);
         setUpQuery();
-	}
+  }
 
 
-	protected void setUpQuery() {
-		query = gremlinServerSingleton.getStoredQueryFromConfig(getQueryName());
-		params = new LinkedHashMap <>();
-		addParam(params);
-		when(dbEngine.getQueryBuilder(any(QueryStyle.class))).thenReturn(new GremlinTraversal<>(loader, graph.traversal()));
-		logger.info("Stored query in abstraction form {}", query);
-		query = new GroovyQueryBuilder().executeTraversal(dbEngine, query, params);
-		logger.info("After converting to gremlin query {}", query);
-		query = "g" + query;
-		GraphTraversal<Vertex, Vertex> g = graph.traversal().V();
-		addStartNode(g);
-		params.put("g", g);
-	}
+  protected void setUpQuery() {
+    query = gremlinServerSingleton.getStoredQueryFromConfig(getQueryName());
+    params = new LinkedHashMap <>();
+    addParam(params);
+    when(dbEngine.getQueryBuilder(any(QueryStyle.class))).thenReturn(new GremlinTraversal<>(loader, graph.traversal()));
+    logger.info("Stored query in abstraction form {}", query);
+    query = new GroovyQueryBuilder().executeTraversal(dbEngine, query, params);
+    logger.info("After converting to gremlin query {}", query);
+    query = "g" + query;
+    GraphTraversal<Vertex, Vertex> g = graph.traversal().V();
+    addStartNode(g);
+    params.put("g", g);
+  }
 
-	public void run() {
+  public void run() {
 
-		GraphTraversal<Vertex, Vertex> result = (GraphTraversal<Vertex, Vertex>)shell.executeTraversal(query, params);
+    GraphTraversal<Vertex, Vertex> result = (GraphTraversal<Vertex, Vertex>)shell.executeTraversal(query, params);
 
-		List<Vertex> vertices = result.toList();
+    List<Vertex> vertices = result.toList();
 
-		logger.info("Expected result set of vertexes [{}]", convert(expectedResult));
-		logger.info("Actual Result set of vertexes [{}]", convert(vertices));
+    logger.info("Expected result set of vertexes [{}]", convert(expectedResult));
+    logger.info("Actual Result set of vertexes [{}]", convert(vertices));
 
-		List<Vertex> nonDuplicateExpectedResult = new ArrayList<>(new HashSet<>(expectedResult));
-		vertices = new ArrayList<>(new HashSet<>(vertices));
+    List<Vertex> nonDuplicateExpectedResult = new ArrayList<>(new HashSet<>(expectedResult));
+    vertices = new ArrayList<>(new HashSet<>(vertices));
 
-		nonDuplicateExpectedResult.sort(Comparator.comparing(vertex -> vertex.id().toString()));
-		vertices.sort(Comparator.comparing(vertex -> vertex.id().toString()));
+    nonDuplicateExpectedResult.sort(Comparator.comparing(vertex -> vertex.id().toString()));
+    vertices.sort(Comparator.comparing(vertex -> vertex.id().toString()));
 
 
-		// Use this instead of the assertTrue as this provides more useful
-		// debugging information such as this when expected and actual differ:
-		// java.lang.AssertionError: Expected all the vertices to be found
-		// Expected :[v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
-		// Actual   :[v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
-		assertEquals("Expected all the vertices to be found", nonDuplicateExpectedResult, vertices);
+    // Use this instead of the assertTrue as this provides more useful
+    // debugging information such as this when expected and actual differ:
+    // java.lang.AssertionError: Expected all the vertices to be found
+    // Expected :[v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
+    // Actual   :[v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12]]
+    assertEquals("Expected all the vertices to be found", nonDuplicateExpectedResult, vertices);
 
-	}
+  }
 
-	protected String convert(List<Vertex> vertices){
-		return vertices
-				.stream()
-				.map(vertex -> vertex.property("aai-node-type").value().toString())
-				.collect(Collectors.joining(","));
-	}
+  protected String convert(List<Vertex> vertices){
+    return vertices
+        .stream()
+        .map(vertex -> vertex.property("aai-node-type").value().toString())
+        .collect(Collectors.joining(","));
+  }
 
-	protected abstract void createGraph() throws AAIException, NoEdgeRuleFoundException, EdgeRuleNotFoundException, AmbiguousRuleChoiceException;
+  protected abstract void createGraph() throws AAIException, NoEdgeRuleFoundException, EdgeRuleNotFoundException, AmbiguousRuleChoiceException;
 
-	protected abstract String getQueryName();
+  protected abstract String getQueryName();
 
-	protected abstract void addStartNode(GraphTraversal<Vertex, Vertex> g);
+  protected abstract void addStartNode(GraphTraversal<Vertex, Vertex> g);
 
-	protected abstract void addParam(Map<String, Object> params);
+  protected abstract void addParam(Map<String, Object> params);
 
 }
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
index cda58a0..6bc2705 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/VnfToEsrSystemInfoQueryTest.java
@@ -32,68 +32,68 @@ import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException;
 import java.util.Map;
 
 public class VnfToEsrSystemInfoQueryTest extends OnapQueryTest {
-	public VnfToEsrSystemInfoQueryTest() {
-		super();
-	}
+  public VnfToEsrSystemInfoQueryTest() {
+    super();
+  }
 
-	@Test
-	public void run() {
-		super.run();
+  @Test
+  public void run() {
+    super.run();
         assertTrue(true);
-	}
+  }
 
-	@Override
-	protected void createGraph() throws AAIException, NoEdgeRuleFoundException {
+  @Override
+  protected void createGraph() throws AAIException, NoEdgeRuleFoundException {
 
 
-		Vertex gnvf = graph.addVertex(T.label, "generic-vnf", T.id, "2", "aai-node-type", "generic-vnf", "vnf-id", "vnf-id-1");
-		Vertex vserver = graph.addVertex(T.label, "vserver", T.id, "3", "aai-node-type", "vserver", "vserver-id", "vserver-id-1","vserver-name","vserver-name-1");
-		Vertex tenant = graph.addVertex(T.label, "tenant", T.id, "4", "aai-node-type", "tenant", "tenant-id", "tenantid01", "tenant-name", "tenantName01");
-		Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "5", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-region-owner", "cloud-owner-name-1");
-		Vertex esr = graph.addVertex(T.label, "esr-system-info", T.id, "6", "aai-node-type", "esr-system-info", "esr-system-info-id", "esr-system-info-1");
+    Vertex gnvf = graph.addVertex(T.label, "generic-vnf", T.id, "2", "aai-node-type", "generic-vnf", "vnf-id", "vnf-id-1");
+    Vertex vserver = graph.addVertex(T.label, "vserver", T.id, "3", "aai-node-type", "vserver", "vserver-id", "vserver-id-1","vserver-name","vserver-name-1");
+    Vertex tenant = graph.addVertex(T.label, "tenant", T.id, "4", "aai-node-type", "tenant", "tenant-id", "tenantid01", "tenant-name", "tenantName01");
+    Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "5", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-region-owner", "cloud-owner-name-1");
+    Vertex esr = graph.addVertex(T.label, "esr-system-info", T.id, "6", "aai-node-type", "esr-system-info", "esr-system-info-id", "esr-system-info-1");
 
-		Vertex gnvf1 = graph.addVertex(T.label, "generic-vnf", T.id, "8", "aai-node-type", "generic-vnf", "vnf-id", "vnf-id-2");
-		Vertex vserver1 = graph.addVertex(T.label, "vserver", T.id, "9", "aai-node-type", "vserver", "vserver-id", "vserver-id-2","vserver-name","vserver-name-2");
-		Vertex tenant1 = graph.addVertex(T.label, "tenant", T.id, "10", "aai-node-type", "tenant", "tenant-id", "tenantid02", "tenant-name", "tenantName02");
-		Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "11", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-2", "cloud-region-owner", "cloud-owner-name-2");
-		Vertex esr1 = graph.addVertex(T.label, "esr-system-info", T.id, "12", "aai-node-type", "esr-system-info", "esr-system-info-id", "esr-system-info-2");
+    Vertex gnvf1 = graph.addVertex(T.label, "generic-vnf", T.id, "8", "aai-node-type", "generic-vnf", "vnf-id", "vnf-id-2");
+    Vertex vserver1 = graph.addVertex(T.label, "vserver", T.id, "9", "aai-node-type", "vserver", "vserver-id", "vserver-id-2","vserver-name","vserver-name-2");
+    Vertex tenant1 = graph.addVertex(T.label, "tenant", T.id, "10", "aai-node-type", "tenant", "tenant-id", "tenantid02", "tenant-name", "tenantName02");
+    Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "11", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-2", "cloud-region-owner", "cloud-owner-name-2");
+    Vertex esr1 = graph.addVertex(T.label, "esr-system-info", T.id, "12", "aai-node-type", "esr-system-info", "esr-system-info-id", "esr-system-info-2");
 
 
 
 
-		GraphTraversalSource g = graph.traversal();
-		rules.addEdge(g, gnvf, vserver);
-		rules.addTreeEdge(g, vserver,tenant);
-		rules.addTreeEdge(g, tenant,cloudregion);
-		rules.addTreeEdge(g, cloudregion, esr);
+    GraphTraversalSource g = graph.traversal();
+    rules.addEdge(g, gnvf, vserver);
+    rules.addTreeEdge(g, vserver,tenant);
+    rules.addTreeEdge(g, tenant,cloudregion);
+    rules.addTreeEdge(g, cloudregion, esr);
 
-		//Not expected in result
-		rules.addEdge(g, gnvf1, vserver1);
-		rules.addTreeEdge(g, vserver1,tenant1);
-		rules.addTreeEdge(g, tenant1,cloudregion1);
-		rules.addTreeEdge(g, cloudregion1, esr1);
-		//Not expected in result
+    //Not expected in result
+    rules.addEdge(g, gnvf1, vserver1);
+    rules.addTreeEdge(g, vserver1,tenant1);
+    rules.addTreeEdge(g, tenant1,cloudregion1);
+    rules.addTreeEdge(g, cloudregion1, esr1);
+    //Not expected in result
 
-		expectedResult.add(gnvf);
-		expectedResult.add(vserver);
-		expectedResult.add(tenant);
-		expectedResult.add(cloudregion);
-		expectedResult.add(esr);
+    expectedResult.add(gnvf);
+    expectedResult.add(vserver);
+    expectedResult.add(tenant);
+    expectedResult.add(cloudregion);
+    expectedResult.add(esr);
 
 
-	}
+  }
 
-	@Override
-	protected String getQueryName() {
-		return	"vnf-to-esr-system-info";
-	}
-	@Override
-	protected void addStartNode(GraphTraversal<Vertex, Vertex> g) {
-		g.has("aai-node-type", "generic-vnf").has("vnf-id", "vnf-id-1");
+  @Override
+  protected String getQueryName() {
+    return  "vnf-to-esr-system-info";
+  }
+  @Override
+  protected void addStartNode(GraphTraversal<Vertex, Vertex> g) {
+    g.has("aai-node-type", "generic-vnf").has("vnf-id", "vnf-id-1");
 
-	}
-	@Override
-	protected void addParam(Map<String, Object> params) {
-		return;
-	}
+  }
+  @Override
+  protected void addParam(Map<String, Object> params) {
+    return;
+  }
 }