Issue-19: Solve MR comments

Author: Olha Yelisieieva

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/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

@@ -4,26 +4,23 @@
 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 java.util.stream.Collectors;
 
 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 com.google.common.net.MediaType;
-import edu.emory.mathcs.backport.java.util.Arrays;
 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 {
-    private final Set<String> definedMimeTypes;
     protected List<PathWrapper> paths = new ArrayList<>();
     protected Map<String, Model> definitions = new HashMap<>();
     private Swagger swagger;
@@ -36,7 +33,6 @@ public ValidationContext(Swagger swagger) {
         this.swagger = swagger;
         setPaths(emptyIfNull(swagger.getPaths()));
         setDefinitions(emptyIfNull(swagger.getDefinitions()));
-        definedMimeTypes = getDefinedMimeTypes();
     }
 
     public Swagger getSwagger() {
@@ -72,26 +68,4 @@ public Map<String, VisitableParameter<? extends Parameter>> getParameters() {
     public Map<String, SecuritySchemeDefinition> getSecurityDefinitions() {
         return swagger.getSecurityDefinitions();
     }
-
-    @SuppressWarnings("unchecked")
-    private Set<String> getDefinedMimeTypes() {
-        Set<String> set;
-        try {
-            set = ((Map<MediaType, MediaType>) readDeclaredStaticField(MediaType.class, "KNOWN_TYPES", true)).keySet().stream()
-                    .map(x -> x.withoutParameters().toString()).collect(Collectors.toSet());
-        } catch (IllegalAccessException e) {
-            set = new HashSet<>();
-        }
-        return set;
-    }
-
-    public Set<String> getMimeTypes() {
-        return definedMimeTypes;
-    }
-
-    public void addCustomMimeTypes(String[] customMimeTypes) {
-        if (customMimeTypes != null) {
-            definedMimeTypes.addAll(Arrays.asList(customMimeTypes));
-        }
-    }
 }

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

@@ -175,4 +175,4 @@ List<String> getRequiredProperties() {
             return requiredProperties;
         }
     }
-}
+}

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

@@ -1,12 +1,17 @@
 package com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.path;
 
+import static com.github.sylvainlaurent.maven.swaggervalidator.semantic.OperationConstants.OPERATION_PARAMETRES_BODY;
+import static com.github.sylvainlaurent.maven.swaggervalidator.semantic.OperationConstants.OPERATION_PARAMETRES_FORM;
+import static com.github.sylvainlaurent.maven.swaggervalidator.semantic.OperationConstants.OPERATION_TYPE_DELETE;
+import static com.github.sylvainlaurent.maven.swaggervalidator.semantic.OperationConstants.OPERATION_TYPE_GET;
 import static org.apache.commons.collections4.ListUtils.emptyIfNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.path.OperationWrapper;
+import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.MediaType;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.error.SemanticError;
 
 public class MimeTypeValidator extends PathValidatorTemplate {
@@ -24,8 +29,8 @@ private void validateConsumes(OperationWrapper operation) {
         if (consumes == null) {
             consumes = new ArrayList<>(emptyIfNull(context.getSwagger().getConsumes()));
         }
-        if ("get".equals(operationName) || "delete".equals(operationName) ||
-                (operation.getParameters("body").isEmpty() && operation.getParameters("formData").isEmpty())) {
+        if (OPERATION_TYPE_GET.equals(operationName) || OPERATION_TYPE_DELETE.equals(operationName) ||
+                (operation.getParameters(OPERATION_PARAMETRES_BODY).isEmpty() && operation.getParameters(OPERATION_PARAMETRES_FORM).isEmpty())) {
             if (consumes == null || !consumes.isEmpty()) {
                 validationErrors
                         .add(new SemanticError(holder.getCurrentPath(), "'consumes' must be equal to 'consumes: []' "));
@@ -68,7 +73,7 @@ private void validateMimeTypesInCollection(Collection<String> collection, String
             collection.stream().filter(x ->
                                        {
                                            try {
-                                               return !(context.getMimeTypes().contains(x));
+                                               return !(MediaType.getMimeTypes().contains(x));
                                            } catch (Exception e) {
                                                return true;
                                            }

src/main/java/com/github/sylvainlaurent/maven/swaggervalidator/service/SemanticValidationService.java

@@ -10,6 +10,7 @@
 
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.VisitableModel;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.node.path.OperationWrapper;
+import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.MediaType;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.SwaggerValidator;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.ValidationContext;
 import com.github.sylvainlaurent.maven.swaggervalidator.semantic.validator.definition.InheritanceChainPropertiesValidator;
@@ -58,7 +59,7 @@ public SemanticValidationService(Swagger swagger, String validatorsPackageName,
         if (pathValidatorsPackageName != null) {
             validators.addAll(Util.createInstances(pathValidatorsPackageName, SwaggerPathValidator.class));
         }
-        context.addCustomMimeTypes(customMimeTypes);
+        MediaType.addCustomMimeTypes(customMimeTypes);
     }
 
     public List<SemanticError> validate() {