Removing deprecated methods in GeoServerTileLayer

src/gwc/src/main/java/org/geoserver/gwc/GWC.java

@@ -1723,12 +1723,11 @@ public Response getResponseEncoder(MimeType responseFormat, RenderedImageMap met
      */
     public boolean isQueryable(final GeoServerTileLayer geoServerTileLayer) {
         WMS wmsMediator = WMS.get();
-        LayerInfo layerInfo = geoServerTileLayer.getLayerInfo();
-        if (layerInfo != null) {
-            return wmsMediator.isQueryable(layerInfo);
+        PublishedInfo published = geoServerTileLayer.getPublishedInfo();
+        if (published instanceof LayerInfo) {
+            return wmsMediator.isQueryable((LayerInfo) published);
         }
-        LayerGroupInfo lgi = geoServerTileLayer.getLayerGroupInfo();
-        return wmsMediator.isQueryable(lgi);
+        return wmsMediator.isQueryable((LayerGroupInfo) published);
     }
 
     /**
@@ -2379,11 +2378,11 @@ CoordinateReferenceSystem getCRSForGridset(GridSubset gridSubset)
 
     public CoordinateReferenceSystem getDeclaredCrs(final String geoServerTileLayerName) {
         GeoServerTileLayer layer = (GeoServerTileLayer) getTileLayerByName(geoServerTileLayerName);
-        LayerInfo layerInfo = layer.getLayerInfo();
-        if (layerInfo != null) {
-            return layerInfo.getResource().getCRS();
+        PublishedInfo published = layer.getPublishedInfo();
+        if (published instanceof LayerInfo) {
+            return ((LayerInfo) published).getResource().getCRS();
         }
-        LayerGroupInfo layerGroupInfo = layer.getLayerGroupInfo();
+        LayerGroupInfo layerGroupInfo = (LayerGroupInfo) published;
         ReferencedEnvelope bounds = layerGroupInfo.getBounds();
         return bounds.getCoordinateReferenceSystem();
     }

src/gwc/src/main/java/org/geoserver/gwc/layer/CatalogConfiguration.java

@@ -480,11 +480,11 @@ public synchronized void addLayer(final TileLayer tl) {
 
         GeoServerTileLayerInfo info = tileLayer.getInfo();
 
-        LayerInfo layerInfo = tileLayer.getLayerInfo();
-        if (layerInfo != null && !isLayerExposable(layerInfo)) {
+        PublishedInfo publishedInfo = tileLayer.getPublishedInfo();
+        if (publishedInfo instanceof LayerInfo && !isLayerExposable((LayerInfo) publishedInfo)) {
             LOGGER.warning(
                     "Requested layer "
-                            + layerInfo.getName()
+                            + publishedInfo.getName()
                             + " has no geometry. Won't create TileLayer");
             return;
         }

src/gwc/src/main/java/org/geoserver/gwc/layer/CatalogStyleChangeListener.java

@@ -126,8 +126,7 @@ private void handleStyleRenamed(final String oldStyleName, final String newStyle
         affectedLayers = mediator.getTileLayersForStyle(oldStyleName);
 
         for (GeoServerTileLayer tl : affectedLayers) {
-            LayerInfo layerInfo = tl.getLayerInfo();
-            if (layerInfo == null) {
+            if (!(tl.getPublishedInfo() instanceof LayerInfo)) {
                 // no extra styles for layer groups
                 continue;
             }
@@ -141,6 +140,7 @@ private void handleStyleRenamed(final String oldStyleName, final String newStyle
                 Set<String> newStyles = new HashSet<String>(styleNames);
                 newStyles.remove(oldStyleName);
                 newStyles.add(newStyleName);
+                LayerInfo layerInfo = (LayerInfo) tl.getPublishedInfo();
                 String defaultStyle =
                         layerInfo.getDefaultStyle() == null
                                 ? null

src/gwc/src/main/java/org/geoserver/gwc/layer/GeoServerTileLayer.java

@@ -277,9 +277,9 @@ public boolean isEnabled() {
             return false;
         }
         boolean geoserverLayerEnabled;
-        LayerInfo layerInfo = getLayerInfo();
-        if (layerInfo != null) {
-            geoserverLayerEnabled = layerInfo.enabled();
+        PublishedInfo published = getPublishedInfo();
+        if (published instanceof LayerInfo) {
+            geoserverLayerEnabled = ((LayerInfo) published).enabled();
         } else {
             // LayerGroupInfo has no enabled property, so assume true
             geoserverLayerEnabled = true;
@@ -313,8 +313,8 @@ private ReferencedEnvelope getLatLonBbox() throws IllegalStateException {
         }
 
         ReferencedEnvelope latLongBbox;
-        if (getLayerInfo() == null) {
-            LayerGroupInfo groupInfo = getLayerGroupInfo();
+        if (getPublishedInfo() instanceof LayerGroupInfo) {
+            LayerGroupInfo groupInfo = (LayerGroupInfo) getPublishedInfo();
             try {
                 ReferencedEnvelope bounds = groupInfo.getBounds();
                 boolean lenient = true;
@@ -344,21 +344,6 @@ private ReferencedEnvelope getLatLonBbox() throws IllegalStateException {
         return latLongBbox;
     }
 
-    /**
-     * @return the {@link LayerInfo} for this layer, or {@code null} if it's backed by a {@link
-     *     LayerGroupInfo} instead
-     * @deprecated use getPublishedInfo instead
-     */
-    @Deprecated
-    public LayerInfo getLayerInfo() {
-        PublishedInfo info = getPublishedInfo();
-        if (info instanceof LayerInfo) {
-            return (LayerInfo) info;
-        }
-
-        return null;
-    }
-
     public PublishedInfo getPublishedInfo() {
         if (publishedInfo == null) {
             synchronized (this) {
@@ -385,24 +370,10 @@ public PublishedInfo getPublishedInfo() {
         return publishedInfo;
     }
 
-    /**
-     * @return the {@link LayerGroupInfo} for this layer, or {@code null} if it's backed by a {@link
-     *     LayerInfo} instead
-     * @deprecated use getPublishedInfo instead
-     */
-    @Deprecated
-    public LayerGroupInfo getLayerGroupInfo() {
-        PublishedInfo info = getPublishedInfo();
-        if (info instanceof LayerGroupInfo) {
-            return (LayerGroupInfo) info;
-        }
-
-        return null;
-    }
-
     private ResourceInfo getResourceInfo() {
-        LayerInfo layerInfo = getLayerInfo();
-        return layerInfo == null ? null : layerInfo.getResource();
+        return getPublishedInfo() instanceof LayerInfo
+                ? ((LayerInfo) getPublishedInfo()).getResource()
+                : null;
     }
 
     /**
@@ -428,8 +399,8 @@ public LayerMetaInformation getMetaInformation() {
                 keywords.add(kw.getValue());
             }
         } else {
-            LayerGroupInfo lg = getLayerGroupInfo();
-            if (lg != null) {
+            if (publishedInfo instanceof LayerGroupInfo) {
+                LayerGroupInfo lg = (LayerGroupInfo) publishedInfo;
                 if (lg.getTitle() != null) {
                     title = lg.getTitle();
                 }
@@ -455,12 +426,12 @@ public LayerMetaInformation getMetaInformation() {
      */
     @Override
     public String getStyles() {
-        LayerGroupInfo layerGroupInfo = getLayerGroupInfo();
-        if (layerGroupInfo != null) {
+        PublishedInfo published = getPublishedInfo();
+        if (!(published instanceof LayerInfo)) {
             // there's no such thing as default style for a layer group
             return null;
         }
-        LayerInfo layerInfo = getLayerInfo();
+        LayerInfo layerInfo = (LayerInfo) published;
         StyleInfo defaultStyle = layerInfo.getDefaultStyle();
         if (defaultStyle == null) {
             setConfigErrorMessage("Underlying GeoSever Layer has no default style");
@@ -969,16 +940,16 @@ private BoundingBox getBounds(final SRS srs) {
         }
 
         ReferencedEnvelope nativeBounds;
-        if (getLayerInfo() != null) {
+        if (getResourceInfo() != null) {
             // projection policy for these bounds are already taken care of by the geoserver
             // configuration
             try {
-                nativeBounds = getLayerInfo().getResource().boundingBox();
+                nativeBounds = getResourceInfo().boundingBox();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
         } else {
-            nativeBounds = getLayerGroupInfo().getBounds();
+            nativeBounds = ((LayerGroupInfo) getPublishedInfo()).getBounds();
         }
         checkState(nativeBounds != null, getName(), " has no native bounds set");
 
@@ -1134,11 +1105,11 @@ public int getExpireClients(int zoomLevel) {
             return info.getExpireClients();
         }
 
-        LayerInfo layerInfo = getLayerInfo();
-        if (layerInfo != null) {
-            return getLayerMaxAge(layerInfo);
+        PublishedInfo published = getPublishedInfo();
+        if (published instanceof LayerInfo) {
+            return getLayerMaxAge((LayerInfo) published);
         }
-        LayerGroupInfo layerGroupInfo = getLayerGroupInfo();
+        LayerGroupInfo layerGroupInfo = (LayerGroupInfo) published;
         if (layerGroupInfo != null) {
             return getGroupMaxAge(layerGroupInfo);
         } else {
@@ -1284,15 +1255,15 @@ public void proxyRequest(ConveyorTile tile) throws GeoWebCacheException {
     public List<MetadataURL> getMetadataURLs() {
         List<MetadataLinkInfo> gsMetadataLinks;
         List<MetadataURL> gwcMetadataLinks = new ArrayList<>();
-        LayerInfo layerInfo = getLayerInfo();
-        if (layerInfo != null) {
+        PublishedInfo published = getPublishedInfo();
+        if (published instanceof LayerInfo) {
             // this is a normal layer
-            gsMetadataLinks = layerInfo.getResource().getMetadataLinks();
+            gsMetadataLinks = ((LayerInfo) published).getResource().getMetadataLinks();
         } else {
             // this is a layer group
             gsMetadataLinks = new ArrayList<>();
             for (LayerInfo layer :
-                    Iterables.filter(getLayerGroupInfo().getLayers(), LayerInfo.class)) {
+                    Iterables.filter(((LayerGroupInfo) published).getLayers(), LayerInfo.class)) {
                 // getting metadata of all layers of the layer group
                 List<MetadataLinkInfo> metadataLinksLayer = layer.getResource().getMetadataLinks();
                 if (metadataLinksLayer != null) {
@@ -1339,11 +1310,11 @@ public void setBlobStoreId(String blobStoreId) {
 
     @Override
     public Map<String, org.geowebcache.config.legends.LegendInfo> getLayerLegendsInfo() {
-        LayerInfo layerInfo = getLayerInfo();
-        if (layerInfo == null) {
+        if (!(publishedInfo instanceof LayerInfo)) {
             return Collections.emptyMap();
         }
         Map<String, org.geowebcache.config.legends.LegendInfo> legends = new HashMap<>();
+        LayerInfo layerInfo = (LayerInfo) publishedInfo;
         Set<StyleInfo> styles = new HashSet<>(layerInfo.getStyles());
         styles.add(layerInfo.getDefaultStyle());
         for (StyleInfo styleInfo : styles) {

src/gwc/src/main/java/org/geoserver/gwc/wms/CachingWebMapService.java

@@ -24,6 +24,7 @@
 import org.apache.commons.httpclient.util.DateUtil;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.MetadataMap;
+import org.geoserver.catalog.PublishedInfo;
 import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.gwc.GWC;
 import org.geoserver.gwc.config.GWCConfig;
@@ -193,9 +194,10 @@ private void setCacheMetadataHeaders(RawMap map, ConveyorTile cachedTile, TileLa
     private Integer getCacheAge(TileLayer layer) {
         Integer cacheAge = null;
         if (layer instanceof GeoServerTileLayer) {
-            LayerInfo layerInfo = ((GeoServerTileLayer) layer).getLayerInfo();
+            PublishedInfo published = ((GeoServerTileLayer) layer).getPublishedInfo();
             // configuring caching does not appear possible for layergroup
-            if (layerInfo != null) {
+            if (published instanceof LayerInfo) {
+                LayerInfo layerInfo = (LayerInfo) published;
                 MetadataMap metadata = layerInfo.getResource().getMetadata();
                 Boolean enabled = metadata.get(ResourceInfo.CACHING_ENABLED, Boolean.class);
                 if (enabled != null && enabled) {

src/gwc/src/test/java/org/geoserver/gwc/GWCIntegrationTest.java

@@ -518,20 +518,21 @@ public void testDirectWMSIntegrationMaxAge() throws Exception {
         final String qualifiedName = super.getLayerId(BASIC_POLYGONS);
         final GeoServerTileLayer tileLayer =
                 (GeoServerTileLayer) gwc.getTileLayerByName(qualifiedName);
-        tileLayer
-                .getLayerInfo()
+        ((LayerInfo) tileLayer.getPublishedInfo())
                 .getResource()
                 .getMetadata()
                 .put(ResourceInfo.CACHING_ENABLED, "true");
-        tileLayer.getLayerInfo().getResource().getMetadata().put(ResourceInfo.CACHE_AGE_MAX, 3456);
+        ((LayerInfo) tileLayer.getPublishedInfo())
+                .getResource()
+                .getMetadata()
+                .put(ResourceInfo.CACHE_AGE_MAX, 3456);
 
         MockHttpServletResponse response = getAsServletResponse(path);
         String cacheControl = response.getHeader("Cache-Control");
         assertEquals("max-age=3456", cacheControl);
         assertNotNull(response.getHeader("Last-Modified"));
 
-        tileLayer
-                .getLayerInfo()
+        ((LayerInfo) tileLayer.getPublishedInfo())
                 .getResource()
                 .getMetadata()
                 .put(ResourceInfo.CACHING_ENABLED, "false");
@@ -540,8 +541,7 @@ public void testDirectWMSIntegrationMaxAge() throws Exception {
         assertEquals("no-cache", cacheControl);
 
         // make sure a boolean is handled, too - see comment in CachingWebMapService
-        tileLayer
-                .getLayerInfo()
+        ((LayerInfo) tileLayer.getPublishedInfo())
                 .getResource()
                 .getMetadata()
                 .put(ResourceInfo.CACHING_ENABLED, Boolean.FALSE);

src/gwc/src/test/java/org/geoserver/gwc/GWCTest.java

@@ -1539,7 +1539,7 @@ private void mockCachedSecureLayer(
         when(subset.boundsFromIndex(eq(new long[] {col, row, zoom}))).thenReturn(bounds);
         when(subset.getSRS()).thenReturn(srs);
         doReturn(crs).when(mediator).getCRSForGridset(eq(subset));
-        when(tileLayer.getLayerInfo()).thenReturn(layer);
+        when(tileLayer.getPublishedInfo()).thenReturn(layer);
         when(layer.getResource()).thenReturn(featureType);
         when(featureType.getCRS()).thenReturn(crs);
         when(crs.getCoordinateSystem()).thenReturn(cs);

src/gwc/src/test/java/org/geoserver/gwc/layer/CatalogConfigurationTest.java

@@ -281,12 +281,8 @@ private void testModifyLayer(GeoServerTileLayer orig) {
         newState.setName(orig.getInfo().getName());
         assertFalse(orig.equals(newState));
 
-        final GeoServerTileLayer modified;
-        if (orig.getLayerInfo() != null) {
-            modified = new GeoServerTileLayer(orig.getLayerInfo(), gridSetBroker, newState);
-        } else {
-            modified = new GeoServerTileLayer(orig.getLayerGroupInfo(), gridSetBroker, newState);
-        }
+        final GeoServerTileLayer modified =
+                new GeoServerTileLayer(orig.getPublishedInfo(), gridSetBroker, newState);
 
         assertEquals(
                 orig.getInfo(),
@@ -473,7 +469,7 @@ public void testNoGeometry() throws Exception {
         when(tl.getId()).thenReturn("layerWithNoGeometry");
         when(tl.isTransientLayer()).thenReturn(false);
         when(tl.getInfo()).thenReturn(info);
-        when(tl.getLayerInfo()).thenReturn(layerWithNoGeometry);
+        when(tl.getPublishedInfo()).thenReturn(layerWithNoGeometry);
         when(catalog.getLayer(layerWithNoGeometry.getId())).thenReturn(layerWithNoGeometry);
         when(catalog.getLayerByName(eq(tileLayerName(layerWithNoGeometry))))
                 .thenReturn(layerWithNoGeometry);

src/gwc/src/test/java/org/geoserver/gwc/layer/CatalogLayerEventListenerTest.java

@@ -178,7 +178,7 @@ public void testResourceInfoRenamed() throws Exception {
         GeoServerTileLayer tileLayer = mock(GeoServerTileLayer.class);
         when(mockMediator.hasTileLayer(same(mockResourceInfo))).thenReturn(true);
         when(tileLayer.getInfo()).thenReturn(info);
-        when(tileLayer.getLayerInfo()).thenReturn(mockLayerInfo);
+        when(tileLayer.getPublishedInfo()).thenReturn(mockLayerInfo);
 
         when(mockMediator.getTileLayer(same(mockResourceInfo))).thenReturn(tileLayer);
         when(mockMediator.getTileLayerByName(eq(oldTileLayerName))).thenReturn(tileLayer);
@@ -218,7 +218,7 @@ public void testCqlFilterChanged() throws Exception {
         GeoServerTileLayer tileLayer = mock(GeoServerTileLayer.class);
         when(mockMediator.hasTileLayer(same(mockResourceInfo))).thenReturn(true);
         when(tileLayer.getInfo()).thenReturn(info);
-        when(tileLayer.getLayerInfo()).thenReturn(mockLayerInfo);
+        when(tileLayer.getPublishedInfo()).thenReturn(mockLayerInfo);
 
         when(mockMediator.getTileLayer(same(mockResourceInfo))).thenReturn(tileLayer);
         String resourceName = mockResourceInfo.prefixedName();
@@ -251,7 +251,7 @@ public void testLayerGroupInfoRenamed() throws Exception {
                 TileLayerInfoUtil.loadOrCreate(mockLayerGroupInfo, GWCConfig.getOldDefaults());
         GeoServerTileLayer tileLayer = mock(GeoServerTileLayer.class);
         when(tileLayer.getInfo()).thenReturn(info);
-        when(tileLayer.getLayerGroupInfo()).thenReturn(mockLayerGroupInfo);
+        when(tileLayer.getPublishedInfo()).thenReturn(mockLayerGroupInfo);
 
         when(mockMediator.hasTileLayer(same(mockLayerGroupInfo))).thenReturn(true);
         when(mockMediator.getTileLayer(same(mockLayerGroupInfo))).thenReturn(tileLayer);
@@ -297,7 +297,7 @@ public void testLayerGroupInfoRenamedDueToWorkspaceChanged() throws Exception {
 
         GeoServerTileLayer tileLayer = mock(GeoServerTileLayer.class);
         when(tileLayer.getInfo()).thenReturn(info);
-        when(tileLayer.getLayerGroupInfo()).thenReturn(mockLayerGroupInfo);
+        when(tileLayer.getPublishedInfo()).thenReturn(mockLayerGroupInfo);
 
         when(mockMediator.hasTileLayer(same(mockLayerGroupInfo))).thenReturn(true);
         when(mockMediator.getTileLayer(same(mockLayerGroupInfo))).thenReturn(tileLayer);
@@ -353,7 +353,7 @@ public void testResourceInfoNamespaceChanged() throws Exception {
                 TileLayerInfoUtil.loadOrCreate(mockLayerInfo, GWCConfig.getOldDefaults());
         GeoServerTileLayer tileLayer = mock(GeoServerTileLayer.class);
         when(tileLayer.getInfo()).thenReturn(info);
-        when(tileLayer.getLayerInfo()).thenReturn(mockLayerInfo);
+        when(tileLayer.getPublishedInfo()).thenReturn(mockLayerInfo);
 
         when(mockMediator.hasTileLayer(same(mockResourceInfo))).thenReturn(true);
         when(mockMediator.getTileLayer(same(mockResourceInfo))).thenReturn(tileLayer);
@@ -550,8 +550,7 @@ public void testLayerInfoAlternateStylesChanged() throws Exception {
                                     @Override
                                     public boolean matches(Object item) {
                                         GeoServerTileLayer tl = (GeoServerTileLayer) item;
-                                        LayerInfo li = tl.getLayerInfo();
-                                        return li == mockLayerInfo;
+                                        return tl.getPublishedInfo() == mockLayerInfo;
                                     }
 
                                     @Override

src/gwc/src/test/java/org/geoserver/gwc/layer/CatalogStyleChangeListenerTest.java

@@ -71,7 +71,7 @@ public void setUp() throws Exception {
         ImmutableSet<String> empty = ImmutableSet.of();
         when(mockTileLayerInfo.cachedStyles()).thenReturn(empty);
 
-        when(mockTileLayer.getLayerInfo()).thenReturn(mockLayerInfo);
+        when(mockTileLayer.getPublishedInfo()).thenReturn(mockLayerInfo);
         when(mockTileLayer.getInfo()).thenReturn(mockTileLayerInfo);
         when(mockTileLayer.getName()).thenReturn(PREFIXED_RESOURCE_NAME);
         when(mockMediator.getTileLayersForStyle(eq(STYLE_NAME)))