Fix FileSearchUtil.getFiles()

Do not skip files in the current folder after finding the first child
folder.

Change-Id: Ifba6071e431e18a0a4caa03c90d11b246ec2bc6b
Signed-off-by: Illia <illia.ihushev@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 9bcd370cdc527f58980689c27857025a07763170..4d7ee9002532edc962e272753759a5033231630b 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
@@ -33,7 +33,7 @@ public class Bug5151Test extends BaseCompilationTest {
         CompilationTestUtils.testCompilation(sourcesOutputDir, compiledOutputDir);
 
         final Map<String, File> generatedFiles = FileSearchUtil.getFiles(sourcesOutputDir);
-        assertEquals(4, generatedFiles.size());
+        assertEquals(13, generatedFiles.size());
 
         final File fooContainerFile = generatedFiles.get("FooContainer.java");
         assertNotNull(fooContainerFile);

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
index df9d097bfab9da40697815b6a9526890e813b334..19abb376152316ea42d63ba476fe951ec5aa8546 100644 (file)
--- 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
@@ -31,18 +31,19 @@ final class FileSearchUtil {
     }
 
     static Map<String, File> getFiles(final File path) {
-        return getFiles(path, new HashMap<>());
+        final Map<String, File> ret = new HashMap<>();
+        getFiles(path, ret);
+        return ret;
     }
 
-    private static Map<String, File> getFiles(final File path, final Map<String, File> files) {
+    private static void 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);
+                getFiles(file, files);
             }
 
             files.put(file.getName(), file);
         }
-        return files;
     }
 }