From 9766dc312c1c2f24babd5d336a89dee5b08ffc34 Mon Sep 17 00:00:00 2001
From: Stefan Herrnleben <s.herrnleben@syslex.de>
Date: Thu, 20 Jul 2017 00:34:07 +0200
Subject: [PATCH] refactor parsers write model to file method
---
.../main/java/tools/descartes/dni/dnimm3/tools/Parser.java | 7 ++-----
.../java/tools/descartes/dni/dnimm3/tools/ParserTest.java | 4 +++-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java b/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java
index bfcf4d6e..d8023700 100644
--- a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java
+++ b/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java
@@ -49,17 +49,14 @@ public class Parser {
return baos.toByteArray();
}
- public static File convertToTempFile(NetworkInfrastructure networkInfrastructure) throws IOException {
- File output = File.createTempFile("dni-", ".dni");
- output.deleteOnExit();
+ public static void writeToFile(NetworkInfrastructure networkInfrastructure, File file) throws IOException {
ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
resourceSet.getPackageRegistry().put(DNIPackage.eNS_URI, DNIPackage.eINSTANCE);
- Resource resource = resourceSet.createResource(URI.createURI(output.toURI().getPath()));
+ Resource resource = resourceSet.createResource(URI.createFileURI(file.toURI().getPath()));
resource.getContents().add(networkInfrastructure);
resource.save(Collections.EMPTY_MAP);
- return output;
}
}
diff --git a/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java
index 0edcee18..b5a689de 100644
--- a/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -26,7 +26,9 @@ public class ParserTest {
public void shouldConvertModelToFile() throws IOException {
DNIFactoryImpl factory = new DNIFactoryImpl();
NetworkInfrastructure model = factory.createNetworkInfrastructure();
- File file = Parser.convertToTempFile(model);
+ File file = File.createTempFile("junit-dni-", ".dni");
+ file.deleteOnExit();
+ Parser.writeToFile(model, file);
Assert.assertTrue(file.length() > 100);
}
--
GitLab