Merge pull request #20 from oyeli/Issue-19

Issue 19

Author: sylvainlaurent

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/ValidateMojo.java

@@ -42,12 +42,16 @@ public class ValidateMojo extends AbstractMojo {
     @Parameter(defaultValue = "true")
     private boolean failOnErrors;
 
+    @Parameter
+    private String[] customMimeTypes;
+
     private final ValidationService validationService = new ValidationService();
 
     @Override
     public void execute() throws MojoExecutionException {
         validationService.setCustomModelValidatorsPackage(customModelValidatorsPackage);
         validationService.setCustomPathValidatorsPackage(customPathValidatorsPackage);
+        validationService.setCustomMimeTypes(customMimeTypes);
 
         Instrumentation.init();
 

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/OperationConstants.java

@@ -0,0 +1,8 @@
+package com.github.sylvainlaurent.maven.swaggervalidator.semantic;
+
+public interface OperationConstants {
+    String OPERATION_TYPE_GET = "get";
+    String OPERATION_TYPE_DELETE = "delete";
+    String OPERATION_PARAMETRES_BODY = "body";
+    String OPERATION_PARAMETRES_FORM = "formData";
+}

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/VisitedItemsHolder.java

@@ -1,6 +1,8 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic;
 
 import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Deque;
 
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.VisitableModel;
@@ -31,4 +33,8 @@ public void pop() {
     public String getCurrentPath() {
         return String.join(".", (Iterable<String>) () -> visitedItems.descendingIterator());
     }
+
+    public Collection<String> getVisitedItems() {
+        return Collections.unmodifiableCollection(visitedItems);
+    }
 }

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/node/model/ComposedModelWrapper.java

@@ -1,6 +1,5 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.model;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -64,16 +63,6 @@ public String getDiscriminator() {
         return ((ModelImpl) model.getChild()).getDiscriminator();
     }
 
-    public List<String> getRequired() {
-        if (model.getChild() == null || !(model.getChild() instanceof ModelImpl)) {
-            return new ArrayList<>();
-        }
-        // looks like it's always of this type
-        List<String> required = ((ModelImpl) model.getChild()).getRequired();
-
-        return required == null ? new ArrayList<>() : required;
-    }
-
     // returns only properties from this model, not parents
     @Override
     public Map<String, VisitableProperty<? extends Property>> getProperties() {

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/node/model/ModelImplWrapper.java

@@ -1,17 +1,16 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.model;
 
-import static java.util.Collections.emptyList;
 import static org.apache.commons.collections4.ListUtils.emptyIfNull;
 import static org.apache.commons.lang3.reflect.FieldUtils.readField;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.ModelVisitor;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.VisitablePropertyFactory;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.VisitableProperty;
-
 import io.swagger.models.ModelImpl;
 import io.swagger.models.properties.Property;
 
@@ -26,11 +25,13 @@ public ModelImplWrapper(String name, ModelImpl model) {
 
     @SuppressWarnings("unchecked")
     public List<String> getRequired() {
+        List<String> requiredProperties;
         try {
-            return emptyIfNull((List<String>) readField(model, "required", true));
+            requiredProperties = new ArrayList<>(emptyIfNull((List<String>) readField(model, "required", true)));
         } catch (IllegalAccessException ex) {
-            return emptyList();
+            requiredProperties = new ArrayList<>();
         }
+        return requiredProperties;
     }
 
     public List<String> getReadOlyProperties() {

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/semantic/node/path/OperationWrapper.java

@@ -25,8 +25,8 @@ public class OperationWrapper implements PathObject {
     private String summary;
     private String description;
     private String operationId;
-    private List<String> consumes = new ArrayList<>();
-    private List<String> produces = new ArrayList<>();
+    private List<String> consumes;
+    private List<String> produces;
     private List<SchemeWrapper> schemes = new ArrayList<>();
     private List<Map<String, List<String>>> security = new ArrayList<>();
     private Boolean deprecated;
@@ -46,10 +46,10 @@ public OperationWrapper(String name, Operation operation, PathWrapper path) {
             this.tags.addAll(operation.getTags());
         }
         if (operation.getConsumes() != null) {
-            this.consumes.addAll(operation.getConsumes());
+            this.consumes = new ArrayList<>(operation.getConsumes());
         }
         if (operation.getProduces() != null) {
-            this.produces.addAll(operation.getProduces());
+            this.produces = new ArrayList<>(operation.getProduces());
         }
         if (operation.getSecurity() != null) {
             this.security.addAll(operation.getSecurity());

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

@@ -0,0 +1,38 @@
+package com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator;
+
+import static org.apache.commons.lang3.reflect.FieldUtils.readDeclaredStaticField;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import io.swagger.models.Swagger;
+
+public class MediaType {
+    private static final Set<String> DEFINED_MEDIA_TYPES = getDefinedMimeTypes();
+
+    @SuppressWarnings("unchecked")
+    private static Set<String> getDefinedMimeTypes() {
+        Set<String> set;
+        try {
+            set = ((Map<com.google.common.net.MediaType, com.google.common.net.MediaType>) readDeclaredStaticField(
+                    com.google.common.net.MediaType.class, "KNOWN_TYPES", true)).keySet().stream()
+                    .map(x -> x.withoutParameters().toString()).collect(Collectors.toSet());
+        } catch (IllegalAccessException e) {
+            set = new HashSet<>();
+        }
+        return set;
+    }
+
+    public static Set<String> getMimeTypes() {
+        return DEFINED_MEDIA_TYPES;
+    }
+
+    public static void addCustomMimeTypes(String[] customMimeTypes) {
+        if (customMimeTypes != null) {
+            DEFINED_MEDIA_TYPES.addAll(Arrays.asList(customMimeTypes));
+        }
+    }
+}

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

@@ -1,24 +1,26 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator;
 
 import static org.apache.commons.collections4.MapUtils.emptyIfNull;
+import static org.apache.commons.lang3.reflect.FieldUtils.readDeclaredStaticField;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.VisitableParameterFactory;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.VisitableParameter;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.path.PathWrapper;
-
 import io.swagger.models.Model;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
 import io.swagger.models.auth.SecuritySchemeDefinition;
 import io.swagger.models.parameters.Parameter;
 
 public class ValidationContext {
-
     protected List<PathWrapper> paths = new ArrayList<>();
     protected Map<String, Model> definitions = new HashMap<>();
     private Swagger swagger;