Merge branch 'master' of https://github.com/GrapeBaBa/java-sdk into GrapeBaBa-master

Author: germanattanasio

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVision.java

@@ -91,7 +91,7 @@ private <T extends AlchemyGenericModel> T executeRequest(Map<String, Object> par
     final String path = AlchemyEndPoints.getPath(operation, inputType);
 
     final RequestBuilder requestBuilder = RequestBuilder.post(path);
-    if (inputType == IMAGE) {
+    if (IMAGE.equals(inputType)) {
       if (params.get(IMAGE) instanceof String) {
         params.put(IMAGE_POST_MODE, NOT_RAW);
       } else {

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/util/TaxonomyTypeAdapter.java

@@ -78,7 +78,7 @@ public void write(JsonWriter writer, Taxonomy value) throws IOException {
 
     if (value.getScore() != null)
       writer.name("score").value(value.getScore());
-    if (value.getConfident() == false)
+    if (!value.getConfident())
       writer.name("confident").value("no");
     if (value.getLabel() != null)
       writer.name("label").value(value.getLabel());

src/main/java/com/ibm/watson/developer_cloud/concept_expansion/v1/model/Job.java

@@ -64,7 +64,7 @@ public static Status fromString(final String id) {
      * @param name the name
      * @param id the id
      */
-    private Status(String name, String id) {
+    Status(String name, String id) {
       this.name = name;
       this.id = id;
     }

src/main/java/com/ibm/watson/developer_cloud/http/HttpHeaders.java

@@ -22,167 +22,167 @@ public interface HttpHeaders {
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">HTTP/1.1
    * documentation</a>.
    */
-  public static final String ACCEPT = "Accept";
+  String ACCEPT = "Accept";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.2">HTTP/1.1
    * documentation</a>.
    */
-  public static final String ACCEPT_CHARSET = "Accept-Charset";
+  String ACCEPT_CHARSET = "Accept-Charset";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3">HTTP/1.1
    * documentation</a>.
    */
-  public static final String ACCEPT_ENCODING = "Accept-Encoding";
+  String ACCEPT_ENCODING = "Accept-Encoding";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4">HTTP/1.1
    * documentation</a>.
    */
-  public static final String ACCEPT_LANGUAGE = "Accept-Language";
+  String ACCEPT_LANGUAGE = "Accept-Language";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.8">HTTP/1.1
    * documentation</a>.
    */
-  public static final String AUTHORIZATION = "Authorization";
+  String AUTHORIZATION = "Authorization";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CACHE_CONTROL = "Cache-Control";
+  String CACHE_CONTROL = "Cache-Control";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_ENCODING = "Content-Encoding";
+  String CONTENT_ENCODING = "Content-Encoding";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.12">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_LANGUAGE = "Content-Language";
+  String CONTENT_LANGUAGE = "Content-Language";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.12">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_DISPOSITION = "Content-Disposition";
+  String CONTENT_DISPOSITION = "Content-Disposition";
 
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_LENGTH = "Content-Length";
+  String CONTENT_LENGTH = "Content-Length";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.14">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_LOCATION = "Content-Location";
+  String CONTENT_LOCATION = "Content-Location";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17">HTTP/1.1
    * documentation</a>.
    */
-  public static final String CONTENT_TYPE = "Content-Type";
+  String CONTENT_TYPE = "Content-Type";
 
   /**
    * See <a href="http://www.ietf.org/rfc/rfc2109.txt">IETF RFC 2109</a>.
    */
-  public static final String COOKIE = "Cookie";
+  String COOKIE = "Cookie";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18">HTTP/1.1
    * documentation</a>.
    */
-  public static final String DATE = "Date";
+  String DATE = "Date";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.19">HTTP/1.1
    * documentation</a>.
    */
-  public static final String ETAG = "ETag";
+  String ETAG = "ETag";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.21">HTTP/1.1
    * documentation</a>.
    */
-  public static final String EXPIRES = "Expires";
+  String EXPIRES = "Expires";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23">HTTP/1.1
    * documentation</a>.
    */
-  public static final String HOST = "Host";
+  String HOST = "Host";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.24">HTTP/1.1
    * documentation</a>.
    */
-  public static final String IF_MATCH = "If-Match";
+  String IF_MATCH = "If-Match";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25">HTTP/1.1
    * documentation</a>.
    */
-  public static final String IF_MODIFIED_SINCE = "If-Modified-Since";
+  String IF_MODIFIED_SINCE = "If-Modified-Since";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.26">HTTP/1.1
    * documentation</a>.
    */
-  public static final String IF_NONE_MATCH = "If-None-Match";
+  String IF_NONE_MATCH = "If-None-Match";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.28">HTTP/1.1
    * documentation</a>.
    */
-  public static final String IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
+  String IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.29">HTTP/1.1
    * documentation</a>.
    */
-  public static final String LAST_MODIFIED = "Last-Modified";
+  String LAST_MODIFIED = "Last-Modified";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30">HTTP/1.1
    * documentation</a>.
    */
-  public static final String LOCATION = "Location";
+  String LOCATION = "Location";
 
   /**
    * See <a href="http://www.ietf.org/rfc/rfc2109.txt">IETF RFC 2109</a>.
    */
-  public static final String SET_COOKIE = "Set-Cookie";
+  String SET_COOKIE = "Set-Cookie";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43">HTTP/1.1
    * documentation</a>.
    */
-  public static final String USER_AGENT = "User-Agent";
+  String USER_AGENT = "User-Agent";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44">HTTP/1.1
    * documentation</a>.
    */
-  public static final String VARY = "Vary";
+  String VARY = "Vary";
 
   /**
    * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.47">HTTP/1.1
    * documentation</a>.
    */
-  public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
+  String WWW_AUTHENTICATE = "WWW-Authenticate";
 
   /** The Authorization token header. */
-  public static final String X_WATSON_AUTHORIZATION_TOKEN = "X-Watson-Authorization-Token";
+  String X_WATSON_AUTHORIZATION_TOKEN = "X-Watson-Authorization-Token";
 
   /** Allow Watson to collect the payload. */
-  public static final String X_WATSON_LEARNING_OPT_OUT = "X-Watson-Learning-Opt-Out";
+  String X_WATSON_LEARNING_OPT_OUT = "X-Watson-Learning-Opt-Out";
 
 }

src/main/java/com/ibm/watson/developer_cloud/http/HttpMediaType.java

@@ -26,118 +26,118 @@ public interface HttpMediaType {
   /**
    * Field APPLICATION_ATOM_XML. (value is "application/atom+xml")
    */
-  public final static String APPLICATION_ATOM_XML = "application/atom+xml";
+  String APPLICATION_ATOM_XML = "application/atom+xml";
   /**
    * Field APPLICATION_FORM_URLENCODED. (value is "application/x-www-form-urlencoded")
    */
-  public final static String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
+  String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
   /**
    * Field APPLICATION_JSON. (value is "application/json")
    */
-  public final static String APPLICATION_JSON = "application/json";
+  String APPLICATION_JSON = "application/json";
   /**
    * Field APPLICATION_MS_WORD. (value is "application/msword")
    */
-  public final static String APPLICATION_MS_WORD = "application/msword";
+  String APPLICATION_MS_WORD = "application/msword";
 
   /**
    * Field APPLICATION_MS_WORD_DOCX. (value is
    * "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
    */
-  public final static String APPLICATION_MS_WORD_DOCX =
+  String APPLICATION_MS_WORD_DOCX =
       "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 
   /**
    * Field APPLICATION_OCTET_STREAM. (value is "application/octet-stream")
    */
-  public final static String APPLICATION_OCTET_STREAM = "application/octet-stream";
+  String APPLICATION_OCTET_STREAM = "application/octet-stream";
   /**
    * Field APPLICATION_PDF. (value is "application/pdf")
    */
-  public final static String APPLICATION_PDF = "application/pdf";
+  String APPLICATION_PDF = "application/pdf";
   /**
    * Field APPLICATION_SVG_XML. (value is "application/svg+xml")
    */
-  public final static String APPLICATION_SVG_XML = "application/svg+xml";
+  String APPLICATION_SVG_XML = "application/svg+xml";
   /**
    * Field APPLICATION_XHTML_XML. (value is "application/xhtml+xml")
    */
-  public final static String APPLICATION_XHTML_XML = "application/xhtml+xml";
+  String APPLICATION_XHTML_XML = "application/xhtml+xml";
   /**
    * Field APPLICATION_ZIP. (value is "application/zip")
    */
-  public final static String APPLICATION_ZIP = "application/zip";
+  String APPLICATION_ZIP = "application/zip";
 
   /**
    * Field APPLICATION_XML. (value is "application/xml")
    */
-  public final static String APPLICATION_XML = "application/xml";
+  String APPLICATION_XML = "application/xml";
   /**
    * Field AUDIO_OGG. (value is "audio/ogg; codecs=opus")
    */
-  public final static String AUDIO_OGG = "audio/ogg; codecs=opus";
+  String AUDIO_OGG = "audio/ogg; codecs=opus";
   /**
    * Field AUDIO_WAV. (value is "audio/wav")
    */
-  public final static String AUDIO_WAV = "audio/wav";
+  String AUDIO_WAV = "audio/wav";
 
   /**
    * Field AUDIO_FLAC. (value is "audio/flac")
    */
-  public static final String AUDIO_FLAC = "audio/flac";
+  String AUDIO_FLAC = "audio/flac";
 
   /**
    * Field AUDIO_RAW. (value is "audio/l16")
    */
-  public static final String AUDIO_RAW = "audio/l16";
+  String AUDIO_RAW = "audio/l16";
 
   /**
    * Field BINARY_FILE. (value is "application/octet-stream")
    */
-  public static final MediaType BINARY_FILE = MediaType.parse(APPLICATION_OCTET_STREAM);
+  MediaType BINARY_FILE = MediaType.parse(APPLICATION_OCTET_STREAM);
   /**
    * Field BINARY_OCTET_STREAM. (value is "binary/octet-stream")
    */
-  public final static String BINARY_OCTET_STREAM = "binary/octet-stream";
+  String BINARY_OCTET_STREAM = "binary/octet-stream";
   /**
    * Field JSON. (value is "application/json; charset=utf-8")
    */
-  public static final MediaType JSON = MediaType.parse(APPLICATION_JSON + "; charset=utf-8");
+  MediaType JSON = MediaType.parse(APPLICATION_JSON + "; charset=utf-8");
   /**
    * Field MEDIA_TYPE_WILDCARD. (value is "*")
    */
-  public static final String MEDIA_TYPE_WILDCARD = "*";
+  String MEDIA_TYPE_WILDCARD = "*";
   /**
    * Field MULTIPART_FORM_DATA. (value is "multipart/form-data")
    */
-  public final static String MULTIPART_FORM_DATA = "multipart/form-data";
+  String MULTIPART_FORM_DATA = "multipart/form-data";
   /**
    * Field TEXT_CSV. (value is "text/csv")
    */
-  public static final String TEXT_CSV = "text/csv";
+  String TEXT_CSV = "text/csv";
 
   /**
    * Field TEXT_HTML. (value is "text/html")
    */
-  public final static String TEXT_HTML = "text/html";
+  String TEXT_HTML = "text/html";
 
   /**
    * Field TEXT_PLAIN. (value is "text/plain")
    */
-  public final static String TEXT_PLAIN = "text/plain";
+  String TEXT_PLAIN = "text/plain";
 
   /**
    * Field TEXT. (value is "text/plain; charset=utf-8")
    */
-  public static final MediaType TEXT = MediaType.parse(TEXT_PLAIN + "; charset=utf-8");
+  MediaType TEXT = MediaType.parse(TEXT_PLAIN + "; charset=utf-8");
 
   /**
    * Field TEXT_XML. (value is "text/xml")
    */
-  public final static String TEXT_XML = "text/xml";
+  String TEXT_XML = "text/xml";
 
   /**
    * Field WILDCARD. (value is "*\/*")
    */
-  public final static String WILDCARD = "*/*";
+  String WILDCARD = "*/*";
 }