fixed postman import for 2.1.0 (more lenient). fixes #204

Author: Peter Mucha

milkman-rest/pom.xml

@@ -95,7 +95,7 @@
 			<plugin>
 				<groupId>org.jsonschema2pojo</groupId>
 				<artifactId>jsonschema2pojo-maven-plugin</artifactId>
-				<version>1.0.1</version>
+				<version>1.2.1</version>
 				<configuration>
 					<sourceDirectory>${basedir}/src/main/schema</sourceDirectory>
 					<targetPackage>com.milkman.rest.postman.schema</targetPackage>

milkman-rest/src/main/java/milkman/ui/plugin/rest/postman/importers/PostmanImporterV21.java

@@ -1,28 +1,22 @@
 package milkman.ui.plugin.rest.postman.importers;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
+import co.poynt.postman.model.PostmanEnvValue;
+import co.poynt.postman.model.PostmanEnvironment;
 import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.milkman.rest.postman.schema.v21.ItemGroup;
 import com.milkman.rest.postman.schema.v21.PostmanCollection210;
 import com.milkman.rest.postman.schema.v21.Url;
-
-import co.poynt.postman.model.PostmanEnvValue;
-import co.poynt.postman.model.PostmanEnvironment;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
 import milkman.domain.Collection;
 import milkman.domain.Environment;
 import milkman.domain.Environment.EnvironmentEntry;
@@ -108,7 +102,9 @@ private void convertToDomain(ItemGroup pmItem, List<RequestContainer> requests,
 
 			//adding headers
 			RestHeaderAspect headers = new RestHeaderAspect();
-			pmItem.getRequest().getHeader().forEach(h -> headers.getEntries().add(new HeaderEntry(UUID.randomUUID().toString(),h.getKey(), h.getValue(), true)));
+			if (pmItem.getRequest().getHeader() != null) {
+				pmItem.getRequest().getHeader().forEach(h -> headers.getEntries().add(new HeaderEntry(UUID.randomUUID().toString(),h.getKey(), h.getValue(), true)));
+			}
 			request.addAspect(headers);
 
 			//adding bodies

milkman-rest/src/main/schema/postman-collection-1.0.0.json

@@ -928,11 +928,7 @@
 					}
 				},
 				"rawModeData": {
-					"type": [
-						"string",
-						"null",
-						"array"
-					],
+					"type": "string",
 					"description": "Contains the raw data (parameters) that Postman sends to the server"
 				},
 				"graphqlModeData": {

milkman-rest/src/main/schema/postman-collection-2.1.0.json

@@ -280,7 +280,7 @@
 			"$schema": "http://json-schema.org/draft-07/schema#",
 			"$id": "#/definitions/description",
 			"description": "A Description can be a raw text, or be an object, which holds the description along with its format.",
-			"type": "string"
+			"type": "any"
 		},
 		"event-list": {
 			"$id": "#/definitions/event-list",