feature: [172] Revert unnecessary changes

Author: crazyrokr

acl-groovy-dsl/src/test/groovy/javasabr/mqtt/acl/groovy/dsl/loader/AclRulesLoaderTest.groovy

@@ -26,7 +26,6 @@ import javasabr.mqtt.test.support.UnitSpecification
 import javasabr.rlib.collections.array.Array
 
 import java.nio.file.Files
-import java.nio.file.NoSuchFileException
 import java.nio.file.Path
 import java.util.concurrent.CompletionException
 
@@ -39,31 +38,22 @@ class AclRulesLoaderTest extends UnitSpecification {
 
   def "should load test Groovy DSL config"() {
     given:
-        def ruleFile = TestRulesGenerator.generate(100)
+        def aclConfigFile = TestRulesGenerator.generate(100)
+        def aclConfigInputStream = new FileInputStream(aclConfigFile)
     when:
-        def load = AclRulesLoader.load(new FileInputStream(ruleFile))
+        def load = AclRulesLoader.load(aclConfigInputStream)
     then:
         load.get(SUBSCRIBE).size() == 50
         load.get(PUBLISH).size() == 50
-        ruleFile.delete()
-  }
-
-  def "should throw exception if config not exists"(String configPath) {
-    when:
-        AclRulesLoader.load(Files.newInputStream(Path.of(configPath)))
-    then:
-        def exception = thrown(NoSuchFileException)
-        exception.message == configPath
-    where:
-        configPath         | _
-        "not/existed/path" | _
+        aclConfigFile.delete()
   }
 
   def "should work fine with only publish rules"() {
     given:
         def onlyPublishRulesAclPath = getAbsolutePath("acl/config/acl-publish-only.gacl")
+        def aclConfigInputStream = Files.newInputStream(Path.of(onlyPublishRulesAclPath))
     when:
-        def ruleMap = AclRulesLoader.load(Files.newInputStream(Path.of(onlyPublishRulesAclPath)))
+        def ruleMap = AclRulesLoader.load(aclConfigInputStream)
     then:
         noExceptionThrown()
         !ruleMap.get(PUBLISH).isEmpty()
@@ -73,8 +63,9 @@ class AclRulesLoaderTest extends UnitSpecification {
   def "should throw exception if config is invalid"(String invalidAclFileName, String errorMessage, Class<? extends Exception> exceptionClass) {
     given:
         def invalidAclPath = getAbsolutePath("acl/config/invalid/${invalidAclFileName}")
+        def aclConfigInputStream = Files.newInputStream(Path.of(invalidAclPath))
     when:
-        AclRulesLoader.load(Files.newInputStream(Path.of(invalidAclPath)))
+        AclRulesLoader.load(aclConfigInputStream)
     then:
         def exception = thrown CompletionException
         exceptionClass.isInstance exception.cause

application/build.gradle

@@ -16,12 +16,10 @@ dependencies {
   implementation libs.springboot.starter.core
   implementation libs.springboot.starter.log4j2
 
-  runtimeOnly projects.credentialsSourceFile
-  runtimeOnly projects.authenticationProviderBasic
-
   testImplementation projects.testSupport
   testImplementation testFixtures(projects.network)
-  testImplementation libs.junit.platform.testkit
+  runtimeOnly projects.credentialsSourceFile
+  runtimeOnly projects.authenticationProviderBasic
 }
 
 tasks.withType(GroovyCompile).configureEach {

application/src/test/groovy/javasabr/mqtt/broker/application/TestSslPropertiesInitializer.groovy

@@ -7,17 +7,19 @@ import org.springframework.core.env.MapPropertySource
 
 class TestSslPropertiesInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
+  static final TestSslContexts TEST_SSL_CONTEXT = TestSslContexts.getInstance()
+
   @Override
   void initialize(ConfigurableApplicationContext applicationContext) {
     applicationContext.environment.propertySources.addFirst(new MapPropertySource("tlsProps", getProps()))
   }
 
   static Map<String, Object> getProps() {
     return [
-        "mqtt.external.tls.keystore-path": TestSslContexts.getInstance().serverKeystorePath.toString(),
-        "mqtt.external.tls.keystore-password": TestSslContexts.getInstance().password,
-        "mqtt.external.tls.truststore-path": TestSslContexts.getInstance().truststore.toString(),
-        "mqtt.external.tls.truststore-password": TestSslContexts.getInstance().password
+        "mqtt.external.tls.keystore-path": TEST_SSL_CONTEXT.serverKeystorePath.toString(),
+        "mqtt.external.tls.keystore-password": TEST_SSL_CONTEXT.password,
+        "mqtt.external.tls.truststore-path": TEST_SSL_CONTEXT.truststore.toString(),
+        "mqtt.external.tls.truststore-password": TEST_SSL_CONTEXT.password
     ]
   }
 }

core-service/src/test/groovy/javasabr/mqtt/service/impl/TlsMqttConnectionFactoryTest.groovy

@@ -2,16 +2,17 @@ package javasabr.mqtt.service.impl
 
 import javasabr.mqtt.model.MqttServerConnectionConfig
 import javasabr.mqtt.model.QoS
+import javasabr.mqtt.network.TlsProperties
 import javasabr.mqtt.network.message.MqttPacketCodec
-import javasabr.mqtt.network.user.NetworkMqttUserFactory
 import javasabr.mqtt.network.user.ConfigurableNetworkMqttUser
-import javasabr.mqtt.network.TlsProperties
-import javasabr.rlib.network.impl.DefaultBufferAllocator
-import spock.lang.Specification
+import javasabr.mqtt.network.user.NetworkMqttUserFactory
 import javasabr.rlib.network.Network
 import javasabr.rlib.network.ServerNetworkConfig
-import java.nio.channels.AsynchronousSocketChannel
+import javasabr.rlib.network.impl.DefaultBufferAllocator
+import spock.lang.Specification
+
 import javax.net.ssl.SSLContext
+import java.nio.channels.AsynchronousSocketChannel
 
 class TlsMqttConnectionFactoryTest extends Specification {
 

gradle/libs.versions.toml

@@ -23,8 +23,6 @@ flyway="11.19.0"
 spock = "2.4-M6-groovy-4.0"
 # https://mvnrepository.com/artifact/org.apache.groovy/groovy-all
 groovy = "4.0.28"
-# https://mvnrepository.com/artifact/org.junit/junit-bom
-junit = "6.0.2"
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
 springboot = '4.0.6'
 # https://mvnrepository.com/artifact/org.springframework/spring-core
@@ -91,7 +89,6 @@ spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
 spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
 groovy-core = { module = "org.apache.groovy:groovy", version.ref = "groovy" }
 groovy-all = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
-junit-platform-testkit = { module = "org.junit.platform:junit-platform-testkit", version.ref = "junit" }
 byte-buddy-dep = { module = "net.bytebuddy:byte-buddy-dep", version.ref = "byte-buddy" }
 objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }
 hivemq-mqtt-client = { module = "com.hivemq:hivemq-mqtt-client", version.ref = "hivemq-mqtt-client" }

native-image/build.gradle

@@ -10,10 +10,6 @@ description = "Standard configuration of standalone version of MQTT Broker"
 
 dependencies {
   implementation projects.application
-  testImplementation(testFixtures(projects.application))
-  testImplementation projects.coreService
-  testImplementation projects.testSupport
-  testImplementation libs.junit.platform.testkit
 }
 
 graalvmNative {
@@ -46,31 +42,3 @@ processAot {
       '-Dmqtt.external.tls.network.enabled=true',
   ])
 }
-
-tasks.register('copyNativeImageTestResources', Copy) {
-  mustRunAfter 'nativeCompile'
-  from('src/test/resources/application-test.properties') {
-    rename 'application-test.properties', "application.properties"
-  }
-  from('src/test/resources/log4j2-test.xml') {
-    rename 'log4j2-test.xml', "log4j2.xml"
-  }
-  from('src/test/resources/auth/credentials-test') {
-    into 'auth'
-  }
-  from('src/test/resources/test-acl.gacl')
-  into layout.buildDirectory.dir("native/nativeCompile")
-}
-
-tasks.register('nativeImageTest', Test) {
-  dependsOn 'nativeCompile', 'copyNativeImageTestResources'
-  useJUnitPlatform()
-
-  group = 'verification'
-  testClassesDirs = sourceSets.test.output.classesDirs
-  classpath = sourceSets.test.runtimeClasspath
-  
-  filter {
-    includeTestsMatching 'javasabr.mqtt.broker.application.NativeImageVerificationTest'
-  }
-}

network/src/main/java/javasabr/mqtt/network/TlsMqttConnection.java

@@ -12,7 +12,6 @@
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;