Merge branch 'plantbreeding:brapi-server-v2' into brapi-server-v2

Author: nickpalladino

src/main/java/io/swagger/api/pheno/ObservationsApi.java

@@ -168,7 +168,6 @@ ResponseEntity<? extends BrAPIResponse> searchObservationsPost(
 	@RequestMapping(value = "/search/observations/{searchResultsDbId}", produces = {
 			"application/json" }, method = RequestMethod.GET)
 	ResponseEntity<? extends BrAPIResponse> searchObservationsSearchResultsDbIdGet(
-			@ApiParam(value = "The requested content type which should be returned by the server", required = true) @RequestHeader(value = "Accept", required = true) WSMIMEDataTypes accept,
 			@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
 			@ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization,
 			@ApiParam(value = "Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,

src/main/java/io/swagger/model/WSMIMEDataTypes.java

@@ -1,40 +1,39 @@
 package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
-
 /**
  * Gets or Sets WSMIMEDataTypes
  */
 public enum WSMIMEDataTypes {
-  APPLICATION_JSON("application/json"),
-    TEXT_CSV("text/csv"),
-    TEXT_TSV("text/tsv"),
-    APPLICATION_FLAPJACK("application/flapjack"),
-    APPLICATION_EXCEL("application/excel"),
-    APPLICATION_ZIP("application/zip");
-
-  private String value;
-
-  WSMIMEDataTypes(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static WSMIMEDataTypes fromValue(String text) {
-    for (WSMIMEDataTypes b : WSMIMEDataTypes.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
+	APPLICATION_JSON("application/json"), 
+	TEXT_CSV("text/csv"), 
+	TEXT_TSV("text/tsv"),
+	APPLICATION_FLAPJACK("application/flapjack"), 
+	APPLICATION_EXCEL("application/excel"),
+	APPLICATION_ZIP("application/zip");
+
+	private String value;
+
+	WSMIMEDataTypes(String value) {
+		this.value = value;
+	}
+
+	@Override
+	@JsonValue
+	public String toString() {
+		return String.valueOf(value);
+	}
+
+	@JsonCreator
+	public static WSMIMEDataTypes fromValue(@JsonProperty("dataType") String text) {
+		for (WSMIMEDataTypes b : WSMIMEDataTypes.values()) {
+			if (String.valueOf(b.value).equals(text)) {
+				return b;
+			}
+		}
+		return null;
+	}
 }