diff --git a/lexer/pom.xml b/lexer/pom.xml index e7a2c338..84919f7f 100644 --- a/lexer/pom.xml +++ b/lexer/pom.xml @@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE. 4.0.0 gov.nasa.pds - api-search-query-lexer + registry-api-lexer 1.1.0-SNAPSHOT jar - PDS API Search Query Lexer - Lexer for PDS API Search queries + ${project.groupId}:${project.artifactId} + PDS Registry API Search Query Lexer UTF-8 @@ -169,11 +169,5 @@ POSSIBILITY OF SUCH DAMAGE. - - https://github.com/NASA-PDS/api-search-query-lexer/tree/master - scm:git:git://github.com/NASA-PDS/api-search-query-lexer.git - scm:git:git@github.com:NASA-PDS/api-search-query-lexer.git - v1.0.0 - diff --git a/model/pom.xml b/model/pom.xml index 3a864aaa..b1de0c9a 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -33,10 +33,10 @@ 4.0.0 gov.nasa.pds - api + registry-api-model 0.5.0-SNAPSHOT - gov.nasa.api.lib - client and server stubs for the PDS federated API + ${project.groupId}:${project.artifactId} + PDS Registry API Controllers and Reponses Models 11 11 @@ -74,6 +74,7 @@ + @@ -272,10 +257,4 @@ - - - https://github.com/NASA-PDS/pds-api-javalib - scm:git:ssh://git@github.com/NASA-PDS/pds-api-javalib.git - scm:git:ssh://git@github.com/NASA-PDS/pds-api-javalib.git - diff --git a/pom.xml b/pom.xml index 9477d384..3d6b7464 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ Go through this file line-by-line and replace the template values with your own. - registry + registry-api UTF-8 @@ -87,7 +87,7 @@ Go through this file line-by-line and replace the template values with your own. ${project.groupId}:${project-name} - PDS registry api + PDS Registry Api 2021 @@ -96,6 +96,7 @@ Go through this file line-by-line and replace the template values with your own. GitHub https://github.com/NASA-PDS/${project-name}/issues + scm:git:https://github.com/NASA-PDS/${project-name}.git scm:git:ssh://github.com/NASA-PDS/${project-name}.git @@ -105,9 +106,11 @@ Go through this file line-by-line and replace the template values with your own. model lexer - api + service + + diff --git a/api/.github/CODEOWNERS b/service/.github/CODEOWNERS similarity index 100% rename from api/.github/CODEOWNERS rename to service/.github/CODEOWNERS diff --git a/api/.github/workflows/run-ci.yaml b/service/.github/workflows/run-ci.yaml similarity index 100% rename from api/.github/workflows/run-ci.yaml rename to service/.github/workflows/run-ci.yaml diff --git a/api/.github/workflows/stable-cicd.yaml b/service/.github/workflows/stable-cicd.yaml similarity index 100% rename from api/.github/workflows/stable-cicd.yaml rename to service/.github/workflows/stable-cicd.yaml diff --git a/api/.github/workflows/unstable-cicd.yaml b/service/.github/workflows/unstable-cicd.yaml similarity index 100% rename from api/.github/workflows/unstable-cicd.yaml rename to service/.github/workflows/unstable-cicd.yaml diff --git a/api/.gitignore b/service/.gitignore similarity index 100% rename from api/.gitignore rename to service/.gitignore diff --git a/api/.zenodo.json b/service/.zenodo.json similarity index 100% rename from api/.zenodo.json rename to service/.zenodo.json diff --git a/api/CHANGELOG.md b/service/CHANGELOG.md similarity index 100% rename from api/CHANGELOG.md rename to service/CHANGELOG.md diff --git a/api/LICENSE.md b/service/LICENSE.md similarity index 100% rename from api/LICENSE.md rename to service/LICENSE.md diff --git a/api/NOTICE.txt b/service/NOTICE.txt similarity index 100% rename from api/NOTICE.txt rename to service/NOTICE.txt diff --git a/api/README.md b/service/README.md similarity index 100% rename from api/README.md rename to service/README.md diff --git a/api/SECURITY.md b/service/SECURITY.md similarity index 100% rename from api/SECURITY.md rename to service/SECURITY.md diff --git a/api/docker/Dockerfile.http b/service/docker/Dockerfile.http similarity index 96% rename from api/docker/Dockerfile.http rename to service/docker/Dockerfile.http index 2c512e6f..23451d92 100644 --- a/api/docker/Dockerfile.http +++ b/service/docker/Dockerfile.http @@ -41,4 +41,4 @@ CMD ["java", \ # "-cp", "", \ "-cp", "/usr/local/registry-api-service", \ "-jar", "/usr/local/registry-api-service/registry-api-service.jar", \ - "gov.nasa.pds.api.engineering.SpringBootMain"] + "gov.nasa.pds.api.registry.SpringBootMain"] diff --git a/api/docker/Dockerfile.http.dev b/service/docker/Dockerfile.http.dev similarity index 96% rename from api/docker/Dockerfile.http.dev rename to service/docker/Dockerfile.http.dev index 1287100e..4c3b03dd 100644 --- a/api/docker/Dockerfile.http.dev +++ b/service/docker/Dockerfile.http.dev @@ -38,4 +38,4 @@ WORKDIR /usr/local/registry-api-service CMD ["java", \ "-cp", "/usr/local/registry-api-service", \ "-jar", "/usr/local/registry-api-service/registry-api-service.jar", \ - "gov.nasa.pds.api.engineering.SpringBootMain"] + "gov.nasa.pds.api.registry.SpringBootMain"] diff --git a/api/docker/Dockerfile.https b/service/docker/Dockerfile.https similarity index 96% rename from api/docker/Dockerfile.https rename to service/docker/Dockerfile.https index 5fd9d492..07e53d3c 100644 --- a/api/docker/Dockerfile.https +++ b/service/docker/Dockerfile.https @@ -48,4 +48,4 @@ CMD ["java", \ # "-cp", "", \ "-cp", "/usr/local/registry-api-service", \ "-jar", "/usr/local/registry-api-service/registry-api-service.jar", \ - "gov.nasa.pds.api.engineering.SpringBootMain"] + "gov.nasa.pds.api.registry.SpringBootMain"] diff --git a/api/docker/Dockerfile.https.dev b/service/docker/Dockerfile.https.dev similarity index 96% rename from api/docker/Dockerfile.https.dev rename to service/docker/Dockerfile.https.dev index c30c9925..0e7c97bf 100644 --- a/api/docker/Dockerfile.https.dev +++ b/service/docker/Dockerfile.https.dev @@ -43,4 +43,4 @@ WORKDIR /usr/local/registry-api-service CMD ["java", \ "-cp", "/usr/local/registry-api-service", \ "-jar", "/usr/local/registry-api-service/registry-api-service.jar", \ - "gov.nasa.pds.api.engineering.SpringBootMain"] + "gov.nasa.pds.api.registry.SpringBootMain"] diff --git a/api/docker/Dockerfile.local b/service/docker/Dockerfile.local similarity index 100% rename from api/docker/Dockerfile.local rename to service/docker/Dockerfile.local diff --git a/api/docker/README.txt b/service/docker/README.txt similarity index 100% rename from api/docker/README.txt rename to service/docker/README.txt diff --git a/api/docs/requirements/v0.2.0/REQUIREMENTS.md b/service/docs/requirements/v0.2.0/REQUIREMENTS.md similarity index 100% rename from api/docs/requirements/v0.2.0/REQUIREMENTS.md rename to service/docs/requirements/v0.2.0/REQUIREMENTS.md diff --git a/api/docs/requirements/v0.3.0/REQUIREMENTS.md b/service/docs/requirements/v0.3.0/REQUIREMENTS.md similarity index 100% rename from api/docs/requirements/v0.3.0/REQUIREMENTS.md rename to service/docs/requirements/v0.3.0/REQUIREMENTS.md diff --git a/api/docs/requirements/v0.3.1/REQUIREMENTS.md b/service/docs/requirements/v0.3.1/REQUIREMENTS.md similarity index 100% rename from api/docs/requirements/v0.3.1/REQUIREMENTS.md rename to service/docs/requirements/v0.3.1/REQUIREMENTS.md diff --git a/api/pom.xml b/service/pom.xml similarity index 97% rename from api/pom.xml rename to service/pom.xml index 5081dc61..abd416e7 100644 --- a/api/pom.xml +++ b/service/pom.xml @@ -35,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE. gov.nasa.pds registry-api-service 0.5.0-SNAPSHOT - gov.nasa.pds.api.registry-service - registry api service contributing to the PDS federated API + ${project.groupId}:${project.artifactId} + PDS Registry API Service 11 11 @@ -58,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE. - gov.nasa.pds.api.engineering.SpringBootMain + gov.nasa.pds.api.registry.SpringBootMain @@ -267,13 +267,13 @@ POSSIBILITY OF SUCH DAMAGE. gov.nasa.pds - api + registry-api-model 0.5.0-SNAPSHOT gov.nasa.pds - api-search-query-lexer + registry-api-lexer 1.1.0-SNAPSHOT diff --git a/api/src/main/assembly/tar-assembly.xml b/service/src/main/assembly/tar-assembly.xml similarity index 100% rename from api/src/main/assembly/tar-assembly.xml rename to service/src/main/assembly/tar-assembly.xml diff --git a/api/src/main/assembly/zip-assembly.xml b/service/src/main/assembly/zip-assembly.xml similarity index 100% rename from api/src/main/assembly/zip-assembly.xml rename to service/src/main/assembly/zip-assembly.xml diff --git a/api/src/main/java/gov/nasa/pds/api/model/xml/Pds4ProductWithXmlLabel.java b/service/src/main/java/gov/nasa/pds/api/model/xml/Pds4ProductWithXmlLabel.java similarity index 100% rename from api/src/main/java/gov/nasa/pds/api/model/xml/Pds4ProductWithXmlLabel.java rename to service/src/main/java/gov/nasa/pds/api/model/xml/Pds4ProductWithXmlLabel.java diff --git a/api/src/main/java/gov/nasa/pds/api/model/xml/ProductWithXmlLabel.java b/service/src/main/java/gov/nasa/pds/api/model/xml/ProductWithXmlLabel.java similarity index 100% rename from api/src/main/java/gov/nasa/pds/api/model/xml/ProductWithXmlLabel.java rename to service/src/main/java/gov/nasa/pds/api/model/xml/ProductWithXmlLabel.java diff --git a/api/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java b/service/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java similarity index 93% rename from api/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java rename to service/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java index 984c7828..233f1ad0 100644 --- a/api/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java +++ b/service/src/main/java/gov/nasa/pds/api/model/xml/XMLMashallableProperyValue.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import gov.nasa.pds.api.engineering.serializer.XmlProductSerializer; +import gov.nasa.pds.api.registry.serializer.XmlProductSerializer; import gov.nasa.pds.model.PropertyArrayValues; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/SpringBootMain.java b/service/src/main/java/gov/nasa/pds/api/registry/SpringBootMain.java similarity index 84% rename from api/src/main/java/gov/nasa/pds/api/engineering/SpringBootMain.java rename to service/src/main/java/gov/nasa/pds/api/registry/SpringBootMain.java index 9afc64a3..aaf9ac4f 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/SpringBootMain.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/SpringBootMain.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering; +package gov.nasa.pds.api.registry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; @@ -12,7 +12,7 @@ @SpringBootApplication @EnableSwagger2 -@ComponentScan(basePackages = { "gov.nasa.pds.api.engineering.configuration ", "gov.nasa.pds.api.engineering.controllers", "gov.nasa.pds.api.engineering.elasticsearch"}) +@ComponentScan(basePackages = { "gov.nasa.pds.api.registry.configuration ", "gov.nasa.pds.api.registry.controllers", "gov.nasa.pds.api.registry.elasticsearch"}) public class SpringBootMain implements CommandLineRunner { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/SystemConstants.java b/service/src/main/java/gov/nasa/pds/api/registry/SystemConstants.java similarity index 95% rename from api/src/main/java/gov/nasa/pds/api/engineering/SystemConstants.java rename to service/src/main/java/gov/nasa/pds/api/registry/SystemConstants.java index 2a3b99eb..21104905 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/SystemConstants.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/SystemConstants.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering; +package gov.nasa.pds.api.registry; public class SystemConstants { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccess.java b/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java similarity index 99% rename from api/src/main/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccess.java rename to service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java index c620f7bc..8f25e710 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccess.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.configuration; +package gov.nasa.pds.api.registry.configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/HomeController.java b/service/src/main/java/gov/nasa/pds/api/registry/configuration/HomeController.java similarity index 92% rename from api/src/main/java/gov/nasa/pds/api/engineering/configuration/HomeController.java rename to service/src/main/java/gov/nasa/pds/api/registry/configuration/HomeController.java index ebe51c7d..eb14afc5 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/HomeController.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/configuration/HomeController.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.configuration; +package gov.nasa.pds.api.registry.configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/SwaggerDocumentationConfig.java b/service/src/main/java/gov/nasa/pds/api/registry/configuration/SwaggerDocumentationConfig.java similarity index 95% rename from api/src/main/java/gov/nasa/pds/api/engineering/configuration/SwaggerDocumentationConfig.java rename to service/src/main/java/gov/nasa/pds/api/registry/configuration/SwaggerDocumentationConfig.java index 2b73e357..02737986 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/SwaggerDocumentationConfig.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/configuration/SwaggerDocumentationConfig.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.configuration; +package gov.nasa.pds.api.registry.configuration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,7 +31,7 @@ ApiInfo apiInfo() { public Docket customImplementation(){ return new Docket(DocumentationType.SWAGGER_2) .select() - .apis(RequestHandlerSelectors.basePackage("gov.nasa.pds.api.engineering")) + .apis(RequestHandlerSelectors.basePackage("gov.nasa.pds.api.registry")) .build() .directModelSubstitute(org.joda.time.LocalDate.class, java.sql.Date.class) .directModelSubstitute(org.joda.time.DateTime.class, java.util.Date.class) diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/WebMVCConfig.java b/service/src/main/java/gov/nasa/pds/api/registry/configuration/WebMVCConfig.java similarity index 72% rename from api/src/main/java/gov/nasa/pds/api/engineering/configuration/WebMVCConfig.java rename to service/src/main/java/gov/nasa/pds/api/registry/configuration/WebMVCConfig.java index 893cd531..6c1f3f05 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/configuration/WebMVCConfig.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/configuration/WebMVCConfig.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.configuration; +package gov.nasa.pds.api.registry.configuration; import java.util.List; @@ -14,23 +14,22 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import gov.nasa.pds.api.engineering.serializer.CsvPluralSerializer; -import gov.nasa.pds.api.engineering.serializer.CsvSingularSerializer; -import gov.nasa.pds.api.engineering.serializer.JsonPluralSerializer; -import gov.nasa.pds.api.engineering.serializer.JsonProductSerializer; -import gov.nasa.pds.api.engineering.serializer.JsonSingularSerializer; -import gov.nasa.pds.api.engineering.serializer.Pds4JsonProductSerializer; -import gov.nasa.pds.api.engineering.serializer.Pds4JsonProductsSerializer; -import gov.nasa.pds.api.engineering.serializer.Pds4XmlProductSerializer; -import gov.nasa.pds.api.engineering.serializer.PdsProductTextHtmlSerializer; -import gov.nasa.pds.api.engineering.serializer.PdsProductsTextHtmlSerializer; - -import gov.nasa.pds.api.engineering.serializer.XmlProductSerializer; +import gov.nasa.pds.api.registry.serializer.CsvPluralSerializer; +import gov.nasa.pds.api.registry.serializer.CsvSingularSerializer; +import gov.nasa.pds.api.registry.serializer.JsonPluralSerializer; +import gov.nasa.pds.api.registry.serializer.JsonProductSerializer; +import gov.nasa.pds.api.registry.serializer.JsonSingularSerializer; +import gov.nasa.pds.api.registry.serializer.Pds4JsonProductSerializer; +import gov.nasa.pds.api.registry.serializer.Pds4JsonProductsSerializer; +import gov.nasa.pds.api.registry.serializer.Pds4XmlProductSerializer; +import gov.nasa.pds.api.registry.serializer.PdsProductTextHtmlSerializer; +import gov.nasa.pds.api.registry.serializer.PdsProductsTextHtmlSerializer; +import gov.nasa.pds.api.registry.serializer.XmlProductSerializer; @Configuration @EnableWebMvc -@ComponentScan(basePackages = { "gov.nasa.pds.api.engineering.configuration ", "gov.nasa.pds.api.engineering.controllers", "gov.nasa.pds.api.engineering.elasticsearch"}) +@ComponentScan(basePackages = { "gov.nasa.pds.api.registry.configuration ", "gov.nasa.pds.api.registry.controllers", "gov.nasa.pds.api.registry.elasticsearch"}) public class WebMVCConfig implements WebMvcConfigurer { private static final Logger log = LoggerFactory.getLogger(WebMVCConfig.class); diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyBundlesApiController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyBundlesApiController.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyBundlesApiController.java rename to service/src/main/java/gov/nasa/pds/api/registry/controllers/MyBundlesApiController.java index e17cc77c..4882e470 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyBundlesApiController.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyBundlesApiController.java @@ -1,14 +1,14 @@ -package gov.nasa.pds.api.engineering.controllers; +package gov.nasa.pds.api.registry.controllers; import gov.nasa.pds.api.base.BundlesApi; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.business.LidVidNotFoundException; -import gov.nasa.pds.api.engineering.elasticsearch.business.ProductVersionSelector; -import gov.nasa.pds.api.engineering.elasticsearch.business.RequestAndResponseContext; -import gov.nasa.pds.api.engineering.exceptions.ApplicationTypeException; -import gov.nasa.pds.api.engineering.exceptions.NothingFoundException; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.business.LidVidNotFoundException; +import gov.nasa.pds.api.registry.elasticsearch.business.ProductVersionSelector; +import gov.nasa.pds.api.registry.elasticsearch.business.RequestAndResponseContext; +import gov.nasa.pds.api.registry.exceptions.ApplicationTypeException; +import gov.nasa.pds.api.registry.exceptions.NothingFoundException; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.*; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyCollectionsApiController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyCollectionsApiController.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyCollectionsApiController.java rename to service/src/main/java/gov/nasa/pds/api/registry/controllers/MyCollectionsApiController.java index 7533bceb..0050daf8 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyCollectionsApiController.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyCollectionsApiController.java @@ -1,10 +1,13 @@ -package gov.nasa.pds.api.engineering.controllers; +package gov.nasa.pds.api.registry.controllers; import gov.nasa.pds.api.base.CollectionsApi; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; - +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.business.LidVidNotFoundException; +import gov.nasa.pds.api.registry.elasticsearch.business.RequestAndResponseContext; +import gov.nasa.pds.api.registry.exceptions.ApplicationTypeException; +import gov.nasa.pds.api.registry.exceptions.NothingFoundException; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.*; @@ -21,11 +24,6 @@ import javax.validation.Valid; import javax.servlet.http.HttpServletRequest; -import gov.nasa.pds.api.engineering.elasticsearch.business.LidVidNotFoundException; -import gov.nasa.pds.api.engineering.elasticsearch.business.RequestAndResponseContext; -import gov.nasa.pds.api.engineering.exceptions.ApplicationTypeException; -import gov.nasa.pds.api.engineering.exceptions.NothingFoundException; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiBareController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiBareController.java similarity index 92% rename from api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiBareController.java rename to service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiBareController.java index 901866b3..3490f2c7 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiBareController.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiBareController.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.controllers; +package gov.nasa.pds.api.registry.controllers; import java.io.IOException; import java.net.MalformedURLException; @@ -24,15 +24,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.business.RequestAndResponseContext; -import gov.nasa.pds.api.engineering.elasticsearch.business.LidVidNotFoundException; -import gov.nasa.pds.api.engineering.elasticsearch.business.LidVidUtils; -import gov.nasa.pds.api.engineering.elasticsearch.business.ProductBusinessObject; -import gov.nasa.pds.api.engineering.exceptions.ApplicationTypeException; -import gov.nasa.pds.api.engineering.exceptions.NothingFoundException; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.business.LidVidNotFoundException; +import gov.nasa.pds.api.registry.elasticsearch.business.LidVidUtils; +import gov.nasa.pds.api.registry.elasticsearch.business.ProductBusinessObject; +import gov.nasa.pds.api.registry.elasticsearch.business.RequestAndResponseContext; +import gov.nasa.pds.api.registry.exceptions.ApplicationTypeException; +import gov.nasa.pds.api.registry.exceptions.NothingFoundException; @Component public class MyProductsApiBareController { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiController.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiController.java rename to service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiController.java index 990c4bd2..733348c9 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/controllers/MyProductsApiController.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/controllers/MyProductsApiController.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.controllers; +package gov.nasa.pds.api.registry.controllers; import java.io.IOException; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import gov.nasa.pds.api.base.ProductsApi; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.business.LidVidNotFoundException; -import gov.nasa.pds.api.engineering.elasticsearch.business.RequestAndResponseContext; -import gov.nasa.pds.api.engineering.exceptions.ApplicationTypeException; -import gov.nasa.pds.api.engineering.exceptions.NothingFoundException; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.business.LidVidNotFoundException; +import gov.nasa.pds.api.registry.elasticsearch.business.RequestAndResponseContext; +import gov.nasa.pds.api.registry.exceptions.ApplicationTypeException; +import gov.nasa.pds.api.registry.exceptions.NothingFoundException; import io.swagger.annotations.ApiParam; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListener.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Antlr4SearchListener.java similarity index 99% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListener.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Antlr4SearchListener.java index a91a5229..bda2a975 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListener.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Antlr4SearchListener.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/BlobUtil.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/BlobUtil.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/BlobUtil.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/BlobUtil.java index 7a38ae6d..48752ea9 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/BlobUtil.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/BlobUtil.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchConfig.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchConfig.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchConfig.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchConfig.java index 966e488e..28b8b714 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchConfig.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchConfig.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.util.List; import org.slf4j.Logger; @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import gov.nasa.pds.api.engineering.SystemConstants; -import gov.nasa.pds.api.engineering.configuration.AWSSecretsAccess; -import gov.nasa.pds.api.engineering.elasticsearch.business.ProductBusinessObject; +import gov.nasa.pds.api.registry.SystemConstants; +import gov.nasa.pds.api.registry.configuration.AWSSecretsAccess; +import gov.nasa.pds.api.registry.elasticsearch.business.ProductBusinessObject; @Configuration diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchHitIterator.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchHitIterator.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchHitIterator.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchHitIterator.java index e57a5bb5..6353492b 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchHitIterator.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchHitIterator.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.io.IOException; import java.util.Iterator; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnection.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnection.java similarity index 84% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnection.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnection.java index d9d32ecd..548a1e92 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnection.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnection.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import org.elasticsearch.client.RestHighLevelClient; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnectionImpl.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnectionImpl.java similarity index 99% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnectionImpl.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnectionImpl.java index bc0b2723..938ad8e8 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistryConnectionImpl.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistryConnectionImpl.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.util.List; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java index d201f8a9..2344e2dc 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchRegistrySearchRequestBuilder.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.util.ArrayList; import java.util.HashMap; @@ -10,6 +10,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import gov.nasa.pds.api.registry.elasticsearch.business.CollectionProductRefBusinessObject; +import gov.nasa.pds.api.registry.elasticsearch.business.ProductQueryBuilderUtil; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntitytProductWithBlob; + import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.search.builder.SearchSourceBuilder; @@ -21,11 +26,6 @@ import org.elasticsearch.index.query.PrefixQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.business.CollectionProductRefBusinessObject; -import gov.nasa.pds.api.engineering.elasticsearch.business.ProductQueryBuilderUtil; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntitytProductWithBlob; - public class ElasticSearchRegistrySearchRequestBuilder { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchUtil.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchUtil.java similarity index 95% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchUtil.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchUtil.java index fcc9293b..a81e4cde 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchUtil.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/ElasticSearchUtil.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.io.IOException; import java.net.URI; @@ -17,12 +17,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntitytProductWithBlob; -import gov.nasa.pds.api.engineering.exceptions.UnsupportedElasticSearchProperty; import gov.nasa.pds.model.Metadata; import gov.nasa.pds.model.PdsProduct; import gov.nasa.pds.api.model.xml.ProductWithXmlLabel; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntitytProductWithBlob; +import gov.nasa.pds.api.registry.exceptions.UnsupportedElasticSearchProperty; import gov.nasa.pds.model.Reference; import gov.nasa.pds.model.Summary; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Pds4JsonSearchRequestBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Pds4JsonSearchRequestBuilder.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Pds4JsonSearchRequestBuilder.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Pds4JsonSearchRequestBuilder.java index 90eaa623..aa2b2acc 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/Pds4JsonSearchRequestBuilder.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/Pds4JsonSearchRequestBuilder.java @@ -1,12 +1,12 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; -import gov.nasa.pds.api.engineering.elasticsearch.business.RequestAndResponseContext; -import gov.nasa.pds.api.engineering.elasticsearch.business.ProductQueryBuilderUtil; +import gov.nasa.pds.api.registry.elasticsearch.business.ProductQueryBuilderUtil; +import gov.nasa.pds.api.registry.elasticsearch.business.RequestAndResponseContext; public class Pds4JsonSearchRequestBuilder diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/SearchRequestBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/SearchRequestBuilder.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/SearchRequestBuilder.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/SearchRequestBuilder.java index 140c3b23..20bfb5a6 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/SearchRequestBuilder.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/SearchRequestBuilder.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch; +package gov.nasa.pds.api.registry.elasticsearch; import java.util.concurrent.TimeUnit; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/BundleDAO.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/BundleDAO.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/BundleDAO.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/BundleDAO.java index d5a35665..913e677e 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/BundleDAO.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/BundleDAO.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.util.ArrayList; @@ -14,7 +14,7 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; /** * Bundle Data Access Object (DAO). diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductIterator.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductIterator.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductIterator.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductIterator.java index 94b378e6..120a974b 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductIterator.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductIterator.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.util.ArrayList; @@ -17,9 +17,9 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.controllers.MyCollectionsApiController; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.controllers.MyCollectionsApiController; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; public class CollectionProductIterator implements Iterator { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRefBusinessObject.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRefBusinessObject.java similarity index 81% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRefBusinessObject.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRefBusinessObject.java index d1f174ea..fd294b6f 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRefBusinessObject.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRefBusinessObject.java @@ -1,8 +1,8 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; public class CollectionProductRefBusinessObject { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRelationships.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRelationships.java similarity index 89% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRelationships.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRelationships.java index 0a1ecfd7..8b0e0a73 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/CollectionProductRelationships.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/CollectionProductRelationships.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.util.Iterator; @@ -13,10 +13,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import gov.nasa.pds.api.engineering.controllers.MyCollectionsApiController; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.controllers.MyCollectionsApiController; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; public class CollectionProductRelationships implements Iterable { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ESResponseUtils.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ESResponseUtils.java similarity index 91% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ESResponseUtils.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ESResponseUtils.java index f9d254f3..ea8b5e8f 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ESResponseUtils.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ESResponseUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.util.Arrays; import java.util.List; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidDAO.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidDAO.java similarity index 92% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidDAO.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidDAO.java index 51491148..5395bebc 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidDAO.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidDAO.java @@ -1,11 +1,11 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.List; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; public class LidVidDAO { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidNotFoundException.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidNotFoundException.java similarity index 80% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidNotFoundException.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidNotFoundException.java index 6dae310f..ffc521bb 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidNotFoundException.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidNotFoundException.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; public class LidVidNotFoundException extends Exception { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidUtils.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidUtils.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidUtils.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidUtils.java index a066b717..5ecdaa23 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/LidVidUtils.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/LidVidUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.util.ArrayList; @@ -22,7 +22,7 @@ import org.elasticsearch.search.sort.FieldSortBuilder; import org.elasticsearch.search.sort.SortOrder; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; /** diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4JsonProductFactory.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4JsonProductFactory.java similarity index 98% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4JsonProductFactory.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4JsonProductFactory.java index 58dee8ce..2210ba7a 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4JsonProductFactory.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4JsonProductFactory.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4ProductBusinessObject.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4ProductBusinessObject.java similarity index 93% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4ProductBusinessObject.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4ProductBusinessObject.java index b7cca62a..cf6e4117 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/Pds4ProductBusinessObject.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/Pds4ProductBusinessObject.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.net.URL; import java.util.ArrayList; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.Pds4JsonSearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.Pds4JsonSearchRequestBuilder; import gov.nasa.pds.model.Pds4Product; import gov.nasa.pds.model.Pds4Products; import gov.nasa.pds.model.Summary; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/PdsProductBusinessObject.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/PdsProductBusinessObject.java similarity index 92% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/PdsProductBusinessObject.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/PdsProductBusinessObject.java index 17de9337..d1ea0bbe 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/PdsProductBusinessObject.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/PdsProductBusinessObject.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.net.URL; import java.util.ArrayList; @@ -13,9 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchUtil; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchUtil; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; import gov.nasa.pds.model.PdsProduct; import gov.nasa.pds.model.PdsProducts; import gov.nasa.pds.model.PropertyArrayValues; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessLogic.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessLogic.java similarity index 84% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessLogic.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessLogic.java index 3a680bc6..efb67139 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessLogic.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessLogic.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.net.URL; import java.util.List; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; import gov.nasa.pds.model.Summary; public interface ProductBusinessLogic diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessObject.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessObject.java similarity index 95% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessObject.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessObject.java index be3a8ded..53c800ff 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductBusinessObject.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductBusinessObject.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.net.URL; @@ -23,13 +23,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchUtil; -import gov.nasa.pds.api.engineering.elasticsearch.Pds4JsonSearchRequestBuilder; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntityProduct; -import gov.nasa.pds.api.engineering.elasticsearch.entities.EntitytProductWithBlob; -import gov.nasa.pds.api.engineering.exceptions.UnsupportedElasticSearchProperty; import gov.nasa.pds.api.model.xml.ProductWithXmlLabel; import gov.nasa.pds.model.Pds4Product; import gov.nasa.pds.model.Pds4Products; @@ -37,6 +30,13 @@ import gov.nasa.pds.model.PropertyArrayValues; import gov.nasa.pds.model.Summary; import gov.nasa.pds.api.model.xml.XMLMashallableProperyValue; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchUtil; +import gov.nasa.pds.api.registry.elasticsearch.Pds4JsonSearchRequestBuilder; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntityProduct; +import gov.nasa.pds.api.registry.elasticsearch.entities.EntitytProductWithBlob; +import gov.nasa.pds.api.registry.exceptions.UnsupportedElasticSearchProperty; public class ProductBusinessObject diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductQueryBuilderUtil.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductQueryBuilderUtil.java similarity index 95% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductQueryBuilderUtil.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductQueryBuilderUtil.java index 1dc75c48..8921d812 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductQueryBuilderUtil.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductQueryBuilderUtil.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.util.List; import java.util.Map; @@ -17,10 +17,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import gov.nasa.pds.api.engineering.elasticsearch.Antlr4SearchListener; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchUtil; import gov.nasa.pds.api.engineering.lexer.SearchLexer; import gov.nasa.pds.api.engineering.lexer.SearchParser; +import gov.nasa.pds.api.registry.elasticsearch.Antlr4SearchListener; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchUtil; public class ProductQueryBuilderUtil diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductVersionSelector.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductVersionSelector.java similarity index 88% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductVersionSelector.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductVersionSelector.java index cbf278d4..b77f79ec 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/ProductVersionSelector.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/ProductVersionSelector.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; /** * Used by API calls, such as "/bundles/{lidvid}/collections", diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/RequestAndResponseContext.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/RequestAndResponseContext.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/RequestAndResponseContext.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/RequestAndResponseContext.java index 65aaee52..a38c2d40 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/RequestAndResponseContext.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/RequestAndResponseContext.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.io.IOException; import java.net.URL; @@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ibm.icu.util.StringTokenizer; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchUtil; -import gov.nasa.pds.api.engineering.exceptions.ApplicationTypeException; -import gov.nasa.pds.api.engineering.exceptions.NothingFoundException; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchUtil; +import gov.nasa.pds.api.registry.exceptions.ApplicationTypeException; +import gov.nasa.pds.api.registry.exceptions.NothingFoundException; import gov.nasa.pds.model.Summary; public class RequestAndResponseContext diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/WyriwygBusinessObject.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/WyriwygBusinessObject.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/WyriwygBusinessObject.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/WyriwygBusinessObject.java index 22da4409..46f9ce68 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/business/WyriwygBusinessObject.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/business/WyriwygBusinessObject.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.business; +package gov.nasa.pds.api.registry.elasticsearch.business; import java.net.URL; import java.util.ArrayList; @@ -16,10 +16,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchHitIterator; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchUtil; -import gov.nasa.pds.api.engineering.exceptions.UnsupportedElasticSearchProperty; - +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchHitIterator; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchUtil; +import gov.nasa.pds.api.registry.exceptions.UnsupportedElasticSearchProperty; import gov.nasa.pds.model.Summary; import gov.nasa.pds.model.WyriwygProduct; import gov.nasa.pds.model.WyriwygProductKeyValuePairs; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntityProduct.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntityProduct.java similarity index 98% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntityProduct.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntityProduct.java index ce353ac7..2a3ec3cb 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntityProduct.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntityProduct.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.entities; +package gov.nasa.pds.api.registry.elasticsearch.entities; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntitytProductWithBlob.java b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntitytProductWithBlob.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntitytProductWithBlob.java rename to service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntitytProductWithBlob.java index 8c95a635..6195ee1b 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/elasticsearch/entities/EntitytProductWithBlob.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/elasticsearch/entities/EntitytProductWithBlob.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.elasticsearch.entities; +package gov.nasa.pds.api.registry.elasticsearch.entities; import java.io.ByteArrayOutputStream; import java.util.Base64; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/ApplicationTypeException.java b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/ApplicationTypeException.java similarity index 80% rename from api/src/main/java/gov/nasa/pds/api/engineering/exceptions/ApplicationTypeException.java rename to service/src/main/java/gov/nasa/pds/api/registry/exceptions/ApplicationTypeException.java index 633b53a3..209bc9f4 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/ApplicationTypeException.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/ApplicationTypeException.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.exceptions; +package gov.nasa.pds.api.registry.exceptions; public class ApplicationTypeException extends Exception { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/NothingFoundException.java b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/NothingFoundException.java similarity index 74% rename from api/src/main/java/gov/nasa/pds/api/engineering/exceptions/NothingFoundException.java rename to service/src/main/java/gov/nasa/pds/api/registry/exceptions/NothingFoundException.java index 64cacd73..6027c841 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/NothingFoundException.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/NothingFoundException.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.exceptions; +package gov.nasa.pds.api.registry.exceptions; public class NothingFoundException extends Exception { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/UnsupportedElasticSearchProperty.java b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/UnsupportedElasticSearchProperty.java similarity index 81% rename from api/src/main/java/gov/nasa/pds/api/engineering/exceptions/UnsupportedElasticSearchProperty.java rename to service/src/main/java/gov/nasa/pds/api/registry/exceptions/UnsupportedElasticSearchProperty.java index 47e65233..979ae28d 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/exceptions/UnsupportedElasticSearchProperty.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/exceptions/UnsupportedElasticSearchProperty.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.exceptions; +package gov.nasa.pds.api.registry.exceptions; public class UnsupportedElasticSearchProperty extends Exception { diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvPluralSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvPluralSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvPluralSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvPluralSerializer.java index ad2caedb..c1e46dbd 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvPluralSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvPluralSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvSingularSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvSingularSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvSingularSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvSingularSerializer.java index 7cf2e172..c2d6cc58 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/CsvSingularSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/CsvSingularSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonPluralSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonPluralSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonPluralSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonPluralSerializer.java index 431afe6d..1392fdb8 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonPluralSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonPluralSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonProductSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonProductSerializer.java similarity index 94% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonProductSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonProductSerializer.java index 34c059a4..42699d5e 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonProductSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonProductSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonSingularSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonSingularSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonSingularSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonSingularSerializer.java index eb65c5fa..ee9fad4c 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/JsonSingularSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/JsonSingularSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductSerializer.java similarity index 96% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductSerializer.java index ad7ec984..78477a2e 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.pds.api.engineering.elasticsearch.BlobUtil; +import gov.nasa.pds.api.registry.elasticsearch.BlobUtil; import gov.nasa.pds.model.Pds4Metadata; import gov.nasa.pds.model.Pds4Product; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductsSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductsSerializer.java similarity index 98% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductsSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductsSerializer.java index 2aa636bc..123853a8 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4JsonProductsSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4JsonProductsSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductSerializer.java index 96a6d507..373a427b 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import gov.nasa.pds.api.model.xml.ProductWithXmlLabel; import java.io.IOException; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductsSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductsSerializer.java similarity index 98% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductsSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductsSerializer.java index 300b074f..52cd8922 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/Pds4XmlProductsSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/Pds4XmlProductsSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductTextHtmlSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductTextHtmlSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductTextHtmlSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductTextHtmlSerializer.java index 2a465cea..4da7e0a4 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductTextHtmlSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductTextHtmlSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductsTextHtmlSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductsTextHtmlSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductsTextHtmlSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductsTextHtmlSerializer.java index 4d56e870..816a089f 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/PdsProductsTextHtmlSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/PdsProductsTextHtmlSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.OutputStream; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/WyriwygSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/WyriwygSerializer.java similarity index 98% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/WyriwygSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/WyriwygSerializer.java index ff7a4bca..96aa5118 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/WyriwygSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/WyriwygSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.io.IOException; import java.io.Writer; diff --git a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/XmlProductSerializer.java b/service/src/main/java/gov/nasa/pds/api/registry/serializer/XmlProductSerializer.java similarity index 97% rename from api/src/main/java/gov/nasa/pds/api/engineering/serializer/XmlProductSerializer.java rename to service/src/main/java/gov/nasa/pds/api/registry/serializer/XmlProductSerializer.java index 9852d47c..d7257815 100644 --- a/api/src/main/java/gov/nasa/pds/api/engineering/serializer/XmlProductSerializer.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/serializer/XmlProductSerializer.java @@ -1,4 +1,4 @@ -package gov.nasa.pds.api.engineering.serializer; +package gov.nasa.pds.api.registry.serializer; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/provisioning/main.tf b/service/src/main/provisioning/main.tf similarity index 100% rename from api/src/main/provisioning/main.tf rename to service/src/main/provisioning/main.tf diff --git a/api/src/main/provisioning/variables.tf b/service/src/main/provisioning/variables.tf similarity index 100% rename from api/src/main/provisioning/variables.tf rename to service/src/main/provisioning/variables.tf diff --git a/api/src/main/resources/application.properties b/service/src/main/resources/application.properties similarity index 100% rename from api/src/main/resources/application.properties rename to service/src/main/resources/application.properties diff --git a/api/src/main/resources/application.properties.aws b/service/src/main/resources/application.properties.aws similarity index 100% rename from api/src/main/resources/application.properties.aws rename to service/src/main/resources/application.properties.aws diff --git a/api/src/main/resources/application.properties.docker b/service/src/main/resources/application.properties.docker similarity index 100% rename from api/src/main/resources/application.properties.docker rename to service/src/main/resources/application.properties.docker diff --git a/api/src/main/resources/application.properties.local b/service/src/main/resources/application.properties.local similarity index 100% rename from api/src/main/resources/application.properties.local rename to service/src/main/resources/application.properties.local diff --git a/api/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java b/service/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java similarity index 89% rename from api/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java rename to service/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java index 8b03529b..552216a9 100644 --- a/api/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java +++ b/service/src/test/java/gov/nasa/pds/api/engineering/configuration/AWSSecretsAccessTest.java @@ -5,7 +5,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// import gov.nasa.pds.api.engineering.configuration.AWSSecretsAccess; +import gov.nasa.pds.api.registry.configuration.AWSSecretsAccess; + +// import gov.nasa.pds.api.registry.configuration.AWSSecretsAccess; public class AWSSecretsAccessTest { diff --git a/api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java b/service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java similarity index 99% rename from api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java rename to service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java index 4b365727..f178f17e 100644 --- a/api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java +++ b/service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/Antlr4SearchListenerTest.java @@ -17,6 +17,7 @@ import gov.nasa.pds.api.engineering.lexer.SearchLexer; import gov.nasa.pds.api.engineering.lexer.SearchParser; +import gov.nasa.pds.api.registry.elasticsearch.Antlr4SearchListener; public class Antlr4SearchListenerTest { diff --git a/api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java b/service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java similarity index 99% rename from api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java rename to service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java index 3000b269..e204d90c 100644 --- a/api/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java +++ b/service/src/test/java/gov/nasa/pds/api/engineering/elasticsearch/ElasticSearchRegistrySearchRequestBuilderTest.java @@ -1,7 +1,5 @@ package gov.nasa.pds.api.engineering.elasticsearch; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; - import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; @@ -25,6 +23,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistrySearchRequestBuilder; + //@ExtendWith(SpringExtension.class) //@SpringBootTest class ElasticSearchRegistrySearchRequestBuilderTest { diff --git a/api/src/test/java/tt/TestLidVidUtils.java b/service/src/test/java/tt/TestLidVidUtils.java similarity index 80% rename from api/src/test/java/tt/TestLidVidUtils.java rename to service/src/test/java/tt/TestLidVidUtils.java index e8a583d4..670aca6d 100644 --- a/api/src/test/java/tt/TestLidVidUtils.java +++ b/service/src/test/java/tt/TestLidVidUtils.java @@ -2,10 +2,9 @@ import java.util.List; - -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnection; -import gov.nasa.pds.api.engineering.elasticsearch.ElasticSearchRegistryConnectionImpl; -import gov.nasa.pds.api.engineering.elasticsearch.business.BundleDAO; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnection; +import gov.nasa.pds.api.registry.elasticsearch.ElasticSearchRegistryConnectionImpl; +import gov.nasa.pds.api.registry.elasticsearch.business.BundleDAO; public class TestLidVidUtils diff --git a/api/src/test/resources/postman_collection.json b/service/src/test/resources/postman_collection.json similarity index 100% rename from api/src/test/resources/postman_collection.json rename to service/src/test/resources/postman_collection.json diff --git a/api/terraform/ecs.tf b/service/terraform/ecs.tf similarity index 100% rename from api/terraform/ecs.tf rename to service/terraform/ecs.tf diff --git a/api/terraform/provider.tf b/service/terraform/provider.tf similarity index 100% rename from api/terraform/provider.tf rename to service/terraform/provider.tf diff --git a/api/terraform/secrets.tf b/service/terraform/secrets.tf similarity index 100% rename from api/terraform/secrets.tf rename to service/terraform/secrets.tf diff --git a/api/terraform/variables.tf b/service/terraform/variables.tf similarity index 100% rename from api/terraform/variables.tf rename to service/terraform/variables.tf diff --git a/api/verify/issue_33_56.py b/service/verify/issue_33_56.py similarity index 100% rename from api/verify/issue_33_56.py rename to service/verify/issue_33_56.py diff --git a/api/verify/issue_4_33.py b/service/verify/issue_4_33.py similarity index 100% rename from api/verify/issue_4_33.py rename to service/verify/issue_4_33.py diff --git a/api/verify/issue_54.py b/service/verify/issue_54.py similarity index 100% rename from api/verify/issue_54.py rename to service/verify/issue_54.py