From 37843cb3c1765bd5263e3c02f5b14ffa53041e1d Mon Sep 17 00:00:00 2001
From: dekstroza <dejan.kitic@ericsson.com>
Date: Fri, 18 May 2018 14:42:24 +0100
Subject: json/yaml validation for models

Introduced yaml-json-validator-maven-plugin
   a. Runs in validate phase
   b. For now only validate /import/tosca subfolders
   c. Validates both yml and json files

Change-Id: I53513321c4378485dd821c251de5555050313911
Issue-ID: SDC-1343
Signed-off-by: dekstroza <dejan.kitic@ericsson.com>
---
 catalog-be/pom.xml                                 | 61 ++++++++++++++--------
 .../src/test/resources/config/mysql-type.yml       |  2 +-
 2 files changed, 40 insertions(+), 23 deletions(-)

(limited to 'catalog-be')

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 068eecf53b..f0113df130 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,5 +1,5 @@
 <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">
+  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>
 
     <artifactId>catalog-be</artifactId>
@@ -145,7 +145,6 @@
             <version>${jersey-bom.version}</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-spring4</artifactId>
@@ -498,9 +497,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
-
         <dependency>
             <groupId>com.att.aft</groupId>
             <artifactId>dme2</artifactId>
@@ -529,12 +525,10 @@
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
             <version>${jersey-bom.version}</version>
-
         </dependency>
 
         <dependency>
@@ -594,13 +588,13 @@
             <artifactId>cucumber-junit</artifactId>
             <scope>test</scope>
         </dependency>
-    	
-    	<dependency>
-    		<groupId>org.jmockit</groupId>
-			<artifactId>jmockit</artifactId>
-			<version>${jmockit.version}</version>
-			<scope>test</scope>
-		</dependency>
+
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>${jmockit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.google.code.bean-matchers</groupId>
@@ -608,9 +602,8 @@
             <version>0.11</version>
             <scope>test</scope>
         </dependency>
-		
     </dependencies>
-	
+
     <build>
 
         <finalName>${project.artifactId}-${project.version}</finalName>
@@ -643,6 +636,35 @@
                     <attachClasses>true</attachClasses>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.sylvainlaurent.maven</groupId>
+                <artifactId>yaml-json-validator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <configuration>
+                            <validationSets>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.y*ml</include>
+                                        <include>src/test/resources/**/*.y*ml</include>
+                                    </includes>
+                                </validationSet>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.json</include>
+                                        <include>src/test/resources/**/*.json</include>
+                                    </includes>
+                                </validationSet>
+                            </validationSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.jcabi</groupId>
                 <artifactId>jcabi-maven-plugin</artifactId>
@@ -655,7 +677,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -742,8 +763,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -1003,7 +1022,5 @@
                 </plugins>
             </build>
         </profile>
-
-
     </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/catalog-be/src/test/resources/config/mysql-type.yml b/catalog-be/src/test/resources/config/mysql-type.yml
index f1985a0bdc..c275537094 100644
--- a/catalog-be/src/test/resources/config/mysql-type.yml
+++ b/catalog-be/src/test/resources/config/mysql-type.yml
@@ -40,7 +40,7 @@ node_types:
       db_password:
         type: string
         default: pass
-        description: The password associated with the user account provided in the ‘db_user’ property.
+        description: The password associated with the user account provided in the db_user property.
       bind_address:
         type: boolean
         default: true
-- 
cgit 1.2.3-korg