Commit 060ce78a authored by neelesh thakur's avatar neelesh thakur
Browse files

Merge branch 'master' into remove-deprecated-api

parents 355614d1 7d3d9a5b
......@@ -13,35 +13,35 @@ The following software have components provided under the terms of this license:
- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
- Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
- Apache Log4j to SLF4J Adapter (from )
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- Bean Validation API (from http://beanvalidation.org)
- Bean Validation API (from http://beanvalidation.org)
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- Byte Buddy agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
- Gson (from https://github.com/google/gson)
- Gson (from http://code.google.com/p/google-gson/)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc)
- Hibernate Validator Engine (from )
- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- HttpCore (NIO extensions module) (from http://hc.apache.org/httpcomponents-core/)
- HttpCore (base module) (from http://hc.apache.org/httpcomponents-core/)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Logging 3 (from http://www.jboss.org)
- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
- Jackson-annotations (from http://wiki.fasterxml.com/JacksonHome)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from http://wiki.fasterxml.com/JacksonHome)
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jakarta Bean Validation API (from https://beanvalidation.org)
- Java Servlet API (from http://servlet-spec.java.net)
- Javassist (from http://www.javassist.org/)
- Joda-Time (from https://www.joda.org/joda-time/)
......@@ -69,24 +69,24 @@ The following software have components provided under the terms of this license:
- Objenesis (from http://objenesis.org)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- PowerMock (from http://www.powermock.org)
- PowerMock (from http://www.powermock.org)
- PowerMock (from http://www.powermock.org)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring AOP (from https://github.com/spring-projects/spring-framework)
- Spring Beans (from https://github.com/spring-projects/spring-framework)
- Spring Boot (from http://projects.spring.io/spring-boot/)
- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Validation Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-validation)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
- Spring Context (from https://github.com/spring-projects/spring-framework)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
- Spring Framework: AOP (from http://www.springframework.org)
- Spring Framework: Context (from http://www.springframework.org)
- Spring Framework: WebMVC (from http://www.springframework.org)
- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
- Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans)
- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
- Spring TestContext Framework (from https://github.com/SpringSource/spring-framework)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
- T-Digest (from https://github.com/tdunning/t-digest)
- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
- compiler (from http://github.com/spullara/mustache.java)
......@@ -97,25 +97,25 @@ The following software have components provided under the terms of this license:
- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
- jackson-databind (from http://wiki.fasterxml.com/JacksonHome)
- jackson-databind (from http://github.com/FasterXML/jackson)
- javax.inject (from http://code.google.com/p/atinject/)
- lang-mustache (from https://github.com/elastic/elasticsearch)
- lettuce (from http://github.com/mp911de/lettuce/wiki)
- mapper-extras (from https://github.com/elastic/elasticsearch)
- parent-join (from https://github.com/elastic/elasticsearch)
- powermock-core (from http://www.powermock.org)
- powermock-module-junit4 (from http://www.powermock.org)
- powermock-module-junit4-common (from )
- powermock-reflect (from )
- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common)
- rank-eval (from https://github.com/elastic/elasticsearch)
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
- server (from https://github.com/elastic/elasticsearch)
- spring-boot-starter-json (from https://spring.io/projects/spring-boot)
- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot)
- spring-boot-starter-web (from https://spring.io/projects/spring-boot)
- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-jaxrs (from )
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from https://tomcat.apache.org/)
========================================================================
BSD-2-Clause
......@@ -141,8 +141,8 @@ The following software have components provided under the terms of this license:
- Lucene Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
- Mockito (from http://www.mockito.org)
- Reflections (from http://github.com/ronmamo/reflections)
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring Core (from https://github.com/spring-projects/spring-framework)
========================================================================
CC-BY-2.5
......@@ -182,7 +182,7 @@ The following software have components provided under the terms of this license:
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- SnakeYAML (from http://www.snakeyaml.org)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
========================================================================
......@@ -206,7 +206,7 @@ GPL-2.0-or-later
========================================================================
The following software have components provided under the terms of this license:
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
GPL-2.0-with-classpath-exception
......@@ -224,7 +224,7 @@ GPL-3.0-only
The following software have components provided under the terms of this license:
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from http://projectlombok.org)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
========================================================================
......@@ -243,7 +243,7 @@ LGPL-2.1-or-later
The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
LGPL-3.0-only
......@@ -258,14 +258,14 @@ MIT
The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- JOpt Simple (from http://pholser.github.io/jopt-simple)
- JOpt Simple (from http://pholser.github.com/jopt-simple)
- JUL to SLF4J bridge (from http://www.slf4j.org)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
- Mockito (from http://www.mockito.org)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from http://projectlombok.org)
- SLF4J API Module (from http://www.slf4j.org)
- java jwt (from http://www.jwt.io)
- java jwt (from https://github.com/auth0/java-jwt)
========================================================================
MPL-1.1
......@@ -317,8 +317,8 @@ The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from https://www.joda.org/joda-time/)
- Project Lombok (from https://projectlombok.org)
- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
- Project Lombok (from http://projectlombok.org)
- Spring Web (from https://github.com/spring-projects/spring-framework)
========================================================================
unknown
......
......@@ -22,14 +22,45 @@ public final class Constants {
public static final String INDEXER_QUEUE_IDENTIFIER = "indexer-queue-osdu";
public static final String PROPERTIES = "properties";
public static final String DATA = "data";
public static final String CRS = "crs";
public static final String TYPE = "type";
public static final String KEYWORD = "keyword";
public static final String KIND = "kind";
public static final String BBOX = "bbox";
public static final String META = "meta";
public static final String DATA = "data";
public static final String POINT = "Point";
public static final String FIELDS = "fields";
public static final String POINTS = "points";
public static final String KEYWORD = "keyword";
public static final String FEATURE = "Feature";
public static final String POLYGON = "Polygon";
public static final String GEOMETRY = "geometry";
public static final String FEATURES = "features";
public static final String GEOMETRIES = "geometries";
public static final String PROPERTIES = "properties";
public static final String MULTIPOINT = "MultiPoint";
public static final String LINE_STRING = "LineString";
public static final String COORDINATES = "coordinates";
public static final String MULTIPOLYGON = "MultiPolygon";
public static final String ANY_CRS_POINT = "AnyCrsPoint";
public static final String PROPERTY_NAMES = "propertyNames";
public static final String ANY_CRS_POLYGON = "AnyCrsPolygon";
public static final String ANY_CRS_FEATURE = "AnyCrsFeature";
public static final String MULTILINE_STRING = "MultiLineString";
public static final String WGS84_COORDINATES = "Wgs84Coordinates";
public static final String ANY_CRS_MULTIPOINT = "AnyCrsMultiPoint";
public static final String FEATURE_COLLECTION = "FeatureCollection";
public static final String ANY_CRS_LINE_STRING = "AnyCrsLineString";
public static final String GEOMETRYCOLLECTION = "GeometryCollection";
public static final String ANY_CRS_MULTIPOLYGON = "AnyCrsMultiPolygon";
public static final String PERSISTABLE_REFERENCE = "persistableReference";
public static final String AS_INGESTED_COORDINATES = "AsIngestedCoordinates";
public static final String ANY_CRS_MULTILINE_STRING = "AnyCrsMultiLineString";
public static final String PERSISTABLE_REFERENCE_CRS = "persistableReferenceCrs";
public static final String ANY_CRS_FEATURE_COLLECTION = "AnyCrsFeatureCollection";
public static final String ANY_CRS_GEOMETRY_COLLECTION = "AnyCrsGeometryCollection";
public static final String PERSISTABLE_REFERENCE_UNIT_Z = "persistableReferenceUnitZ";
//headers needed to call storage and get converted data
public static final String SLB_FRAME_OF_REFERENCE_VALUE = "units=SI;crs=wgs84;elevation=msl;azimuth=true north;dates=utc;";
}
\ No newline at end of file
......@@ -129,4 +129,11 @@ public class RedisCache<K, V> implements ICache<K, V>, AutoCloseable {
public long getTtl(K key) {
return commands.pttl(key);
}
/**
* Gets redis INFO
*/
public String info() {
return commands.info();
}
}
......@@ -19,6 +19,7 @@ public class CrsConversionServiceErrorMessages {
* Please do not change these error messages as these are included in public interface.
* Or if you do need to change, just be aware those changes can be breaking changes to our consumers.
*/
public static final String MISSING_META_BLOCK = "CRS Conversion: Meta Block is missing or empty in this record, no conversion applied.";
public static final String MISSING_DATA_BLOCK = "CRS Conversion: DataBlock is missing or empty in this record, no conversion applied.";
public static final String ILLEGAL_METAITEM_ARRAY = "CRS conversion: error when extract metaItem array, error message: %s, no conversion applied.";
public static final String MISSING_META_KIND = "CRS conversion: Required property 'kind' in meta block is missing or empty, no conversion applied.";
......@@ -26,6 +27,15 @@ public class CrsConversionServiceErrorMessages {
public static final String ILLEGAL_PROPERTY_NAMES = "CRS conversion: 'propertyNames' illegal, no conversion applied.";
public static final String MISSING_REFERENCE = "CRS conversion: 'persistableReference' missing, no conversion applied.";
public static final String MISSING_PROPERTY = "CRS conversion: property '%s' is missing in datablock, no conversion applied to this property and its corresponding pairing property.";
public static final String MISSING_FEATURES = "CRS conversion: 'features' missing, no conversion applied.";
public static final String MISSING_COORDINATES = "CRS conversion: Coordinates values are empty, no conversion applied.";
public static final String MISSING_AS_INGESTED_COORDINATES = "CRS conversion: 'AsIngestedCoordinates' missing in data block, no conversion applied.";
public static final String MISSING_AS_INGESTED_TYPE = "CRS conversion: 'AsIngestedCoordinates' type: %s, is not valid, no conversion applied.";
public static final String WGS84COORDINATES_EXISTS = "CRS conversion: 'Wgs84Coordinates' block exists, no conversion applied.";
public static final String MISSING_GEOMETRY = "CRS conversion: 'geometry' missing in AsIngestedCoordinates block, no conversion applied.";
public static final String MISSING_GEOMETRIES = "CRS conversion: 'geometries' missing in AsIngestedCoordinates block, no conversion applied.";
public static final String INVALID_GEOMETRIES = "CRS conversion: Invalid 'geometries' type %s, no conversion applied.";
public static final String INVALID_GEOMETRY = "CRS conversion: Invalid 'geometry' type %s, no conversion applied.";
public static final String PROPERTY_VALUE_CAST_ERROR = "CRS conversion: cannot cast the value of property '%s' to double, error message: %s, no conversion applied.";
public static final String ILLEGAL_PROPERTY_VALUE = "CRS conversion: illegal value for property '%s', error message: %s, no conversion applied.";
public static final String INVALID_NESTED_PROPERTY_NAME = "CRS conversion: invalid nested property name: '%s', no conversion applied.";
......
......@@ -56,6 +56,13 @@ public class CrsConverterService implements ICrsConverterService {
return this.getResult(result, ConvertTrajectoryResponse.class);
}
@Override
public ConvertGeoJsonResponse convertGeoJson(ConvertGeoJsonRequest request) throws CrsConverterException {
String url = this.createUrl("/convertGeoJson");
HttpResponse result = this.httpClient.send(HttpRequest.post(request).url(url).headers(this.headers.getHeaders()).build());
return this.getResult(result, ConvertGeoJsonResponse.class);
}
private CrsConverterException generateException(HttpResponse result) {
return new CrsConverterException(
"Error making request to CrsConverter service. Check the inner HttpResponse for more info.", result);
......
......@@ -20,4 +20,6 @@ public interface ICrsConverterService {
ConvertPointsResponse convertPoints(ConvertPointsRequest request) throws CrsConverterException;
ConvertTrajectoryResponse convertTrajectory(ConvertTrajectoryRequest request) throws CrsConverterException;
ConvertGeoJsonResponse convertGeoJson(ConvertGeoJsonRequest request) throws CrsConverterException;
}
\ No newline at end of file
......@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package org.opengroup.osdu.core.common.cryptographic;
public class SignatureServiceException extends Exception {
private static final long serialVersionUID = -4393652925816393733L;
SignatureServiceException(String errorMessage) {
super(errorMessage);
}
SignatureServiceException(String errorMessage, Exception e) {
super(errorMessage);
this.initCause(e);
}
}
package org.opengroup.osdu.core.common.cryptographic;
public class SignatureServiceException extends Exception {
private static final long serialVersionUID = -4393652925816393733L;
public SignatureServiceException(String errorMessage) {
super(errorMessage);
}
public SignatureServiceException(String errorMessage, Exception e) {
super(errorMessage);
this.initCause(e);
}
}
/*
* 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.core.common.info;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import lombok.extern.slf4j.Slf4j;
import org.opengroup.osdu.core.common.model.info.ConnectedOuterService;
import org.opengroup.osdu.core.common.model.info.VersionInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class CloudVersionInfoBuilder implements VersionInfoBuilder {
private final Properties buildInfoProperties = new Properties();
private final Properties gitProperties = new Properties();
private final VersionInfoProperties versionInfoProperties;
@Autowired(required = false)
private ConnectedOuterServicesBuilder outerServicesBuilder;
public CloudVersionInfoBuilder(VersionInfoProperties versionInfoProperties) {
this.versionInfoProperties = versionInfoProperties;
}
public VersionInfo buildVersionInfo() throws IOException {
loadBuildInfoProperties();
loadGitProperties();
List<ConnectedOuterService> connectedOuterServices = loadConnectedOuterServices();
return VersionInfo.builder()
.groupId(buildInfoProperties.getProperty("build.group"))
.artifactId(buildInfoProperties.getProperty("build.artifact"))
.version(buildInfoProperties.getProperty("build.version"))
.buildTime(buildInfoProperties.getProperty("build.time"))
.branch(gitProperties.getProperty("git.branch"))
.commitId(gitProperties.getProperty("git.commit.id"))
.commitMessage(gitProperties.getProperty("git.commit.message.short"))
.connectedOuterServices(connectedOuterServices)
.build();
}
private void loadBuildInfoProperties() throws IOException {
InputStream buildInfoStream =
this.getClass().getResourceAsStream(versionInfoProperties.getBuildPropertiesPath());
if (buildInfoStream != null) {
buildInfoProperties.load(buildInfoStream);
} else {
log.error(
"Build-info properties file not found by path: {}",
versionInfoProperties.getBuildPropertiesPath());
}
}
private void loadGitProperties() throws IOException {
InputStream gitStream =
this.getClass().getResourceAsStream(versionInfoProperties.getGitPropertiesPath());
if (gitStream != null) {
gitProperties.load(gitStream);
} else {
log.error(
"Git properties file not found by path: {}",
versionInfoProperties.getGitPropertiesPath());
}
}
/**
* The method collects service-specific values for all outer services connected to OSDU service.
* To define outer services info for OSDU service need to inject ConnectedOuterServicesBuilder.
*/
private List<ConnectedOuterService> loadConnectedOuterServices() {
return outerServicesBuilder == null ? Collections.emptyList()
: outerServicesBuilder.buildConnectedOuterServices();
}
}
/*
* 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.core.common.info;
import java.util.List;
import org.opengroup.osdu.core.common.model.info.ConnectedOuterService;
public interface ConnectedOuterServicesBuilder {
List<ConnectedOuterService> buildConnectedOuterServices();
}
/*
* 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.core.common.info;
import lombok.extern.java.Log;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@Log
@ComponentScan("org.opengroup.osdu.core.common.info")
public class VersionInfoAutoconfiguration {}
/*
* 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.core.common.info;
import java.io.IOException;
import org.opengroup.osdu.core.common.model.info.VersionInfo;
public interface VersionInfoBuilder {
VersionInfo buildVersionInfo() throws IOException;
}
/*
* 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.core.common.info;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@ConfigurationProperties(prefix = "osdu.version.info")
@Getter
@Setter
public class VersionInfoProperties {
private String buildPropertiesPath = "/META-INF/build-info.properties";
private String gitPropertiesPath = "/BOOT-INF/classes/git.properties";
}
// Copyright 2017-2019, Schlumberger
//
// 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.opengroup.osdu.core.common.model.crs;
import lombok.Data;
import lombok.AllArgsConstructor;
import org.opengroup.osdu.core.common.model.crs.GeoJson.GeoJsonFeatureCollection;
@Data
@AllArgsConstructor
public class ConvertGeoJsonRequest {
private GeoJsonFeatureCollection featureCollection;
private String toCRS;
private String toUnitZ;
}
\ No newline at end of file
// Copyright 2017-2019, Schlumberger
//
// 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.opengroup.osdu.core.common.model.crs;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import org.opengroup.osdu.core.common.model.crs.GeoJson.GeoJsonFeatureCollection;