Merge d1cbe8c into 28959ff

agorapulse · Nov 3, 2022 · fce226e · fce226e
2 parents 28959ff + d1cbe8c
commit fce226e
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 1 deletion.
diff --git a/...e/micronaut/grails/CompatibilityMode.java → ...e/micronaut/grails/CompatibilityMode.java b/...e/micronaut/grails/CompatibilityMode.java → ...e/micronaut/grails/CompatibilityMode.java
diff --git a/.../DefaultGrailsMicronautBeanProcessor.java → .../DefaultGrailsMicronautBeanProcessor.java b/.../DefaultGrailsMicronautBeanProcessor.java → .../DefaultGrailsMicronautBeanProcessor.java
diff --git a/...arLikeSystemPropertiesPropertySource.java → ...arLikeSystemPropertiesPropertySource.java b/...arLikeSystemPropertiesPropertySource.java → ...arLikeSystemPropertiesPropertySource.java
diff --git a/...ut/grails/GrailsMicronautBeanFactory.java → ...ut/grails/GrailsMicronautBeanFactory.java b/...ut/grails/GrailsMicronautBeanFactory.java → ...ut/grails/GrailsMicronautBeanFactory.java
diff --git a/.../grails/GrailsMicronautBeanProcessor.java → .../grails/GrailsMicronautBeanProcessor.java b/.../grails/GrailsMicronautBeanProcessor.java → .../grails/GrailsMicronautBeanProcessor.java
diff --git a/...ropertyTranslatingApplicationContext.java → ...ropertyTranslatingApplicationContext.java b/...ropertyTranslatingApplicationContext.java → ...ropertyTranslatingApplicationContext.java
diff --git a/.../GrailsPropertyTranslatingCustomizer.java → .../GrailsPropertyTranslatingCustomizer.java b/.../GrailsPropertyTranslatingCustomizer.java → .../GrailsPropertyTranslatingCustomizer.java
diff --git a/...GrailsPropertyTranslatingEnvironment.java → ...GrailsPropertyTranslatingEnvironment.java b/...GrailsPropertyTranslatingEnvironment.java → ...GrailsPropertyTranslatingEnvironment.java
@@ -86,7 +86,7 @@ public List<String> 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/...cronaut/grails/MicronautBeanImporter.java → ...cronaut/grails/MicronautBeanImporter.java b/...cronaut/grails/MicronautBeanImporter.java → ...cronaut/grails/MicronautBeanImporter.java
diff --git a/...ronaut/grails/MicronautContextHolder.java → ...ronaut/grails/MicronautContextHolder.java b/...ronaut/grails/MicronautContextHolder.java → ...ronaut/grails/MicronautContextHolder.java
diff --git a/.../micronaut/grails/MicronautGrailsApp.java → .../micronaut/grails/MicronautGrailsApp.java b/.../micronaut/grails/MicronautGrailsApp.java → .../micronaut/grails/MicronautGrailsApp.java
diff --git a/...aut/grails/MicronautGrailsAppBuilder.java → ...aut/grails/MicronautGrailsAppBuilder.java b/...aut/grails/MicronautGrailsAppBuilder.java → ...aut/grails/MicronautGrailsAppBuilder.java
diff --git a/...ils/MicronautGrailsAutoConfiguration.java → ...ils/MicronautGrailsAutoConfiguration.java b/...ils/MicronautGrailsAutoConfiguration.java → ...ils/MicronautGrailsAutoConfiguration.java
diff --git a/.../grails/MicronautGrailsConfiguration.java → .../grails/MicronautGrailsConfiguration.java b/.../grails/MicronautGrailsConfiguration.java → .../grails/MicronautGrailsConfiguration.java
diff --git a/...grails/PropertyTranslatingCustomizer.java → ...grails/PropertyTranslatingCustomizer.java b/...grails/PropertyTranslatingCustomizer.java → ...grails/PropertyTranslatingCustomizer.java
diff --git a/...se/micronaut/grails/TypeAndQualifier.java → ...se/micronaut/grails/TypeAndQualifier.java b/...se/micronaut/grails/TypeAndQualifier.java → ...se/micronaut/grails/TypeAndQualifier.java
diff --git a/.../groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy b/.../groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy
@@ -71,6 +71,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/...ces/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties b/...ces/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