[GEOS-7698] Raster legend border colour now set by configuration. Do …

…not treat legend option keys as case sensitive
geoserver · Sep 30, 2016 · 20a36a9 · 20a36a9
1 parent 5d53023
commit 20a36a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/wms/src/main/java/org/geoserver/wms/legendgraphic/ColorMapLegendCreator.java b/src/wms/src/main/java/org/geoserver/wms/legendgraphic/ColorMapLegendCreator.java
@@ -24,6 +24,7 @@
 import java.util.Queue;
 import java.util.logging.Logger;
 
+import org.apache.commons.collections.map.CaseInsensitiveMap;
 import org.geoserver.wms.legendgraphic.Cell.ClassesEntryLegendBuilder;
 import org.geoserver.wms.legendgraphic.Cell.ColorMapEntryLegendBuilder;
 import org.geoserver.wms.legendgraphic.Cell.RampColorMapEntryLegendBuilder;
@@ -116,7 +117,7 @@ public static class Builder {
 
         private ColorMapEntry previousCMapEntry;
 
-        private final Map<String, Object> additionalOptions = new HashMap<String, Object>();
+        private final CaseInsensitiveMap additionalOptions = new CaseInsensitiveMap();
 
         private Color backgroundColor;
 

diff --git a/src/wms/src/test/java/org/geoserver/wms/legendgraphic/RasterLegendBuilderTest.java b/src/wms/src/test/java/org/geoserver/wms/legendgraphic/RasterLegendBuilderTest.java
@@ -159,7 +159,7 @@ public void testLegendBorderColour() {
 
         colourToTest = Color.red;
 
-        legendOptions.put("borderColor", SLD.toHTMLColor(colourToTest));
+        legendOptions.put("BORDERCOLOR", SLD.toHTMLColor(colourToTest));
 
         request.setLegendOptions(legendOptions);
         helper = new RasterLayerLegendHelper(request, style, null);