Use FileGenerator for java-api-generator

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / test / java / org / opendaylight / mdsal / binding / java / api / generator / BaseCompilationTest.java

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java
similarity index 78%
rename from binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java
rename to binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java
index 0ae56db159f7e48450f50314b63336771189d7af..acc2fc39b61fa1ac2a941f4772789b5fc736c3e8 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java
@@ -5,27 +5,27 @@
  * 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;
+package org.opendaylight.mdsal.binding.java.api.generator;
 
+import static java.nio.file.Files.newOutputStream;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Table;
 import com.google.common.collect.Table.Cell;
 import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Supplier;
 import org.junit.BeforeClass;
 import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingGenerator;
-import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile;
-import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
+import org.opendaylight.yangtools.plugin.generator.api.GeneratedFile;
+import org.opendaylight.yangtools.plugin.generator.api.GeneratedFilePath;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@@ -45,12 +45,14 @@ public abstract class BaseCompilationTest {
             throws IOException {
         types.sort((o1, o2) -> o2.getName().compareTo(o1.getName()));
 
-        final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types));
-        final Table<?, String, Supplier<String>> generatedFiles = generator.generateFileContent(true);
-        for (Cell<?, String, Supplier<String>> cell : generatedFiles.cellSet()) {
-            final File target = new File(sourcesOutputDir, cell.getColumnKey());
+        final Table<?, GeneratedFilePath, GeneratedFile> generatedFiles = JavaFileGenerator.generateFiles(types, true);
+        for (Cell<?, GeneratedFilePath, GeneratedFile> cell : generatedFiles.cellSet()) {
+            final File target = new File(sourcesOutputDir, cell.getColumnKey().getPath());
             Files.createParentDirs(target);
-            Files.asCharSink(target, StandardCharsets.UTF_8).write(cell.getValue().get());
+
+            try (OutputStream os = newOutputStream(target.toPath())) {
+                cell.getValue().writeBody(os);
+            }
         }
     }
 
@@ -66,8 +68,8 @@ public abstract class BaseCompilationTest {
             final YangModuleInfoTemplate template = new YangModuleInfoTemplate(module, context,
                 mod -> Optional.of("fake/" + mod.getName()));
 
-            final File file = new File(GeneratorJavaFile.packageToDirectory(sourcesOutputDir,
-                BindingMapping.getRootPackageName(module.getQNameModule())),
+            final File file = new File(new File(sourcesOutputDir,
+                BindingMapping.getRootPackageName(module.getQNameModule()).replace('.', File.separatorChar)),
                 BindingMapping.MODULE_INFO_CLASS_NAME + ".java");
             Files.createParentDirs(file);
             Files.asCharSink(file, StandardCharsets.UTF_8).write(template.generate());