Commit 37d5fefe authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Fixed context.

parent d67cf54d
Pipeline #106608 failed with stages
in 27 minutes and 36 seconds
/* /*
* Copyright 2021 Google LLC * Copyright 2021-2022 Google LLC
* Copyright 2021 EPAM Systems, Inc * Copyright 2021-2022 EPAM Systems, Inc
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
package org.opengroup.osdu.dataset.provider.gcp; package org.opengroup.osdu.dataset.provider.gcp;
import org.opengroup.osdu.core.gcp.multitenancy.IStorageFactory;
import org.opengroup.osdu.dataset.DatasetApplication; import org.opengroup.osdu.dataset.DatasetApplication;
import org.opengroup.osdu.dataset.di.DmsClientFactory; import org.opengroup.osdu.dataset.di.DmsClientFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
...@@ -30,7 +29,7 @@ import org.springframework.context.annotation.FilterType; ...@@ -30,7 +29,7 @@ import org.springframework.context.annotation.FilterType;
@ConfigurationPropertiesScan(basePackages = "org.opengroup") @ConfigurationPropertiesScan(basePackages = "org.opengroup")
@ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = { @ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {DmsClientFactory.class, @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {DmsClientFactory.class,
DatasetApplication.class, IStorageFactory.class})}) DatasetApplication.class})})
public class DatasetApplicationGCP { public class DatasetApplicationGCP {
public static void main(String[] args) { public static void main(String[] args) {
......
/* /*
* Copyright 2021 Google LLC * Copyright 2021-2022 Google LLC
* Copyright 2021 EPAM Systems, Inc * Copyright 2021-2022 EPAM Systems, Inc
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -19,7 +19,6 @@ package org.opengroup.osdu.dataset.provider.gcp.config; ...@@ -19,7 +19,6 @@ package org.opengroup.osdu.dataset.provider.gcp.config;
import com.google.cloud.storage.Storage; import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageOptions; import com.google.cloud.storage.StorageOptions;
import org.opengroup.osdu.core.gcp.multitenancy.GcsMultiTenantAccess;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -33,8 +32,4 @@ public class GcpGoogleCloudStorageConfig { ...@@ -33,8 +32,4 @@ public class GcpGoogleCloudStorageConfig {
return StorageOptions.getDefaultInstance().getService(); return StorageOptions.getDefaultInstance().getService();
} }
@Bean
public GcsMultiTenantAccess gcsMultiTenantAccess() {
return new GcsMultiTenantAccess();
}
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment