limitations under the License.
============LICENSE_END=====================================================
-->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.aai.validation</groupId>
- <artifactId>validation</artifactId>
- <name>aai-validation</name>
- <version>1.4.0-SNAPSHOT</version>
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>1.2.1</version>
- <relativePath/>
- </parent>
+ <groupId>org.onap.aai.validation</groupId>
+
<artifactId>validation</artifactId>
+ <name>aai-validation</name>
+ <version>1.4.0-SNAPSHOT</version>
+ <groupId>org.onap.oparent</groupId>
+
<artifactId>oparent</artifactId>
+ <version>1.2.1</version>
+ <relativePath />
+ </parent>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+
<artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <properties>
- <spring-boot.version>1.5.18.RELEASE</spring-boot.version>
- <start-class>org.onap.aai.validation.ValidationServiceApplication</start-class>
- <serverPort>9500</serverPort>
- <sslport>9501</sslport>
- <version.org.onap.aai.logging-service>1.2.2</version.org.onap.aai.logging-service>
- <version.aai.rest.client>1.4.0</version.aai.rest.client>
- <version.org.onap.aai.event.client>1.2.2</version.org.onap.aai.event.client>
- <version.com.ecomp.aai.gap.data.client>1.0</version.com.ecomp.aai.gap.data.client>
- <version.com.google.code.gson>2.7</version.com.google.code.gson>
- <version.com.jayway.jsonpath>2.2.0</version.com.jayway.jsonpath>
- <version.commons-configuration>1.10</version.commons-configuration>
- <version.jaxen.jaxen>1.1.6</version.jaxen.jaxen>
- <version.org.apache.httpcomponents.httpclient>4.5.2</version.org.apache.httpcomponents.httpclient>
- <version.org.codehaus.groovy.groovy-eclipse-batch>2.4.3-01</version.org.codehaus.groovy.groovy-eclipse-batch>
- <version.org.codehaus.groovy.groovy-eclipse-compiler>2.9.2-01</version.org.codehaus.groovy.groovy-eclipse-compiler>
- <version.org.eclipse.persistence.moxy>2.6.2</version.org.eclipse.persistence.moxy>
- <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
- <version.org.json.json>20160212</version.org.json.json>
- <version.org.onap.aai.aai-schema>1.2.4</version.org.onap.aai.aai-schema>
- <version.org.glassfish.jersey.core.jersey-client>2.23</version.org.glassfish.jersey.core.jersey-client>
- <version.aai.aai-schema-ingest>1.2.4</version.aai.aai-schema-ingest>
- <docker.location>${basedir}/target</docker.location>
- </properties>
+ <properties>
+ <spring-boot.version>1.5.18.RELEASE</spring-boot.version>
+ <start-class>org.onap.aai.validation.ValidationServiceApplication</start-class>
+ <serverPort>9500</serverPort>
+ <sslport>9501</sslport>
+ <version.org.onap.aai.logging-service>1.2.2</version.org.onap.aai.logging-service>
+ <version.aai.rest.client>1.4.0</version.aai.rest.client>
+ <version.org.onap.aai.event.client>1.2.2</version.org.onap.aai.event.client>
+ <version.com.ecomp.aai.gap.data.client>1.0</version.com.ecomp.aai.gap.data.client>
+ <version.com.google.code.gson>2.7</version.com.google.code.gson>
+ <version.com.jayway.jsonpath>2.2.0</version.com.jayway.jsonpath>
+ <version.commons-configuration>1.10</version.commons-configuration>
+ <version.jaxen.jaxen>1.1.6</version.jaxen.jaxen>
+ <version.org.apache.httpcomponents.httpclient>4.5.2</version.org.apache.httpcomponents.httpclient>
+ <version.org.codehaus.groovy.groovy-eclipse-batch>2.4.3-01</version.org.codehaus.groovy.groovy-eclipse-batch>
+ <version.org.codehaus.groovy.groovy-eclipse-compiler>2.9.2-01</version.org.codehaus.groovy.groovy-eclipse-compiler>
+ <version.org.eclipse.persistence.moxy>2.6.2</version.org.eclipse.persistence.moxy>
+ <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
+ <version.org.json.json>20160212</version.org.json.json>
+ <version.aai.aai-schema>1.4.1-SNAPSHOT</version.aai.aai-schema>
+ <version.aai.aai-schema-ingest>1.4.1-SNAPSHOT</version.aai.aai-schema-ingest>
+ <aai.oxm.target.folder>${project.build.directory}/bundleconfig/etc/oxm/</aai.oxm.target.folder>
+ <version.org.glassfish.jersey.core.jersey-client>2.23</version.org.glassfish.jersey.core.jersey-client>
+ <docker.location>${basedir}/target</docker.location>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>logback-classic</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.7</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
- <!-- 02: Logging -->
+ <!-- 02: Logging -->
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>logging-api</artifactId>
- <version>${version.org.onap.aai.logging-service}</version>
- </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.aai.logging-service</groupId>
+ <artifactId>logging-api</artifactId>
+ <version>${version.org.onap.aai.logging-service}</version>
+ </dependency>
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>common-logging</artifactId>
- <version>${version.org.onap.aai.logging-service}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aai.logging-service</groupId>
+
<artifactId>common-logging</artifactId>
+ <version>${version.org.onap.aai.logging-service}</version>
+ </dependency>
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>eelf-logging</artifactId>
- <version>${version.org.onap.aai.logging-service}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aai.logging-service</groupId>
+
<artifactId>eelf-logging</artifactId>
+ <version>${version.org.onap.aai.logging-service}</version>
+ </dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>1.0.1-oss</version>
- </dependency>
+ <dependency>
+ <groupId>com.att.eelf</groupId>
+
<artifactId>eelf-core</artifactId>
+ <version>1.0.1-oss</version>
+ </dependency>
- <dependency>
- <groupId>org.onap.aai</groupId>
- <artifactId>rest-client</artifactId>
- <version>${version.aai.rest.client}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aai</groupId>
+
<artifactId>rest-client</artifactId>
+ <version>${version.aai.rest.client}</version>
+ </dependency>
- <dependency>
- <groupId>org.onap.aai.event-client</groupId>
- <artifactId>event-client-dmaap</artifactId>
- <version>${version.org.onap.aai.event.client}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aai.event-client</groupId>
+
<artifactId>event-client-dmaap</artifactId>
+ <version>${version.org.onap.aai.event.client}</version>
+ </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+
<artifactId>gson</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+
<artifactId>json-path</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${version.commons-configuration}</version>
- </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+
<artifactId>commons-configuration</artifactId>
+ <version>${version.commons-configuration}</version>
+ </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+
<artifactId>jaxen</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+
<artifactId>httpclient</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>${version.org.eclipse.persistence.moxy}</version>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+
<artifactId>org.eclipse.persistence.moxy</artifactId>
+ <version>${version.org.eclipse.persistence.moxy}</version>
+ </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${version.org.json.json}</version><!--$NO-MVN-MAN-VER$ -->
- </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+
<artifactId>json</artifactId>
+ <version>${version.org.json.json}</version><!--$NO-MVN-MAN-VER$ -->
+ </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+
<artifactId>jersey-client</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-schema-ingest</artifactId>
- <version>${version.aai.aai-schema-ingest}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-schema-ingest</artifactId>
+ <version>${version.aai.aai-schema-ingest}</version>
+ </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- <configuration>
- <executable>true</executable>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- <verbose>true</verbose>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>${version.org.codehaus.groovy.groovy-eclipse-compiler}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-batch</artifactId>
- <version>${version.org.codehaus.groovy.groovy-eclipse-batch}</version>
- </dependency>
- </dependencies>
- </plugin>
+ </dependencies>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-schema</artifactId>
- <version>${version.org.onap.aai.aai-schema}</version>
- <type>jar</type>
- <includes>oxm/</includes>
- <outputDirectory>${project.build.directory}/bundleconfig/etc/</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <configuration>
+ <executable>true</executable>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <compilerId>groovy-eclipse-compiler</compilerId>
+ <verbose>true</verbose>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>${version.org.codehaus.groovy.groovy-eclipse-compiler}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-batch</artifactId>
+ <version>${version.org.codehaus.groovy.groovy-eclipse-batch}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- Skips unit tests if the value of skip.unit.tests property is true -->
- <skipTests>${skip.unit.tests}</skipTests>
- <!-- Excludes integration tests when unit tests are run -->
- <excludes>
- <exclude>**/IT*.java</exclude>
- </excludes>
- <environmentVariables>
- <APP_HOME>.</APP_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-schema</artifactId>
+ <version>${version.aai.aai-schema}</version>
+ <type>jar</type>
+ <includes>onap/oxm/**/</includes>
+ <outputDirectory>${aai.oxm.target.folder}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
- <executions>
- <execution>
- <id>copy-docker-file</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${basedir}/src/main/docker</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/bin/</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-bundleconfig</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/bundleconfig</outputDirectory>
- <overwrite>false</overwrite>
- <resources>
- <resource>
- <directory>${basedir}/bundleconfig/</directory>
- <filtering>true</filtering>
- <includes>
- <include>etc/appprops/</include>
- <include>etc/rules/</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.4.11</version>
- <configuration>
- <verbose>true</verbose>
- <serverId>docker-hub</serverId>
- <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
- <dockerDirectory>${docker.location}</dockerDirectory>
- <imageTags>
- <imageTag>latest</imageTag>
- </imageTags>
- <forceTags>true</forceTags>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Skips unit tests if the value of skip.unit.tests property is true -->
+ <skipTests>${skip.unit.tests}</skipTests>
+ <!-- Excludes integration tests when unit tests are run -->
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ <environmentVariables>
+ <APP_HOME>.</APP_HOME>
+ </environmentVariables>
+ </configuration>
+ </plugin>
- <profiles>
- <profile>
- <id>dev</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <build.profile.id>dev</build.profile.id>
- <!-- Only unit tests are run when the development profile is active -->
- <skip.integration.tests>true</skip.integration.tests>
- <skip.unit.tests>false</skip.unit.tests>
- </properties>
- </profile>
- </profiles>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ <executions>
+ <execution>
+ <id>copy-docker-file</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/docker</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/bin/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-bundleconfig</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/bundleconfig</outputDirectory>
+ <overwrite>false</overwrite>
+ <resources>
+ <resource>
+ <directory>${basedir}/bundleconfig/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>etc/appprops/</include>
+ <include>etc/rules/</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.4.11</version>
+ <configuration>
+ <verbose>true</verbose>
+ <serverId>docker-hub</serverId>
+ <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+ <dockerDirectory>${docker.location}</dockerDirectory>
+ <imageTags>
+ <imageTag>latest</imageTag>
+ </imageTags>
+ <forceTags>true</forceTags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <build.profile.id>dev</build.profile.id>
+ <!-- Only unit tests are run when the development profile is active -->
+ <skip.integration.tests>true</skip.integration.tests>
+ <skip.unit.tests>false</skip.unit.tests>
+ </properties>
+ </profile>
+ </profiles>
</project>
import java.util.HashMap;
import java.util.Map;
+import javax.annotation.PostConstruct;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.jetty.util.security.Password;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.onap.aai.validation.config.TopicPropertiesConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ImportResource;
+import org.springframework.core.env.Environment;
/**
* Validation Service Spring Boot Application.
*/
-@SpringBootApplication
-@ComponentScan(basePackages = "org.onap.aai.validation.config")
+@Configuration
+@EnableAutoConfiguration
+@Import(TopicPropertiesConfig.class)
@ImportResource("classpath:validation-service-beans.xml")
public class ValidationServiceApplication extends SpringBootServletInitializer {
+ @Autowired
+ private Environment env;
+
public static void main(String[] args) {
Map<String, Object> props = new HashMap<>();
String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
- if (keyStorePassword != null && !keyStorePassword.isEmpty()) {
- props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));
+ if (StringUtils.isEmpty(keyStorePassword)) {
+ throw new IllegalArgumentException("System Property KEY_STORE_PASSWORD not set");
}
+ String deobfuscated = Password.deobfuscate(keyStorePassword);
+ props.put("server.ssl.key-store-password", deobfuscated);
+ props.put("schema.service.ssl.key-store-password", deobfuscated);
+ props.put("schema.service.ssl.trust-store-password", deobfuscated);
new ValidationServiceApplication()
.configure(new SpringApplicationBuilder(ValidationServiceApplication.class).properties(props))
.run(args);
}
+ /**
+ * Set the trust store system properties using default values from the application properties.
+ */
+ @PostConstruct
+ public void setSystemProperties() {
+ String trustStorePath = env.getProperty("server.ssl.key-store");
+ if (trustStorePath != null) {
+ String trustStorePassword = env.getProperty("server.ssl.key-store-password");
+ if (trustStorePassword != null) {
+ System.setProperty("javax.net.ssl.trustStore", trustStorePath);
+ System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
+ } else {
+ throw new IllegalArgumentException("Env property server.ssl.key-store-password not set");
+ }
+ }
+ }
}
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
/**
* Gets the configuration of the topics. The topics are configured using Spring in topic-config-beans.xml.
*/
-@Component("TopicConfig")
public class TopicConfig {
private List<String> consumerTopicNames;
+++ /dev/null
-/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=====================================================
- */
-package org.onap.aai.validation.reader;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceConfigurationError;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.onap.aai.setup.ConfigTranslator;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.Version;
-
-/**
- * Determine which OXM and edge rules files to return based on the latest Version
- *
- */
-public class OxmConfigTranslator extends ConfigTranslator {
-
- public OxmConfigTranslator(SchemaLocationsBean bean) {
- super(bean);
- }
-
- @Override
- public Map<Version, List<String>> getNodeFiles() {
- String nodeDirectory = bean.getNodeDirectory();
- if (nodeDirectory == null) {
- throw new ServiceConfigurationError(
- "Node(s) directory is empty in the schema location bean (" + bean.getSchemaConfigLocation() + ")");
- }
- try {
- return getVersionMap(Paths.get(nodeDirectory), "*_v*.xml");
- } catch (IOException e) {
- throw new ServiceConfigurationError("Failed to read node(s) directory " + getPath(nodeDirectory), e);
- }
- }
-
- @Override
- public Map<Version, List<String>> getEdgeFiles() {
- String edgeDirectory = bean.getEdgeDirectory();
- if (edgeDirectory == null) {
- throw new ServiceConfigurationError(
- "Edge(s) directory is empty in the schema location bean (" + bean.getSchemaConfigLocation() + ")");
- }
- try {
- return getVersionMap(Paths.get(edgeDirectory), "*_v*.json");
- } catch (IOException e) {
- throw new ServiceConfigurationError("Failed to read edge(s) directory " + getPath(edgeDirectory), e);
- }
- }
-
- private String getPath(String nodeDirectory) {
- return Paths.get(nodeDirectory).toAbsolutePath().toString();
- }
-
- /**
- * Creates a map containing each OXM Version and the matching OXM file path(s)
- *
- * @param folderPath the folder/directory containing the OXM files
- * @param fileSuffix
- * @return a new Map object (may be empty)
- * @throws IOException if there is a problem reading the specified directory path
- */
- private Map<Version, List<String>> getVersionMap(Path folderPath, String globPattern) throws IOException {
- final PathMatcher filter = folderPath.getFileSystem().getPathMatcher("glob:**/" + globPattern);
- try (final Stream<Path> stream = Files.list(folderPath)) {
- return stream.filter(filter::matches).map(Path::toString).filter(p -> getVersionFromPath(p) != null)
- .collect(Collectors.groupingBy(this::getVersionFromPath));
- }
- }
-
- private Version getVersionFromPath(String pathName) {
- String version = "V" + pathName.replaceAll("\\D+", "");
- try {
- return Version.valueOf(version);
- } catch (IllegalArgumentException e) {
- return null;
- }
- }
-}
-/*
+/**
* ============LICENSE_START===================================================
* Copyright (c) 2018 Amdocs
* ============================================================================
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
import org.eclipse.persistence.internal.oxm.mappings.Descriptor;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.Version;
+import org.onap.aai.setup.SchemaVersion;
import org.onap.aai.validation.exception.ValidationServiceError;
import org.onap.aai.validation.exception.ValidationServiceException;
import org.onap.aai.validation.util.StringUtils;
public class OxmReader {
private NodeIngestor nodeIngestor;
- private Version version;
+ private SchemaVersion version;
private Map<String, List<String>> primaryKeysMap = new HashMap<>();
- public OxmReader(NodeIngestor nodeIngestor, Version version) {
+ public OxmReader(NodeIngestor nodeIngestor, SchemaVersion version) {
this.nodeIngestor = nodeIngestor;
this.version = version;
}
- public OxmReader(NodeIngestor nodeIngestor) {
- this(nodeIngestor, Version.getLatest());
- }
-
/**
* Get the primary keys for a given entity type.
*
# ============LICENSE_START===================================================
-# Copyright (c) 2018 Amdocs
+# Copyright (c) 2018-2019 Amdocs
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
com.att.eelf.logging.file=logback.xml
logback.configurationFile=${com.att.eelf.logging.path}/${com.att.eelf.logging.file}
-schemaIngestPropLoc=${CONFIG_HOME}/schemaIngest.properties
server.port=9501
server.ssl.client-auth=want
topics.properties.location=${CONFIG_HOME}/topics/
+schema.translator.list=schema-service
+spring.application.name=aai-validation
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
+Copyright (c) 2018-2019 Amdocs
============================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
limitations under the License.
============LICENSE_END=====================================================
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
<!-- ////////////////////////////////////////////////////////////////// -->
<!-- PROPERTY AND CONFIGURATION FILES -->
<!-- ////////////////////////////////////////////////////////////////// -->
- <context:property-placeholder location="classpath:event-reader.properties" ignore-unresolvable="true" />
- <context:property-placeholder location="file:${CONFIG_HOME}/aai-environment.properties" ignore-unresolvable="true" />
- <context:property-placeholder location="file:${CONFIG_HOME}/validation-service.properties" ignore-unresolvable="true" />
- <context:property-placeholder location="file:${CONFIG_HOME}/validation-service-auth.properties" ignore-unresolvable="true" />
- <context:property-placeholder location="file:${CONFIG_HOME}/rule-indexing.properties" ignore-unresolvable="true" ignore-resource-not-found="true" />
- <context:property-placeholder location="file:${schemaIngestPropLoc}" ignore-unresolvable="true" />
+ <context:property-placeholder location="file:${CONFIG_HOME}/rule-indexing.properties"
+ ignore-unresolvable="true" ignore-resource-not-found="true" />
+ <context:property-placeholder
+ location="
+ classpath:event-reader.properties,
+ file:${CONFIG_HOME}/aai-environment.properties,
+ file:${CONFIG_HOME}/validation-service.properties,
+ file:${CONFIG_HOME}/validation-service-auth.properties,
+ file:${CONFIG_HOME}/schemaIngest.properties"
+ ignore-unresolvable="true" />
<bean id="mappingFile" class="org.apache.commons.io.IOUtils" factory-method="toString">
- <constructor-arg value="file:${APP_HOME}/bundleconfig/etc/appprops/model-instance-mapping.json_conf" type="java.io.InputStream" />
+ <constructor-arg value="file:${APP_HOME}/bundleconfig/etc/appprops/model-instance-mapping.json_conf"
+ type="java.io.InputStream" />
</bean>
- <util:properties id="dataDictionaryProperties" location="file:${CONFIG_HOME}/rule-data-dictionary.properties" />
+ <util:properties id="dataDictionaryProperties" location="file:${CONFIG_HOME}/rule-data-dictionary.properties" />
<!-- ////////////////////////////////////////////////////////////////// -->
<!-- CONFIG BEANS -->
<!-- ////////////////////////////////////////////////////////////////// -->
+
+ <!-- Component scan for schema service components -->
+ <context:component-scan base-package="org.onap.aai.config,org.onap.aai.setup">
+ <!-- Exclude EdgesConfiguration since edge rules are not required -->
+ <context:exclude-filter type="assignable" expression="org.onap.aai.config.EdgesConfiguration" />
+ </context:component-scan>
+
<bean id="eventReaderConfig" class="org.onap.aai.validation.config.EventReaderConfig">
<property name="eventDomainPath" value="${event.domain.path}" />
<property name="eventActionPath" value="${event.action.path}" />
<property name="connectionTimeout" value="${connectionTimeout}" />
<property name="readTimeout" value="${readTimeout}" />
</bean>
+ <bean id="topicConfig" class="org.onap.aai.validation.config.TopicConfig" />
<bean id="topicAdminConfig" class="org.onap.aai.validation.config.TopicAdminConfig">
<property name="publishEnable" value="${topic.publish.enable}" />
<property name="eventTypeRule" value="#{'${event.type.rule}'.split(',')}" />
<property name="eventTypeModel" value="#{'${event.type.model}'.split(',')}" />
</bean>
-
+
<bean id="ruleIndexingConfig" class="org.onap.aai.validation.config.RuleIndexingConfig">
<property name="indexedEvents" value="#{'${rule.indexing.events}'.split(',')}" />
<property name="excludedOxmValidationEvents" value="#{'${rule.indexing.exclude.oxm.validation}'.split(',')}" />
</list>
</property>
</bean>
-
<!-- ////////////////////////////////////////////////////////////////// -->
<!-- READER BEANS -->
<!-- ////////////////////////////////////////////////////////////////// -->
- <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean">
- <property name="nodeDirectory" value="${nodeDir}" />
- <property name="edgeDirectory" value="${edgeDir}" />
- </bean>
-
- <bean id="configTranslator" class="org.onap.aai.validation.reader.OxmConfigTranslator">
- <constructor-arg ref="schemaLocationsBean" />
- </bean>
+ <bean id="configTranslator" class="org.onap.aai.setup.AAIConfigTranslator" />
- <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor">
- <constructor-arg ref="configTranslator" />
+ <bean id="schemaVersionBean" class="org.onap.aai.setup.SchemaVersion">
+ <constructor-arg value="${schema.version.api.default}" />
</bean>
<bean id="oxmReader" class="org.onap.aai.validation.reader.OxmReader" init-method="init">
<constructor-arg ref="nodeIngestor" />
- <constructor-arg value="V${aai.oxm.version}" />
+ <constructor-arg ref="schemaVersionBean" />
</bean>
<bean id="jsonReader" class="org.onap.aai.validation.reader.JsonReader" />
<constructor-arg ref="rulesConfigurationPath" />
<constructor-arg ref="oxmReader" />
<constructor-arg ref="eventReader" />
- <constructor-arg ref="ruleIndexingConfig"/>
+ <constructor-arg ref="ruleIndexingConfig" />
</bean>
- <bean id="restClient" class="org.onap.aai.validation.data.client.RestClient">
+ <bean id="aaiRestClient" class="org.onap.aai.validation.data.client.RestClient">
<constructor-arg ref="restConfig" />
</bean>
LOG0012I|\
{0}|\
|\
-
+
MESSAGE_METRIC=\
LOG0013I|\
{0}|\
|\
-
+
MISSING_REQUEST_ID=\
LOG0014I|\
Missing request ID. Assigned {0}|\
+
INVALID_EVENT_TYPE=\
LOG0015I|\
Event has not been validated. Invalid event type. Event:{0}|\
+
MISSING_EVENT_TYPE=\
LOG0016I|\
Event has not been validated. Missing event type. Event:{0}|\
+
FILTERED_EVENT=\
LOG0017I|\
Event has been filtered.Event:{0}|\
CANNOT_VALIDATE_HANDLE_EXCEPTION_ERROR=\
LOG0902E|\
Error during handling the exception for an event that could not be validated: {0}|\
- |\
-
+ |\
+
MALFORMED_REQUEST_ERROR=\
LOG1000E|\
Malformed request.|\
-
+
PROCESS_REQUEST_ERROR=\
LOG1001E|\
Error while processing request.|\
+
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import org.junit.runner.RunWith;
import org.onap.aai.validation.exception.ValidationServiceException;
import org.onap.aai.validation.modeldriven.configuration.mapping.ModelInstanceMapper;
-import org.onap.aai.validation.modeldriven.validator.InstanceReader;
import org.onap.aai.validation.test.util.TestUtil;
import org.onap.aai.validation.util.JsonUtil;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = { "classpath:oxm-reader/schemaIngest.properties" })
@ContextConfiguration(locations = {"classpath:model-validation/instance-reader/test-validation-service-beans.xml"})
public class TestInstanceReader {
enum TestData {
// @formatter:off
- MAPPING ("model-validation/instance-reader/model-instance-mapping.json_conf"),
- MAPPING_ROOT_UNKNOWN ("model-validation/instance-reader/model-instance-mapping-root-unknown.json_conf"),
- MAPPING_ROOT_MISSING ("model-validation/instance-reader/model-instance-mapping-root-missing.json_conf"),
- CONNECTOR ("model-validation/instance-reader/connector.json"),
- CONNECTOR_MODEL_NAME ("model-validation/instance-reader/connector-model-name.json"),
- CONNECTOR_SIBLING ("model-validation/instance-reader/connector-sibling-inventory-items.json"),
- EXPECTED_VDC ("model-validation/instance-reader/expected-virtual-data-center.json"),
- EXPECTED_VDC_MODEL_NAME ("model-validation/instance-reader/expected-virtual-data-center-model-name.json"),
- EXPECTED_LOGICAL_LINK ("model-validation/instance-reader/expected-logical-link.json"),
- EXPECTED_GENERIC_VNF ("model-validation/instance-reader/expected-generic-vnf.json"),
- EXPECTED_PSERVER ("model-validation/instance-reader/expected-pserver.json");
+ MAPPING ("model-validation/instance-reader/model-instance-mapping.json_conf"),
+ MAPPING_ROOT_UNKNOWN ("model-validation/instance-reader/model-instance-mapping-root-unknown.json_conf"),
+ MAPPING_ROOT_MISSING ("model-validation/instance-reader/model-instance-mapping-root-missing.json_conf"),
+ CONNECTOR ("model-validation/instance-reader/connector.json"),
+ CONNECTOR_MODEL_NAME ("model-validation/instance-reader/connector-model-name.json"),
+ CONNECTOR_SIBLING ("model-validation/instance-reader/connector-sibling-inventory-items.json"),
+ EXPECTED_VDC ("model-validation/instance-reader/expected-virtual-data-center.json"),
+ EXPECTED_VDC_MODEL_NAME ("model-validation/instance-reader/expected-virtual-data-center-model-name.json"),
+ EXPECTED_LOGICAL_LINK ("model-validation/instance-reader/expected-logical-link.json"),
+ EXPECTED_GENERIC_VNF ("model-validation/instance-reader/expected-generic-vnf.json"),
+ EXPECTED_PSERVER ("model-validation/instance-reader/expected-pserver.json");
+ // @formatter:on
private String filename;
- TestData(String filename) {this.filename = filename;}
- public String getFilename() {return this.filename;}
- // @formatter:on
+ TestData(String filename) {
+ this.filename = filename;
+ }
+ public String getFilename() {
+ return this.filename;
+ }
}
@Rule
JsonElement genericVnfJsonElement = jsonParser.parse(expectedGenericVnf);
String expectedGenericVnf = genericVnfJsonElement.toString();
- JsonElement pserverJsonElement = jsonParser.parse(expectedPserver);
- String expectedPserver = pserverJsonElement.toString();
// Method under test
Multimap<String, String> values = instanceReader.getValues(connectorSibling, mapping);
values = instanceReader.getValues(logicalLinkInstance, mapping);
assertThat(values.get("generic-vnf").iterator().next(), is(equalTo(expectedGenericVnf)));
- assertThat(values.get("pserver").iterator().next(), is(equalTo(expectedPserver)));
+ assertThat(values.get("pserver").iterator().next(), is(equalTo(jsonParser.parse(expectedPserver).toString())));
}
@Test
-/*
+/**
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
import org.onap.aai.validation.modeldriven.ModelCacheManager;
import org.onap.aai.validation.modeldriven.ModelId;
import org.onap.aai.validation.modeldriven.parser.XMLModelParser;
-import org.onap.aai.validation.modeldriven.validator.ModelDrivenValidator;
import org.onap.aai.validation.result.ValidationResult;
import org.onap.aai.validation.result.Violation;
import org.onap.aai.validation.test.util.TestUtil;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"})
@ContextConfiguration(locations = {"classpath:model-validation/instance-validator/test-validation-service-beans.xml"})
public class TestModelDrivenValidator {
private String objectInstance;
private String connectorModel;
- enum INSTANCE_VALIDATION_FILE {
+ static enum InstanceValidationFile {
// @formatter:off
- CONNECTOR_MODEL ("model-validation/instance-validator/connector-widget-id.xml"),
- NO_MODEL_ID ("model-validation/instance-validator/connector-instance-no-model-id.json"),
- UNKNOWN_MODEL_ID ("model-validation/instance-validator/connector-instance-unknown-model-id.json"),
- ERRORS ("model-validation/instance-validator/connector-instance-errors.json"),
- MULTIPLE_MISSING_ATTRS ("model-validation/instance-validator/connector-instance-multiple-missing-attrs.json"),
- MULTIPLE_UNEXPECTED_ATTRS ("model-validation/instance-validator/connector-instance-multiple-unexpected-attrs.json"),
- SUCCESS ("model-validation/instance-validator/connector-instance-success.json");
- // @formatter:on
+ CONNECTOR_MODEL ("connector-widget-id.xml"),
+ NO_MODEL_ID ("connector-instance-no-model-id.json"),
+ UNKNOWN_MODEL_ID ("connector-instance-unknown-model-id.json"),
+ ERRORS ("connector-instance-errors.json"),
+ MULTIPLE_MISSING_ATTRS ("connector-instance-multiple-missing-attrs.json"),
+ MULTIPLE_UNEXPECTED_ATTRS ("connector-instance-multiple-unexpected-attrs.json"),
+ SUCCESS ("connector-instance-success.json");
+ // @formatter:on
private String filename;
- INSTANCE_VALIDATION_FILE(String filename) {
- this.filename = filename;
+ InstanceValidationFile(String filename) {
+ this.filename = "model-validation/instance-validator/" + filename;
}
public String getFilename() {
@Before
public void setUp() throws Exception {
- connectorModel = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.CONNECTOR_MODEL.getFilename());
+ connectorModel = TestUtil.getFileAsString(InstanceValidationFile.CONNECTOR_MODEL.getFilename());
}
@Test
public void testValidateInstanceWithoutModelId() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.NO_MODEL_ID.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.NO_MODEL_ID.getFilename());
ValidationResult validationResult = modelDrivenValidator.validate(objectInstance).get(0);
assertThatValidationResultIsValid(validationResult, "c7611ebe-c324-48f1-8085-94aef0c12fd", "connector",
@Test
public void testValidateInstanceWithUnknownModelId() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.UNKNOWN_MODEL_ID.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.UNKNOWN_MODEL_ID.getFilename());
Mockito.when(mockModelCacheManager.get(new ModelId(MODEL_ID_ATTRIBUTE_MID, "UNKNOWN-MODEL"))).thenReturn(null);
@Test
public void testValidate() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.ERRORS.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.ERRORS.getFilename());
Element modelElement = XMLModelParser.parse(connectorModel, true);
@Test
public void testValidateMultipleMissingAttrs() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.MULTIPLE_MISSING_ATTRS.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.MULTIPLE_MISSING_ATTRS.getFilename());
Element modelElement = XMLModelParser.parse(connectorModel, true);
@Test
public void testValidateMultipleUnexpectedAttrs() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.MULTIPLE_UNEXPECTED_ATTRS.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.MULTIPLE_UNEXPECTED_ATTRS.getFilename());
Element modelElement = XMLModelParser.parse(connectorModel, true);
@Test
public void testValidateSuccess() throws Exception {
- objectInstance = TestUtil.getFileAsString(INSTANCE_VALIDATION_FILE.SUCCESS.getFilename());
+ objectInstance = TestUtil.getFileAsString(InstanceValidationFile.SUCCESS.getFilename());
Element modelElement = XMLModelParser.parse(connectorModel, true);
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.aai.validation.exception.ValidationServiceException;
-import org.onap.aai.validation.reader.EventReader;
import org.onap.aai.validation.reader.data.Entity;
import org.onap.aai.validation.reader.data.EntityId;
import org.onap.aai.validation.test.util.TestUtil;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = { "classpath:oxm-reader/schemaIngest.properties" })
@ContextConfiguration(locations = {"classpath:event-reader/test-validation-service-beans.xml"})
public class TestEventReader {
// @formatter:off
VSERVER ("event-reader/vserver-create-event.json"),
GENERIC_VNF ("event-reader/generic-vnf-create-event.json"),
- INVALID_1 ("event-reader/invalid-event-1.json"),
- INVALID_2 ("event-reader/invalid-event-2.json"),
- INVALID_3 ("event-reader/invalid-event-3.json"),
- INVALID_4 ("event-reader/invalid-event-4.json"),
- INVALID_5 ("event-reader/invalid-event-5.json");
+ INVALID_1 ("event-reader/invalid-event-1.json"),
+ INVALID_2 ("event-reader/invalid-event-2.json"),
+ INVALID_3 ("event-reader/invalid-event-3.json"),
+ INVALID_4 ("event-reader/invalid-event-4.json"),
+ INVALID_5 ("event-reader/invalid-event-5.json");
+ // @formatter:on
private String filename;
- TestData(String filename) {this.filename = filename;}
- public String getFilename() {return this.filename;}
- // @formatter:on
+ TestData(String filename) {
+ this.filename = filename;
+ }
+ public String getFilename() {
+ return this.filename;
+ }
}
@Test
-/*
+/**
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.onap.aai.validation.reader.JsonReader;
import org.onap.aai.validation.test.util.TestUtil;
public class TestJsonReader {
}
enum TestData {
- // @formatter:off
- SAMPLE_JSON ("json-reader/sample.json");
+ SAMPLE_JSON(
+ "json-reader/sample.json"
+ );
- private String filename;
- TestData(String filename) {this.filename = filename;}
- public String getFilename() {return this.filename;}
- // @formatter:on
+ private String filename;
+
+ TestData(String filename) {
+ this.filename = filename;
+ }
+
+ public String getFilename() {
+ return this.filename;
+ }
}
@Test
+++ /dev/null
-/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=====================================================
- */
-package org.onap.aai.validation.reader;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
-
-import java.nio.file.InvalidPathException;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceConfigurationError;
-import org.junit.Test;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.Version;
-import org.onap.aai.validation.reader.OxmConfigTranslator;
-import org.springframework.test.util.ReflectionTestUtils;
-
-public class TestOxmConfigTranslator {
-
- static {
- System.setProperty("APP_HOME", ".");
- }
-
- @Test
- public void testOxmFiles() {
- OxmConfigTranslator translator = buildConfigTranslator("src/test/resources/oxm-reader/single/");
- Map<Version, List<String>> latestVersion = translator.getNodeFiles();
- assertThat(latestVersion.size(), is(3));
- assertThat(latestVersion.values().iterator().next().size(), is(1));
- assertThat(latestVersion.values().iterator().next().get(0), not(isEmptyString()));
- Map<Version, List<String>> latestVersion1 = translator.getEdgeFiles();
- assertThat(latestVersion1.size(), is(1));
- assertThat(latestVersion1.values().iterator().next().size(), is(1));
- assertThat(latestVersion1.values().iterator().next().get(0), not(isEmptyString()));
- }
-
- @Test
- public void testMultipleOxmFilesPerVersion() {
- OxmConfigTranslator translator = buildConfigTranslator("src/test/resources/oxm-reader/multiple");
- Map<Version, List<String>> latestVersion = translator.getNodeFiles();
- assertThat(latestVersion.size(), is(2));
- assertThat(latestVersion.values().iterator().next().size(), is(2));
- assertThat(latestVersion.values().iterator().next().get(0), not(isEmptyString()));
- Map<Version, List<String>> latestVersion1 = translator.getEdgeFiles();
- assertThat(latestVersion1.size(), is(0));
- }
-
- @Test
- public void testZeroMatchingFiles() {
- OxmConfigTranslator translator = buildConfigTranslator("src/test/resources/oxm-reader/");
- Map<Version, List<String>> versionsMap = translator.getNodeFiles();
- assertThat(versionsMap.size(), is(0));
- }
-
- @Test(expected = ServiceConfigurationError.class)
- public void testNullNodesPath() {
- buildConfigTranslator(null).getNodeFiles();
- }
-
- @Test(expected = ServiceConfigurationError.class)
- public void testNullEdgesPath() {
- buildConfigTranslator(null).getEdgeFiles();
- }
-
- @Test(expected = ServiceConfigurationError.class)
- public void testNonExistentNodesPath() {
- buildConfigTranslator("no-such-folder-exists/").getNodeFiles();
- }
-
- @Test(expected = ServiceConfigurationError.class)
- public void testNonExistentEdgesPath() {
- SchemaLocationsBean bean = new SchemaLocationsBean();
- ReflectionTestUtils.setField(bean, "nodeDirectory", "src/test/resources/oxm-reader/");
- ReflectionTestUtils.setField(bean, "edgeDirectory", "no-such-folder-exists/");
- new OxmConfigTranslator(bean).getEdgeFiles();
- }
-
- @Test(expected = InvalidPathException.class)
- public void testInvalidPath() {
- buildConfigTranslator("\0").getEdgeFiles();
- }
-
- private OxmConfigTranslator buildConfigTranslator(String path) {
- return new OxmConfigTranslator(createSchemaLocationsBean(path));
- }
-
- private SchemaLocationsBean createSchemaLocationsBean(String path) {
- SchemaLocationsBean bean = new SchemaLocationsBean();
- ReflectionTestUtils.setField(bean, "nodeDirectory", path);
- ReflectionTestUtils.setField(bean, "edgeDirectory", path);
- return bean;
- }
-
-}
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import javax.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.aai.validation.reader.OxmReader;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"})
@ContextConfiguration(locations = {"classpath:oxm-reader/oxm-reader-beans.xml"})
public class TestOxmReader {
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import org.onap.aai.validation.exception.ValidationServiceException;
import org.onap.aai.validation.reader.EventReader;
import org.onap.aai.validation.reader.data.Entity;
-import org.onap.aai.validation.result.ValidationResult;
-import org.onap.aai.validation.result.Violation;
import org.onap.aai.validation.result.Violation.Builder;
import org.onap.aai.validation.result.Violation.ViolationType;
import org.onap.aai.validation.test.util.TestUtil;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = { "classpath:oxm-reader/schemaIngest.properties" })
@ContextConfiguration(locations = {"classpath:validation-result/test-validation-service-beans.xml"})
public class TestValidationResult {
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.aai.validation.ruledriven.rule;
import org.onap.aai.validation.reader.data.AttributeValues;
-import org.onap.aai.validation.ruledriven.rule.Rule;
/**
* Helper class for testing rules
/*
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
-@ContextConfiguration(
- locations = {"classpath:" + TestRuleDrivenValidator.UNIT_TEST_FOLDER + "/test-rule-driven-validator-beans.xml"})
+@TestPropertySource(locations = { "classpath:oxm-reader/schemaIngest.properties" })
+@ContextConfiguration(locations = {
+ "classpath:" + TestRuleDrivenValidator.UNIT_TEST_FOLDER + "/test-rule-driven-validator-beans.xml" })
public class TestRuleDrivenValidator {
static {
-/*
+/**
* ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
+ * Copyright (c) 2018-2019 Amdocs
* ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
import org.onap.aai.validation.controller.ValidationController;
import org.onap.aai.validation.exception.ValidationServiceException;
import org.onap.aai.validation.publisher.MockEventPublisher;
-import org.onap.aai.validation.services.InfoService;
import org.onap.aai.validation.test.util.TestEntity;
import org.onap.aai.validation.test.util.TestUtil;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/oxm-reader/schemaIngest.properties"})
+@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties", "classpath:application.properties"})
@ContextConfiguration(locations = {"classpath:/info-service/test-validation-service-beans.xml"})
public class TestInfoService {
enum TestData {
// @formatter:off
- VSERVER ("rule-driven-validator/test_events/vserver-create-event.json");
+ VSERVER("rule-driven-validator/test_events/vserver-create-event.json");
+ // @formatter:on
private String filename;
- TestData(String filename) {this.filename = filename;}
- public String getFilename() {return this.filename;}
- // @formatter:on
+
+ TestData(String filename) {
+ this.filename = filename;
+ }
+
+ public String getFilename() {
+ return this.filename;
+ }
}
private InfoService infoService;
assertThat(info, containsString("errored=1"));
}
- /**
- * @throws ValidationServiceException
- * @throws IOException
- * @throws URISyntaxException
- */
+
@Test
- public void testVserverEventRecorded() throws ValidationServiceException, URISyntaxException, IOException {
+ public void testVserverEventRecorded() throws URISyntaxException, IOException {
Path vserverTestFile = Paths.get(ClassLoader.getSystemResource(TestData.VSERVER.getFilename()).toURI());
Path root = vserverTestFile.getParent();
assertThat(root, is(not(nullValue())));
/**
* Assert that the info service status string contains the expected standard results and formatting.
- *
+ *
* @param info
*/
private void assertResultsStringFormatted(String info) {
# limitations under the License.
# ============LICENSE_END=====================================================
-# Test properties for the org.onap.aai.setup.SchemaLocationsBean
-schemaConfig=NA
-nodeDir=src/test/resources/oxm-reader/single/
-edgeDir=src/test/resources/oxm-reader/single/
\ No newline at end of file
+# Properties for the org.onap.aai.setup.SchemaLocationsBean
+# Schema related attributes for the oxm and edges
+# Any additional schema related attributes should start with prefix schema
+schema.configuration.location=N/A
+schema.nodes.location=src/test/resources/oxm-reader/single/oxm
+schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules
+
+# Schema Version Related Attributes
+
+# Lists all of the versions in the schema
+schema.version.list=v8,v9,v10
+# Specifies from which version should the depth parameter to default to zero
+schema.version.depth.start=v9
+# Specifies from which version should the related link be displayed in response payload
+schema.version.related.link.start=v10
+# Specifies from which version should the client see only the uri excluding host info
+# Before this version server base will also be included
+schema.version.app.root.start=v10
+# Specifies from which version should the namespace be changed
+schema.version.namespace.change.start=v10
+# Specifies from which version should the client start seeing the edge label in payload
+schema.version.edge.label.start=v10
+# Specifies the version that the application should default to
+schema.version.api.default=v9
+
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
+schema.service.nodes.endpoint=nodes?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
+
+schema.service.ssl.key-store=src/integration-test/resources/authentication/aai-client-cert.p12
+schema.service.ssl.trust-store=src/integration-test/resources/authentication/tomcat_keystore
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.business.v12" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
- </xml-schema>
- <java-types>
-
- <java-type name="Bar">
- <xml-root-element name="bar" />
- <java-attributes>
- <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <xml-property name="description" value="Unique id of Bar This is unique across the graph." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
- <xml-properties>
- <xml-property name="description" value="How many." />
- </xml-properties>
- </xml-element>
-
- </java-attributes>
- <xml-properties>
- <xml-property name="description" value="General purpose metasyntactic variable" />
- <xml-property name="uniqueProps" value="bar-id" />
- </xml-properties>
- </java-type>
-
- </java-types>
-</xml-bindings>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.business.v13" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
- </xml-schema>
- <java-types>
-
- <java-type name="Bar">
- <xml-root-element name="bar" />
- <java-attributes>
- <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <xml-property name="description" value="Unique id of Bar This is unique across the graph." />
- </xml-properties>
- </xml-element>
-
- </java-attributes>
- <xml-properties>
- <xml-property name="description" value="General purpose metasyntactic variable" />
- <xml-property name="uniqueProps" value="bar-id" />
- </xml-properties>
- </java-type>
-
- </java-types>
-</xml-bindings>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.network.v10" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
- </xml-schema>
- <java-types>
-
- <java-type name="Foo">
- <xml-root-element name="foo" />
- <java-attributes>
- <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <xml-property name="description" value="Unique id of Foo. This is unique across the graph." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="Name of Foo." />
- </xml-properties>
- </xml-element>
-
- </java-attributes>
- <xml-properties>
- <xml-property name="description" value="General purpose metasyntactic variable" />
- <xml-property name="nameProps" value="foo-name" />
- <xml-property name="uniqueProps" value="foo-id" />
- </xml-properties>
- </java-type>
-
- </java-types>
-</xml-bindings>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.network.v13" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
- </xml-schema>
- <java-types>
-
- <java-type name="Foo">
- <xml-root-element name="foo" />
- <java-attributes>
- <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <xml-property name="description" value="Unique id of Foo. This is unique across the graph." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="Name of Foo." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="How many." />
- </xml-properties>
- </xml-element>
-
- </java-attributes>
- <xml-properties>
- <xml-property name="description" value="General purpose metasyntactic variable" />
- <xml-property name="nameProps" value="foo-name" />
- <xml-property name="uniqueProps" value="foo-id" />
- </xml-properties>
- </java-type>
-
- <java-type name="Quux">
- <xml-root-element name="quux" />
- <java-attributes>
- <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <xml-property name="description" value="Unique id of Quux owner. This is unique across the graph." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="color" />
- </xml-properties>
- </xml-element>
-
- </java-attributes>
- <xml-properties>
- <xml-property name="description" value="General purpose metasyntactic variable" />
- </xml-properties>
- </java-type>
-
- </java-types>
-</xml-bindings>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
- <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean" />
+ <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean" />
- <bean id="configTranslator" class="org.onap.aai.validation.reader.OxmConfigTranslator">
- <constructor-arg ref="schemaLocationsBean" />
- </bean>
+ <bean id="schemaVersionsBean" class="org.onap.aai.setup.SchemaVersions" />
- <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor">
- <constructor-arg ref="configTranslator" />
- </bean>
+ <bean id="configTranslator" class="org.onap.aai.setup.AAIConfigTranslator" />
+
+ <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor" />
+ <bean id="schemaVersionBean" class="org.onap.aai.setup.SchemaVersion">
+ <constructor-arg value="${schema.version.api.default}" />
+ </bean>
+
<bean id="oxmReader" class="org.onap.aai.validation.reader.OxmReader" init-method="init">
<constructor-arg ref="nodeIngestor" />
- <constructor-arg value="V9" />
+ <constructor-arg ref="schemaVersionBean" />
</bean>
</beans>
-# ============LICENSE_START===================================================
-# Copyright (c) 2018 Amdocs
-# ============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=====================================================
+# Properties for the org.onap.aai.setup.SchemaLocationsBean
+# Schema related attributes for the oxm and edges
+# Any additional schema related attributes should start with prefix schema
+schema.configuration.location=N/A
+schema.nodes.location=src/test/resources/oxm-reader/single/oxm
+schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules
-# Test properties for the org.onap.aai.setup.SchemaLocationsBean
-schemaConfig=NA
-nodeDir=src/test/resources/oxm-reader/single/
-edgeDir=src/test/resources/oxm-reader/single/
\ No newline at end of file
+# Schema Version Related Attributes
+
+# Lists all of the versions in the schema
+schema.version.list=v8,v9,v10
+# Specifies from which version should the depth parameter to default to zero
+schema.version.depth.start=v9
+# Specifies from which version should the related link be displayed in response payload
+schema.version.related.link.start=v10
+# Specifies from which version should the client see only the uri excluding host info
+# Before this version server base will also be included
+schema.version.app.root.start=v10
+# Specifies from which version should the namespace be changed
+schema.version.namespace.change.start=v10
+# Specifies from which version should the client start seeing the edge label in payload
+schema.version.edge.label.start=v10
+# Specifies the version that the application should default to
+schema.version.api.default=v9
+
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
+schema.service.nodes.endpoint=nodes?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
+
+schema.service.ssl.key-store=appconfig-local/auth/aai-client-cert.p12
+schema.service.ssl.trust-store=appconfig-local/auth/tomcat_keystore
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
- </xml-schema>
-</xml-bindings>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 2018 Amdocs
-============================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=====================================================
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
- <xml-schema element-form-default="QUALIFIED">
- <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
- </xml-schema>
-</xml-bindings>
\ No newline at end of file
Code Review / aai / validation.git / commitdiff