From e0b1990e06a4e5658522500ec9cd12b2643970ac Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Mon, 27 Jan 2025 01:45:45 -0300 Subject: [PATCH] Remove support for pgraster, follow suite with removal upstream --- README.md | 1 - src/pom.xml | 5 -- src/starters/raster-formats/pom.xml | 6 +-- .../PostgisRasterWebUIAutoConfiguration.java | 24 --------- .../main/resources/META-INF/spring.factories | 3 +- ...stgisRasterWebUIAutoConfigurationTest.java | 49 ------------------- 6 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 src/starters/raster-formats/src/main/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfiguration.java delete mode 100644 src/starters/raster-formats/src/test/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfigurationTest.java diff --git a/README.md b/README.md index 89c1fe1be..6f9bb47f8 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,6 @@ Only a curated selection of the extensive [GeoServer extensions](http://geoserve * Cloud Optimized GeoTIFF * Pre-generalized Features * ImagePyramid - * PostGIS Raster * **Output Formats**: * WFS FlatGeobuf * WFS DXF diff --git a/src/pom.xml b/src/pom.xml index 522f50086..b9958f6d0 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -697,11 +697,6 @@ gs-authkey ${gs.version} - - org.geoserver.community - gs-pgraster - ${gs.version} - org.geoserver.community gs-cog-core diff --git a/src/starters/raster-formats/pom.xml b/src/starters/raster-formats/pom.xml index 234001290..f8529f05e 100644 --- a/src/starters/raster-formats/pom.xml +++ b/src/starters/raster-formats/pom.xml @@ -30,10 +30,6 @@ org.geotools gt-imagemosaic - - org.geoserver.community - gs-pgraster - org.geoserver.community gs-cog-core @@ -64,7 +60,7 @@ sts - + org.geoserver.web gs-web-core provided diff --git a/src/starters/raster-formats/src/main/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfiguration.java b/src/starters/raster-formats/src/main/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfiguration.java deleted file mode 100644 index 56e982867..000000000 --- a/src/starters/raster-formats/src/main/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfiguration.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * (c) 2022 Open Source Geospatial Foundation - all rights reserved This code is licensed under the - * GPL 2.0 license, available at the root application directory. - */ -package org.geoserver.cloud.autoconfigure.pgraster; - -import org.geoserver.web.GeoServerApplication; -import org.geoserver.web.data.resource.DataStorePanelInfo; -import org.geoserver.web.data.store.pgraster.PGRasterCoverageStoreEditPanel; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.context.annotation.ImportResource; - -/** - * Auto configuration to enable the pg_raster customized store panel when the web-ui is present. - * - * @implNote importing {@literal classpath:pgrasterApplicationContext.xml} instead of defining the - * bean in place because of parameterized class incompatibility on {@link - * org.geoserver.web.data.resource.DataStorePanelInfo#setComponentClass(Class)} - */ -@AutoConfiguration -@ConditionalOnClass({GeoServerApplication.class, DataStorePanelInfo.class, PGRasterCoverageStoreEditPanel.class}) -@ImportResource(locations = "classpath:pgrasterApplicationContext.xml") -public class PostgisRasterWebUIAutoConfiguration {} diff --git a/src/starters/raster-formats/src/main/resources/META-INF/spring.factories b/src/starters/raster-formats/src/main/resources/META-INF/spring.factories index 9c8700afc..ce0e696bf 100644 --- a/src/starters/raster-formats/src/main/resources/META-INF/spring.factories +++ b/src/starters/raster-formats/src/main/resources/META-INF/spring.factories @@ -1,5 +1,4 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.geoserver.cloud.autoconfigure.pgraster.PostgisRasterWebUIAutoConfiguration,\ org.geoserver.cloud.autoconfigure.cog.COGAutoConfiguration,\ -org.geoserver.cloud.autoconfigure.cog.COGWebUIAutoConfiguration \ No newline at end of file +org.geoserver.cloud.autoconfigure.cog.COGWebUIAutoConfiguration diff --git a/src/starters/raster-formats/src/test/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfigurationTest.java b/src/starters/raster-formats/src/test/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfigurationTest.java deleted file mode 100644 index 89ef50d06..000000000 --- a/src/starters/raster-formats/src/test/java/org/geoserver/cloud/autoconfigure/pgraster/PostgisRasterWebUIAutoConfigurationTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * (c) 2022 Open Source Geospatial Foundation - all rights reserved This code is licensed under the - * GPL 2.0 license, available at the root application directory. - */ -package org.geoserver.cloud.autoconfigure.pgraster; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.geoserver.web.GeoServerApplication; -import org.geoserver.web.data.resource.DataStorePanelInfo; -import org.geoserver.web.data.store.pgraster.PGRasterCoverageStoreEditPanel; -import org.geotools.gce.pgraster.PostgisRasterFormat; -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.FilteredClassLoader; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; - -class PostgisRasterWebUIAutoConfigurationTest { - - private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(PostgisRasterWebUIAutoConfiguration.class)); - - @Test - void testConditionalOnPostgisRasterWebUI_enabled() { - - contextRunner.run(context -> { - assertThat(context) - .hasBean("pgrasterCoverageStorePanel") - .getBean("pgrasterCoverageStorePanel") - .isInstanceOf(DataStorePanelInfo.class); - - assertThat(context.getBean("pgrasterCoverageStorePanel", DataStorePanelInfo.class)) - .hasFieldOrPropertyWithValue("factoryClass", PostgisRasterFormat.class); - - assertThat(context.getBean("pgrasterCoverageStorePanel", DataStorePanelInfo.class)) - .hasFieldOrPropertyWithValue("componentClass", PGRasterCoverageStoreEditPanel.class); - }); - } - - @Test - void testConditionalOnPostgisRasterWebUI_disabled() { - - contextRunner - .withClassLoader(new FilteredClassLoader(GeoServerApplication.class)) - .run(context -> { - assertThat(context).doesNotHaveBean("pgrasterCoverageStorePanel"); - }); - } -}