Move common util methods to dedicated class

This will make it easier to reuse them.

Change-Id: I4ad75ba20da12936311bdb81c7b2e8e7a7a284d0
Signed-off-by: illia.ihushev <illia.ihushev@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java
index ed0ae6c0bea138d34ea6a880ea8c468114f99c07..9bcd370cdc527f58980689c27857025a07763170 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java
@@ -12,10 +12,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Scanner;
 import org.junit.Test;
 
 /**
@@ -35,48 +32,20 @@ public class Bug5151Test extends BaseCompilationTest {
         // Test if sources are compilable
         CompilationTestUtils.testCompilation(sourcesOutputDir, compiledOutputDir);
 
-        final Map<String, File> generatedFiles = getFiles(sourcesOutputDir);
+        final Map<String, File> generatedFiles = FileSearchUtil.getFiles(sourcesOutputDir);
         assertEquals(4, generatedFiles.size());
 
         final File fooContainerFile = generatedFiles.get("FooContainer.java");
         assertNotNull(fooContainerFile);
-        assertTrue(findInFile(fooContainerFile,
+        assertTrue(FileSearchUtil.findInFile(fooContainerFile,
                 "@return <code>java.lang.String</code> <code>fooInContainer</code>, "
                         + "or <code>null</code> if not present"));
 
         final File fooDataFile = generatedFiles.get("FooData.java");
         assertNotNull(fooDataFile);
-        assertTrue(findInFile(fooDataFile,
+        assertTrue(FileSearchUtil.findInFile(fooDataFile,
             "FooContainer</code> <code>fooContainer</code>, or <code>null</code> if not present"));
 
         CompilationTestUtils.cleanUp(sourcesOutputDir, compiledOutputDir);
     }
-
-    private static boolean findInFile(final File file, final String searchText) throws FileNotFoundException {
-        try (Scanner scanner = new Scanner(file)) {
-            while (scanner.hasNextLine()) {
-                final String nextLine = scanner.nextLine();
-                if (nextLine.contains(searchText)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static Map<String, File> getFiles(final File path) {
-        return getFiles(path, new HashMap<>());
-    }
-
-    private static Map<String, File> getFiles(final File path, final Map<String, File> files) {
-        final File [] dirFiles = path.listFiles();
-        for (File file : dirFiles) {
-            if (file.isDirectory()) {
-                return getFiles(file, files);
-            }
-
-            files.put(file.getName(), file);
-        }
-        return files;
-    }
 }

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/FileSearchUtil.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/FileSearchUtil.java
new file mode 100644 (file)
index 0000000..df9d097
--- /dev/null
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/FileSearchUtil.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 Pantheon Technologies, s.r.o.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.mdsal.binding.java.api.generator.test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+
+final class FileSearchUtil {
+    private FileSearchUtil() {
+        // Hidden on purpose
+    }
+
+    static boolean findInFile(final File file, final String searchText) throws FileNotFoundException {
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                final String nextLine = scanner.nextLine();
+                if (nextLine.contains(searchText)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    static Map<String, File> getFiles(final File path) {
+        return getFiles(path, new HashMap<>());
+    }
+
+    private static Map<String, File> getFiles(final File path, final Map<String, File> files) {
+        final File [] dirFiles = path.listFiles();
+        for (File file : dirFiles) {
+            if (file.isDirectory()) {
+                return getFiles(file, files);
+            }
+
+            files.put(file.getName(), file);
+        }
+        return files;
+    }
+}