Handle duplicate keys in map #10734

enonic · Nov 1, 2024 · 872906a · 872906a
1 parent 689b9f7
commit 872906a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...les/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/RichTextProcessor.java b/...les/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/RichTextProcessor.java
@@ -308,7 +308,8 @@ private Map<String, ImageStyle> getImageStyleMap( final StyleDescriptors styleDe
         return styleDescriptors.stream()
             .flatMap( styleDescriptor -> styleDescriptor.getElements().stream() )
             .filter( elementStyle -> ImageStyle.STYLE_ELEMENT_NAME.equals( elementStyle.getElement() ) )
-            .collect( Collectors.toUnmodifiableMap( ElementStyle::getName, elementStyle -> (ImageStyle) elementStyle ) );
+            .collect( Collectors.toUnmodifiableMap( ElementStyle::getName, elementStyle -> (ImageStyle) elementStyle,
+                                                    ( existingKey, newKey ) -> existingKey ) );
     }
 
     private StyleDescriptors getStyleDescriptors( final PortalRequest portalRequest )

diff --git a/...mpl/src/test/java/com/enonic/xp/portal/impl/url/PortalUrlServiceImpl_processHtmlTest.java b/...mpl/src/test/java/com/enonic/xp/portal/impl/url/PortalUrlServiceImpl_processHtmlTest.java
@@ -340,12 +340,16 @@ public void process_image_with_styles()
             aspectRatio( "2:1" ).
             filter( "myfilter" ).
             build();
-        final StyleDescriptor styleDescriptor = StyleDescriptor.create().
-            application( ApplicationKey.from( "myapp" ) ).
+        final StyleDescriptor styleDescriptor1 = StyleDescriptor.create().
+            application( ApplicationKey.from( "myapp1" ) ).
             addStyleElement( imageStyle ).
             build();
-        when( styleDescriptorService.getByApplications( Mockito.any() ) ).
-            thenReturn( StyleDescriptors.from( styleDescriptor ) );
+        final StyleDescriptor styleDescriptor2 = StyleDescriptor.create().
+            application( ApplicationKey.from( "myapp2" ) ).
+            addStyleElement( imageStyle ).
+            build();
+        when( styleDescriptorService.getByApplications( Mockito.any() ) ).thenReturn(
+            StyleDescriptors.from( styleDescriptor1, styleDescriptor2 ) );
 
         final Map<String, String> imageProjection = new HashMap<>();