private String getLayerId(final String layerName) { String storedName = layerName; // check pending modifs first in case name changed if (!pendingModications.isEmpty()) { for (GeoServerTileLayerInfo info : pendingModications.values()) { String name = info.getName(); if (name.equals(layerName)) { storedName = info.getName(); break; } } } final String layerId = tileLayerCatalog.getLayerId(storedName); if (layerId == null || pendingDeletes.contains(layerId)) { return null; } // name changed? GeoServerTileLayerInfo modifiedState = pendingModications.get(layerId); if (modifiedState != null && !layerName.equals(modifiedState.getName())) { return null; } return layerId; }
when(tileLayerCatalog.getLayerByName(tileLayerName(group2))).thenReturn(groupInfo2); when(tileLayerCatalog.getLayerId(tileLayerName(layer1))).thenReturn(layer1.getId()); when(tileLayerCatalog.getLayerId(tileLayerName(layer2))).thenReturn(layer2.getId()); when(tileLayerCatalog.getLayerId(tileLayerName(group1))).thenReturn(group1.getId()); when(tileLayerCatalog.getLayerId(tileLayerName(group2))).thenReturn(group2.getId());
private String getLayerId(final String layerName) { String storedName = layerName; // check pending modifs first in case name changed if (!pendingModications.isEmpty()) { for (GeoServerTileLayerInfo info : pendingModications.values()) { String name = info.getName(); if (name.equals(layerName)) { storedName = info.getName(); break; } } } final String layerId = tileLayerCatalog.getLayerId(storedName); if (layerId == null || pendingDeletes.contains(layerId)) { return null; } // name changed? GeoServerTileLayerInfo modifiedState = pendingModications.get(layerId); if (modifiedState != null && !layerName.equals(modifiedState.getName())) { return null; } return layerId; }