continue restructuring project

Author: JavaSaBr

base/build.gradle

@@ -2,5 +2,7 @@ apply plugin: "java-library"
 apply from: "$rootDir/gradle/configure-java.gradle"
 
 dependencies {
+  api libs.gson
+  api libs.rlib.collections
   testImplementation projects.testSupport
 }

build.gradle

@@ -30,78 +30,6 @@ subprojects {
   }
 }
 
-allprojects {
-  apply plugin: "java"
-  apply plugin: "groovy"
-  apply plugin: "org.springframework.boot"
-
-  repositories {
-    mavenCentral()
-    mavenLocal()
-  }
-
-  dependencies {
-
-    implementation libs.rlib.network
-    implementation libs.rlib.logger.slf4j
-    implementation libs.springboot.starter.core
-    implementation libs.springboot.starter.log4j2
-    implementation libs.project.reactor.core
-    implementation libs.gson
-
-    compileOnly libs.jspecify
-    compileOnly libs.lombok
-    annotationProcessor libs.lombok
-
-    // FIXME to remove
-    testImplementation libs.hivemq.mqtt.client
-    // FIXME to remove
-    testImplementation libs.moquette.broker
-    testImplementation libs.spring.test
-    testImplementation libs.spock.core
-    testImplementation libs.spock.spring
-    testImplementation libs.groovy.all
-    testImplementation libs.byte.buddy.dep
-    testImplementation libs.objenesis
-  }
-
-  test {
-    useJUnitPlatform()
-    failOnNoDiscoveredTests = false
-  }
-
-  sourceSets {
-    main {
-      java {
-        srcDirs 'src/main/groovy'
-      }
-    }
-    test {
-      java {
-        srcDirs 'src/test/groovy'
-      }
-    }
-  }
-
-  tasks.withType(Test).configureEach {
-    maxParallelForks = 2
-    forkEvery = 100
-    jvmArgs += "--enable-preview"
-  }
-
-  tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs += "--enable-preview"
-  }
-
-  tasks.withType(GroovyCompile).configureEach {
-    options.forkOptions.jvmArgs += "--enable-preview"
-  }
-
-  processResources {
-    filter(ReplaceTokens, tokens: [])
-  }
-}
-
 tasks.register("buildSingleArtifact", GradleBuild) {
   group = "build"
   description = "Build all modules -> Build result artifact"

gradle/configure-java.gradle

@@ -1,5 +1,40 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 dependencies {
   compileOnly libs.jspecify
   compileOnly libs.lombok
   annotationProcessor libs.lombok
+}
+
+test {
+  useJUnitPlatform()
+  failOnNoDiscoveredTests = false
+}
+
+sourceSets {
+  main {
+    java {
+      srcDirs 'src/main/groovy'
+    }
+  }
+  test {
+    java {
+      srcDirs 'src/test/groovy'
+    }
+  }
+}
+
+tasks.withType(Test).configureEach {
+  maxParallelForks = 2
+  forkEvery = 100
+  jvmArgs += "--enable-preview"
+}
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs += "--enable-preview"
+}
+
+
+processResources {
+  filter(ReplaceTokens, tokens: [])
 }

gradle/libs.versions.toml

@@ -38,6 +38,7 @@ moquette-broker = "0.17"
 [libraries]
 rlib-network = { module = "javasabr.rlib:rlib-network", version.ref = "rlib" }
 rlib-logger-slf4j = { module = "javasabr.rlib:rlib-logger-slf4j", version.ref = "rlib" }
+rlib-collections = { module = "javasabr.rlib:rlib-collections", version.ref = "rlib" }
 springboot-starter-core = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot" }
 springboot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2", version.ref = "springboot" }
 project-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "project-reactor" }

legacy/build.gradle

@@ -1,5 +1,7 @@
 plugins {
   id "java"
+  id "groovy"
+  id "org.springframework.boot"
 }
 
 apply from: "$rootDir/gradle/configure-java.gradle"
@@ -8,5 +10,21 @@ dependencies {
   implementation projects.model
   implementation projects.base
 
+  implementation libs.rlib.network
+  implementation libs.rlib.logger.slf4j
+  implementation libs.springboot.starter.core
+  implementation libs.springboot.starter.log4j2
+  implementation libs.project.reactor.core
+
   testImplementation projects.testSupport
-}
+}
+
+
+tasks.withType(GroovyCompile).configureEach {
+  options.forkOptions.jvmArgs += "--enable-preview"
+}
+
+configurations.each {
+  it.exclude group: "org.slf4j", module: "slf4j-log4j12"
+  it.exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+}

src/main/resources/application.properties renamed to legacy/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-package com.ss.mqtt.broker.test
+package javasabr.mqtt.legacy
 
 import spock.lang.Specification
 

src/main/resources/credentials renamed to legacy/src/main/resources/credentials

@@ -1,10 +1,10 @@
-package com.ss.mqtt.broker.test.extension
+package javasabr.mqtt.legacy.extension
 
-import javasabr.mqtt.legacy.model.PacketProperty
-import javasabr.mqtt.legacy.model.data.type.PacketDataType
-import javasabr.mqtt.legacy.model.data.type.StringPair
 import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket
 import javasabr.mqtt.legacy.util.MqttDataUtils
+import javasabr.mqtt.model.PacketProperty
+import javasabr.mqtt.model.data.type.PacketDataType
+import javasabr.mqtt.model.data.type.StringPair
 import javasabr.rlib.collections.array.Array
 import javasabr.rlib.collections.array.IntArray
 import spock.lang.Specification