Merge pull request #26 from opsgenie/STLR-298

 Update version of jackson-mapper-igpl-1.9.3 to jackson-databind 2.9.10.8

common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java

@@ -1,12 +1,12 @@
 package com.ifountain.opsgenie.client.script.util;
 
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.ifountain.opsgenie.client.script.util.deserializer.RecipientDeserializer;
 import com.ifountain.opsgenie.client.util.JsonUtils;
 import com.opsgenie.oas.sdk.model.Recipient;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.Version;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.module.SimpleModule;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
@@ -160,7 +160,7 @@ public static List<Recipient> getAsRecipientList(Map params, String propName) th
         if (objectList != null) {
             for (Map objectEntry : objectList) {
                 JsonNode jsonNode = mapper.valueToTree(objectEntry);
-                listElements.add(mapper.readValue(jsonNode, Recipient.class));
+                listElements.add(mapper.readValue(String.valueOf(jsonNode), Recipient.class));
             }
             return listElements;
         }
@@ -170,7 +170,7 @@ public static List<Recipient> getAsRecipientList(Map params, String propName) th
     public static Recipient getAsRecipient(Map params) throws Exception {
 
         JsonNode jsonNode = mapper.valueToTree(params);
-        return mapper.readValue(jsonNode, Recipient.class);
+        return mapper.readValue(String.valueOf(jsonNode), Recipient.class);
 
     }
 }

common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java

@@ -1,13 +1,14 @@
 package com.ifountain.opsgenie.client.script.util.deserializer;
 
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.util.JsonUtils;
 import com.opsgenie.oas.sdk.model.*;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 
 import java.io.IOException;
 import java.text.ParseException;

gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

sdk/build.gradle

@@ -6,8 +6,7 @@ dependencies {
     compile 'org.apache.httpcomponents:httpcore:4.2.5'
     compile 'org.apache.httpcomponents:httpmime:4.2.5'
     compile 'org.apache.httpcomponents:httpclient:4.2.5'
-    compile 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.3'
-
+    compile "com.fasterxml.jackson.core:jackson-databind:2.9.10.8"
     testCompile project(':test')
 }
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java

@@ -1,12 +1,12 @@
 package com.ifountain.opsgenie.client.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.util.JsonUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 
 import java.util.Map;
 
@@ -16,7 +16,7 @@
  *
  * @author Sezgin Kucukkaraaslan
  */
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @JsonPropertyOrder(alphabetic = true)
 public abstract class BaseRequest<T extends BaseResponse,K extends BaseRequest> implements Request {
     private String apiKey;

sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java

@@ -1,6 +1,6 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Map;
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java

@@ -1,8 +1,9 @@
 package com.ifountain.opsgenie.client.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ifountain.opsgenie.client.util.JsonUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
 
 import java.io.IOException;
 import java.text.ParseException;

sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java

@@ -1,6 +1,6 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.TimeZone;
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java

@@ -1,6 +1,7 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Interface for OpsGenie service api requests.

sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Account;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get account request.

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.BaseResponse;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java

@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.alert;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.BaseResponse;
-import org.codehaus.jackson.annotate.JsonIgnore;
 
 /**
  * Abstract Container for the alert requests.

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java

@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.alert;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Alert;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents the OpsGenie service response for an get alert request.

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alert logs api call.

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.AlertLog;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alert notes api call.

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java

@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.AlertNote;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 

sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java

@@ -1,6 +1,7 @@
 package com.ifountain.opsgenie.client.model.alert;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alerts api call.