diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000000..f590adfcea1 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/catalog-rest-service/pom.xml b/catalog-rest-service/pom.xml index 1b74d71ceef..73f3e15b97e 100644 --- a/catalog-rest-service/pom.xml +++ b/catalog-rest-service/pom.xml @@ -82,10 +82,6 @@ org.glassfish.jersey.media jersey-media-multipart - - com.google.inject - guice - commons-lang commons-lang diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java index 9a8ee1a01c2..9d3462ea10d 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java @@ -13,8 +13,6 @@ package org.openmetadata.catalog; -import com.google.inject.Guice; -import com.google.inject.Injector; import io.dropwizard.Application; import io.dropwizard.assets.AssetsBundle; import io.dropwizard.health.conf.HealthConfiguration; @@ -44,7 +42,6 @@ import org.openmetadata.catalog.events.EventPubSub; import org.openmetadata.catalog.exception.CatalogGenericExceptionMapper; import org.openmetadata.catalog.exception.ConstraintViolationExceptionMapper; import org.openmetadata.catalog.exception.JsonMappingExceptionMapper; -import org.openmetadata.catalog.module.CatalogModule; import org.openmetadata.catalog.resources.CollectionRegistry; import org.openmetadata.catalog.resources.config.ConfigResource; import org.openmetadata.catalog.resources.search.SearchResource; @@ -60,7 +57,6 @@ import org.slf4j.LoggerFactory; /** Main catalog application */ public class CatalogApplication extends Application { public static final Logger LOG = LoggerFactory.getLogger(CatalogApplication.class); - private Injector injector; private Authorizer authorizer; @Override @@ -156,7 +152,6 @@ public class CatalogApplication extends Application { ContainerRequestFilter filter = NoopFilter.class.getConstructor().newInstance(); environment.jersey().register(filter); } - injector = Guice.createInjector(new CatalogModule(authorizer)); } private void registerEventFilter(CatalogApplicationConfig catalogConfig, Environment environment, Jdbi jdbi) { @@ -168,22 +163,6 @@ public class CatalogApplication extends Application { private void registerResources(CatalogApplicationConfig config, Environment environment, Jdbi jdbi) { CollectionRegistry.getInstance().registerResources(jdbi, environment, config, authorizer); - - environment - .lifecycle() - .manage( - new Managed() { - @Override - public void start() { - LOG.info("Application starting"); - } - - @Override - public void stop() { - long startTime = System.currentTimeMillis(); - LOG.info("Took {} ms to close all the services", (System.currentTimeMillis() - startTime)); - } - }); environment.jersey().register(new SearchResource(config.getElasticSearchConfiguration())); environment.jersey().register(new JsonPatchProvider()); ErrorPageErrorHandler eph = new ErrorPageErrorHandler(); @@ -200,14 +179,14 @@ public class CatalogApplication extends Application { @Override public void start() throws Exception { - LOG.info("starting the application"); + LOG.info("Starting the application"); EventPubSub.start(); } @Override public void stop() throws Exception { EventPubSub.shutdown(); - LOG.info("stopping the application"); + LOG.info("Stopping the application"); } } } diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java deleted file mode 100644 index c5691e2862d..00000000000 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/module/CatalogModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2021 Collate - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openmetadata.catalog.module; - -import com.google.inject.AbstractModule; -import com.google.inject.Provides; -import org.openmetadata.catalog.security.Authorizer; - -public class CatalogModule extends AbstractModule { - private final Authorizer authorizer; - - public CatalogModule(Authorizer authorizer) { - this.authorizer = authorizer; - } - - // Authorizer - @Provides - public Authorizer providesAuthorizer() { - return authorizer; - } - - @Override - protected void configure() { - // TODO do we need this - } -} diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java index 266e06c909f..0a5f8f4969d 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.bots; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -61,7 +60,6 @@ public class BotsResource { private final BotsRepository dao; private final Authorizer authorizer; - @Inject public BotsResource(CollectionDAO dao, Authorizer authorizer) { this.dao = new BotsRepository(dao); this.authorizer = authorizer; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java index 0f722994620..5184ed2109c 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.charts; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -92,7 +91,6 @@ public class ChartResource { return chart; } - @Inject public ChartResource(CollectionDAO dao, Authorizer authorizer) { this.dao = new ChartRepository(dao); this.authorizer = authorizer; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java index 6d3096d2ac1..0e14ba5f791 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.dashboards; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -92,7 +91,6 @@ public class DashboardResource { return dashboard; } - @Inject public DashboardResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "DashboardRepository must not be null"); this.dao = new DashboardRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java index 857f1d9b5e7..dfb6d6f3a90 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.databases; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -103,7 +102,6 @@ public class DatabaseResource { databaseEntityReference.withHref(RestUtil.getHref(uriInfo, COLLECTION_PATH, databaseEntityReference.getId())); } - @Inject public DatabaseResource(CollectionDAO dao, Authorizer authorizer) { this.dao = new DatabaseRepository(dao); this.authorizer = authorizer; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java index ae77a15739a..1e6c81305c7 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.databases; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -90,7 +89,6 @@ public class TableResource { return table; } - @Inject public TableResource(CollectionDAO dao, Authorizer authorizer) { this.dao = new TableRepository(dao); this.authorizer = authorizer; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java index dba1d7bfd2c..7cfdbca4969 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.events; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -65,7 +64,6 @@ public class EventResource { } } - @Inject public EventResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "ChangeEventRepository must not be null"); this.dao = new ChangeEventRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java index 7af5934abfa..a2608a10781 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/WebhookResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.events; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -82,7 +81,6 @@ public class WebhookResource { } } - @Inject public WebhookResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "ChangeEventRepository must not be null"); this.dao = new WebhookRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java index dc30dd41a4c..6b8a3f0df9a 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.feeds; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -67,7 +66,6 @@ public class FeedResource { return thread; } - @Inject public FeedResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "FeedRepository must not be null"); this.dao = new FeedRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java index 8ec321be705..8424837c85b 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.lineage; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -58,7 +57,6 @@ public class LineageResource { private static final Logger LOG = LoggerFactory.getLogger(UserResource.class); private final LineageRepository dao; - @Inject public LineageResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "LineageRepository must not be null"); this.dao = new LineageRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java index bcb0addffb0..7de87449b29 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/locations/LocationResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.locations; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -84,7 +83,6 @@ public class LocationResource { return location; } - @Inject public LocationResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "LocationRepository must not be null"); this.dao = new LocationRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java index f5dafe4f36e..c17dd1a6b68 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.metrics; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -64,7 +63,6 @@ public class MetricsResource { public static final String COLLECTION_PATH = "/v1/metrics/"; private final MetricsRepository dao; - @Inject public MetricsResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "MetricsRepository must not be null"); this.dao = new MetricsRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java index 539007ebe20..2fb205daf21 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/mlmodels/MlModelResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.mlmodels; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -85,7 +84,6 @@ public class MlModelResource { return mlmodel; } - @Inject public MlModelResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "ModelRepository must not be null"); this.dao = new MlModelRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java index 87c198719ec..1b790ef8df8 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/operations/IngestionResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.operations; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -103,7 +102,6 @@ public class IngestionResource { return ingestion; } - @Inject public IngestionResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "IngestionRepository must not be null"); this.dao = new IngestionRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java index d080e7ae945..015086cc81f 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.pipelines; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -92,7 +91,6 @@ public class PipelineResource { return pipeline; } - @Inject public PipelineResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "PipelineRepository must not be null"); this.dao = new PipelineRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java index aab16c1bbe0..571228a3d38 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/policies/PolicyResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.policies; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -90,7 +89,6 @@ public class PolicyResource { return policy; } - @Inject public PolicyResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "PolicyRepository must not be null"); this.dao = new PolicyRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java index 0f46d5e841f..0e8ec8bd4ac 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.reports; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -60,7 +59,6 @@ public class ReportResource { public static final String COLLECTION_PATH = "/v1/bots/"; private final ReportRepository dao; - @Inject public ReportResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "ReportRepository must not be null"); this.dao = new ReportRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java index 793dcd1edea..71718d12351 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.services.dashboard; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -68,7 +67,6 @@ public class DashboardServiceResource { private final DashboardServiceRepository dao; private final Authorizer authorizer; - @Inject public DashboardServiceResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "DashboardServiceRepository must not be null"); this.dao = new DashboardServiceRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java index 1732d90af8b..5f59b5ad220 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.services.database; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -68,7 +67,6 @@ public class DatabaseServiceResource { private final DatabaseServiceRepository dao; private final Authorizer authorizer; - @Inject public DatabaseServiceResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "DatabaseServiceRepository must not be null"); this.dao = new DatabaseServiceRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java index e092ad125b4..8879e3753a7 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.services.messaging; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -68,7 +67,6 @@ public class MessagingServiceResource { private final MessagingServiceRepository dao; private final Authorizer authorizer; - @Inject public MessagingServiceResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "MessagingServiceRepository must not be null"); this.dao = new MessagingServiceRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java index 3392dbee6c4..f7a47da1dba 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.services.pipeline; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -73,7 +72,6 @@ public class PipelineServiceResource { return service.withHref(RestUtil.getHref(uriInfo, "v1/services/pipelineServices/", service.getId())); } - @Inject public PipelineServiceResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "PipelineServiceRepository must not be null"); this.dao = new PipelineServiceRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java index a2ba6396a7c..4562db42b17 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/storage/StorageServiceResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.services.storage; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -68,7 +67,6 @@ public class StorageServiceResource { private final StorageServiceRepository dao; private final Authorizer authorizer; - @Inject public StorageServiceResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "StorageServiceRepository must not be null"); this.dao = new StorageServiceRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java index 9fc61971d7a..21e6320be59 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.tags; -import com.google.inject.Inject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation; @@ -81,7 +80,6 @@ public class TagResource { } } - @Inject public TagResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "TagRepository must not be null"); this.dao = new TagRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/RoleResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/RoleResource.java index a20c2de4928..5c813ce2791 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/RoleResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/RoleResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.teams; -import com.google.inject.Inject; import io.dropwizard.jersey.PATCH; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -75,7 +74,6 @@ public class RoleResource { private final RoleRepository dao; private final Authorizer authorizer; - @Inject public RoleResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "RoleRepository must not be null"); this.dao = new RoleRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java index 1561e7ce3c9..57a08d2c2db 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.teams; -import com.google.inject.Inject; import io.dropwizard.jersey.PATCH; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -82,7 +81,6 @@ public class TeamResource { return team; } - @Inject public TeamResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "TeamRepository must not be null"); this.dao = new TeamRepository(dao); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java index 307316a34f4..fed616ffdf1 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java @@ -13,7 +13,6 @@ package org.openmetadata.catalog.resources.teams; -import com.google.inject.Inject; import io.dropwizard.jersey.PATCH; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -92,7 +91,6 @@ public class UserResource { return user; } - @Inject public UserResource(CollectionDAO dao, Authorizer authorizer) { Objects.requireNonNull(dao, "UserRepository must not be null"); this.dao = new UserRepository(dao); diff --git a/common/src/test/java/org/openmetadata/common/module/StartableModule.java b/common/src/test/java/org/openmetadata/common/module/StartableModule.java deleted file mode 100644 index e671102da9e..00000000000 --- a/common/src/test/java/org/openmetadata/common/module/StartableModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2021 Collate - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openmetadata.common.module; - -import java.util.Map; - -/** - * Used to define start() and stop() methods for a guice module that expects to start and stop services with creation - * and destruction of a injector - */ -public interface StartableModule { - - /** - * Starts up required services before tests are invoked for a test class - * - * @param props properties that were defined as a part of CatalogTest - */ - void start(Map props); - - /** - * Stops services that were invoked with start() after all the tests for a class - * - * @param props properties that were defined as a part of CatalogTest - */ - void stop(Map props); -} diff --git a/pom.xml b/pom.xml index c1e73839847..ea18df6ecd1 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,6 @@ 2.33 2.33 2.6.1.0.0 - 5.0.1 2.1.1 3.1.0 @@ -188,11 +187,6 @@ jersey-media-multipart ${jersey-media-multipart.version} - - com.google.inject - guice - ${google-guice.version} - com.google.code.gson gson