From 102e54d1a67e02778e4348366875e377e4e1c242 Mon Sep 17 00:00:00 2001
From: Stefan Herrnleben <s.herrnleben@syslex.de>
Date: Sun, 23 Jul 2017 14:19:38 +0200
Subject: [PATCH] rename model parsers to distinguishable names
---
.../tools/descartes/dni/dnimm3/tools/ParserTest.java | 12 ++++++------
.../dnimm3ap/tools/{Parser.java => DniApParser.java} | 2 +-
.../tools/descartes/dni/dnimm3/tools/ParserTest.java | 10 +++++-----
.../dni/dnimm3/tools/{Parser.java => DniParser.java} | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
rename tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/{Parser.java => DniApParser.java} (99%)
rename tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/{Parser.java => DniParser.java} (99%)
diff --git a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
index 967e92c4..4a5a20db 100644
--- a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -12,21 +12,21 @@ import org.junit.Test;
import tools.descartes.dni.dnimm3ap.AdaptationPoints;
import tools.descartes.dni.dnimm3ap.impl.AdaptationPointsImpl;
import tools.descartes.dni.dnimm3ap.impl.DNIAPFactoryImpl;
-import tools.descartes.dni.dnimm3ap.tools.Parser;
+import tools.descartes.dni.dnimm3ap.tools.DniApParser;
public class ParserTest {
@Test
public void shouldConvertFileToModel() {
File file = new File("resources-test/scenario0B.dniap");
- AdaptationPointsImpl adaptationPoints = Parser.convertToModel(file);
+ AdaptationPointsImpl adaptationPoints = DniApParser.convertToModel(file);
Assert.assertTrue(adaptationPoints.getRepositories().getNodes().size() > 0);
}
@Test
public void shouldConvertFileToModelWithNetworkStructure() {
File file = new File("resources-test/scenario0B.dniap");
- AdaptationPointsImpl adaptationPoints = Parser.convertToModel(file);
+ AdaptationPointsImpl adaptationPoints = DniApParser.convertToModel(file);
Assert.assertEquals(6, adaptationPoints.getNetworkInfrastructure().getStructure().getNodes().size());
}
@@ -36,7 +36,7 @@ public class ParserTest {
AdaptationPoints model = factory.createAdaptationPoints();
File file = File.createTempFile("junit-dni-", ".dniap");
file.deleteOnExit();
- Parser.writeToFile(model, file);
+ DniApParser.writeToFile(model, file);
Assert.assertTrue(file.length() > 100);
}
@@ -44,7 +44,7 @@ public class ParserTest {
public void shouldConvertModelToByteArray() throws IOException {
DNIAPFactoryImpl factory = new DNIAPFactoryImpl();
AdaptationPoints model = factory.createAdaptationPoints();
- byte[] bytes = Parser.convertToByteArray(model);
+ byte[] bytes = DniApParser.convertToByteArray(model);
Assert.assertTrue(bytes.length > 10);
}
@@ -52,7 +52,7 @@ public class ParserTest {
public void shouldConvertByteArrayToModel() throws IOException {
Path path = Paths.get("resources-test/scenario0B.dniap");
byte[] data = Files.readAllBytes(path);
- AdaptationPoints adaptationPoints = Parser.convertToModel(data);
+ AdaptationPoints adaptationPoints = DniApParser.convertToModel(data);
Assert.assertTrue(adaptationPoints.getRepositories().getNodes().size() > 0);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
similarity index 99%
rename from tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
index 97730109..b1522520 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
@@ -16,7 +16,7 @@ import tools.descartes.dni.dnimm3ap.AdaptationPoints;
import tools.descartes.dni.dnimm3ap.DNIAPPackage;
import tools.descartes.dni.dnimm3ap.impl.AdaptationPointsImpl;
-public class Parser {
+public class DniApParser {
public static AdaptationPointsImpl convertToModel(File file) {
ResourceSet resourceSet = new ResourceSetImpl();
diff --git a/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
index 01cadfd7..2844ddea 100644
--- a/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -18,14 +18,14 @@ public class ParserTest {
@Test
public void shouldConvertFileToModel() {
File file = new File("resources-test/scenario0A.dni");
- NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
+ NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(file);
Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
}
@Test
public void shouldConvertFileWithAdaptationToModel() {
File file = new File("resources-test/scenario0B.dni");
- NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
+ NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(file);
Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
}
@@ -35,7 +35,7 @@ public class ParserTest {
NetworkInfrastructure model = factory.createNetworkInfrastructure();
File file = File.createTempFile("junit-dni-", ".dni");
file.deleteOnExit();
- Parser.writeToFile(model, file);
+ DniParser.writeToFile(model, file);
Assert.assertTrue(file.length() > 100);
}
@@ -43,7 +43,7 @@ public class ParserTest {
public void shouldConvertModelToByteArray() throws IOException {
DNIFactoryImpl factory = new DNIFactoryImpl();
NetworkInfrastructure model = factory.createNetworkInfrastructure();
- byte[] bytes = Parser.convertToByteArray(model);
+ byte[] bytes = DniParser.convertToByteArray(model);
Assert.assertTrue(bytes.length > 100);
}
@@ -51,7 +51,7 @@ public class ParserTest {
public void shouldConvertByteArrayToModel() throws IOException {
Path path = Paths.get("resources-test/scenario0A.dni");
byte[] data = Files.readAllBytes(path);
- NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(data);
+ NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(data);
Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
similarity index 99%
rename from tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
index efe1fa79..510d2ba6 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
@@ -16,7 +16,7 @@ import tools.descartes.dni.dnimm3.DNIPackage;
import tools.descartes.dni.dnimm3.NetworkInfrastructure;
import tools.descartes.dni.dnimm3.impl.NetworkInfrastructureImpl;
-public class Parser {
+public class DniParser {
public static NetworkInfrastructureImpl convertToModel(File file) {
ResourceSet resourceSet = new ResourceSetImpl();
--
GitLab