Corrected project structure

build.gradle

@@ -41,21 +41,17 @@ allprojects {
     }
 
     dependencies {
-        implementation("com.exactpro.th2:common:$commonVersion") {
-            exclude group: 'com.squareup.okhttp3', module: 'okhttp'
-        }
-        implementation "com.exactpro.th2:cradle-core:$cradleVersion"
-        implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
-        implementation 'org.apache.commons:commons-lang3'
-
         implementation "org.slf4j:slf4j-api"
 
-        testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
         testImplementation 'org.mockito:mockito-inline:5.2.0'
         testImplementation 'org.mockito:mockito-junit-jupiter:5.10.0'
+
         testImplementation 'com.exactpro.th2:junit-jupiter-integration:0.0.1'
+
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
     }
 
     test {

cradle-admin-tool-cli/build.gradle

@@ -3,10 +3,18 @@ plugins {
 }
 
 dependencies {
-    implementation project(':')
+    implementation project(':cradle-admin-tool-core')
+
+    implementation("com.exactpro.th2:common:$commonVersion") {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+
+    implementation "com.exactpro.th2:cradle-core:$cradleVersion"
+    implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
+
     implementation 'commons-cli:commons-cli:1.7.0'
 
-    testImplementation project(':').sourceSets.test.output
+    testImplementation project(':cradle-admin-tool-test')
 }
 
 application {

cradle-admin-tool-core/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    implementation "com.exactpro.th2:cradle-core:$cradleVersion"
+    implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
+    implementation 'org.apache.commons:commons-lang3'
+}

src/main/java/com/exactpro/th2/cradle/adm/modes/AbstractMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/AbstractMode.java

@@ -16,8 +16,8 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
-import com.exactpro.cradle.CradleStorage;
 import com.exactpro.th2.cradle.adm.results.SimpleResult;
+import com.exactpro.cradle.CradleStorage;
 
 
 public abstract class AbstractMode<T, K extends SimpleResult> {

src/main/java/com/exactpro/th2/cradle/adm/modes/GetAllBooksMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/GetAllBooksMode.java

@@ -16,11 +16,11 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
+import com.exactpro.th2.cradle.adm.results.BooksListInfo;
+import com.exactpro.th2.cradle.adm.results.ResultBookInfo;
 import com.exactpro.cradle.BookInfo;
 import com.exactpro.cradle.utils.CradleStorageException;
 import com.exactpro.th2.cradle.adm.params.GetAllBooksParams;
-import com.exactpro.th2.cradle.adm.results.BooksListInfo;
-import com.exactpro.th2.cradle.adm.results.ResultBookInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/exactpro/th2/cradle/adm/modes/GetBookInfoMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/GetBookInfoMode.java

@@ -16,12 +16,12 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
+import com.exactpro.th2.cradle.adm.results.BooksListInfo;
+import com.exactpro.th2.cradle.adm.results.ResultBookDetailedInfo;
 import com.exactpro.cradle.BookInfo;
 import com.exactpro.cradle.PageInfo;
 import com.exactpro.cradle.utils.CradleStorageException;
 import com.exactpro.th2.cradle.adm.params.GetBookInfoParams;
-import com.exactpro.th2.cradle.adm.results.BooksListInfo;
-import com.exactpro.th2.cradle.adm.results.ResultBookDetailedInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/exactpro/th2/cradle/adm/modes/ListAllBookSchemasMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/ListAllBookSchemasMode.java

@@ -1,8 +1,8 @@
 package com.exactpro.th2.cradle.adm.modes;
 
+import com.exactpro.th2.cradle.adm.results.BookSchemaInfo;
 import com.exactpro.cradle.BookListEntry;
 import com.exactpro.th2.cradle.adm.params.NoParams;
-import com.exactpro.th2.cradle.adm.results.BookSchemaInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/exactpro/th2/cradle/adm/modes/NewBookCreationMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/NewBookCreationMode.java

@@ -16,13 +16,12 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
-import com.exactpro.th2.cradle.adm.params.NewBookCreationParams;
 import com.exactpro.th2.cradle.adm.results.SimpleResult;
+import com.exactpro.th2.cradle.adm.params.NewBookCreationParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.Instant;
-import java.util.UUID;
 
 
 public class NewBookCreationMode extends AbstractMode<NewBookCreationParams, SimpleResult> {

src/main/java/com/exactpro/th2/cradle/adm/modes/NewPageCreationMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/NewPageCreationMode.java

@@ -16,8 +16,8 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
-import com.exactpro.th2.cradle.adm.params.NewPageParams;
 import com.exactpro.th2.cradle.adm.results.SimpleResult;
+import com.exactpro.th2.cradle.adm.params.NewPageParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/exactpro/th2/cradle/adm/modes/RemovePageMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/RemovePageMode.java

@@ -16,12 +16,12 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
+import com.exactpro.th2.cradle.adm.results.SimpleResult;
 import com.exactpro.cradle.PageId;
 import com.exactpro.cradle.PageInfo;
 import com.exactpro.cradle.counters.Interval;
 import com.exactpro.cradle.utils.CradleStorageException;
 import com.exactpro.th2.cradle.adm.params.RemovePageParams;
-import com.exactpro.th2.cradle.adm.results.SimpleResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/exactpro/th2/cradle/adm/modes/ResultConverter.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/ResultConverter.java

@@ -16,10 +16,10 @@
 
 package com.exactpro.th2.cradle.adm.modes;
 
-import com.exactpro.cradle.BookInfo;
-import com.exactpro.cradle.PageInfo;
 import com.exactpro.th2.cradle.adm.results.ResultBookInfo;
 import com.exactpro.th2.cradle.adm.results.ResultPageInfo;
+import com.exactpro.cradle.BookInfo;
+import com.exactpro.cradle.PageInfo;
 
 public class ResultConverter {
 

src/main/java/com/exactpro/th2/cradle/adm/modes/UpdatePageMode.java → cradle-admin-tool-core/src/main/java/com/exactpro/th2/cradle/adm/modes/UpdatePageMode.java

@@ -1,8 +1,8 @@
 package com.exactpro.th2.cradle.adm.modes;
 
+import com.exactpro.th2.cradle.adm.results.SimpleResult;
 import com.exactpro.cradle.PageInfo;
 import com.exactpro.th2.cradle.adm.params.UpdatePageParams;
-import com.exactpro.th2.cradle.adm.results.SimpleResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

cradle-admin-tool-http/build.gradle

@@ -8,17 +8,23 @@ ext {
 }
 
 dependencies {
-    implementation project(':')
+    implementation project(':cradle-admin-tool-core')
+    implementation("com.exactpro.th2:common:$commonVersion") {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    implementation "com.exactpro.th2:cradle-core:$cradleVersion"
+    implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
+
     implementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
     implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
+
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
 
-    testImplementation project(':').sourceSets.test.output
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+    implementation 'org.apache.commons:commons-lang3'
+
+    testImplementation project(':cradle-admin-tool-test')
     testImplementation "org.eclipse.jetty:jetty-http:${jettyVersion}:tests"
     testImplementation "org.eclipse.jetty:jetty-util:${jettyVersion}"
-
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 application {

cradle-admin-tool-test/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    implementation "com.exactpro.th2:cradle-core:$cradleVersion"
+    implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
+    implementation 'org.apache.commons:commons-lang3'
+}

settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'th2-cradle-admin-tool'
 include 'cradle-admin-tool-http'
+include 'cradle-admin-tool-core'
+include 'cradle-admin-tool-test'
 include 'cradle-admin-tool-cli'