Remove unused catalog-service microservice and client

The catalog service has been out of commission for a long time now, becoming dead code. The idea is still sound but the complexity of WebFlux makes it a maintenance nightmare. Plus, with Java 21's virtual threads, it will be possible to write a non WebFlux implementation with almost the same benefits, except maybe for the reactive back-pressure support.
geoserver · Dec 6, 2023 · 23cabb9 · 23cabb9
1 parent 078bb63
commit 23cabb9
Show file tree

Hide file tree

Showing 120 changed files with 12 additions and 12,321 deletions.
diff --git a/config b/config
diff --git a/pom.xml b/pom.xml
@@ -74,11 +74,6 @@
         <artifactId>gs-cloud-starter-webmvc</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.geoserver.cloud</groupId>
-        <artifactId>gs-cloud-starter-reactive</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.geoserver.cloud</groupId>
         <artifactId>gs-cloud-starter-wms-extensions</artifactId>
@@ -109,16 +104,6 @@
         <artifactId>gs-cloud-catalog-cache</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.geoserver.cloud.catalog.service</groupId>
-        <artifactId>gs-cloud-reactive-catalog-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.geoserver.cloud.catalog.service</groupId>
-        <artifactId>gs-cloud-reactive-catalog-server</artifactId>
-        <version>${revision}</version>
-      </dependency>
       <dependency>
         <groupId>org.geoserver.cloud.catalog.backend</groupId>
         <artifactId>gs-cloud-catalog-backend-common</artifactId>
@@ -134,11 +119,6 @@
         <artifactId>gs-cloud-catalog-backend-jdbcconfig</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.geoserver.cloud.catalog.backend</groupId>
-        <artifactId>gs-cloud-catalog-backend-catalog-service</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.geoserver.cloud.catalog.backend</groupId>
         <artifactId>gs-cloud-catalog-backend-pgsql</artifactId>

diff --git a/src/apps/geoserver/catalog/Dockerfile b/src/apps/geoserver/catalog/Dockerfile
diff --git a/src/apps/geoserver/catalog/README.md b/src/apps/geoserver/catalog/README.md
diff --git a/src/apps/geoserver/catalog/pom.xml b/src/apps/geoserver/catalog/pom.xml
diff --git a/...rver/catalog/src/main/java/org/geoserver/cloud/catalog/app/CatalogServiceApplication.java b/...rver/catalog/src/main/java/org/geoserver/cloud/catalog/app/CatalogServiceApplication.java
diff --git a/src/apps/geoserver/catalog/src/main/resources/bootstrap.yml b/src/apps/geoserver/catalog/src/main/resources/bootstrap.yml
diff --git a/src/apps/geoserver/pom.xml b/src/apps/geoserver/pom.xml
@@ -17,8 +17,6 @@
     <module>restconfig</module>
     <module>webui</module>
     <module>gwc</module>
-    <!-- temporarily disabled -->
-    <!-- <module>catalog</module>-->
   </modules>
   <dependencyManagement>
     <dependencies>

diff --git a/src/catalog/README.md b/src/catalog/README.md
@@ -7,14 +7,14 @@ Dependency graph:
                                     ^
                                     |
  (catalog-event-bus) <-------- (catalog-backend-starter) ------> (catalog-cache)
-                                 ^  |           \
+                                 /  |           \
                                 /   |            \--> [gs-jdbcconfig]
                                /    |             \
                               /     |              \--> <other catalog backends>...
                              /      | 
-                            /       +--> (catalog-service-client)
+                            /       +--> (pgconfig)
                            /    
-                   (catalog-service)
+                   (data-directory)
 ```
 
 ## pluggable-catalog-support
@@ -28,12 +28,14 @@ Implements `spring-could-bus` based event notification of catalog and configurat
 
 ## catalog-backend-starter
 
-Provides spring atuo-configuration for several catalog back-ends. Namely: traditional file based data directory, jdbcconfig, and catalog-service-client. More can be added as implementations are developed.
+Provides spring atuo-configuration for several catalog back-ends. Namely: traditional file based data directory, jdbcconfig, and pgconfig. More can be added as implementations are developed.
 
  depends on: 
-  * catalog-event-bus
-  * gs-jdbcconfig
-  * catalog-service-client
+  * gs-cloud-catalog-events
+  * gs-cloud-catalog-cache
+  * gs-cloud-catalog-backend-datadir
+  * gs-cloud-catalog-backend-jdbcconfig
+  * gs-cloud-catalog-backend-pgsql
 
 ## catalog-cache
 
@@ -42,18 +44,6 @@ Based on `spring-boot-starter-cache`, decorates the application catalog's backen
  depends on: 
   * catalog-event-bus
 
-## catalog-service-client
-
-Catalog implementation to use `catalog-service` as the application's catalog backend. Hooks into the configured `Catalog` and `ResourceStore`
-
-## catalog-service
-
-Microservice that implements the web-api to back the `catalog-service-client`.
-
- depends on: 
-  * catalog-backend-starter (hence transitively on all the supported backends)
-
-
 # Common configuration properties
 The following configuration properties apply to all *GeoServer* microservices (i.e. not edge services):