From ef6d49592c814d8e736646e1cd1d5e46440177a5 Mon Sep 17 00:00:00 2001 From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com> Date: Mon, 25 Nov 2024 09:28:44 +0100 Subject: [PATCH 1/2] Rename package name and groupid --- pom.xml | 4 +-- .../cc/config/elements/ConnectionConfig.java | 2 +- .../cc/config/elements/DatasetConfig.java | 2 +- .../cc/config/elements/StorageConfig.java | 8 ++--- .../iguana/cc/controller/MainController.java | 6 ++-- .../iguana/cc/lang/LanguageProcessor.java | 16 ++++++---- .../cc/lang/impl/BooleanResultData.java | 10 +++---- .../iguana/cc/lang/impl/ResultCountData.java | 10 +++---- .../SaxSparqlJsonResultCountingParser.java | 4 +-- .../SaxSparqlXmlResultCountingParser.java | 4 +-- .../impl/SparqlCsvResultCountingParser.java | 4 +-- .../impl/SparqlTsvResultCountingParser.java | 4 +-- .../iguana/cc/metrics/Metric.java | 3 +- .../iguana/cc/metrics/ModelWritingMetric.java | 6 ++-- .../iguana/cc/metrics/QueryMetric.java | 4 +-- .../iguana/cc/metrics/TaskMetric.java | 4 +-- .../iguana/cc/metrics/WorkerMetric.java | 4 +-- .../impl/AggregatedExecutionStatistics.java | 16 +++++----- .../iguana/cc/metrics/impl/AvgQPS.java | 10 +++---- .../metrics/impl/EachExecutionStatistic.java | 16 +++++----- .../iguana/cc/metrics/impl/NoQ.java | 11 ++++--- .../iguana/cc/metrics/impl/NoQPH.java | 10 +++---- .../iguana/cc/metrics/impl/PAvgQPS.java | 10 +++---- .../iguana/cc/metrics/impl/PQPS.java | 8 ++--- .../iguana/cc/metrics/impl/QMPH.java | 10 +++---- .../iguana/cc/metrics/impl/QPS.java | 8 ++--- .../iguana/cc/query/QueryData.java | 2 +- .../iguana/cc/query/handler/QueryHandler.java | 29 +++++++++---------- .../cc/query/list/FileBasedQueryList.java | 4 +-- .../iguana/cc/query/list/QueryList.java | 2 +- .../query/list/impl/FileCachingQueryList.java | 10 +++---- .../query/list/impl/FileReadingQueryList.java | 6 ++-- .../query/list/impl/StringListQueryList.java | 6 ++-- .../cc/query/selector/QuerySelector.java | 2 +- .../selector/impl/LinearQuerySelector.java | 4 +-- .../selector/impl/RandomQuerySelector.java | 4 +-- .../iguana/cc/query/source/QuerySource.java | 4 +-- .../source/impl/FileLineQuerySource.java | 4 +-- .../source/impl/FileSeparatorQuerySource.java | 6 ++-- .../query/source/impl/FolderQuerySource.java | 6 ++-- .../iguana/cc/storage/Storable.java | 2 +- .../iguana/cc/storage/Storage.java | 2 +- .../iguana/cc/storage/impl/CSVStorage.java | 20 ++++++++----- .../cc/storage/impl/RDFFileStorage.java | 6 ++-- .../cc/storage/impl/TriplestoreStorage.java | 8 ++--- .../iguana/cc/suite/IguanaSuiteParser.java | 6 ++-- .../iguana/cc/suite/Suite.java | 27 ++++++++--------- .../iguana/cc/tasks/Task.java | 4 +-- .../iguana/cc/tasks/impl/Stresstest.java | 16 +++++----- .../tasks/impl/StresstestResultProcessor.java | 19 ++++++------ .../iguana/cc/utils/files/FileUtils.java | 2 +- .../cc/utils/files/IndexedQueryReader.java | 2 +- .../iguana/cc/utils/files/QueryIndex.java | 2 +- .../iguana/cc/utils/http/RequestFactory.java | 12 ++++---- .../cc/utils/http/StreamEntityProducer.java | 4 +-- .../iguana/cc/worker/HttpWorker.java | 12 ++++---- .../cc/worker/ResponseBodyProcessor.java | 4 +-- .../ResponseBodyProcessorInstances.java | 4 +-- .../cc/worker/impl/SPARQLProtocolWorker.java | 18 ++++++------ .../commons/io/BigByteArrayInputStream.java | 2 +- .../commons/io/BigByteArrayOutputStream.java | 2 +- .../commons/io/ByteArrayListInputStream.java | 2 +- .../commons/io/ByteArrayListOutputStream.java | 2 +- .../commons/io/ReversibleOutputStream.java | 2 +- .../iguana/commons/rdf/IGUANA_BASE.java | 2 +- .../iguana/commons/rdf/IONT.java | 4 +-- .../iguana/commons/rdf/IPROP.java | 4 +-- .../iguana/commons/rdf/IRES.java | 6 ++-- .../iguana/commons/time/DurationLiteral.java | 2 +- .../iguana/commons/time/TimeUtils.java | 2 +- .../config/elements/ConnectionConfigTest.java | 3 +- .../cc/config/elements/DatasetConfigTest.java | 2 +- .../cc/config/elements/StorageConfigTest.java | 8 ++--- ...SaxSparqlJsonResultCountingParserTest.java | 2 +- .../SaxSparqlXmlResultCountingParserTest.java | 2 +- .../SparqlCsvResultCountingParserTest.java | 2 +- .../SparqlTsvResultCountingParserTest.java | 2 +- .../iguana/cc/mockup/MockupConnection.java | 4 +-- .../iguana/cc/mockup/MockupQueryHandler.java | 8 ++--- .../iguana/cc/mockup/MockupStorage.java | 4 +-- .../iguana/cc/mockup/MockupWorker.java | 10 +++---- .../iguana/cc/query/QueryDataTest.java | 6 ++-- .../query/handler/QueryHandlerConfigTest.java | 2 +- .../cc/query/handler/QueryHandlerTest.java | 23 +++++++-------- .../cc/query/handler/TemplateQueriesTest.java | 2 +- .../cc/query/list/FileBasedQueryListTest.java | 18 ++++++------ .../impl/LinearQuerySelectorTest.java | 2 +- .../impl/RandomQuerySelectorTest.java | 2 +- .../source/impl/FileLineQuerySourceTest.java | 2 +- .../impl/FileSeparatorQuerySourceTest.java | 2 +- .../source/impl/FolderQuerySourceTest.java | 2 +- .../cc/query/source/impl/QuerySourceTest.java | 4 +-- .../cc/storage/impl/CSVStorageTest.java | 6 ++-- .../cc/storage/impl/RDFFileStorageTest.java | 6 ++-- .../iguana/cc/storage/impl/StorageTest.java | 19 ++++++------ .../storage/impl/TriplestoreStorageTest.java | 8 ++--- .../cc/suite/IguanaSuiteParserTest.java | 2 +- .../iguana/cc/utils/FileUtilsTest.java | 9 +++--- .../cc/utils/IndexedQueryReaderTest.java | 4 +-- .../worker/impl/SPARQLProtocolWorkerTest.java | 14 ++++----- .../io/BigByteArrayInputStreamTest.java | 2 +- .../io/BigByteArrayOutputStreamTest.java | 2 +- .../io/ByteArrayListInputStreamTest.java | 2 +- .../io/ByteArrayListOutputStreamTest.java | 2 +- 104 files changed, 338 insertions(+), 333 deletions(-) rename src/main/java/org/{aksw => dice_research}/iguana/cc/config/elements/ConnectionConfig.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/config/elements/DatasetConfig.java (84%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/config/elements/StorageConfig.java (70%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/controller/MainController.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/LanguageProcessor.java (72%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/BooleanResultData.java (88%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/ResultCountData.java (90%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java (98%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java (96%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/Metric.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/ModelWritingMetric.java (79%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/QueryMetric.java (56%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/TaskMetric.java (61%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/WorkerMetric.java (61%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java (89%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/AvgQPS.java (84%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/EachExecutionStatistic.java (87%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/NoQ.java (80%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/NoQPH.java (86%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/PAvgQPS.java (86%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/PQPS.java (86%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/QMPH.java (87%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/metrics/impl/QPS.java (83%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/QueryData.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/handler/QueryHandler.java (94%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/list/FileBasedQueryList.java (92%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/list/QueryList.java (94%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/list/impl/FileCachingQueryList.java (87%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/list/impl/FileReadingQueryList.java (76%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/list/impl/StringListQueryList.java (80%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/selector/QuerySelector.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/selector/impl/LinearQuerySelector.java (88%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/selector/impl/RandomQuerySelector.java (84%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/source/QuerySource.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FileLineQuerySource.java (76%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FileSeparatorQuerySource.java (92%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FolderQuerySource.java (92%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/storage/Storable.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/storage/Storage.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/storage/impl/CSVStorage.java (96%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/storage/impl/RDFFileStorage.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/storage/impl/TriplestoreStorage.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/suite/IguanaSuiteParser.java (98%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/suite/Suite.java (79%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/tasks/Task.java (81%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/tasks/impl/Stresstest.java (92%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/tasks/impl/StresstestResultProcessor.java (96%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/utils/files/FileUtils.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/utils/files/IndexedQueryReader.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/utils/files/QueryIndex.java (57%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/utils/http/RequestFactory.java (95%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/utils/http/StreamEntityProducer.java (97%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/worker/HttpWorker.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/worker/ResponseBodyProcessor.java (97%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/worker/ResponseBodyProcessorInstances.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/cc/worker/impl/SPARQLProtocolWorker.java (97%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/io/BigByteArrayInputStream.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/io/BigByteArrayOutputStream.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/io/ByteArrayListInputStream.java (99%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/io/ByteArrayListOutputStream.java (98%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/io/ReversibleOutputStream.java (87%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/rdf/IGUANA_BASE.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/rdf/IONT.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/rdf/IPROP.java (97%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/rdf/IRES.java (93%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/time/DurationLiteral.java (97%) rename src/main/java/org/{aksw => dice_research}/iguana/commons/time/TimeUtils.java (97%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/config/elements/ConnectionConfigTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/config/elements/DatasetConfigTest.java (95%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/config/elements/StorageConfigTest.java (88%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java (96%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java (96%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/mockup/MockupConnection.java (82%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/mockup/MockupQueryHandler.java (76%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/mockup/MockupStorage.java (79%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/mockup/MockupWorker.java (94%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/QueryDataTest.java (92%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/handler/QueryHandlerConfigTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/handler/QueryHandlerTest.java (91%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/handler/TemplateQueriesTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/list/FileBasedQueryListTest.java (92%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java (96%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java (95%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FileLineQuerySourceTest.java (98%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/FolderQuerySourceTest.java (97%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/query/source/impl/QuerySourceTest.java (86%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/storage/impl/CSVStorageTest.java (97%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/storage/impl/RDFFileStorageTest.java (94%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/storage/impl/StorageTest.java (88%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/storage/impl/TriplestoreStorageTest.java (92%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/suite/IguanaSuiteParserTest.java (96%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/utils/FileUtilsTest.java (94%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/utils/IndexedQueryReaderTest.java (98%) rename src/test/java/org/{aksw => dice_research}/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java (97%) rename src/test/java/org/{aksw => dice_research}/iguana/commons/io/BigByteArrayInputStreamTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/commons/io/BigByteArrayOutputStreamTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/commons/io/ByteArrayListInputStreamTest.java (99%) rename src/test/java/org/{aksw => dice_research}/iguana/commons/io/ByteArrayListOutputStreamTest.java (98%) diff --git a/pom.xml b/pom.xml index eea952d5b..48ed45dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.aksw + org.dice-research iguana ${revision} Iguana @@ -208,7 +208,7 @@ - org.aksw.iguana.cc.controller.MainController + org.dice_research.iguana.cc.controller.MainController diff --git a/src/main/java/org/aksw/iguana/cc/config/elements/ConnectionConfig.java b/src/main/java/org/dice_research/iguana/cc/config/elements/ConnectionConfig.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/config/elements/ConnectionConfig.java rename to src/main/java/org/dice_research/iguana/cc/config/elements/ConnectionConfig.java index 99addab0c..b436ec288 100644 --- a/src/main/java/org/aksw/iguana/cc/config/elements/ConnectionConfig.java +++ b/src/main/java/org/dice_research/iguana/cc/config/elements/ConnectionConfig.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/org/aksw/iguana/cc/config/elements/DatasetConfig.java b/src/main/java/org/dice_research/iguana/cc/config/elements/DatasetConfig.java similarity index 84% rename from src/main/java/org/aksw/iguana/cc/config/elements/DatasetConfig.java rename to src/main/java/org/dice_research/iguana/cc/config/elements/DatasetConfig.java index 8986de3be..7166f0679 100644 --- a/src/main/java/org/aksw/iguana/cc/config/elements/DatasetConfig.java +++ b/src/main/java/org/dice_research/iguana/cc/config/elements/DatasetConfig.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java b/src/main/java/org/dice_research/iguana/cc/config/elements/StorageConfig.java similarity index 70% rename from src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java rename to src/main/java/org/dice_research/iguana/cc/config/elements/StorageConfig.java index bd55cace2..da7ab4c8c 100644 --- a/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java +++ b/src/main/java/org/dice_research/iguana/cc/config/elements/StorageConfig.java @@ -1,10 +1,10 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.aksw.iguana.cc.storage.impl.CSVStorage; -import org.aksw.iguana.cc.storage.impl.RDFFileStorage; -import org.aksw.iguana.cc.storage.impl.TriplestoreStorage; +import org.dice_research.iguana.cc.storage.impl.CSVStorage; +import org.dice_research.iguana.cc.storage.impl.RDFFileStorage; +import org.dice_research.iguana.cc.storage.impl.TriplestoreStorage; /** * Storage Configuration class diff --git a/src/main/java/org/aksw/iguana/cc/controller/MainController.java b/src/main/java/org/dice_research/iguana/cc/controller/MainController.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/controller/MainController.java rename to src/main/java/org/dice_research/iguana/cc/controller/MainController.java index b806d3ea5..df7a0698b 100644 --- a/src/main/java/org/aksw/iguana/cc/controller/MainController.java +++ b/src/main/java/org/dice_research/iguana/cc/controller/MainController.java @@ -1,8 +1,8 @@ -package org.aksw.iguana.cc.controller; +package org.dice_research.iguana.cc.controller; import com.beust.jcommander.*; -import org.aksw.iguana.cc.suite.IguanaSuiteParser; -import org.aksw.iguana.cc.suite.Suite; +import org.dice_research.iguana.cc.suite.IguanaSuiteParser; +import org.dice_research.iguana.cc.suite.Suite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java b/src/main/java/org/dice_research/iguana/cc/lang/LanguageProcessor.java similarity index 72% rename from src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java rename to src/main/java/org/dice_research/iguana/cc/lang/LanguageProcessor.java index 8c46e7596..915e17e40 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/LanguageProcessor.java @@ -1,6 +1,10 @@ -package org.aksw.iguana.cc.lang; +package org.dice_research.iguana.cc.lang; -import org.aksw.iguana.cc.storage.Storable; +import org.dice_research.iguana.cc.storage.Storable; +import org.dice_research.iguana.cc.lang.impl.SaxSparqlJsonResultCountingParser; +import org.dice_research.iguana.cc.lang.impl.SaxSparqlXmlResultCountingParser; +import org.dice_research.iguana.cc.lang.impl.SparqlCsvResultCountingParser; +import org.dice_research.iguana.cc.lang.impl.SparqlTsvResultCountingParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,10 +48,10 @@ public interface LanguageProcessingData extends Storable { // Register all available LanguageProcessors here. static { - processors.put("application/sparql-results+json", org.aksw.iguana.cc.lang.impl.SaxSparqlJsonResultCountingParser.class); - processors.put("application/sparql-results+xml", org.aksw.iguana.cc.lang.impl.SaxSparqlXmlResultCountingParser.class); - processors.put("text/tab-separated-values", org.aksw.iguana.cc.lang.impl.SparqlTsvResultCountingParser.class); - processors.put("text/csv", org.aksw.iguana.cc.lang.impl.SparqlCsvResultCountingParser.class); + processors.put("application/sparql-results+json", SaxSparqlJsonResultCountingParser.class); + processors.put("application/sparql-results+xml", SaxSparqlXmlResultCountingParser.class); + processors.put("text/tab-separated-values", SparqlTsvResultCountingParser.class); + processors.put("text/csv", SparqlCsvResultCountingParser.class); } public static LanguageProcessor getInstance(String contentType) { diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/BooleanResultData.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/BooleanResultData.java similarity index 88% rename from src/main/java/org/aksw/iguana/cc/lang/impl/BooleanResultData.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/BooleanResultData.java index 746042d3f..638f49781 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/BooleanResultData.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/BooleanResultData.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; -import org.aksw.iguana.cc.lang.LanguageProcessor; -import org.aksw.iguana.cc.storage.Storable; -import org.aksw.iguana.commons.rdf.IPROP; -import org.aksw.iguana.commons.rdf.IRES; +import org.dice_research.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.storage.Storable; +import org.dice_research.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.commons.rdf.IRES; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/ResultCountData.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/ResultCountData.java similarity index 90% rename from src/main/java/org/aksw/iguana/cc/lang/impl/ResultCountData.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/ResultCountData.java index d2e05454f..a8b531200 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/ResultCountData.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/ResultCountData.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; -import org.aksw.iguana.cc.lang.LanguageProcessor; -import org.aksw.iguana.cc.storage.Storable; -import org.aksw.iguana.commons.rdf.IPROP; -import org.aksw.iguana.commons.rdf.IRES; +import org.dice_research.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.storage.Storable; +import org.dice_research.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.commons.rdf.IRES; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java similarity index 98% rename from src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java index 3645ec9ec..c9ee16454 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import com.fasterxml.jackson.core.JsonFactory; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.slf4j.Logger; import java.io.IOException; diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java similarity index 99% rename from src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java index 1cff6a038..fcd103575 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParser.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.slf4j.Logger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java index 2147ee36a..766894270 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParser.java @@ -1,8 +1,8 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import com.opencsv.*; import com.opencsv.exceptions.CsvValidationException; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.slf4j.Logger; import java.io.IOException; diff --git a/src/main/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java b/src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java similarity index 96% rename from src/main/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java rename to src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java index 46d134d83..beb347d11 100644 --- a/src/main/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java +++ b/src/main/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParser.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import com.opencsv.*; import com.opencsv.enums.CSVReaderNullFieldIndicator; import com.opencsv.exceptions.CsvValidationException; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.slf4j.Logger; import java.io.*; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/Metric.java b/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java similarity index 93% rename from src/main/java/org/aksw/iguana/cc/metrics/Metric.java rename to src/main/java/org/dice_research/iguana/cc/metrics/Metric.java index 0f4bc15fa..4e751b4b5 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/Metric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java @@ -1,7 +1,8 @@ -package org.aksw.iguana.cc.metrics; +package org.dice_research.iguana.cc.metrics; import com.fasterxml.jackson.annotation.*; import org.aksw.iguana.cc.metrics.impl.*; +import org.dice_research.iguana.cc.metrics.impl.*; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ diff --git a/src/main/java/org/aksw/iguana/cc/metrics/ModelWritingMetric.java b/src/main/java/org/dice_research/iguana/cc/metrics/ModelWritingMetric.java similarity index 79% rename from src/main/java/org/aksw/iguana/cc/metrics/ModelWritingMetric.java rename to src/main/java/org/dice_research/iguana/cc/metrics/ModelWritingMetric.java index 9debe1481..c422393ab 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/ModelWritingMetric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/ModelWritingMetric.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.metrics; +package org.dice_research.iguana.cc.metrics; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.commons.rdf.IRES; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.commons.rdf.IRES; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/QueryMetric.java b/src/main/java/org/dice_research/iguana/cc/metrics/QueryMetric.java similarity index 56% rename from src/main/java/org/aksw/iguana/cc/metrics/QueryMetric.java rename to src/main/java/org/dice_research/iguana/cc/metrics/QueryMetric.java index 9b771a570..a944f3ece 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/QueryMetric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/QueryMetric.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.metrics; +package org.dice_research.iguana.cc.metrics; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.util.List; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/TaskMetric.java b/src/main/java/org/dice_research/iguana/cc/metrics/TaskMetric.java similarity index 61% rename from src/main/java/org/aksw/iguana/cc/metrics/TaskMetric.java rename to src/main/java/org/dice_research/iguana/cc/metrics/TaskMetric.java index 8b4360306..342beffd0 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/TaskMetric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/TaskMetric.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.metrics; +package org.dice_research.iguana.cc.metrics; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.util.List; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/WorkerMetric.java b/src/main/java/org/dice_research/iguana/cc/metrics/WorkerMetric.java similarity index 61% rename from src/main/java/org/aksw/iguana/cc/metrics/WorkerMetric.java rename to src/main/java/org/dice_research/iguana/cc/metrics/WorkerMetric.java index 1fe5b763f..b4a45fd04 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/WorkerMetric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/WorkerMetric.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.metrics; +package org.dice_research.iguana.cc.metrics; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.util.List; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java similarity index 89% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java index 8582f2020..09b62eaf3 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/AggregatedExecutionStatistics.java @@ -1,12 +1,12 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.ModelWritingMetric; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.commons.rdf.IONT; -import org.aksw.iguana.commons.rdf.IPROP; -import org.aksw.iguana.commons.rdf.IRES; -import org.aksw.iguana.commons.time.TimeUtils; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.ModelWritingMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.commons.rdf.IONT; +import org.dice_research.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.commons.rdf.IRES; +import org.dice_research.iguana.commons.time.TimeUtils; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/AvgQPS.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/AvgQPS.java similarity index 84% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/AvgQPS.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/AvgQPS.java index 3a271a20e..ee01cee9a 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/AvgQPS.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/AvgQPS.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.TaskMetric; -import org.aksw.iguana.cc.metrics.WorkerMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/EachExecutionStatistic.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/EachExecutionStatistic.java similarity index 87% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/EachExecutionStatistic.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/EachExecutionStatistic.java index c6e1bf95a..e22783925 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/EachExecutionStatistic.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/EachExecutionStatistic.java @@ -1,12 +1,12 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.ModelWritingMetric; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.commons.rdf.IONT; -import org.aksw.iguana.commons.rdf.IPROP; -import org.aksw.iguana.commons.rdf.IRES; -import org.aksw.iguana.commons.time.TimeUtils; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.ModelWritingMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.commons.rdf.IONT; +import org.dice_research.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.commons.rdf.IRES; +import org.dice_research.iguana.commons.time.TimeUtils; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/NoQ.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQ.java similarity index 80% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/NoQ.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQ.java index 411f73ca9..86a7810de 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/NoQ.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQ.java @@ -1,11 +1,10 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.TaskMetric; -import org.aksw.iguana.cc.metrics.WorkerMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; -import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/NoQPH.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQPH.java similarity index 86% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/NoQPH.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQPH.java index 819a308e7..721d125f2 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/NoQPH.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/NoQPH.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.TaskMetric; -import org.aksw.iguana.cc.metrics.WorkerMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/PAvgQPS.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/PAvgQPS.java similarity index 86% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/PAvgQPS.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/PAvgQPS.java index 3dab66358..ede3c60e3 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/PAvgQPS.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/PAvgQPS.java @@ -1,10 +1,10 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.TaskMetric; -import org.aksw.iguana.cc.metrics.WorkerMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/PQPS.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/PQPS.java similarity index 86% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/PQPS.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/PQPS.java index 67916b97e..41d4449b8 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/PQPS.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/PQPS.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.QueryMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.QueryMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/QMPH.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/QMPH.java similarity index 87% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/QMPH.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/QMPH.java index ab60be12a..84a339a60 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/QMPH.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/QMPH.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.TaskMetric; -import org.aksw.iguana.cc.metrics.WorkerMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/aksw/iguana/cc/metrics/impl/QPS.java b/src/main/java/org/dice_research/iguana/cc/metrics/impl/QPS.java similarity index 83% rename from src/main/java/org/aksw/iguana/cc/metrics/impl/QPS.java rename to src/main/java/org/dice_research/iguana/cc/metrics/impl/QPS.java index 4039d2e67..045306ac4 100644 --- a/src/main/java/org/aksw/iguana/cc/metrics/impl/QPS.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/impl/QPS.java @@ -1,8 +1,8 @@ -package org.aksw.iguana.cc.metrics.impl; +package org.dice_research.iguana.cc.metrics.impl; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.QueryMetric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.QueryMetric; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/aksw/iguana/cc/query/QueryData.java b/src/main/java/org/dice_research/iguana/cc/query/QueryData.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/query/QueryData.java rename to src/main/java/org/dice_research/iguana/cc/query/QueryData.java index 02858cb8f..aaa561789 100644 --- a/src/main/java/org/aksw/iguana/cc/query/QueryData.java +++ b/src/main/java/org/dice_research/iguana/cc/query/QueryData.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query; +package org.dice_research.iguana.cc.query; import org.apache.jena.update.UpdateFactory; diff --git a/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java b/src/main/java/org/dice_research/iguana/cc/query/handler/QueryHandler.java similarity index 94% rename from src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java rename to src/main/java/org/dice_research/iguana/cc/query/handler/QueryHandler.java index 3bf41a02e..1e6cd3b48 100644 --- a/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java +++ b/src/main/java/org/dice_research/iguana/cc/query/handler/QueryHandler.java @@ -1,27 +1,24 @@ -package org.aksw.iguana.cc.query.handler; +package org.dice_research.iguana.cc.query.handler; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.aksw.iguana.cc.query.QueryData; -import org.aksw.iguana.cc.query.list.impl.StringListQueryList; -import org.aksw.iguana.cc.query.selector.QuerySelector; -import org.aksw.iguana.cc.query.selector.impl.LinearQuerySelector; -import org.aksw.iguana.cc.query.selector.impl.RandomQuerySelector; -import org.aksw.iguana.cc.query.list.QueryList; -import org.aksw.iguana.cc.query.list.impl.FileReadingQueryList; -import org.aksw.iguana.cc.query.list.impl.FileCachingQueryList; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.query.source.impl.FileLineQuerySource; -import org.aksw.iguana.cc.query.source.impl.FileSeparatorQuerySource; -import org.aksw.iguana.cc.query.source.impl.FolderQuerySource; +import org.dice_research.iguana.cc.query.QueryData; +import org.dice_research.iguana.cc.query.list.impl.StringListQueryList; +import org.dice_research.iguana.cc.query.selector.QuerySelector; +import org.dice_research.iguana.cc.query.selector.impl.LinearQuerySelector; +import org.dice_research.iguana.cc.query.selector.impl.RandomQuerySelector; +import org.dice_research.iguana.cc.query.list.QueryList; +import org.dice_research.iguana.cc.query.list.impl.FileReadingQueryList; +import org.dice_research.iguana.cc.query.list.impl.FileCachingQueryList; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileLineQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileSeparatorQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FolderQuerySource; import org.apache.jena.query.*; import org.apache.jena.sparql.exec.http.QueryExecutionHTTP; -import org.apache.jena.sparql.exec.http.QueryExecutionHTTPBuilder; -import org.apache.jena.sparql.service.single.ServiceExecutor; -import org.apache.jena.sparql.service.single.ServiceExecutorHttp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/query/list/FileBasedQueryList.java b/src/main/java/org/dice_research/iguana/cc/query/list/FileBasedQueryList.java similarity index 92% rename from src/main/java/org/aksw/iguana/cc/query/list/FileBasedQueryList.java rename to src/main/java/org/dice_research/iguana/cc/query/list/FileBasedQueryList.java index 0256fee53..da2fd8171 100644 --- a/src/main/java/org/aksw/iguana/cc/query/list/FileBasedQueryList.java +++ b/src/main/java/org/dice_research/iguana/cc/query/list/FileBasedQueryList.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.query.list; +package org.dice_research.iguana.cc.query.list; -import org.aksw.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.source.QuerySource; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java b/src/main/java/org/dice_research/iguana/cc/query/list/QueryList.java similarity index 94% rename from src/main/java/org/aksw/iguana/cc/query/list/QueryList.java rename to src/main/java/org/dice_research/iguana/cc/query/list/QueryList.java index 3f9f2a788..fe4d95483 100644 --- a/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java +++ b/src/main/java/org/dice_research/iguana/cc/query/list/QueryList.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.list; +package org.dice_research.iguana.cc.query.list; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/cc/query/list/impl/FileCachingQueryList.java b/src/main/java/org/dice_research/iguana/cc/query/list/impl/FileCachingQueryList.java similarity index 87% rename from src/main/java/org/aksw/iguana/cc/query/list/impl/FileCachingQueryList.java rename to src/main/java/org/dice_research/iguana/cc/query/list/impl/FileCachingQueryList.java index 8f6c3a38d..882a1aafe 100644 --- a/src/main/java/org/aksw/iguana/cc/query/list/impl/FileCachingQueryList.java +++ b/src/main/java/org/dice_research/iguana/cc/query/list/impl/FileCachingQueryList.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.query.list.impl; +package org.dice_research.iguana.cc.query.list.impl; -import org.aksw.iguana.cc.query.list.FileBasedQueryList; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.commons.io.ByteArrayListInputStream; -import org.aksw.iguana.commons.io.ByteArrayListOutputStream; +import org.dice_research.iguana.cc.query.list.FileBasedQueryList; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.commons.io.ByteArrayListInputStream; +import org.dice_research.iguana.commons.io.ByteArrayListOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/query/list/impl/FileReadingQueryList.java b/src/main/java/org/dice_research/iguana/cc/query/list/impl/FileReadingQueryList.java similarity index 76% rename from src/main/java/org/aksw/iguana/cc/query/list/impl/FileReadingQueryList.java rename to src/main/java/org/dice_research/iguana/cc/query/list/impl/FileReadingQueryList.java index e3074be04..88cde2aa7 100644 --- a/src/main/java/org/aksw/iguana/cc/query/list/impl/FileReadingQueryList.java +++ b/src/main/java/org/dice_research/iguana/cc/query/list/impl/FileReadingQueryList.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.query.list.impl; +package org.dice_research.iguana.cc.query.list.impl; -import org.aksw.iguana.cc.query.list.FileBasedQueryList; -import org.aksw.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.list.FileBasedQueryList; +import org.dice_research.iguana.cc.query.source.QuerySource; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/cc/query/list/impl/StringListQueryList.java b/src/main/java/org/dice_research/iguana/cc/query/list/impl/StringListQueryList.java similarity index 80% rename from src/main/java/org/aksw/iguana/cc/query/list/impl/StringListQueryList.java rename to src/main/java/org/dice_research/iguana/cc/query/list/impl/StringListQueryList.java index 809ff6ff5..4864d316e 100644 --- a/src/main/java/org/aksw/iguana/cc/query/list/impl/StringListQueryList.java +++ b/src/main/java/org/dice_research/iguana/cc/query/list/impl/StringListQueryList.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.query.list.impl; +package org.dice_research.iguana.cc.query.list.impl; -import org.aksw.iguana.cc.query.list.QueryList; -import org.aksw.iguana.commons.io.ByteArrayListInputStream; +import org.dice_research.iguana.cc.query.list.QueryList; +import org.dice_research.iguana.commons.io.ByteArrayListInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java b/src/main/java/org/dice_research/iguana/cc/query/selector/QuerySelector.java similarity index 93% rename from src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java rename to src/main/java/org/dice_research/iguana/cc/query/selector/QuerySelector.java index 824643213..edc8d67af 100644 --- a/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java +++ b/src/main/java/org/dice_research/iguana/cc/query/selector/QuerySelector.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.selector; +package org.dice_research.iguana.cc.query.selector; import static java.text.MessageFormat.format; diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java b/src/main/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelector.java similarity index 88% rename from src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java rename to src/main/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelector.java index 60c0ae0ed..4b09d8988 100644 --- a/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java +++ b/src/main/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelector.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.query.selector.impl; +package org.dice_research.iguana.cc.query.selector.impl; -import org.aksw.iguana.cc.query.selector.QuerySelector; +import org.dice_research.iguana.cc.query.selector.QuerySelector; /** * This QuerySelector is used to get the next query index in a linear order. If the last query is reached it starts diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java b/src/main/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelector.java similarity index 84% rename from src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java rename to src/main/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelector.java index 80b18d51c..d0111b245 100644 --- a/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java +++ b/src/main/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelector.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.query.selector.impl; +package org.dice_research.iguana.cc.query.selector.impl; -import org.aksw.iguana.cc.query.selector.QuerySelector; +import org.dice_research.iguana.cc.query.selector.QuerySelector; import java.util.Random; diff --git a/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java b/src/main/java/org/dice_research/iguana/cc/query/source/QuerySource.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java rename to src/main/java/org/dice_research/iguana/cc/query/source/QuerySource.java index 430a024c0..c3b19e883 100644 --- a/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java +++ b/src/main/java/org/dice_research/iguana/cc/query/source/QuerySource.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.query.source; +package org.dice_research.iguana.cc.query.source; -import org.aksw.iguana.cc.utils.files.FileUtils; +import org.dice_research.iguana.cc.utils.files.FileUtils; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySource.java similarity index 76% rename from src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java rename to src/main/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySource.java index 69789aa6b..d4e84cabb 100644 --- a/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java +++ b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySource.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; -import org.aksw.iguana.cc.utils.files.FileUtils; +import org.dice_research.iguana.cc.utils.files.FileUtils; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySource.java similarity index 92% rename from src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java rename to src/main/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySource.java index b1e82c9c3..e1807debf 100644 --- a/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java +++ b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySource.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.utils.files.IndexedQueryReader; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.utils.files.IndexedQueryReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySource.java similarity index 92% rename from src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java rename to src/main/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySource.java index 00d4f6734..6b21122b0 100644 --- a/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java +++ b/src/main/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySource.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.utils.files.FileUtils; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.utils.files.FileUtils; import org.apache.commons.io.input.AutoCloseInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/storage/Storable.java b/src/main/java/org/dice_research/iguana/cc/storage/Storable.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/storage/Storable.java rename to src/main/java/org/dice_research/iguana/cc/storage/Storable.java index e45bcc976..c55651c80 100644 --- a/src/main/java/org/aksw/iguana/cc/storage/Storable.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/Storable.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.storage; +package org.dice_research.iguana.cc.storage; import org.apache.jena.rdf.model.Model; diff --git a/src/main/java/org/aksw/iguana/cc/storage/Storage.java b/src/main/java/org/dice_research/iguana/cc/storage/Storage.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/storage/Storage.java rename to src/main/java/org/dice_research/iguana/cc/storage/Storage.java index 06d1c2234..9d713e926 100644 --- a/src/main/java/org/aksw/iguana/cc/storage/Storage.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/Storage.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.storage; +package org.dice_research.iguana.cc.storage; import org.apache.jena.rdf.model.Model; diff --git a/src/main/java/org/aksw/iguana/cc/storage/impl/CSVStorage.java b/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java similarity index 96% rename from src/main/java/org/aksw/iguana/cc/storage/impl/CSVStorage.java rename to src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java index 6565525fc..3f522dfa7 100644 --- a/src/main/java/org/aksw/iguana/cc/storage/impl/CSVStorage.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java @@ -1,17 +1,17 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; import com.opencsv.CSVReader; import com.opencsv.CSVWriter; import com.opencsv.CSVWriterBuilder; import com.opencsv.exceptions.CsvValidationException; -import org.aksw.iguana.cc.config.elements.StorageConfig; +import org.dice_research.iguana.cc.config.elements.StorageConfig; import org.aksw.iguana.cc.metrics.*; -import org.aksw.iguana.cc.metrics.impl.AggregatedExecutionStatistics; -import org.aksw.iguana.cc.metrics.impl.EachExecutionStatistic; -import org.aksw.iguana.cc.storage.Storable; -import org.aksw.iguana.cc.storage.Storage; -import org.aksw.iguana.commons.rdf.IONT; -import org.aksw.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.cc.metrics.impl.AggregatedExecutionStatistics; +import org.dice_research.iguana.cc.metrics.impl.EachExecutionStatistic; +import org.dice_research.iguana.cc.storage.Storable; +import org.dice_research.iguana.cc.storage.Storage; +import org.dice_research.iguana.commons.rdf.IONT; +import org.dice_research.iguana.commons.rdf.IPROP; import org.apache.jena.arq.querybuilder.SelectBuilder; import org.apache.jena.arq.querybuilder.WhereBuilder; import org.apache.jena.query.*; @@ -19,6 +19,10 @@ import org.apache.jena.sparql.lang.sparql_11.ParseException; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDFS; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.QueryMetric; +import org.dice_research.iguana.cc.metrics.TaskMetric; +import org.dice_research.iguana.cc.metrics.WorkerMetric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/storage/impl/RDFFileStorage.java b/src/main/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorage.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/storage/impl/RDFFileStorage.java rename to src/main/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorage.java index 73ca1642d..e7bad3a09 100644 --- a/src/main/java/org/aksw/iguana/cc/storage/impl/RDFFileStorage.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorage.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; -import org.aksw.iguana.cc.config.elements.StorageConfig; -import org.aksw.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.config.elements.StorageConfig; +import org.dice_research.iguana.cc.storage.Storage; import org.apache.commons.io.FilenameUtils; import org.apache.jena.rdf.model.Model; import org.apache.jena.riot.Lang; diff --git a/src/main/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorage.java b/src/main/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorage.java similarity index 93% rename from src/main/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorage.java rename to src/main/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorage.java index cebb01ab2..ba1ee545a 100644 --- a/src/main/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorage.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorage.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import org.aksw.iguana.cc.config.elements.StorageConfig; -import org.aksw.iguana.cc.controller.MainController; -import org.aksw.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.config.elements.StorageConfig; +import org.dice_research.iguana.cc.controller.MainController; +import org.dice_research.iguana.cc.storage.Storage; import org.apache.jena.rdf.model.Model; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; diff --git a/src/main/java/org/aksw/iguana/cc/suite/IguanaSuiteParser.java b/src/main/java/org/dice_research/iguana/cc/suite/IguanaSuiteParser.java similarity index 98% rename from src/main/java/org/aksw/iguana/cc/suite/IguanaSuiteParser.java rename to src/main/java/org/dice_research/iguana/cc/suite/IguanaSuiteParser.java index ad431cb65..ae589f14c 100644 --- a/src/main/java/org/aksw/iguana/cc/suite/IguanaSuiteParser.java +++ b/src/main/java/org/dice_research/iguana/cc/suite/IguanaSuiteParser.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.suite; +package org.dice_research.iguana.cc.suite; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,8 +16,8 @@ import com.networknt.schema.JsonSchemaFactory; import com.networknt.schema.SpecVersion; import com.networknt.schema.ValidationMessage; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.config.elements.DatasetConfig; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.config.elements.DatasetConfig; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/suite/Suite.java b/src/main/java/org/dice_research/iguana/cc/suite/Suite.java similarity index 79% rename from src/main/java/org/aksw/iguana/cc/suite/Suite.java rename to src/main/java/org/dice_research/iguana/cc/suite/Suite.java index 7e2e50025..7fc796848 100644 --- a/src/main/java/org/aksw/iguana/cc/suite/Suite.java +++ b/src/main/java/org/dice_research/iguana/cc/suite/Suite.java @@ -1,20 +1,21 @@ -package org.aksw.iguana.cc.suite; +package org.dice_research.iguana.cc.suite; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.config.elements.DatasetConfig; -import org.aksw.iguana.cc.config.elements.StorageConfig; -import org.aksw.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.config.elements.DatasetConfig; +import org.dice_research.iguana.cc.config.elements.StorageConfig; +import org.dice_research.iguana.cc.metrics.Metric; import org.aksw.iguana.cc.metrics.impl.*; -import org.aksw.iguana.cc.storage.Storage; -import org.aksw.iguana.cc.storage.impl.CSVStorage; -import org.aksw.iguana.cc.storage.impl.RDFFileStorage; -import org.aksw.iguana.cc.storage.impl.TriplestoreStorage; -import org.aksw.iguana.cc.tasks.impl.Stresstest; -import org.aksw.iguana.cc.tasks.Task; -import org.aksw.iguana.cc.worker.ResponseBodyProcessor; -import org.aksw.iguana.cc.worker.ResponseBodyProcessorInstances; +import org.dice_research.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.storage.impl.CSVStorage; +import org.dice_research.iguana.cc.storage.impl.RDFFileStorage; +import org.dice_research.iguana.cc.storage.impl.TriplestoreStorage; +import org.dice_research.iguana.cc.tasks.impl.Stresstest; +import org.dice_research.iguana.cc.tasks.Task; +import org.dice_research.iguana.cc.worker.ResponseBodyProcessor; +import org.dice_research.iguana.cc.worker.ResponseBodyProcessorInstances; +import org.dice_research.iguana.cc.metrics.impl.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/tasks/Task.java b/src/main/java/org/dice_research/iguana/cc/tasks/Task.java similarity index 81% rename from src/main/java/org/aksw/iguana/cc/tasks/Task.java rename to src/main/java/org/dice_research/iguana/cc/tasks/Task.java index 5c5901fcc..03b5578ac 100644 --- a/src/main/java/org/aksw/iguana/cc/tasks/Task.java +++ b/src/main/java/org/dice_research/iguana/cc/tasks/Task.java @@ -1,8 +1,8 @@ -package org.aksw.iguana.cc.tasks; +package org.dice_research.iguana.cc.tasks; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.aksw.iguana.cc.tasks.impl.Stresstest; +import org.dice_research.iguana.cc.tasks.impl.Stresstest; public interface Task { @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, diff --git a/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java b/src/main/java/org/dice_research/iguana/cc/tasks/impl/Stresstest.java similarity index 92% rename from src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java rename to src/main/java/org/dice_research/iguana/cc/tasks/impl/Stresstest.java index ad36af220..afa981f14 100644 --- a/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java +++ b/src/main/java/org/dice_research/iguana/cc/tasks/impl/Stresstest.java @@ -1,13 +1,13 @@ -package org.aksw.iguana.cc.tasks.impl; +package org.dice_research.iguana.cc.tasks.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.storage.Storage; -import org.aksw.iguana.cc.tasks.Task; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.cc.worker.ResponseBodyProcessorInstances; -import org.aksw.iguana.cc.worker.impl.SPARQLProtocolWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.tasks.Task; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.ResponseBodyProcessorInstances; +import org.dice_research.iguana.cc.worker.impl.SPARQLProtocolWorker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/tasks/impl/StresstestResultProcessor.java b/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java similarity index 96% rename from src/main/java/org/aksw/iguana/cc/tasks/impl/StresstestResultProcessor.java rename to src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java index c748f3244..167ce4178 100644 --- a/src/main/java/org/aksw/iguana/cc/tasks/impl/StresstestResultProcessor.java +++ b/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java @@ -1,17 +1,18 @@ -package org.aksw.iguana.cc.tasks.impl; +package org.dice_research.iguana.cc.tasks.impl; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.aksw.iguana.cc.metrics.*; -import org.aksw.iguana.cc.storage.Storage; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.commons.rdf.IGUANA_BASE; -import org.aksw.iguana.commons.rdf.IONT; -import org.aksw.iguana.commons.rdf.IPROP; -import org.aksw.iguana.commons.rdf.IRES; -import org.aksw.iguana.commons.time.TimeUtils; +import org.dice_research.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.commons.rdf.IGUANA_BASE; +import org.dice_research.iguana.commons.rdf.IONT; +import org.dice_research.iguana.commons.rdf.IPROP; +import org.dice_research.iguana.commons.rdf.IRES; +import org.dice_research.iguana.commons.time.TimeUtils; import org.apache.jena.rdf.model.*; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDFS; +import org.dice_research.iguana.cc.metrics.*; import java.math.BigInteger; import java.time.ZonedDateTime; diff --git a/src/main/java/org/aksw/iguana/cc/utils/files/FileUtils.java b/src/main/java/org/dice_research/iguana/cc/utils/files/FileUtils.java similarity index 99% rename from src/main/java/org/aksw/iguana/cc/utils/files/FileUtils.java rename to src/main/java/org/dice_research/iguana/cc/utils/files/FileUtils.java index e00f30238..9f498162d 100644 --- a/src/main/java/org/aksw/iguana/cc/utils/files/FileUtils.java +++ b/src/main/java/org/dice_research/iguana/cc/utils/files/FileUtils.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.utils.files; +package org.dice_research.iguana.cc.utils.files; import net.jpountz.xxhash.StreamingXXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/src/main/java/org/aksw/iguana/cc/utils/files/IndexedQueryReader.java b/src/main/java/org/dice_research/iguana/cc/utils/files/IndexedQueryReader.java similarity index 99% rename from src/main/java/org/aksw/iguana/cc/utils/files/IndexedQueryReader.java rename to src/main/java/org/dice_research/iguana/cc/utils/files/IndexedQueryReader.java index ed0206de3..1af5d3889 100644 --- a/src/main/java/org/aksw/iguana/cc/utils/files/IndexedQueryReader.java +++ b/src/main/java/org/dice_research/iguana/cc/utils/files/IndexedQueryReader.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.utils.files; +package org.dice_research.iguana.cc.utils.files; import org.apache.commons.io.input.AutoCloseInputStream; import org.apache.commons.io.input.BoundedInputStream; diff --git a/src/main/java/org/aksw/iguana/cc/utils/files/QueryIndex.java b/src/main/java/org/dice_research/iguana/cc/utils/files/QueryIndex.java similarity index 57% rename from src/main/java/org/aksw/iguana/cc/utils/files/QueryIndex.java rename to src/main/java/org/dice_research/iguana/cc/utils/files/QueryIndex.java index 40968e386..60ce43d8d 100644 --- a/src/main/java/org/aksw/iguana/cc/utils/files/QueryIndex.java +++ b/src/main/java/org/dice_research/iguana/cc/utils/files/QueryIndex.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.utils.files; +package org.dice_research.iguana.cc.utils.files; public record QueryIndex(long filePosition, long queryLength) { } diff --git a/src/main/java/org/aksw/iguana/cc/utils/http/RequestFactory.java b/src/main/java/org/dice_research/iguana/cc/utils/http/RequestFactory.java similarity index 95% rename from src/main/java/org/aksw/iguana/cc/utils/http/RequestFactory.java rename to src/main/java/org/dice_research/iguana/cc/utils/http/RequestFactory.java index e0853166e..abf818a54 100644 --- a/src/main/java/org/aksw/iguana/cc/utils/http/RequestFactory.java +++ b/src/main/java/org/dice_research/iguana/cc/utils/http/RequestFactory.java @@ -1,12 +1,12 @@ -package org.aksw.iguana.cc.utils.http; +package org.dice_research.iguana.cc.utils.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.query.selector.impl.LinearQuerySelector; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.cc.worker.impl.SPARQLProtocolWorker; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.query.selector.impl.LinearQuerySelector; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.impl.SPARQLProtocolWorker; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.nio.AsyncRequestProducer; import org.apache.hc.core5.http.nio.entity.BasicAsyncEntityProducer; diff --git a/src/main/java/org/aksw/iguana/cc/utils/http/StreamEntityProducer.java b/src/main/java/org/dice_research/iguana/cc/utils/http/StreamEntityProducer.java similarity index 97% rename from src/main/java/org/aksw/iguana/cc/utils/http/StreamEntityProducer.java rename to src/main/java/org/dice_research/iguana/cc/utils/http/StreamEntityProducer.java index 08e41f42c..6797fc530 100644 --- a/src/main/java/org/aksw/iguana/cc/utils/http/StreamEntityProducer.java +++ b/src/main/java/org/dice_research/iguana/cc/utils/http/StreamEntityProducer.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.utils.http; +package org.dice_research.iguana.cc.utils.http; -import org.aksw.iguana.commons.io.ByteArrayListInputStream; +import org.dice_research.iguana.commons.io.ByteArrayListInputStream; import org.apache.hc.core5.http.nio.AsyncEntityProducer; import org.apache.hc.core5.http.nio.DataStreamChannel; import org.slf4j.Logger; diff --git a/src/main/java/org/aksw/iguana/cc/worker/HttpWorker.java b/src/main/java/org/dice_research/iguana/cc/worker/HttpWorker.java similarity index 93% rename from src/main/java/org/aksw/iguana/cc/worker/HttpWorker.java rename to src/main/java/org/dice_research/iguana/cc/worker/HttpWorker.java index 6e0242d9a..e0fc344a9 100644 --- a/src/main/java/org/aksw/iguana/cc/worker/HttpWorker.java +++ b/src/main/java/org/dice_research/iguana/cc/worker/HttpWorker.java @@ -1,13 +1,13 @@ -package org.aksw.iguana.cc.worker; +package org.dice_research.iguana.cc.worker; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.query.selector.QuerySelector; -import org.aksw.iguana.cc.tasks.impl.Stresstest; -import org.aksw.iguana.cc.worker.impl.SPARQLProtocolWorker; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.query.selector.QuerySelector; +import org.dice_research.iguana.cc.tasks.impl.Stresstest; +import org.dice_research.iguana.cc.worker.impl.SPARQLProtocolWorker; import java.net.http.HttpTimeoutException; import java.time.Duration; diff --git a/src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessor.java b/src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessor.java similarity index 97% rename from src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessor.java rename to src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessor.java index af3e297a1..ecbff98c0 100644 --- a/src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessor.java +++ b/src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessor.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.worker; +package org.dice_research.iguana.cc.worker; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessorInstances.java b/src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessorInstances.java similarity index 93% rename from src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessorInstances.java rename to src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessorInstances.java index 95be1f0e9..c021b13c5 100644 --- a/src/main/java/org/aksw/iguana/cc/worker/ResponseBodyProcessorInstances.java +++ b/src/main/java/org/dice_research/iguana/cc/worker/ResponseBodyProcessorInstances.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.worker; +package org.dice_research.iguana.cc.worker; -import org.aksw.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.lang.LanguageProcessor; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java b/src/main/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorker.java similarity index 97% rename from src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java rename to src/main/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorker.java index a4e841039..40397e4b9 100644 --- a/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java +++ b/src/main/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorker.java @@ -1,16 +1,16 @@ -package org.aksw.iguana.cc.worker.impl; +package org.dice_research.iguana.cc.worker.impl; import com.fasterxml.jackson.annotation.JsonProperty; import net.jpountz.xxhash.StreamingXXHash64; import net.jpountz.xxhash.XXHashFactory; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.utils.http.RequestFactory; -import org.aksw.iguana.cc.worker.ResponseBodyProcessor; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.commons.io.BigByteArrayOutputStream; -import org.aksw.iguana.commons.io.ByteArrayListOutputStream; -import org.aksw.iguana.commons.io.ReversibleOutputStream; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.utils.http.RequestFactory; +import org.dice_research.iguana.cc.worker.ResponseBodyProcessor; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.commons.io.BigByteArrayOutputStream; +import org.dice_research.iguana.commons.io.ByteArrayListOutputStream; +import org.dice_research.iguana.commons.io.ReversibleOutputStream; import org.apache.hc.client5.http.async.methods.AbstractBinResponseConsumer; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; diff --git a/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java b/src/main/java/org/dice_research/iguana/commons/io/BigByteArrayInputStream.java similarity index 99% rename from src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java rename to src/main/java/org/dice_research/iguana/commons/io/BigByteArrayInputStream.java index f6c124162..55205fa59 100644 --- a/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java +++ b/src/main/java/org/dice_research/iguana/commons/io/BigByteArrayInputStream.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java b/src/main/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStream.java similarity index 99% rename from src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java rename to src/main/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStream.java index 633fae2b9..94f045214 100644 --- a/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java +++ b/src/main/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStream.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import org.apache.hadoop.hbase.io.ByteArrayOutputStream; diff --git a/src/main/java/org/aksw/iguana/commons/io/ByteArrayListInputStream.java b/src/main/java/org/dice_research/iguana/commons/io/ByteArrayListInputStream.java similarity index 99% rename from src/main/java/org/aksw/iguana/commons/io/ByteArrayListInputStream.java rename to src/main/java/org/dice_research/iguana/commons/io/ByteArrayListInputStream.java index 627385ba4..615f30254 100644 --- a/src/main/java/org/aksw/iguana/commons/io/ByteArrayListInputStream.java +++ b/src/main/java/org/dice_research/iguana/commons/io/ByteArrayListInputStream.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import java.io.EOFException; import java.io.IOException; diff --git a/src/main/java/org/aksw/iguana/commons/io/ByteArrayListOutputStream.java b/src/main/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStream.java similarity index 98% rename from src/main/java/org/aksw/iguana/commons/io/ByteArrayListOutputStream.java rename to src/main/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStream.java index 74d00949b..ad2cbc9ae 100644 --- a/src/main/java/org/aksw/iguana/commons/io/ByteArrayListOutputStream.java +++ b/src/main/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStream.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/aksw/iguana/commons/io/ReversibleOutputStream.java b/src/main/java/org/dice_research/iguana/commons/io/ReversibleOutputStream.java similarity index 87% rename from src/main/java/org/aksw/iguana/commons/io/ReversibleOutputStream.java rename to src/main/java/org/dice_research/iguana/commons/io/ReversibleOutputStream.java index 0a78acade..b64fe9136 100644 --- a/src/main/java/org/aksw/iguana/commons/io/ReversibleOutputStream.java +++ b/src/main/java/org/dice_research/iguana/commons/io/ReversibleOutputStream.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/org/aksw/iguana/commons/rdf/IGUANA_BASE.java b/src/main/java/org/dice_research/iguana/commons/rdf/IGUANA_BASE.java similarity index 93% rename from src/main/java/org/aksw/iguana/commons/rdf/IGUANA_BASE.java rename to src/main/java/org/dice_research/iguana/commons/rdf/IGUANA_BASE.java index b05101dd5..6807439ac 100644 --- a/src/main/java/org/aksw/iguana/commons/rdf/IGUANA_BASE.java +++ b/src/main/java/org/dice_research/iguana/commons/rdf/IGUANA_BASE.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.rdf; +package org.dice_research.iguana.commons.rdf; import java.util.Map; diff --git a/src/main/java/org/aksw/iguana/commons/rdf/IONT.java b/src/main/java/org/dice_research/iguana/commons/rdf/IONT.java similarity index 93% rename from src/main/java/org/aksw/iguana/commons/rdf/IONT.java rename to src/main/java/org/dice_research/iguana/commons/rdf/IONT.java index aecaaee24..61cba6f2c 100644 --- a/src/main/java/org/aksw/iguana/commons/rdf/IONT.java +++ b/src/main/java/org/dice_research/iguana/commons/rdf/IONT.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.commons.rdf; +package org.dice_research.iguana.commons.rdf; -import org.aksw.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.Metric; import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; diff --git a/src/main/java/org/aksw/iguana/commons/rdf/IPROP.java b/src/main/java/org/dice_research/iguana/commons/rdf/IPROP.java similarity index 97% rename from src/main/java/org/aksw/iguana/commons/rdf/IPROP.java rename to src/main/java/org/dice_research/iguana/commons/rdf/IPROP.java index 705513651..8abfa8034 100644 --- a/src/main/java/org/aksw/iguana/commons/rdf/IPROP.java +++ b/src/main/java/org/dice_research/iguana/commons/rdf/IPROP.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.commons.rdf; +package org.dice_research.iguana.commons.rdf; -import org.aksw.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.metrics.Metric; import org.apache.jena.rdf.model.Property; import org.apache.jena.rdf.model.ResourceFactory; diff --git a/src/main/java/org/aksw/iguana/commons/rdf/IRES.java b/src/main/java/org/dice_research/iguana/commons/rdf/IRES.java similarity index 93% rename from src/main/java/org/aksw/iguana/commons/rdf/IRES.java rename to src/main/java/org/dice_research/iguana/commons/rdf/IRES.java index c24768f68..5df3d529f 100644 --- a/src/main/java/org/aksw/iguana/commons/rdf/IRES.java +++ b/src/main/java/org/dice_research/iguana/commons/rdf/IRES.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.commons.rdf; +package org.dice_research.iguana.commons.rdf; -import org.aksw.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.worker.HttpWorker; import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; diff --git a/src/main/java/org/aksw/iguana/commons/time/DurationLiteral.java b/src/main/java/org/dice_research/iguana/commons/time/DurationLiteral.java similarity index 97% rename from src/main/java/org/aksw/iguana/commons/time/DurationLiteral.java rename to src/main/java/org/dice_research/iguana/commons/time/DurationLiteral.java index f4ce8c272..f3ea9a047 100644 --- a/src/main/java/org/aksw/iguana/commons/time/DurationLiteral.java +++ b/src/main/java/org/dice_research/iguana/commons/time/DurationLiteral.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.time; +package org.dice_research.iguana.commons.time; import org.apache.jena.datatypes.DatatypeFormatException; import org.apache.jena.datatypes.RDFDatatype; diff --git a/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java b/src/main/java/org/dice_research/iguana/commons/time/TimeUtils.java similarity index 97% rename from src/main/java/org/aksw/iguana/commons/time/TimeUtils.java rename to src/main/java/org/dice_research/iguana/commons/time/TimeUtils.java index 653d7ff38..7b7e3cdb9 100644 --- a/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java +++ b/src/main/java/org/dice_research/iguana/commons/time/TimeUtils.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.time; +package org.dice_research.iguana.commons.time; import org.apache.jena.datatypes.xsd.impl.XSDDateTimeStampType; import org.apache.jena.rdf.model.Literal; diff --git a/src/test/java/org/aksw/iguana/cc/config/elements/ConnectionConfigTest.java b/src/test/java/org/dice_research/iguana/cc/config/elements/ConnectionConfigTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/config/elements/ConnectionConfigTest.java rename to src/test/java/org/dice_research/iguana/cc/config/elements/ConnectionConfigTest.java index 32034d23e..35764ffab 100644 --- a/src/test/java/org/aksw/iguana/cc/config/elements/ConnectionConfigTest.java +++ b/src/test/java/org/dice_research/iguana/cc/config/elements/ConnectionConfigTest.java @@ -1,7 +1,6 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/aksw/iguana/cc/config/elements/DatasetConfigTest.java b/src/test/java/org/dice_research/iguana/cc/config/elements/DatasetConfigTest.java similarity index 95% rename from src/test/java/org/aksw/iguana/cc/config/elements/DatasetConfigTest.java rename to src/test/java/org/dice_research/iguana/cc/config/elements/DatasetConfigTest.java index 9d09b7cb6..04a22fd16 100644 --- a/src/test/java/org/aksw/iguana/cc/config/elements/DatasetConfigTest.java +++ b/src/test/java/org/dice_research/iguana/cc/config/elements/DatasetConfigTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/config/elements/StorageConfigTest.java b/src/test/java/org/dice_research/iguana/cc/config/elements/StorageConfigTest.java similarity index 88% rename from src/test/java/org/aksw/iguana/cc/config/elements/StorageConfigTest.java rename to src/test/java/org/dice_research/iguana/cc/config/elements/StorageConfigTest.java index 0c99a46dd..c8d4d26b2 100644 --- a/src/test/java/org/aksw/iguana/cc/config/elements/StorageConfigTest.java +++ b/src/test/java/org/dice_research/iguana/cc/config/elements/StorageConfigTest.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.config.elements; +package org.dice_research.iguana.cc.config.elements; import com.fasterxml.jackson.databind.ObjectMapper; -import org.aksw.iguana.cc.storage.impl.CSVStorage; -import org.aksw.iguana.cc.storage.impl.RDFFileStorage; -import org.aksw.iguana.cc.storage.impl.TriplestoreStorage; +import org.dice_research.iguana.cc.storage.impl.CSVStorage; +import org.dice_research.iguana.cc.storage.impl.RDFFileStorage; +import org.dice_research.iguana.cc.storage.impl.TriplestoreStorage; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java b/src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java rename to src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java index 23f7c2c56..914bb29d1 100644 --- a/src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java +++ b/src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParserTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java b/src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java rename to src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java index 82589a061..0086831d3 100644 --- a/src/test/java/org/aksw/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java +++ b/src/test/java/org/dice_research/iguana/cc/lang/impl/SaxSparqlXmlResultCountingParserTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java b/src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java similarity index 96% rename from src/test/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java rename to src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java index 5cde83dd8..1f1e1d9e2 100644 --- a/src/test/java/org/aksw/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java +++ b/src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlCsvResultCountingParserTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java b/src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java similarity index 96% rename from src/test/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java rename to src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java index 2fcd481a6..588d6148c 100644 --- a/src/test/java/org/aksw/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java +++ b/src/test/java/org/dice_research/iguana/cc/lang/impl/SparqlTsvResultCountingParserTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.lang.impl; +package org.dice_research.iguana.cc.lang.impl; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/cc/mockup/MockupConnection.java b/src/test/java/org/dice_research/iguana/cc/mockup/MockupConnection.java similarity index 82% rename from src/test/java/org/aksw/iguana/cc/mockup/MockupConnection.java rename to src/test/java/org/dice_research/iguana/cc/mockup/MockupConnection.java index 3e6d7bb05..56f5a14a2 100644 --- a/src/test/java/org/aksw/iguana/cc/mockup/MockupConnection.java +++ b/src/test/java/org/dice_research/iguana/cc/mockup/MockupConnection.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.mockup; +package org.dice_research.iguana.cc.mockup; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; import java.net.URI; diff --git a/src/test/java/org/aksw/iguana/cc/mockup/MockupQueryHandler.java b/src/test/java/org/dice_research/iguana/cc/mockup/MockupQueryHandler.java similarity index 76% rename from src/test/java/org/aksw/iguana/cc/mockup/MockupQueryHandler.java rename to src/test/java/org/dice_research/iguana/cc/mockup/MockupQueryHandler.java index 6988f0ab9..38c42bee6 100644 --- a/src/test/java/org/aksw/iguana/cc/mockup/MockupQueryHandler.java +++ b/src/test/java/org/dice_research/iguana/cc/mockup/MockupQueryHandler.java @@ -1,8 +1,8 @@ -package org.aksw.iguana.cc.mockup; +package org.dice_research.iguana.cc.mockup; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.query.selector.QuerySelector; -import org.aksw.iguana.cc.query.selector.impl.LinearQuerySelector; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.query.selector.QuerySelector; +import org.dice_research.iguana.cc.query.selector.impl.LinearQuerySelector; public class MockupQueryHandler extends QueryHandler { diff --git a/src/test/java/org/aksw/iguana/cc/mockup/MockupStorage.java b/src/test/java/org/dice_research/iguana/cc/mockup/MockupStorage.java similarity index 79% rename from src/test/java/org/aksw/iguana/cc/mockup/MockupStorage.java rename to src/test/java/org/dice_research/iguana/cc/mockup/MockupStorage.java index ef15adf9e..34ae8c06a 100644 --- a/src/test/java/org/aksw/iguana/cc/mockup/MockupStorage.java +++ b/src/test/java/org/dice_research/iguana/cc/mockup/MockupStorage.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.mockup; +package org.dice_research.iguana.cc.mockup; -import org.aksw.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.storage.Storage; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; diff --git a/src/test/java/org/aksw/iguana/cc/mockup/MockupWorker.java b/src/test/java/org/dice_research/iguana/cc/mockup/MockupWorker.java similarity index 94% rename from src/test/java/org/aksw/iguana/cc/mockup/MockupWorker.java rename to src/test/java/org/dice_research/iguana/cc/mockup/MockupWorker.java index 9950c9f9d..0ece8f740 100644 --- a/src/test/java/org/aksw/iguana/cc/mockup/MockupWorker.java +++ b/src/test/java/org/dice_research/iguana/cc/mockup/MockupWorker.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.mockup; +package org.dice_research.iguana.cc.mockup; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.config.elements.DatasetConfig; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.config.elements.DatasetConfig; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.worker.HttpWorker; import java.time.Duration; import java.time.Instant; diff --git a/src/test/java/org/aksw/iguana/cc/query/QueryDataTest.java b/src/test/java/org/dice_research/iguana/cc/query/QueryDataTest.java similarity index 92% rename from src/test/java/org/aksw/iguana/cc/query/QueryDataTest.java rename to src/test/java/org/dice_research/iguana/cc/query/QueryDataTest.java index 63b56d249..90fdd8540 100644 --- a/src/test/java/org/aksw/iguana/cc/query/QueryDataTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/QueryDataTest.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.query; +package org.dice_research.iguana.cc.query; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.query.source.impl.FileSeparatorQuerySource; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileSeparatorQuerySource; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerConfigTest.java b/src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerConfigTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerConfigTest.java rename to src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerConfigTest.java index 71e256055..ce61f16e9 100644 --- a/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerConfigTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerConfigTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.handler; +package org.dice_research.iguana.cc.query.handler; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java b/src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerTest.java similarity index 91% rename from src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java rename to src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerTest.java index aa0832311..c174106cb 100644 --- a/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/handler/QueryHandlerTest.java @@ -1,15 +1,14 @@ -package org.aksw.iguana.cc.query.handler; +package org.dice_research.iguana.cc.query.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import org.aksw.iguana.cc.query.selector.impl.LinearQuerySelector; -import org.aksw.iguana.cc.query.selector.impl.RandomQuerySelector; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.query.source.impl.FileLineQuerySource; -import org.aksw.iguana.cc.query.source.impl.FileSeparatorQuerySource; -import org.aksw.iguana.cc.query.source.impl.FolderQuerySource; -import org.aksw.iguana.cc.query.source.impl.FolderQuerySourceTest; +import org.dice_research.iguana.cc.query.selector.impl.LinearQuerySelector; +import org.dice_research.iguana.cc.query.selector.impl.RandomQuerySelector; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileLineQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileSeparatorQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FolderQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FolderQuerySourceTest; import org.junit.jupiter.api.*; -import org.junit.jupiter.api.condition.DisabledInNativeImage; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -94,7 +93,7 @@ public void testDeserialization(String json, Class sourceType) thro assertNotEquals(0, queryHandler.hashCode()); for (int i = 0; i < queryHandler.getQueryCount(); i++) { final var wrapper = queryHandler.getNextQuery(selector); - assertEquals(i, selector.getCurrentIndex()); + Assertions.assertEquals(i, selector.getCurrentIndex()); if (FolderQuerySource.class.isAssignableFrom(sourceType)) assertEquals(folderQueries.get(i).content(), wrapper.query()); else @@ -114,7 +113,7 @@ public void testQueryStreamWrapper(String json, Class sourceType) t assertNotEquals(0, queryHandler.hashCode()); for (int i = 0; i < queryHandler.getQueryCount(); i++) { final var wrapper = queryHandler.getNextQueryStream(selector); - assertEquals(i, selector.getCurrentIndex()); + Assertions.assertEquals(i, selector.getCurrentIndex()); final var acutalQuery = new String(wrapper.queryInputStreamSupplier().get().readAllBytes(), StandardCharsets.UTF_8); if (FolderQuerySource.class.isAssignableFrom(sourceType)) assertEquals(folderQueries.get(i).content(), acutalQuery); @@ -135,7 +134,7 @@ public void testQueryStringWrapper(String json, Class sourceType) t assertNotEquals(0, queryHandler.hashCode()); for (int i = 0; i < queryHandler.getQueryCount(); i++) { final var wrapper = queryHandler.getNextQuery(selector); - assertEquals(i, selector.getCurrentIndex()); + Assertions.assertEquals(i, selector.getCurrentIndex()); if (FolderQuerySource.class.isAssignableFrom(sourceType)) assertEquals(folderQueries.get(i).content(), wrapper.query()); else diff --git a/src/test/java/org/aksw/iguana/cc/query/handler/TemplateQueriesTest.java b/src/test/java/org/dice_research/iguana/cc/query/handler/TemplateQueriesTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/query/handler/TemplateQueriesTest.java rename to src/test/java/org/dice_research/iguana/cc/query/handler/TemplateQueriesTest.java index 2beb8bf19..aa68bcadc 100644 --- a/src/test/java/org/aksw/iguana/cc/query/handler/TemplateQueriesTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/handler/TemplateQueriesTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.handler; +package org.dice_research.iguana.cc.query.handler; import com.github.tomakehurst.wiremock.common.ConsoleNotifier; import com.github.tomakehurst.wiremock.core.Options; diff --git a/src/test/java/org/aksw/iguana/cc/query/list/FileBasedQueryListTest.java b/src/test/java/org/dice_research/iguana/cc/query/list/FileBasedQueryListTest.java similarity index 92% rename from src/test/java/org/aksw/iguana/cc/query/list/FileBasedQueryListTest.java rename to src/test/java/org/dice_research/iguana/cc/query/list/FileBasedQueryListTest.java index 1025f72f8..30256c43c 100644 --- a/src/test/java/org/aksw/iguana/cc/query/list/FileBasedQueryListTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/list/FileBasedQueryListTest.java @@ -1,11 +1,11 @@ -package org.aksw.iguana.cc.query.list; - -import org.aksw.iguana.cc.query.list.impl.FileReadingQueryList; -import org.aksw.iguana.cc.query.list.impl.FileCachingQueryList; -import org.aksw.iguana.cc.query.source.QuerySource; -import org.aksw.iguana.cc.query.source.impl.FileLineQuerySource; -import org.aksw.iguana.cc.query.source.impl.FileSeparatorQuerySource; -import org.aksw.iguana.cc.query.source.impl.FolderQuerySource; +package org.dice_research.iguana.cc.query.list; + +import org.dice_research.iguana.cc.query.list.impl.FileReadingQueryList; +import org.dice_research.iguana.cc.query.list.impl.FileCachingQueryList; +import org.dice_research.iguana.cc.query.source.QuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileLineQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FileSeparatorQuerySource; +import org.dice_research.iguana.cc.query.source.impl.FolderQuerySource; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.AfterAll; @@ -36,7 +36,7 @@ private enum QuerySourceType { static Path tempDir; static List cachedArguments = null; - private static QueryList createQueryList(Class queryListClass,QuerySource querySource) { + private static QueryList createQueryList(Class queryListClass, QuerySource querySource) { try { return (QueryList) queryListClass.getConstructor(QuerySource.class).newInstance(querySource); } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { diff --git a/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java b/src/test/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java similarity index 96% rename from src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java rename to src/test/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java index c52331c99..af70e5fcd 100644 --- a/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.selector.impl; +package org.dice_research.iguana.cc.query.selector.impl; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java b/src/test/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java similarity index 95% rename from src/test/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java rename to src/test/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java index 2353d983c..0beceef3e 100644 --- a/src/test/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/selector/impl/RandomQuerySelectorTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.selector.impl; +package org.dice_research.iguana.cc.query.selector.impl; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySourceTest.java similarity index 98% rename from src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java rename to src/test/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySourceTest.java index 521ec2df4..c4ecc2236 100644 --- a/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FileLineQuerySourceTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; import org.apache.commons.io.FileUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java rename to src/test/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java index dca076593..488c63282 100644 --- a/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; import org.apache.commons.io.FileUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySourceTest.java similarity index 97% rename from src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java rename to src/test/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySourceTest.java index 811cd26c5..914f8097c 100644 --- a/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/source/impl/FolderQuerySourceTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/aksw/iguana/cc/query/source/impl/QuerySourceTest.java b/src/test/java/org/dice_research/iguana/cc/query/source/impl/QuerySourceTest.java similarity index 86% rename from src/test/java/org/aksw/iguana/cc/query/source/impl/QuerySourceTest.java rename to src/test/java/org/dice_research/iguana/cc/query/source/impl/QuerySourceTest.java index b5baefe8c..d605c7517 100644 --- a/src/test/java/org/aksw/iguana/cc/query/source/impl/QuerySourceTest.java +++ b/src/test/java/org/dice_research/iguana/cc/query/source/impl/QuerySourceTest.java @@ -1,9 +1,7 @@ -package org.aksw.iguana.cc.query.source.impl; +package org.dice_research.iguana.cc.query.source.impl; import org.junit.jupiter.api.Test; -import java.nio.file.Path; - import static org.junit.jupiter.api.Assertions.assertThrows; public class QuerySourceTest { diff --git a/src/test/java/org/aksw/iguana/cc/storage/impl/CSVStorageTest.java b/src/test/java/org/dice_research/iguana/cc/storage/impl/CSVStorageTest.java similarity index 97% rename from src/test/java/org/aksw/iguana/cc/storage/impl/CSVStorageTest.java rename to src/test/java/org/dice_research/iguana/cc/storage/impl/CSVStorageTest.java index a77333377..10f722cbb 100644 --- a/src/test/java/org/aksw/iguana/cc/storage/impl/CSVStorageTest.java +++ b/src/test/java/org/dice_research/iguana/cc/storage/impl/CSVStorageTest.java @@ -1,9 +1,9 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; import com.opencsv.CSVReader; import com.opencsv.exceptions.CsvException; -import org.aksw.iguana.cc.mockup.MockupQueryHandler; -import org.aksw.iguana.cc.mockup.MockupWorker; +import org.dice_research.iguana.cc.mockup.MockupQueryHandler; +import org.dice_research.iguana.cc.mockup.MockupWorker; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/src/test/java/org/aksw/iguana/cc/storage/impl/RDFFileStorageTest.java b/src/test/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorageTest.java similarity index 94% rename from src/test/java/org/aksw/iguana/cc/storage/impl/RDFFileStorageTest.java rename to src/test/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorageTest.java index e251b55b0..0187a0557 100644 --- a/src/test/java/org/aksw/iguana/cc/storage/impl/RDFFileStorageTest.java +++ b/src/test/java/org/dice_research/iguana/cc/storage/impl/RDFFileStorageTest.java @@ -1,7 +1,7 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; -import org.aksw.iguana.cc.mockup.MockupQueryHandler; -import org.aksw.iguana.cc.mockup.MockupWorker; +import org.dice_research.iguana.cc.mockup.MockupQueryHandler; +import org.dice_research.iguana.cc.mockup.MockupWorker; import org.apache.jena.rdf.model.*; import org.apache.jena.riot.RDFDataMgr; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/storage/impl/StorageTest.java b/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java similarity index 88% rename from src/test/java/org/aksw/iguana/cc/storage/impl/StorageTest.java rename to src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java index c38586a4c..f35d81d4f 100644 --- a/src/test/java/org/aksw/iguana/cc/storage/impl/StorageTest.java +++ b/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java @@ -1,17 +1,18 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; -import org.aksw.iguana.cc.lang.LanguageProcessor; -import org.aksw.iguana.cc.metrics.Metric; +import org.dice_research.iguana.cc.lang.LanguageProcessor; +import org.dice_research.iguana.cc.metrics.Metric; import org.aksw.iguana.cc.metrics.impl.*; -import org.aksw.iguana.cc.mockup.MockupWorker; -import org.aksw.iguana.cc.storage.Storable; -import org.aksw.iguana.cc.storage.Storage; -import org.aksw.iguana.cc.mockup.MockupStorage; -import org.aksw.iguana.cc.tasks.impl.StresstestResultProcessor; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.mockup.MockupWorker; +import org.dice_research.iguana.cc.storage.Storable; +import org.dice_research.iguana.cc.storage.Storage; +import org.dice_research.iguana.cc.mockup.MockupStorage; +import org.dice_research.iguana.cc.tasks.impl.StresstestResultProcessor; +import org.dice_research.iguana.cc.worker.HttpWorker; import org.apache.commons.io.FileUtils; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; +import org.dice_research.iguana.cc.metrics.impl.*; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorageTest.java b/src/test/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorageTest.java similarity index 92% rename from src/test/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorageTest.java rename to src/test/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorageTest.java index 7dc0694d3..f179b1797 100644 --- a/src/test/java/org/aksw/iguana/cc/storage/impl/TriplestoreStorageTest.java +++ b/src/test/java/org/dice_research/iguana/cc/storage/impl/TriplestoreStorageTest.java @@ -1,13 +1,13 @@ -package org.aksw.iguana.cc.storage.impl; +package org.dice_research.iguana.cc.storage.impl; import com.github.tomakehurst.wiremock.common.Slf4jNotifier; import com.github.tomakehurst.wiremock.core.Options; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit5.WireMockExtension; import com.github.tomakehurst.wiremock.stubbing.ServeEvent; -import org.aksw.iguana.cc.mockup.MockupQueryHandler; -import org.aksw.iguana.cc.mockup.MockupWorker; -import org.aksw.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.mockup.MockupQueryHandler; +import org.dice_research.iguana.cc.mockup.MockupWorker; +import org.dice_research.iguana.cc.worker.HttpWorker; import org.apache.jena.riot.RDFDataMgr; import org.apache.jena.update.UpdateFactory; import org.apache.jena.update.UpdateRequest; diff --git a/src/test/java/org/aksw/iguana/cc/suite/IguanaSuiteParserTest.java b/src/test/java/org/dice_research/iguana/cc/suite/IguanaSuiteParserTest.java similarity index 96% rename from src/test/java/org/aksw/iguana/cc/suite/IguanaSuiteParserTest.java rename to src/test/java/org/dice_research/iguana/cc/suite/IguanaSuiteParserTest.java index 9ab39b009..7bc380e4e 100644 --- a/src/test/java/org/aksw/iguana/cc/suite/IguanaSuiteParserTest.java +++ b/src/test/java/org/dice_research/iguana/cc/suite/IguanaSuiteParserTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.suite; +package org.dice_research.iguana.cc.suite; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java b/src/test/java/org/dice_research/iguana/cc/utils/FileUtilsTest.java similarity index 94% rename from src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java rename to src/test/java/org/dice_research/iguana/cc/utils/FileUtilsTest.java index 7137ce9c2..b6b9bcd59 100644 --- a/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java +++ b/src/test/java/org/dice_research/iguana/cc/utils/FileUtilsTest.java @@ -1,8 +1,9 @@ -package org.aksw.iguana.cc.utils; +package org.dice_research.iguana.cc.utils; import net.jpountz.xxhash.XXHashFactory; -import org.aksw.iguana.cc.utils.files.FileUtils; -import org.aksw.iguana.cc.utils.files.QueryIndex; +import org.dice_research.iguana.cc.utils.files.FileUtils; +import org.dice_research.iguana.cc.utils.files.QueryIndex; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -42,7 +43,7 @@ public static Path createTestFileWithContent(String content) throws IOException @ValueSource(strings = {"\n", "\r", "\r\n"}) public void testGetLineEndings(String ending) throws IOException { final var file = createTestFileWithLines(List.of("a", "b"), ending); - assertEquals(FileUtils.getLineEnding(file), ending); + Assertions.assertEquals(FileUtils.getLineEnding(file), ending); } public record IndexTestData( diff --git a/src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java b/src/test/java/org/dice_research/iguana/cc/utils/IndexedQueryReaderTest.java similarity index 98% rename from src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java rename to src/test/java/org/dice_research/iguana/cc/utils/IndexedQueryReaderTest.java index 2bafe0ddf..af76f52fb 100644 --- a/src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java +++ b/src/test/java/org/dice_research/iguana/cc/utils/IndexedQueryReaderTest.java @@ -1,6 +1,6 @@ -package org.aksw.iguana.cc.utils; +package org.dice_research.iguana.cc.utils; -import org.aksw.iguana.cc.utils.files.IndexedQueryReader; +import org.dice_research.iguana.cc.utils.files.IndexedQueryReader; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java b/src/test/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java similarity index 97% rename from src/test/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java rename to src/test/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java index 6d9842fa7..516ddd506 100644 --- a/src/test/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java +++ b/src/test/java/org/dice_research/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.cc.worker.impl; +package org.dice_research.iguana.cc.worker.impl; import com.github.tomakehurst.wiremock.client.MappingBuilder; import com.github.tomakehurst.wiremock.common.ConsoleNotifier; @@ -6,12 +6,12 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.http.Fault; import com.github.tomakehurst.wiremock.junit5.WireMockExtension; -import org.aksw.iguana.cc.config.elements.ConnectionConfig; -import org.aksw.iguana.cc.config.elements.DatasetConfig; -import org.aksw.iguana.cc.query.handler.QueryHandler; -import org.aksw.iguana.cc.utils.http.RequestFactory; -import org.aksw.iguana.cc.worker.HttpWorker; -import org.aksw.iguana.cc.worker.ResponseBodyProcessor; +import org.dice_research.iguana.cc.config.elements.ConnectionConfig; +import org.dice_research.iguana.cc.config.elements.DatasetConfig; +import org.dice_research.iguana.cc.query.handler.QueryHandler; +import org.dice_research.iguana.cc.utils.http.RequestFactory; +import org.dice_research.iguana.cc.worker.HttpWorker; +import org.dice_research.iguana.cc.worker.ResponseBodyProcessor; import org.apache.commons.lang3.function.TriFunction; import org.junit.jupiter.api.*; import org.junit.jupiter.api.condition.DisabledInNativeImage; diff --git a/src/test/java/org/aksw/iguana/commons/io/BigByteArrayInputStreamTest.java b/src/test/java/org/dice_research/iguana/commons/io/BigByteArrayInputStreamTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/commons/io/BigByteArrayInputStreamTest.java rename to src/test/java/org/dice_research/iguana/commons/io/BigByteArrayInputStreamTest.java index 939328b75..74c060578 100644 --- a/src/test/java/org/aksw/iguana/commons/io/BigByteArrayInputStreamTest.java +++ b/src/test/java/org/dice_research/iguana/commons/io/BigByteArrayInputStreamTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import com.google.common.primitives.Bytes; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/aksw/iguana/commons/io/BigByteArrayOutputStreamTest.java b/src/test/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStreamTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/commons/io/BigByteArrayOutputStreamTest.java rename to src/test/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStreamTest.java index 21104d80c..c9d0e548a 100644 --- a/src/test/java/org/aksw/iguana/commons/io/BigByteArrayOutputStreamTest.java +++ b/src/test/java/org/dice_research/iguana/commons/io/BigByteArrayOutputStreamTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Named; diff --git a/src/test/java/org/aksw/iguana/commons/io/ByteArrayListInputStreamTest.java b/src/test/java/org/dice_research/iguana/commons/io/ByteArrayListInputStreamTest.java similarity index 99% rename from src/test/java/org/aksw/iguana/commons/io/ByteArrayListInputStreamTest.java rename to src/test/java/org/dice_research/iguana/commons/io/ByteArrayListInputStreamTest.java index b5c675c73..46f4218e3 100644 --- a/src/test/java/org/aksw/iguana/commons/io/ByteArrayListInputStreamTest.java +++ b/src/test/java/org/dice_research/iguana/commons/io/ByteArrayListInputStreamTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/aksw/iguana/commons/io/ByteArrayListOutputStreamTest.java b/src/test/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStreamTest.java similarity index 98% rename from src/test/java/org/aksw/iguana/commons/io/ByteArrayListOutputStreamTest.java rename to src/test/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStreamTest.java index 007468cfc..87a1ced5b 100644 --- a/src/test/java/org/aksw/iguana/commons/io/ByteArrayListOutputStreamTest.java +++ b/src/test/java/org/dice_research/iguana/commons/io/ByteArrayListOutputStreamTest.java @@ -1,4 +1,4 @@ -package org.aksw.iguana.commons.io; +package org.dice_research.iguana.commons.io; import org.junit.jupiter.api.Test; From 4c05095962f6157aaa21239e47d79763598909dd Mon Sep 17 00:00:00 2001 From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com> Date: Mon, 25 Nov 2024 09:43:39 +0100 Subject: [PATCH 2/2] Remove references to aksw package --- src/main/java/org/dice_research/iguana/cc/metrics/Metric.java | 1 - .../org/dice_research/iguana/cc/storage/impl/CSVStorage.java | 1 - src/main/java/org/dice_research/iguana/cc/suite/Suite.java | 1 - .../iguana/cc/tasks/impl/StresstestResultProcessor.java | 1 - .../org/dice_research/iguana/cc/storage/impl/StorageTest.java | 1 - 5 files changed, 5 deletions(-) diff --git a/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java b/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java index 4e751b4b5..551de6b9b 100644 --- a/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java +++ b/src/main/java/org/dice_research/iguana/cc/metrics/Metric.java @@ -1,7 +1,6 @@ package org.dice_research.iguana.cc.metrics; import com.fasterxml.jackson.annotation.*; -import org.aksw.iguana.cc.metrics.impl.*; import org.dice_research.iguana.cc.metrics.impl.*; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") diff --git a/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java b/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java index 3f522dfa7..e58b3f1fb 100644 --- a/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java +++ b/src/main/java/org/dice_research/iguana/cc/storage/impl/CSVStorage.java @@ -5,7 +5,6 @@ import com.opencsv.CSVWriterBuilder; import com.opencsv.exceptions.CsvValidationException; import org.dice_research.iguana.cc.config.elements.StorageConfig; -import org.aksw.iguana.cc.metrics.*; import org.dice_research.iguana.cc.metrics.impl.AggregatedExecutionStatistics; import org.dice_research.iguana.cc.metrics.impl.EachExecutionStatistic; import org.dice_research.iguana.cc.storage.Storable; diff --git a/src/main/java/org/dice_research/iguana/cc/suite/Suite.java b/src/main/java/org/dice_research/iguana/cc/suite/Suite.java index 7fc796848..d156c29bf 100644 --- a/src/main/java/org/dice_research/iguana/cc/suite/Suite.java +++ b/src/main/java/org/dice_research/iguana/cc/suite/Suite.java @@ -6,7 +6,6 @@ import org.dice_research.iguana.cc.config.elements.DatasetConfig; import org.dice_research.iguana.cc.config.elements.StorageConfig; import org.dice_research.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.impl.*; import org.dice_research.iguana.cc.storage.Storage; import org.dice_research.iguana.cc.storage.impl.CSVStorage; import org.dice_research.iguana.cc.storage.impl.RDFFileStorage; diff --git a/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java b/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java index 167ce4178..629dcf9ae 100644 --- a/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java +++ b/src/main/java/org/dice_research/iguana/cc/tasks/impl/StresstestResultProcessor.java @@ -1,7 +1,6 @@ package org.dice_research.iguana.cc.tasks.impl; import org.dice_research.iguana.cc.lang.LanguageProcessor; -import org.aksw.iguana.cc.metrics.*; import org.dice_research.iguana.cc.storage.Storage; import org.dice_research.iguana.cc.worker.HttpWorker; import org.dice_research.iguana.commons.rdf.IGUANA_BASE; diff --git a/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java b/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java index f35d81d4f..6be9f6a9b 100644 --- a/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java +++ b/src/test/java/org/dice_research/iguana/cc/storage/impl/StorageTest.java @@ -2,7 +2,6 @@ import org.dice_research.iguana.cc.lang.LanguageProcessor; import org.dice_research.iguana.cc.metrics.Metric; -import org.aksw.iguana.cc.metrics.impl.*; import org.dice_research.iguana.cc.mockup.MockupWorker; import org.dice_research.iguana.cc.storage.Storable; import org.dice_research.iguana.cc.storage.Storage;