Merge pull request #17 from oyeli/Issue-16

Issue-16: Fixing NPE during ComposedModel validation in InheritanceCh…

Author: sylvainlaurent

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/validator/definition/InheritanceChainPropertiesValidator.java

@@ -68,9 +68,9 @@ public void validate(RefModelWrapper refModelWrapper) {
         @Override
         public void validate(ComposedModelWrapper composedModelWrapper) {
             if (composedModelWrapper != root) {
-                Map<String, Property> childProperties = composedModelWrapper.getChild().getProperties() != null ?
-                                                        composedModelWrapper.getChild().getProperties() :
-                                                        Collections.<String, Property>emptyMap();
+                Map<String, Property> childProperties = composedModelWrapper.getChild()== null || composedModelWrapper.getChild().getProperties() == null ?
+                                                        Collections.<String, Property>emptyMap() :
+                                                        composedModelWrapper.getChild().getProperties();
                 parentProperties.addAll(childProperties.keySet());
             }
 

src/test/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/validator/path/InheritanceChainPropertiesValidatorTest.java

@@ -0,0 +1,35 @@
+package com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.path;
+
+import static com.github.sylvainlaurent.maven.swaggervalidator.SemanticValidationServiceTest.RESOURCE_FOLDER;
+import static com.github.sylvainlaurent.maven.swaggervalidator.SemanticValidationServiceTest.readDoc;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import com.github.sylvainlaurent.maven.swaggervalidator.ValidatorJunitRunner;
+import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.error.SemanticError;
+import com.github.sylvainlaurent.maven.swaggervalidator.service.SemanticValidationService;
+import io.swagger.parser.util.SwaggerDeserializationResult;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(ValidatorJunitRunner.class)
+public class InheritanceChainPropertiesValidatorTest {
+
+    private static Logger logger = LoggerFactory.getLogger(InheritanceChainPropertiesValidatorTest.class);
+
+    @Test
+    public void succeed_when_ancestor_has_no_properties() {
+        SwaggerDeserializationResult swaggerResult = readDoc(
+                RESOURCE_FOLDER + "inheritance-hierarchy-model-valid.yml");
+        List<SemanticError> errors = new SemanticValidationService(swaggerResult.getSwagger()).validate();
+        logger.info(errors.toString());
+
+        assertTrue(errors.isEmpty());
+    }
+
+}

src/test/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/validator/path/OperationParametersReferenceValidatorTest.java

@@ -1,9 +1,11 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.path;
 
+import com.github.sylvainlaurent.maven.swaggervalidator.ValidatorJunitRunner;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.error.SemanticError;
 import com.github.sylvainlaurent.maven.swaggervalidator.service.SemanticValidationService;
 import io.swagger.parser.util.SwaggerDeserializationResult;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,6 +17,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(ValidatorJunitRunner.class)
 public class OperationParametersReferenceValidatorTest {
 
     private static Logger logger = LoggerFactory.getLogger(OperationParametersReferenceValidatorTest.class);

src/test/java/com/github/sylvainlaurent/maven/swaggervalidator/util/UtilTest.java

@@ -2,6 +2,7 @@
 
 import java.util.Set;
 
+import com.github.sylvainlaurent.maven.swaggervalidator.ValidatorJunitRunner;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -12,7 +13,9 @@
 import com.github.sylvainlaurent.maven.swaggervalidator.util.validators.path.PathValidatorImpl;
 import com.github.sylvainlaurent.maven.swaggervalidator.util.validators.path.PathValidatorTemplateImpl;
 import com.github.sylvainlaurent.maven.swaggervalidator.util.validators.path.SwaggerPathValidatorImpl;
+import org.junit.runner.RunWith;
 
+@RunWith(ValidatorJunitRunner.class)
 public class UtilTest {
 
     private static final String MODEL_VALIDATORS_PACKAGE = "com.github.sylvainlaurent.maven.swaggervalidator.util.validators.model";

src/test/resources/semantic-validation/inheritance-hierarchy-model-valid.yml

@@ -0,0 +1,56 @@
+swagger: '2.0'
+info:
+  title: Test API
+  description: Test API
+  version: "1.0.0"
+host: none
+schemes:
+  - https
+basePath: /v1
+produces:
+  - application/json
+paths:
+  /products/{id}:
+    get:
+      parameters:
+        - name: id
+          in: path
+          required: true
+          type: string
+      operationId: getProduct
+      summary: test service
+      responses:
+        200:
+          description: ok
+          schema:
+            $ref: '#/definitions/Product'
+
+definitions:
+  TypedProduct1:
+    x-discriminator-value: productType1
+    allOf:
+      - $ref: '#/definitions/CatalogProduct'
+  CatalogProduct:
+    allOf:
+      - $ref: '#/definitions/Product'
+  Product:
+    allOf:
+      - $ref: '#/definitions/Entity'
+      - type: object
+        discriminator: productType
+        required:
+          - productType
+        properties:
+          productType:
+            $ref: '#/definitions/ProductType'
+  Entity:
+    type: object
+    properties:
+      id:
+        type: string
+  ProductType:
+    type: string
+    enum:
+      - productType1
+      - productType2
+      - productType3