Engages if enabled and configured as described by the {@link CatalogService} configuration
- * properties under the {@code geoserver.backend.catalog-service} prefix.
- *
- * @see ConditionalOnCatalogServiceClientEnabled
- */
-@AutoConfiguration(before = DefaultUpdateSequenceAutoConfiguration.class)
-@ConditionalOnCatalogServiceClientEnabled
-@Import(CatalogClientBackendConfigurer.class)
-public class CatalogClientBackendAutoConfiguration {}
diff --git a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/ConditionalOnCatalogServiceClientEnabled.java b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/ConditionalOnCatalogServiceClientEnabled.java
deleted file mode 100644
index b493f787b..000000000
--- a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/ConditionalOnCatalogServiceClientEnabled.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) 2020 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.catalog.backend.catalogservice;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Documented
-@ConditionalOnClass(org.geoserver.cloud.catalog.client.impl.CatalogClientConfiguration.class)
-@ConditionalOnProperty(
- prefix = "geoserver.backend.catalog-service",
- name = "enabled",
- havingValue = "true",
- matchIfMissing = false)
-public @interface ConditionalOnCatalogServiceClientEnabled {}
diff --git a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientBackendConfigurer.java b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientBackendConfigurer.java
deleted file mode 100644
index 3838a0876..000000000
--- a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientBackendConfigurer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * (c) 2020 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.config.catalog.backend.catalogservice;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.geoserver.GeoServerConfigurationLock;
-import org.geoserver.catalog.plugin.ExtendedCatalogFacade;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientCatalogFacade;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientConfiguration;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientGeoServerFacade;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientResourceStore;
-import org.geoserver.cloud.config.catalog.backend.core.GeoServerBackendConfigurer;
-import org.geoserver.config.GeoServerFacade;
-import org.geoserver.config.GeoServerLoader;
-import org.geoserver.platform.GeoServerResourceLoader;
-import org.geoserver.platform.config.UpdateSequence;
-import org.geoserver.platform.resource.FileSystemResourceStore;
-import org.geoserver.platform.resource.ResourceStore;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
-
-import java.io.File;
-
-@Configuration(proxyBeanMethods = true)
-@EnableConfigurationProperties(CatalogClientProperties.class)
-@Import(CatalogClientConfiguration.class)
-@Slf4j(topic = "org.geoserver.cloud.config.catalogclient")
-public class CatalogClientBackendConfigurer extends GeoServerBackendConfigurer {
-
- private @Autowired CatalogClientCatalogFacade catalogClientFacade;
- private @Autowired CatalogClientGeoServerFacade configClientFacade;
- private @Autowired CatalogClientResourceStore catalogServiceResourceStore;
-
- private @Autowired CatalogClientProperties catalogClientConfig;
-
- public CatalogClientBackendConfigurer() {
- log.info(
- "Loading geoserver config backend with {}",
- CatalogClientBackendConfigurer.class.getSimpleName());
- }
-
- protected @Bean @Override UpdateSequence updateSequence() {
- throw new UnsupportedOperationException("implement");
- }
-
- protected @Bean @Override GeoServerConfigurationLock configurationLock() {
- throw new UnsupportedOperationException("implement");
- }
-
- protected @Bean @Override ExtendedCatalogFacade catalogFacade() {
- return catalogClientFacade;
- }
-
- protected @Bean @Override GeoServerFacade geoserverFacade() {
- return configClientFacade;
- }
-
- @Bean(name = {"resourceStoreImpl"})
- protected @Override CatalogClientResourceStore resourceStoreImpl() {
- CatalogClientResourceStore store = catalogServiceResourceStore;
- File cacheDirectory = catalogClientConfig.getCacheDirectory();
- if (null != cacheDirectory) {
- store.setLocalCacheDirectory(cacheDirectory);
- }
- return store;
- }
-
- @DependsOn({
- "extensions",
- "wmsLoader",
- "wfsLoader",
- "wcsLoader",
- "wpsServiceLoader",
- "wmtsLoader"
- })
- protected @Bean @Override GeoServerLoader geoServerLoaderImpl() {
- return new CatalogClientGeoServerLoader(resourceLoader());
- }
-
- protected @Bean @Override GeoServerResourceLoader resourceLoader() {
- CatalogClientResourceStore resourceStore = resourceStoreImpl();
- GeoServerResourceLoader resourceLoader = new GeoServerResourceLoader(resourceStore);
- File cacheDirectory = catalogClientConfig.getCacheDirectory();
- if (null != cacheDirectory) {
- resourceLoader.setBaseDirectory(cacheDirectory);
- }
- return resourceLoader;
- }
-
- @Bean
- ResourceStore catalogServiceFallbackResourceStore(@Autowired Environment springEnv) {
- File dir =
- springEnv.getProperty(
- "geoserver.backend.catalog-service.fallback-resource-directory",
- File.class);
- if (dir == null) return null;
- dir.mkdirs();
- return new FileSystemResourceStore(dir);
- }
-}
diff --git a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java
deleted file mode 100644
index f08969ea0..000000000
--- a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * (c) 2020 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.config.catalog.backend.catalogservice;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.geoserver.catalog.Catalog;
-import org.geoserver.catalog.WorkspaceInfo;
-import org.geoserver.config.GeoServer;
-import org.geoserver.config.GeoServerInfo;
-import org.geoserver.config.GeoServerLoader;
-import org.geoserver.config.util.XStreamPersister;
-import org.geoserver.platform.GeoServerResourceLoader;
-import org.geotools.api.filter.Filter;
-
-import java.io.IOException;
-
-/** */
-@Slf4j
-public class CatalogClientGeoServerLoader extends GeoServerLoader {
-
- public CatalogClientGeoServerLoader(GeoServerResourceLoader resourceLoader) {
- super(resourceLoader);
- }
-
- protected @Override void initializeDefaultStyles(Catalog catalog) throws IOException {
- try {
- super.initializeDefaultStyles(catalog);
- } catch (Exception e) {
- log.warn(
- "Unable to connect to catalog-service's catalog API during GeoServerLoader bean initialization",
- e);
- }
- }
-
- protected @Override void loadCatalog(Catalog catalog, XStreamPersister xp) throws Exception {
- log.info("Checking catalog service health...");
- try {
- int count = catalog.count(WorkspaceInfo.class, Filter.INCLUDE);
- log.info(
- "Catalog-service reports {} workspaces, roundtrip succeeded, assuming service is healthy",
- count);
- } catch (Exception e) {
- log.warn(
- "Unable to connect to catalog-service's catalog API during GeoServerLoader bean initialization",
- e);
- }
- }
-
- protected @Override void loadGeoServer(GeoServer geoServer, XStreamPersister xp)
- throws Exception {
- log.info("Checking config service health...");
- try {
- GeoServerInfo global = geoServer.getGlobal();
- log.info(
- "Catalog-service returned global config, update sequence: {}, roundtrip succeeded, assuming service is healthy",
- global.getUpdateSequence());
- } catch (Exception e) {
- log.warn(
- "Unable to connect to catalog-service's config API during GeoServerLoader bean initialization",
- e);
- }
- }
-}
diff --git a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientProperties.java b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientProperties.java
deleted file mode 100644
index 5d0950499..000000000
--- a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (c) 2020 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.config.catalog.backend.catalogservice;
-
-import lombok.Data;
-import lombok.Generated;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.io.File;
-
-/**
- * Configuration properties bean to use the {@code catalog-service} micro-service client back-end
- * and can be used as a {@link ConfigurationProperties @ConfigurationProperties}
- */
-@Generated
-@ConfigurationProperties(prefix = "geoserver.backend.catalog-service")
-public @Data class CatalogClientProperties {
- private boolean enabled;
- private String url;
- private File cacheDirectory;
-}
diff --git a/src/catalog/backends/catalog-service/src/main/resources/META-INF/spring.factories b/src/catalog/backends/catalog-service/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index fb7b52f42..000000000
--- a/src/catalog/backends/catalog-service/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.geoserver.cloud.autoconfigure.catalog.backend.catalogservice.CatalogClientBackendAutoConfiguration
\ No newline at end of file
diff --git a/src/catalog/backends/catalog-service/src/test/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/CatalogClientBackendAutoConfigurationTest.java b/src/catalog/backends/catalog-service/src/test/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/CatalogClientBackendAutoConfigurationTest.java
deleted file mode 100644
index f3f276f1a..000000000
--- a/src/catalog/backends/catalog-service/src/test/java/org/geoserver/cloud/autoconfigure/catalog/backend/catalogservice/CatalogClientBackendAutoConfigurationTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * (c) 2020 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.catalog.backend.catalogservice;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
-import org.geoserver.catalog.CatalogFacade;
-import org.geoserver.catalog.plugin.CatalogPlugin;
-import org.geoserver.cloud.autoconfigure.catalog.backend.core.GeoServerBackendAutoConfiguration;
-import org.geoserver.cloud.autoconfigure.security.GeoServerSecurityAutoConfiguration;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientCatalogFacade;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientGeoServerFacade;
-import org.geoserver.cloud.catalog.client.impl.CatalogClientResourceStore;
-import org.geoserver.cloud.config.catalog.backend.catalogservice.CatalogClientBackendConfigurer;
-import org.geoserver.cloud.config.catalog.backend.catalogservice.CatalogClientGeoServerLoader;
-import org.geoserver.platform.GeoServerResourceLoader;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-
-import reactivefeign.spring.config.ReactiveFeignAutoConfiguration;
-
-/**
- * Test {@link CatalogClientBackendConfigurer} through {@link CatalogClientBackendAutoConfiguration}
- * when {@code geoserver.backend.catalog-service.enabled=true}
- */
-@Disabled("Make it run without ReactiveCatalogClient trying to connect")
-class CatalogClientBackendAutoConfigurationTest {
-
- // geoserver.security.enabled=false to avoid calling the catalog during bean initialization,
- // since there's no backend service to connect to
- private final ApplicationContextRunner contextRunner =
- new ApplicationContextRunner()
- .withAllowBeanDefinitionOverriding(true)
- .withPropertyValues(
- "reactive.feign.loadbalancer.enabled=false",
- "geoserver.backend.catalog-service.enabled=true",
- "geoserver.security.enabled=false")
- .withAllowBeanDefinitionOverriding(true)
- .withConfiguration(
- AutoConfigurations.of( //
- GeoServerBackendAutoConfiguration.class,
- GeoServerSecurityAutoConfiguration.class,
- ReactiveFeignAutoConfiguration.class,
- WebClientAutoConfiguration.class,
- CacheAutoConfiguration.class));
-
- @Test
- void testCatalog() {
- contextRunner.run(
- context ->
- context.isTypeMatch(
- "rawCatalog", org.geoserver.catalog.plugin.CatalogPlugin.class));
- }
-
- @Test
- void testCatalogFacade() {
- contextRunner.run(
- context -> context.isTypeMatch("catalogFacade", CatalogClientCatalogFacade.class));
- }
-
- @Test
- void testCatalogFacadeIsRawCatalogFacade() {
- contextRunner.run(
- context -> {
- CatalogPlugin catalog = context.getBean("rawCatalog", CatalogPlugin.class);
- CatalogFacade rawCatalogFacade =
- context.getBean("catalogFacade", CatalogFacade.class);
- assertSame(rawCatalogFacade, catalog.getRawFacade());
- });
- }
-
- @Test
- void testResourceStore() {
- contextRunner.run(
- context ->
- context.isTypeMatch("resourceStoreImpl", CatalogClientResourceStore.class));
- }
-
- @Test
- void testResourceLoadersResourceStore() {
- contextRunner.run(
- context -> {
- GeoServerResourceLoader resourceLoader =
- context.getBean(GeoServerResourceLoader.class);
- assertThat(
- resourceLoader.getResourceStore(),
- instanceOf(CatalogClientResourceStore.class));
- });
- }
-
- @Test
- void testGeoserverFacade() {
- contextRunner.run(
- context ->
- context.isTypeMatch("geoserverFacade", CatalogClientGeoServerFacade.class));
- }
-
- @Test
- void testGeoserverLoader() {
- contextRunner.run(
- context ->
- context.isTypeMatch(
- "geoServerLoaderImpl", CatalogClientGeoServerLoader.class));
- }
-}
diff --git a/src/catalog/backends/catalog-service/src/test/resources/application.yml b/src/catalog/backends/catalog-service/src/test/resources/application.yml
deleted file mode 100644
index ad138e97f..000000000
--- a/src/catalog/backends/catalog-service/src/test/resources/application.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-info:
- instance-id: test-instance-id
-spring:
- main:
- banner-mode: off
- allow-bean-definition-overriding: true
- # false by default since spring-boot 2.6.0, breaks geoserver initialization
- allow-circular-references: true
- cloud.bus.enabled: false
- autoconfigure:
- exclude:
- - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-
-
-eureka.client.enabled: false
-
-geoserver:
- backend:
- catalog-service:
- enabled: false
- url: catalog-service
-# resource-store.fallback.enabled: ${java.io.tmpdir}/gs_cloud/catalog_client_resource_store_fallback
-# resource-store.fallback: ${java.io.tmpdir}/gs_cloud/catalog_client_resource_store_fallback
-
-logging:
- level:
- root: WARN
- #org.geoserver.platform: ERROR
- org.geoserver: warn
- org.geoserver.cloud: warn
- org.geoserver.cloud.config.factory: warn
- org.geoserver.jdbcconfig: warn
- org.geoserver.jdbcstore: warn
diff --git a/src/catalog/backends/catalog-service/src/test/resources/logback-test.xml b/src/catalog/backends/catalog-service/src/test/resources/logback-test.xml
deleted file mode 100644
index 92a70edd5..000000000
--- a/src/catalog/backends/catalog-service/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
Note these in/out bound resolvers do not deal with {@link ModificationProxy} at all. It - * is up to the {@link Catalog} implementation itself to do that if it so requires it. - * - *
This decorator specializes in resolving the objects returned by {@link ReactiveCatalogClient} - * through {@link CatalogClientRepository}. For instance: - * - *
- * - *