Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning submodules and rename engineering package #72

Closed
wants to merge 2 commits into from
Closed

Cleaning submodules and rename engineering package #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96add19
clean at bit the submodule
Jan 7, 2022
de77e9d
rename engineering package as registry
Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions lexer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
<modelVersion>4.0.0</modelVersion>

<groupId>gov.nasa.pds</groupId>
<artifactId>api-search-query-lexer</artifactId>
<artifactId>registry-api-lexer</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDS API Search Query Lexer</name>
<description>Lexer for PDS API Search queries</description>
<name>${project.groupId}:${project.artifactId}</name>
<description>PDS Registry API Search Query Lexer</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -169,11 +169,5 @@ POSSIBILITY OF SUCH DAMAGE.
</plugins>
</build>

<scm>
<url>https://github.com/NASA-PDS/api-search-query-lexer/tree/master</url>
<connection>scm:git:git://github.com/NASA-PDS/api-search-query-lexer.git</connection>
<developerConnection>scm:git:[email protected]:NASA-PDS/api-search-query-lexer.git</developerConnection>
<tag>v1.0.0</tag>
</scm>

</project>
31 changes: 5 additions & 26 deletions model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nasa.pds</groupId>
<artifactId>api</artifactId>
<artifactId>registry-api-model</artifactId>
<version>0.5.0-SNAPSHOT</version>
<name>gov.nasa.api.lib</name>
<description>client and server stubs for the PDS federated API</description>
<name>${project.groupId}:${project.artifactId}</name>
<description>PDS Registry API Controllers and Reponses Models</description>
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
Expand Down Expand Up @@ -74,33 +74,18 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<sources>
<source>${project.build.directory}/api/target/generated-sources/swagger/src/gen/java/main</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>

Expand Down Expand Up @@ -272,10 +257,4 @@
</repository>
</repositories>


<scm>
<url>https://github.com/NASA-PDS/pds-api-javalib</url>
<connection>scm:git:ssh://[email protected]/NASA-PDS/pds-api-javalib.git</connection>
<developerConnection>scm:git:ssh://[email protected]/NASA-PDS/pds-api-javalib.git</developerConnection>
</scm>
</project>
9 changes: 6 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Go through this file line-by-line and replace the template values with your own.
<!-- My project metadata here -->
<properties>
<!-- Obviously put in your own project name instead of `myproject` -->
<project-name>registry</project-name>
<project-name>registry-api</project-name>

<!-- You'll want a Unicode-type encoding here in almost every case -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -87,7 +87,7 @@ Go through this file line-by-line and replace the template values with your own.

<name>${project.groupId}:${project-name}</name>
<description>
PDS registry api
PDS Registry Api
</description>
<!-- Check the calendar -->
<inceptionYear>2021</inceptionYear>
Expand All @@ -96,6 +96,7 @@ Go through this file line-by-line and replace the template values with your own.
<system>GitHub</system>
<url>https://github.com/NASA-PDS/${project-name}/issues</url>
</issueManagement>

<scm>
<connection>scm:git:https://github.com/NASA-PDS/${project-name}.git</connection>
<developerConnection>scm:git:ssh://github.com/NASA-PDS/${project-name}.git</developerConnection>
Expand All @@ -105,9 +106,11 @@ Go through this file line-by-line and replace the template values with your own.
<modules >
<module>model</module>
<module>lexer</module>
<module>api</module>
<module>service</module>
</modules>



<!-- Put the packages your project depends on here -->
<dependencies>
<!-- If you do any kind of testing—and you should—use Junit, which is the gold standard for Java -->
Expand Down
0 api/.github/CODEOWNERS → service/.github/CODEOWNERS
View file
Open in desktop
File renamed without changes.
0 api/.github/workflows/run-ci.yaml → service/.github/workflows/run-ci.yaml
View file
Open in desktop
File renamed without changes.
0 api/.github/workflows/stable-cicd.yaml → service/.github/workflows/stable-cicd.yaml
View file
Open in desktop
File renamed without changes.
0 api/.github/workflows/unstable-cicd.yaml → service/.github/workflows/unstable-cicd.yaml
View file
Open in desktop
File renamed without changes.
0 api/.gitignore → service/.gitignore
View file
Open in desktop
File renamed without changes.
0 api/.zenodo.json → service/.zenodo.json
View file
Open in desktop
File renamed without changes.
0 api/CHANGELOG.md → service/CHANGELOG.md
View file
Open in desktop
File renamed without changes.
0 api/LICENSE.md → service/LICENSE.md
View file
Open in desktop
File renamed without changes.
0 api/NOTICE.txt → service/NOTICE.txt
View file
Open in desktop
File renamed without changes.
0 api/README.md → service/README.md
View file
Open in desktop
File renamed without changes.
0 api/SECURITY.md → service/SECURITY.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/docker/Dockerfile.http → service/docker/Dockerfile.http
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ CMD ["java", \
# "-cp", "<bind_dir>", \
"-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"]
2 changes: 1 addition & 1 deletion api/docker/Dockerfile.http.dev → service/docker/Dockerfile.http.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion api/docker/Dockerfile.https → service/docker/Dockerfile.https
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ CMD ["java", \
# "-cp", "<bind_dir>", \
"-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"]
2 changes: 1 addition & 1 deletion api/docker/Dockerfile.https.dev → service/docker/Dockerfile.https.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
0 api/docker/Dockerfile.local → service/docker/Dockerfile.local
View file
Open in desktop
File renamed without changes.
0 api/docker/README.txt → service/docker/README.txt
View file
Open in desktop
File renamed without changes.
0 api/docs/requirements/v0.2.0/REQUIREMENTS.md → .../docs/requirements/v0.2.0/REQUIREMENTS.md
View file
Open in desktop
File renamed without changes.
0 api/docs/requirements/v0.3.0/REQUIREMENTS.md → .../docs/requirements/v0.3.0/REQUIREMENTS.md
View file
Open in desktop
File renamed without changes.
0 api/docs/requirements/v0.3.1/REQUIREMENTS.md → .../docs/requirements/v0.3.1/REQUIREMENTS.md
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions api/pom.xml → service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
<groupId>gov.nasa.pds</groupId>
<artifactId>registry-api-service</artifactId>
<version>0.5.0-SNAPSHOT</version>
<name>gov.nasa.pds.api.registry-service</name>
<description>registry api service contributing to the PDS federated API</description>
<name>${project.groupId}:${project.artifactId}</name>
<description>PDS Registry API Service</description>
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -58,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
<configuration>
<mainClass>gov.nasa.pds.api.engineering.SpringBootMain</mainClass>
<mainClass>gov.nasa.pds.api.registry.SpringBootMain</mainClass>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -267,13 +267,13 @@ POSSIBILITY OF SUCH DAMAGE.

<dependency>
<groupId>gov.nasa.pds</groupId>
<artifactId>api</artifactId>
<artifactId>registry-api-model</artifactId>
<version>0.5.0-SNAPSHOT</version>
</dependency>

<dependency>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Critical OSS Vulnerability:

pkg:maven/gov.nasa.pds/[email protected]

4 Critical, 0 Severe, 2 Moderate, 0 Unknown vulnerabilities have been found across 2 dependencies

Components
    pkg:maven/log4j/[email protected]
      CRITICAL Vulnerabilities (2)
        CVE-2019-17571

        [CVE-2019-17571] Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserializat...

        Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserialization of untrusted data which can be exploited to remotely execute arbitrary code when combined with a deserialization gadget when listening to untrusted network traffic for log data. This affects Log4j versions up to 1.2 up to 1.2.17.

        CVSS Score: 9.8

        CVSS Vector: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H

        CVE-2021-4104

        [CVE-2021-4104] JMSAppender in Log4j 1.2 is vulnerable to deserialization of untrusted data when...

        JMSAppender in Log4j 1.2 is vulnerable to deserialization of untrusted data when the attacker has write access to the Log4j configuration. The attacker can provide TopicBindingName and TopicConnectionFactoryBindingName configurations causing JMSAppender to perform JNDI requests that result in remote code execution in a similar fashion to CVE-2021-44228. Note this issue only affects Log4j 1.2 when specifically configured to use JMSAppender, which is not the default. Apache Log4j 1.2 reached end of life in August 2015. Users should upgrade to Log4j 2 as it addresses numerous other issues from the previous versions.

        ===================================================
        The following information is provided by Sonatype Nexus Intelligence. Nexus Intelligence is the only security research service that performs "secondary expansion" to determine if newly discovered vulnerabilities are also present in other components.

        Learn more about Nexus Intelligence -- https://www.sonatype.com/products/intelligence

        Explanation

        The log4j:log4j package is vulnerable to Deserialization of Untrusted Data. The lookup() and activateOptions() methods in the JMSAppender class allow JNDI lookup requests to be made when the TopicBindingName and TopicConnectionFactoryBindingName specify a trusted host. Lookups made to this host may be used by attackers to request a serialized malicious Java Object that can be deserialized and executed, leading to Remote Code Execution (RCE).

        Note that this vulnerability is different from CVE-2021-44228 and requires the attacker to be in control of the third party host that is specified in the configuration, or write access to the Log4j configuration file in order to specify a malicious lookup host directly. This vulnerability also only affects the 1.x.x component of Log4j released under the log4j:log4j group and artifact IDs.

        Advisory Deviation Notice: The Sonatype security research team discovered that the root cause of the vulnerability is in all versions of log4j:log4j, not just in the 1.2.x branch as the advisory states.

        Detection

        The application is vulnerable by using this component under the following circumstances:

        • The configuration file specifies an allowed third-party JNDI lookup host for the JMSAppender
        • the javax.jms.* API is included in the application's CLASSPATH

        Reference: https://bugzilla.redhat.com/show_bug.cgi?id=2031667#c28

        Recommendation

        The 1.x.x component has reach End of Life, and users should upgrade to a non-vulnerable version of org.apache.logging.log4j:log4j-core as this component includes other security vulnerabilities that are not fixed.

        References:

        CVSS Score: 8.1

        CVSS Vector: CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H

      MODERATE Vulnerabilities (1)

        [CVE-2020-9488] Improper validation of certificate with host mismatch in Apache Log4j SMTP appen...

        Improper validation of certificate with host mismatch in Apache Log4j SMTP appender. This could allow an SMTPS connection to be intercepted by a man-in-the-middle attack which could leak any log messages sent through that appender.

        CVSS Score: 3.7

        CVSS Vector: CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:N/A:N

    pkg:maven/log4j/[email protected]
      CRITICAL Vulnerabilities (2)
        CVE-2019-17571

        [CVE-2019-17571] Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserializat...

        Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserialization of untrusted data which can be exploited to remotely execute arbitrary code when combined with a deserialization gadget when listening to untrusted network traffic for log data. This affects Log4j versions up to 1.2 up to 1.2.17.

        CVSS Score: 9.8

        CVSS Vector: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H

        CVE-2021-4104

        [CVE-2021-4104] JMSAppender in Log4j 1.2 is vulnerable to deserialization of untrusted data when...

        JMSAppender in Log4j 1.2 is vulnerable to deserialization of untrusted data when the attacker has write access to the Log4j configuration. The attacker can provide TopicBindingName and TopicConnectionFactoryBindingName configurations causing JMSAppender to perform JNDI requests that result in remote code execution in a similar fashion to CVE-2021-44228. Note this issue only affects Log4j 1.2 when specifically configured to use JMSAppender, which is not the default. Apache Log4j 1.2 reached end of life in August 2015. Users should upgrade to Log4j 2 as it addresses numerous other issues from the previous versions.

        ===================================================
        The following information is provided by Sonatype Nexus Intelligence. Nexus Intelligence is the only security research service that performs "secondary expansion" to determine if newly discovered vulnerabilities are also present in other components.

        Learn more about Nexus Intelligence -- https://www.sonatype.com/products/intelligence

        Explanation

        The log4j:log4j package is vulnerable to Deserialization of Untrusted Data. The lookup() and activateOptions() methods in the JMSAppender class allow JNDI lookup requests to be made when the TopicBindingName and TopicConnectionFactoryBindingName specify a trusted host. Lookups made to this host may be used by attackers to request a serialized malicious Java Object that can be deserialized and executed, leading to Remote Code Execution (RCE).

        Note that this vulnerability is different from CVE-2021-44228 and requires the attacker to be in control of the third party host that is specified in the configuration, or write access to the Log4j configuration file in order to specify a malicious lookup host directly. This vulnerability also only affects the 1.x.x component of Log4j released under the log4j:log4j group and artifact IDs.

        Advisory Deviation Notice: The Sonatype security research team discovered that the root cause of the vulnerability is in all versions of log4j:log4j, not just in the 1.2.x branch as the advisory states.

        Detection

        The application is vulnerable by using this component under the following circumstances:

        • The configuration file specifies an allowed third-party JNDI lookup host for the JMSAppender
        • the javax.jms.* API is included in the application's CLASSPATH

        Reference: https://bugzilla.redhat.com/show_bug.cgi?id=2031667#c28

        Recommendation

        The 1.x.x component has reach End of Life, and users should upgrade to a non-vulnerable version of org.apache.logging.log4j:log4j-core as this component includes other security vulnerabilities that are not fixed.

        References:

        CVSS Score: 8.1

        CVSS Vector: CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H

      MODERATE Vulnerabilities (1)

        [CVE-2020-9488] Improper validation of certificate with host mismatch in Apache Log4j SMTP appen...

        Improper validation of certificate with host mismatch in Apache Log4j SMTP appender. This could allow an SMTPS connection to be intercepted by a man-in-the-middle attack which could leak any log messages sent through that appender.

        CVSS Score: 3.7

        CVSS Vector: CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:N/A:N

(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)

<groupId>gov.nasa.pds</groupId>
<artifactId>api-search-query-lexer</artifactId>
<artifactId>registry-api-lexer</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>

Expand Down
0 api/src/main/assembly/tar-assembly.xml → service/src/main/assembly/tar-assembly.xml
View file
Open in desktop
File renamed without changes.
0 api/src/main/assembly/zip-assembly.xml → service/src/main/assembly/zip-assembly.xml
View file
Open in desktop
File renamed without changes.
0 ...pi/model/xml/Pds4ProductWithXmlLabel.java → ...pi/model/xml/Pds4ProductWithXmlLabel.java
View file
Open in desktop
File renamed without changes.
0 ...ds/api/model/xml/ProductWithXmlLabel.java → ...ds/api/model/xml/ProductWithXmlLabel.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...model/xml/XMLMashallableProperyValue.java → ...model/xml/XMLMashallableProperyValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
4 changes: 2 additions & 2 deletions ...a/pds/api/engineering/SpringBootMain.java → ...nasa/pds/api/registry/SpringBootMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {


Expand Down
2 changes: 1 addition & 1 deletion .../pds/api/engineering/SystemConstants.java → ...asa/pds/api/registry/SystemConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gov.nasa.pds.api.engineering;
package gov.nasa.pds.api.registry;

public class SystemConstants {

Expand Down
2 changes: 1 addition & 1 deletion ...ering/configuration/AWSSecretsAccess.java → ...istry/configuration/AWSSecretsAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...neering/configuration/HomeController.java → ...egistry/configuration/HomeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...iguration/SwaggerDocumentationConfig.java → ...iguration/SwaggerDocumentationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)
Expand Down
27 changes: 13 additions & 14 deletions ...gineering/configuration/WebMVCConfig.java → .../registry/configuration/WebMVCConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gov.nasa.pds.api.engineering.configuration;
package gov.nasa.pds.api.registry.configuration;

import java.util.List;

Expand All @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions ...g/controllers/MyBundlesApiController.java → ...y/controllers/MyBundlesApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
16 changes: 7 additions & 9 deletions ...ntrollers/MyCollectionsApiController.java → ...ntrollers/MyCollectionsApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions ...trollers/MyProductsApiBareController.java → ...trollers/MyProductsApiBareController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions .../controllers/MyProductsApiController.java → .../controllers/MyProductsApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;


Expand Down
Loading