Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Dataset
Commits
d662f96e
Commit
d662f96e
authored
May 04, 2022
by
Rustam Lotsmanenko (EPAM)
Browse files
fix compile
parent
c8c7ac91
Pipeline
#106889
passed with stages
in 30 minutes and 24 seconds
Changes
4
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
provider/dataset-gcp/pom.xml
View file @
d662f96e
...
...
@@ -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>
...
...
provider/dataset-gcp/src/main/java/org/opengroup/osdu/dataset/provider/gcp/DatasetApplicationGCP.java
View file @
d662f96e
...
...
@@ -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
)
{
...
...
provider/dataset-gcp/src/main/java/org/opengroup/osdu/dataset/provider/gcp/config/GcpGoogleCloudStorageConfig.java
deleted
100644 → 0
View file @
c8c7ac91
/*
* 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
();
}
}
provider/dataset-gcp/src/main/java/org/opengroup/osdu/dataset/provider/gcp/model/FileInstructionsItem.java
deleted
100644 → 0
View file @
c8c7ac91
/*
* 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
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment