From e931856041673955cb2899ac5b6c1ead6c5a9518 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 8 Dec 2019 18:47:54 +0100 Subject: [PATCH] merge projects file-utils, byte-utils and pdb-utils It turned out that most projects needed at least two of the utils projects. file-utils and byte-utils had only one class. Merging them made sense. --- block-storage/build.gradle | 2 -- byte-utils/.gitignore | 7 ------- byte-utils/build.gradle | 4 ---- data-store/build.gradle | 2 -- file-utils/.gitignore | 7 ------- file-utils/build.gradle | 3 --- pdb-api/build.gradle | 2 -- pdb-plotting/build.gradle | 1 - pdb-ui/build.gradle | 2 -- .../org/lucares/utils/byteencoder/VariableByteEncoder.java | 0 .../src/main/java/org/lucares/utils/file/FileUtils.java | 0 .../lucares/utils/byteencoder/VariableByteEncoderTest.java | 0 performanceDb/build.gradle | 3 +-- 13 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 byte-utils/.gitignore delete mode 100644 byte-utils/build.gradle delete mode 100644 file-utils/.gitignore delete mode 100644 file-utils/build.gradle rename {byte-utils => pdb-utils}/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java (100%) rename {file-utils => pdb-utils}/src/main/java/org/lucares/utils/file/FileUtils.java (100%) rename {byte-utils => pdb-utils}/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java (100%) diff --git a/block-storage/build.gradle b/block-storage/build.gradle index bb4c405..9d3c634 100644 --- a/block-storage/build.gradle +++ b/block-storage/build.gradle @@ -5,8 +5,6 @@ System.out.println(dependencies.class); dependencies { api lib_primitive_collections - implementation project(':byte-utils') - implementation project(':file-utils') implementation project(':pdb-utils') diff --git a/byte-utils/.gitignore b/byte-utils/.gitignore deleted file mode 100644 index 691dc42..0000000 --- a/byte-utils/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/.settings/ -/.classpath -/.project -/bin/ -/build/ -/target/ -/test-output/ \ No newline at end of file diff --git a/byte-utils/build.gradle b/byte-utils/build.gradle deleted file mode 100644 index ed54cf5..0000000 --- a/byte-utils/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - implementation lib_log4j2_slf4j_impl - implementation lib_primitive_collections -} diff --git a/data-store/build.gradle b/data-store/build.gradle index 7ef0238..d83f696 100644 --- a/data-store/build.gradle +++ b/data-store/build.gradle @@ -2,10 +2,8 @@ apply plugin: 'antlr' dependencies { implementation project(':pdb-api') - implementation project(':file-utils') implementation project(':pdb-utils') api project(':block-storage') - implementation project(':byte-utils') antlr lib_antlr implementation lib_primitive_collections diff --git a/file-utils/.gitignore b/file-utils/.gitignore deleted file mode 100644 index 691dc42..0000000 --- a/file-utils/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/.settings/ -/.classpath -/.project -/bin/ -/build/ -/target/ -/test-output/ \ No newline at end of file diff --git a/file-utils/build.gradle b/file-utils/build.gradle deleted file mode 100644 index e208024..0000000 --- a/file-utils/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation lib_log4j2_slf4j_impl -} diff --git a/pdb-api/build.gradle b/pdb-api/build.gradle index 292b1dc..f7960ff 100644 --- a/pdb-api/build.gradle +++ b/pdb-api/build.gradle @@ -1,7 +1,5 @@ dependencies { - implementation project(':byte-utils') implementation project(':pdb-utils') - implementation project(':file-utils') implementation lib_primitive_collections } \ No newline at end of file diff --git a/pdb-plotting/build.gradle b/pdb-plotting/build.gradle index fcb2d8d..652b714 100644 --- a/pdb-plotting/build.gradle +++ b/pdb-plotting/build.gradle @@ -1,7 +1,6 @@ dependencies { implementation project(':performanceDb') - implementation project(':file-utils') implementation project(':pdb-utils') implementation lib_primitive_collections implementation lib_jackson_databind diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle index 9a1d04c..f14a1b2 100644 --- a/pdb-ui/build.gradle +++ b/pdb-ui/build.gradle @@ -14,7 +14,6 @@ dependencies { implementation project(':pdb-plotting') implementation project(':pdb-js') implementation project(':pdb-utils') - implementation project(':file-utils') implementation lib_commons_lang3 implementation lib_primitive_collections @@ -27,7 +26,6 @@ dependencies { testImplementation(lib_spring_boot_test){ exclude module: 'spring-boot-starter-logging' } - testImplementation project(':file-utils') } jar { diff --git a/byte-utils/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java b/pdb-utils/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java similarity index 100% rename from byte-utils/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java rename to pdb-utils/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java diff --git a/file-utils/src/main/java/org/lucares/utils/file/FileUtils.java b/pdb-utils/src/main/java/org/lucares/utils/file/FileUtils.java similarity index 100% rename from file-utils/src/main/java/org/lucares/utils/file/FileUtils.java rename to pdb-utils/src/main/java/org/lucares/utils/file/FileUtils.java diff --git a/byte-utils/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java b/pdb-utils/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java similarity index 100% rename from byte-utils/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java rename to pdb-utils/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java diff --git a/performanceDb/build.gradle b/performanceDb/build.gradle index 4990177..2a2f5a6 100644 --- a/performanceDb/build.gradle +++ b/performanceDb/build.gradle @@ -2,11 +2,10 @@ dependencies { api project(':pdb-api') api project(':data-store') - implementation project(':file-utils') + implementation project(':pdb-utils') implementation lib_jackson_databind implementation lib_commons_collections4 implementation lib_log4j2_core implementation lib_log4j2_slf4j_impl - testImplementation project(':pdb-utils') }