Merge pull request #174 from xenit-eu/remove-deprecated-app-metadata

Remove deprecated/unused ContentGridApplicationMetadata
xenit-eu · Aug 21, 2023 · df8b281 · df8b281
2 parents ac952ef + 658b7dc
commit df8b281
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 93 deletions.
diff --git a/src/main/java/com/contentgrid/gateway/runtime/RuntimeConfiguration.java b/src/main/java/com/contentgrid/gateway/runtime/RuntimeConfiguration.java
@@ -3,10 +3,8 @@
 import static com.contentgrid.gateway.runtime.web.ContentGridAppRequestWebFilter.CONTENTGRID_WEB_FILTER_CHAIN_FILTER_ORDER;
 
 import com.contentgrid.gateway.ServiceDiscoveryProperties;
-import com.contentgrid.gateway.runtime.application.ContentGridApplicationMetadata;
 import com.contentgrid.gateway.runtime.application.ContentGridDeploymentMetadata;
 import com.contentgrid.gateway.runtime.application.ServiceCatalog;
-import com.contentgrid.gateway.runtime.application.SimpleContentGridApplicationMetadata;
 import com.contentgrid.gateway.runtime.application.SimpleContentGridDeploymentMetadata;
 import com.contentgrid.gateway.runtime.config.ApplicationConfigurationRepository;
 import com.contentgrid.gateway.runtime.config.ComposableApplicationConfigurationRepository;
@@ -40,7 +38,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.cors.reactive.CorsConfigurationSource;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -61,11 +58,6 @@ ContentGridDeploymentMetadata deploymentMetadata() {
         return new SimpleContentGridDeploymentMetadata();
     }
 
-    @Bean
-    ContentGridApplicationMetadata applicationMetadata(ContentGridDeploymentMetadata deploymentMetadata) {
-        return new SimpleContentGridApplicationMetadata(deploymentMetadata);
-    }
-
     @Bean
     RuntimeRequestResolver runtimeRequestResolver() {
         return new DefaultRuntimeRequestResolver();

diff --git a/...main/java/com/contentgrid/gateway/runtime/application/ContentGridApplicationMetadata.java b/...main/java/com/contentgrid/gateway/runtime/application/ContentGridApplicationMetadata.java
diff --git a/...ava/com/contentgrid/gateway/runtime/application/SimpleContentGridApplicationMetadata.java b/...ava/com/contentgrid/gateway/runtime/application/SimpleContentGridApplicationMetadata.java
diff --git a/...com/contentgrid/gateway/runtime/application/SimpleContentGridApplicationMetadataTest.java b/...com/contentgrid/gateway/runtime/application/SimpleContentGridApplicationMetadataTest.java
diff --git a/src/test/java/com/contentgrid/gateway/runtime/routing/SimpleRuntimeRequestRouterTest.java b/src/test/java/com/contentgrid/gateway/runtime/routing/SimpleRuntimeRequestRouterTest.java
@@ -4,10 +4,8 @@
 
 import com.contentgrid.gateway.runtime.ServiceInstanceStubs;
 import com.contentgrid.gateway.runtime.application.ApplicationId;
-import com.contentgrid.gateway.runtime.application.ContentGridApplicationMetadata;
 import com.contentgrid.gateway.runtime.application.DeploymentId;
 import com.contentgrid.gateway.runtime.application.ServiceCatalog;
-import com.contentgrid.gateway.runtime.application.SimpleContentGridApplicationMetadata;
 import com.contentgrid.gateway.runtime.application.SimpleContentGridDeploymentMetadata;
 import com.contentgrid.gateway.runtime.config.ApplicationConfiguration.Keys;
 import com.contentgrid.gateway.runtime.config.ApplicationConfigurationFragment;
@@ -21,15 +19,13 @@
 
 class SimpleRuntimeRequestRouterTest {
 
-    protected ContentGridApplicationMetadata applicationMetadata;
     protected ComposableApplicationConfigurationRepository appConfigRepo;
     protected ServiceCatalog serviceCatalog;
     protected RuntimeRequestRouter requestRouter;
 
     @BeforeEach
     void setup() {
         var deployMetadata = new SimpleContentGridDeploymentMetadata();
-        this.applicationMetadata = new SimpleContentGridApplicationMetadata(deployMetadata);
         this.appConfigRepo = new ComposableApplicationConfigurationRepository();
         this.serviceCatalog = new ServiceCatalog(event -> { }, deployMetadata, appConfigRepo);
         this.requestRouter = new SimpleRuntimeRequestRouter(this.serviceCatalog, deployMetadata, appConfigRepo);