From 79c9d1d0995a7eab925af02671bcb98bb45ee6d4 Mon Sep 17 00:00:00 2001 From: musketyr Date: Thu, 3 Nov 2022 11:38:05 +0100 Subject: [PATCH 1/2] Fixed issue with multiple map keys (e.g. queue configuration) --- .../micronaut/grails/GrailsPropertyTranslatingEnvironment.java | 2 +- .../grails/SimpleNotificationServiceConfigurationSpec.groovy | 2 ++ .../SimpleNotificationServiceConfigurationSpec.properties | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java b/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java index 9478d770..041d72f2 100644 --- a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java +++ b/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java @@ -86,7 +86,7 @@ public List getEnvironments() { Object currentOrNewMap; if (expectedPrefix.get().equals(currentKey)) { - currentOrNewMap = new LinkedHashMap<>(); + currentOrNewMap = multilayer.computeIfAbsent(currentKey, key -> new LinkedHashMap<>()); multilayer.put(currentKey, currentOrNewMap); } else { currentOrNewMap = currentLevelMap.computeIfAbsent(part, key -> new LinkedHashMap<>()); diff --git a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy index 2cecc333..85516b13 100644 --- a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy +++ b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy @@ -20,6 +20,7 @@ package com.agorapulse.micronaut.grails import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationService import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationServiceConfiguration import com.agorapulse.micronaut.amazon.awssdk.sqs.SimpleQueueService +import com.agorapulse.micronaut.amazon.awssdk.sqs.SimpleQueueServiceConfiguration import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import io.micronaut.inject.qualifiers.Qualifiers @@ -71,6 +72,7 @@ class GrailsSimpleNotificationServiceConfig { .addByType(SimpleNotificationService) .addByType(SimpleNotificationServiceConfiguration) .addByQualifiers('notificationsQueueService', SimpleQueueService, Qualifiers.byName('notifications')) + .addByQualifiers('syncQueueService', SimpleQueueService, Qualifiers.byName('notification-manager-device-sync')) .createMapForPropertiesStarting('aws.sqs.queues') } diff --git a/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties b/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties index edc4725f..09291907 100644 --- a/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties +++ b/subprojects/micronaut-grails/src/test/resources/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties @@ -18,3 +18,4 @@ grails.plugin.awssdk.sns.android.applicationArn = arn::dummy aws.sqs.queues.notifications.queue = beta_notifications +aws.sqs.queues.notification-manager-device-sync.queue = beta_sync_queue From d1cbe8cc83f13b11965b5e2bdac1f09ebe39192b Mon Sep 17 00:00:00 2001 From: musketyr Date: Thu, 3 Nov 2022 11:45:10 +0100 Subject: [PATCH 2/2] fixed codenarc violation, moved main java code to java folder --- .../com/agorapulse/micronaut/grails/CompatibilityMode.java | 0 .../micronaut/grails/DefaultGrailsMicronautBeanProcessor.java | 0 .../grails/EnvVarLikeSystemPropertiesPropertySource.java | 0 .../agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java | 0 .../micronaut/grails/GrailsMicronautBeanProcessor.java | 0 .../grails/GrailsPropertyTranslatingApplicationContext.java | 0 .../micronaut/grails/GrailsPropertyTranslatingCustomizer.java | 0 .../micronaut/grails/GrailsPropertyTranslatingEnvironment.java | 0 .../com/agorapulse/micronaut/grails/MicronautBeanImporter.java | 0 .../com/agorapulse/micronaut/grails/MicronautContextHolder.java | 0 .../com/agorapulse/micronaut/grails/MicronautGrailsApp.java | 0 .../agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java | 0 .../micronaut/grails/MicronautGrailsAutoConfiguration.java | 0 .../micronaut/grails/MicronautGrailsConfiguration.java | 0 .../micronaut/grails/PropertyTranslatingCustomizer.java | 0 .../com/agorapulse/micronaut/grails/TypeAndQualifier.java | 0 .../grails/SimpleNotificationServiceConfigurationSpec.groovy | 1 - 17 files changed, 1 deletion(-) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/CompatibilityMode.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautBeanImporter.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautContextHolder.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautGrailsApp.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java (100%) rename subprojects/micronaut-grails/src/main/{groovy => java}/com/agorapulse/micronaut/grails/TypeAndQualifier.java (100%) diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/CompatibilityMode.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/CompatibilityMode.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/CompatibilityMode.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/CompatibilityMode.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/EnvVarLikeSystemPropertiesPropertySource.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanFactory.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingApplicationContext.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingCustomizer.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/GrailsPropertyTranslatingEnvironment.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautBeanImporter.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautBeanImporter.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautBeanImporter.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautBeanImporter.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautContextHolder.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautContextHolder.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautContextHolder.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautContextHolder.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsApp.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsApp.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsApp.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsApp.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAppBuilder.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsAutoConfiguration.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizer.java diff --git a/subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/TypeAndQualifier.java b/subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/TypeAndQualifier.java similarity index 100% rename from subprojects/micronaut-grails/src/main/groovy/com/agorapulse/micronaut/grails/TypeAndQualifier.java rename to subprojects/micronaut-grails/src/main/java/com/agorapulse/micronaut/grails/TypeAndQualifier.java diff --git a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy index 85516b13..b9c3ddfb 100644 --- a/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy +++ b/subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy @@ -20,7 +20,6 @@ package com.agorapulse.micronaut.grails import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationService import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationServiceConfiguration import com.agorapulse.micronaut.amazon.awssdk.sqs.SimpleQueueService -import com.agorapulse.micronaut.amazon.awssdk.sqs.SimpleQueueServiceConfiguration import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import io.micronaut.inject.qualifiers.Qualifiers