Commit af42046b authored by Rustam Lotsmanenko (EPAM)'s avatar Rustam Lotsmanenko (EPAM)
Browse files

Merge branch 'gcp-fix-compile' into 'master'

fix compile

See merge request !190
parents c8c7ac91 d662f96e
Pipeline #106912 failed with stages
in 27 minutes and 35 seconds
......@@ -56,7 +56,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.15.0-SNAPSHOT</version>
<version>0.15.0-rc3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
......@@ -17,7 +17,6 @@
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.di.DmsClientFactory;
import org.springframework.boot.SpringApplication;
......@@ -30,7 +29,7 @@ import org.springframework.context.annotation.FilterType;
@ConfigurationPropertiesScan(basePackages = "org.opengroup")
@ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {DmsClientFactory.class,
DatasetApplication.class, IStorageFactory.class})})
DatasetApplication.class})})
public class DatasetApplicationGCP {
public static void main(String[] args) {
......
/*
* Copyright 2021 Google LLC
* Copyright 2021 EPAM Systems, Inc
*
* 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
*
* https://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.opengroup.osdu.dataset.provider.gcp.config;
import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageOptions;
import org.opengroup.osdu.core.gcp.multitenancy.GcsMultiTenantAccess;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@ConditionalOnProperty(name = "obmDriver", havingValue = "gcs")
public class GcpGoogleCloudStorageConfig {
@Bean
public Storage googleCloudStorage() {
return StorageOptions.getDefaultInstance().getService();
}
@Bean
public GcsMultiTenantAccess gcsMultiTenantAccess() {
return new GcsMultiTenantAccess();
}
}
/*
* Copyright 2021 Google LLC
* Copyright 2021 EPAM Systems, Inc
*
* 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
*
* https://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.opengroup.osdu.dataset.provider.gcp.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.net.URL;
import java.time.Instant;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FileInstructionsItem {
@JsonProperty("unsignedUrl")
private String unsignedUrl;
@JsonProperty("signedUrl")
private URL signedUrl;
@JsonProperty("createdAt")
private Instant createdAt;
}
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