feature: [174] Integrate Antlr DSL into configs

Author: crazyrokr

acl-engine/src/main/java/javasabr/mqtt/acl/engine/exception/AclConfigurationException.java

@@ -5,4 +5,8 @@ public class AclConfigurationException extends RuntimeException {
   public AclConfigurationException(String message) {
     super(message);
   }
+
+  public AclConfigurationException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }

acl-service/build.gradle

@@ -8,4 +8,5 @@ dependencies {
   api projects.coreService
   api libs.springboot.starter.autoconfigure
   compileOnlyApi projects.aclGroovyDsl
+  compileOnlyApi projects.aclAntlrDsl
 }

acl-service/src/main/java/javasabr/mqtt/acl/service/conifg/AntlrDslBasedAclServiceSpringConfig.java

@@ -0,0 +1,27 @@
+package javasabr.mqtt.acl.service.conifg;
+
+import java.net.URI;
+import javasabr.mqtt.acl.java.dsl.AclRulesLoader;
+import javasabr.mqtt.acl.service.impl.UriLoaderAuthorizationService;
+import javasabr.mqtt.service.AuthorizationService;
+import lombok.CustomLog;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@CustomLog
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty(name = "acl.engine.type", havingValue = "antlr-dsl")
+@ConditionalOnClass(name = "javasabr.mqtt.acl.java.dsl.AclRulesLoader")
+public class AntlrDslBasedAclServiceSpringConfig {
+
+  @Bean
+  AuthorizationService authorizationService(@Value("${acl.engine.groovy.dsl.config}") URI aclConfigUri) {
+    log.info("Initializing Antlr-DSL based AuthorizationService...");
+    var authorizationService = new UriLoaderAuthorizationService(AclRulesLoader::load);
+    authorizationService.loadFrom(aclConfigUri);
+    return authorizationService;
+  }
+}

acl-service/src/main/java/javasabr/mqtt/acl/service/conifg/GroovyDslBasedAclServiceSpringConfig.java

@@ -1,7 +1,8 @@
 package javasabr.mqtt.acl.service.conifg;
 
 import java.net.URI;
-import javasabr.mqtt.acl.service.impl.GroovyDslBasedAuthorizationService;
+import javasabr.mqtt.acl.groovy.dsl.loader.AclRulesLoader;
+import javasabr.mqtt.acl.service.impl.UriLoaderAuthorizationService;
 import javasabr.mqtt.service.AuthorizationService;
 import lombok.CustomLog;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +20,7 @@ public class GroovyDslBasedAclServiceSpringConfig {
   @Bean
   AuthorizationService authorizationService(@Value("${acl.engine.groovy.dsl.config}") URI aclConfigUri) {
     log.info("Initializing Groovy-DSL based AuthorizationService...");
-    var authorizationService = new GroovyDslBasedAuthorizationService();
+    var authorizationService = new UriLoaderAuthorizationService(AclRulesLoader::load);
     authorizationService.loadFrom(aclConfigUri);
     return authorizationService;
   }

…/GroovyDslBasedAuthorizationService.java …/impl/UriLoaderAuthorizationService.javaacl-service/src/main/java/javasabr/mqtt/acl/service/impl/GroovyDslBasedAuthorizationService.java renamed to acl-service/src/main/java/javasabr/mqtt/acl/service/impl/UriLoaderAuthorizationService.java acl-service/src/main/java/javasabr/mqtt/acl/service/impl/GroovyDslBasedAuthorizationService.java renamed to acl-service/src/main/java/javasabr/mqtt/acl/service/impl/UriLoaderAuthorizationService.java

@@ -4,17 +4,24 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.function.Function;
 import javasabr.mqtt.acl.engine.AclEngine;
 import javasabr.mqtt.acl.engine.exception.AclConfigurationException;
 import javasabr.mqtt.acl.engine.model.rule.AclRule;
-import javasabr.mqtt.acl.groovy.dsl.loader.AclRulesLoader;
 import javasabr.mqtt.acl.service.AclEngineBasedAuthorizationService;
 import javasabr.mqtt.model.acl.Operation;
 import javasabr.rlib.collections.array.Array;
+import lombok.AccessLevel;
 import lombok.CustomLog;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 
 @CustomLog
-public class GroovyDslBasedAuthorizationService extends AclEngineBasedAuthorizationService {
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class UriLoaderAuthorizationService extends AclEngineBasedAuthorizationService {
+
+  Function<Path, Map<Operation, Array<AclRule>>> rulerLoader;
 
   public void loadFrom(URI resource) {
     Path localFile = Path.of(resource);
@@ -23,16 +30,19 @@ public void loadFrom(URI resource) {
     } else if (Files.isDirectory(localFile)) {
       throw new AclConfigurationException("ACL configuration:[%s] is directory".formatted(resource));
     }
-    Map<Operation, Array<AclRule>> loadedAclRulesMap = AclRulesLoader.load(localFile);
+    Map<Operation, Array<AclRule>> loadedAclRulesMap = rulerLoader.apply(localFile);
     switchTo(new AclEngine(loadedAclRulesMap));
-    log.info(resource, loadedAclRulesMap, GroovyDslBasedAuthorizationService::buildServiceDescription);
+    log.info(resource, loadedAclRulesMap, UriLoaderAuthorizationService::buildServiceDescription);
   }
 
   private static String buildServiceDescription(URI resource, Map<Operation, Array<AclRule>> aclRulesMap) {
     var builder = new StringBuilder();
     builder.append("{\n");
-    builder.append("  \"SOURCE\":\"").append(resource).append("\",\n");
-    
+    builder
+        .append("  \"SOURCE\":\"")
+        .append(resource)
+        .append("\",\n");
+
     int count = 0;
     for (Map.Entry<Operation, Array<AclRule>> entry : aclRulesMap.entrySet()) {
       Operation operation = entry.getKey();

application/build.gradle

@@ -10,7 +10,7 @@ description = "Standard configuration of standalone version of MQTT Broker"
 dependencies {
   implementation projects.coreService
   implementation projects.aclService
-  implementation projects.aclGroovyDsl
+  implementation projects.aclAntlrDsl
   implementation projects.authenticationService
   implementation libs.rlib.logger.slf4j
   implementation libs.springboot.starter.core

application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerSpringConfig.java

@@ -1,7 +1,7 @@
 package javasabr.mqtt.broker.application.config;
 
 import java.util.Collection;
-import javasabr.mqtt.acl.service.conifg.GroovyDslBasedAclServiceSpringConfig;
+import javasabr.mqtt.acl.service.conifg.AntlrDslBasedAclServiceSpringConfig;
 import javasabr.mqtt.auth.api.AuthenticationService;
 import javasabr.mqtt.auth.service.config.AuthenticationServiceSpringConfig;
 import javasabr.mqtt.model.MqttProperties;
@@ -70,7 +70,7 @@
 
 @Import({
     AuthenticationServiceSpringConfig.class,
-    GroovyDslBasedAclServiceSpringConfig.class,
+    AntlrDslBasedAclServiceSpringConfig.class,
     MqttExternalPlainNetworkConfig.class,
     MqttExternalTlsNetworkConfig.class
 })

application/src/test/resources/application-test.properties

@@ -7,5 +7,5 @@ authentication.credentials-source.file.path=classpath:auth/credentials-test
 mqtt.external.connection.shared.subscription.available=true
 mqtt.external.connection.wildcard.subscription.available=true
 
-acl.engine.type=groovy-dsl
+acl.engine.type=antlr-dsl
 acl.engine.groovy.dsl.config=classpath:test-acl.gacl

core-service/src/test/groovy/javasabr/mqtt/service/publish/impl/InMemoryIncomingPublishStorageTest.groovy

@@ -299,7 +299,7 @@ class InMemoryIncomingPublishStorageTest extends UnitSpecification {
         def incomingPublish = createAndStorePublishWithRegisteredData(publishStorage, dataStorage)
     when:
         publishStorage.scheduleRemoval(incomingPublish, Duration.ofMillis(1))
-        waitUntil(1000) {
+        waitUntil(2000) {
           dataStorage.findById(incomingPublish.data().id()) == null
         }
     then:

settings.gradle

@@ -11,6 +11,7 @@ include(":embedded")
 include(":test-support")
 include(":test-coverage")
 include(":acl-groovy-dsl")
+include(":acl-antlr-dsl")
 include(":acl-engine")
 include(":acl-service")
 include(":authentication-api")