From a895d8741e1d2d49ed8ed3938e4281384534d8f1 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Mon, 5 Dec 2016 16:44:07 +0100 Subject: [PATCH] Clean up and move unused code into a separate package --- src/main/java/de/hsh/inform/orientdb_project/Main.java | 4 ++-- .../{orientdb => UNUSED}/BatchNetdataImportService.java | 2 +- .../orientdb_project/{ => UNUSED}/DummyImportService.java | 2 +- .../ExampleImportService.java} | 6 +++--- .../{orientdb => UNUSED}/OrientDbNetdataImportService.java | 2 +- ...etdataImportService.java => NodeBasedImportService.java} | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/de/hsh/inform/orientdb_project/{orientdb => UNUSED}/BatchNetdataImportService.java (97%) rename src/main/java/de/hsh/inform/orientdb_project/{ => UNUSED}/DummyImportService.java (95%) rename src/main/java/de/hsh/inform/orientdb_project/{orientdb/LowPerformanceOrientDbNetdataImportService.java => UNUSED/ExampleImportService.java} (95%) rename src/main/java/de/hsh/inform/orientdb_project/{orientdb => UNUSED}/OrientDbNetdataImportService.java (99%) rename src/main/java/de/hsh/inform/orientdb_project/orientdb/{HighPerformanceKappaOrientDbNetdataImportService.java => NodeBasedImportService.java} (98%) diff --git a/src/main/java/de/hsh/inform/orientdb_project/Main.java b/src/main/java/de/hsh/inform/orientdb_project/Main.java index fb78031..bb5857a 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/Main.java +++ b/src/main/java/de/hsh/inform/orientdb_project/Main.java @@ -9,7 +9,7 @@ import org.pcap4j.core.PcapNativeException; import com.tinkerpop.blueprints.impls.orient.OrientGraphNoTx; import de.hsh.inform.orientdb_project.netdata.AbstractNetdataImportService; -import de.hsh.inform.orientdb_project.orientdb.HighPerformanceKappaOrientDbNetdataImportService; +import de.hsh.inform.orientdb_project.orientdb.NodeBasedImportService; import de.hsh.inform.orientdb_project.orientdb.OrientDbHelperService; public class Main { @@ -28,7 +28,7 @@ public class Main { //AbstractNetdataImportService importService = new DummyImportService(filename); //AbstractNetdataImportService importService = new LowPerformanceOrientDbNetdataImportService(filename, ogf); - AbstractNetdataImportService importService = new HighPerformanceKappaOrientDbNetdataImportService(filename, ogf); + AbstractNetdataImportService importService = new NodeBasedImportService(filename, ogf); // Go go gadget import service! try { diff --git a/src/main/java/de/hsh/inform/orientdb_project/orientdb/BatchNetdataImportService.java b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/BatchNetdataImportService.java similarity index 97% rename from src/main/java/de/hsh/inform/orientdb_project/orientdb/BatchNetdataImportService.java rename to src/main/java/de/hsh/inform/orientdb_project/UNUSED/BatchNetdataImportService.java index d773cc8..cad6c96 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/orientdb/BatchNetdataImportService.java +++ b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/BatchNetdataImportService.java @@ -1,4 +1,4 @@ -package de.hsh.inform.orientdb_project.orientdb; +package de.hsh.inform.orientdb_project.UNUSED; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/hsh/inform/orientdb_project/DummyImportService.java b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/DummyImportService.java similarity index 95% rename from src/main/java/de/hsh/inform/orientdb_project/DummyImportService.java rename to src/main/java/de/hsh/inform/orientdb_project/UNUSED/DummyImportService.java index fd33b7d..6be1cb5 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/DummyImportService.java +++ b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/DummyImportService.java @@ -1,4 +1,4 @@ -package de.hsh.inform.orientdb_project; +package de.hsh.inform.orientdb_project.UNUSED; import org.pcap4j.packet.ArpPacket; import org.pcap4j.packet.EthernetPacket; diff --git a/src/main/java/de/hsh/inform/orientdb_project/orientdb/LowPerformanceOrientDbNetdataImportService.java b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/ExampleImportService.java similarity index 95% rename from src/main/java/de/hsh/inform/orientdb_project/orientdb/LowPerformanceOrientDbNetdataImportService.java rename to src/main/java/de/hsh/inform/orientdb_project/UNUSED/ExampleImportService.java index 1ed8731..7039b7d 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/orientdb/LowPerformanceOrientDbNetdataImportService.java +++ b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/ExampleImportService.java @@ -1,4 +1,4 @@ -package de.hsh.inform.orientdb_project.orientdb; +package de.hsh.inform.orientdb_project.UNUSED; import org.pcap4j.packet.ArpPacket; import org.pcap4j.packet.EthernetPacket; @@ -17,11 +17,11 @@ import de.hsh.inform.orientdb_project.netdata.AbstractNetdataImportService; /** * This service is incomplete! DO NOT USE! */ -public class LowPerformanceOrientDbNetdataImportService extends AbstractNetdataImportService { +public class ExampleImportService extends AbstractNetdataImportService { private OrientGraphNoTx og; - public LowPerformanceOrientDbNetdataImportService(String filename, OrientGraphNoTx orientGraph) { + public ExampleImportService(String filename, OrientGraphNoTx orientGraph) { super(filename); this.og = orientGraph; } diff --git a/src/main/java/de/hsh/inform/orientdb_project/orientdb/OrientDbNetdataImportService.java b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/OrientDbNetdataImportService.java similarity index 99% rename from src/main/java/de/hsh/inform/orientdb_project/orientdb/OrientDbNetdataImportService.java rename to src/main/java/de/hsh/inform/orientdb_project/UNUSED/OrientDbNetdataImportService.java index 23ca947..d4f8a23 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/orientdb/OrientDbNetdataImportService.java +++ b/src/main/java/de/hsh/inform/orientdb_project/UNUSED/OrientDbNetdataImportService.java @@ -1,4 +1,4 @@ -package de.hsh.inform.orientdb_project.orientdb; +package de.hsh.inform.orientdb_project.UNUSED; import org.pcap4j.packet.ArpPacket; import org.pcap4j.packet.EthernetPacket; diff --git a/src/main/java/de/hsh/inform/orientdb_project/orientdb/HighPerformanceKappaOrientDbNetdataImportService.java b/src/main/java/de/hsh/inform/orientdb_project/orientdb/NodeBasedImportService.java similarity index 98% rename from src/main/java/de/hsh/inform/orientdb_project/orientdb/HighPerformanceKappaOrientDbNetdataImportService.java rename to src/main/java/de/hsh/inform/orientdb_project/orientdb/NodeBasedImportService.java index f3fc093..bdf9b11 100644 --- a/src/main/java/de/hsh/inform/orientdb_project/orientdb/HighPerformanceKappaOrientDbNetdataImportService.java +++ b/src/main/java/de/hsh/inform/orientdb_project/orientdb/NodeBasedImportService.java @@ -25,7 +25,7 @@ import de.hsh.inform.orientdb_project.model.TcpPacketModel; import de.hsh.inform.orientdb_project.model.UdpPacketModel; import de.hsh.inform.orientdb_project.netdata.AbstractNetdataImportService; -public class HighPerformanceKappaOrientDbNetdataImportService extends AbstractNetdataImportService { +public class NodeBasedImportService extends AbstractNetdataImportService { private OrientGraphNoTx og; @@ -51,7 +51,7 @@ public class HighPerformanceKappaOrientDbNetdataImportService extends AbstractNe private Vertex tcpPacketVertex; private Vertex icmpPacketVertex; - public HighPerformanceKappaOrientDbNetdataImportService(String filename, OrientGraphNoTx orientGraph) { + public NodeBasedImportService(String filename, OrientGraphNoTx orientGraph) { super(filename); this.og = orientGraph; this.knownHosts = new HashMap();