From 048db7b1b6d95a2f3b40c6e4537065919b659d63 Mon Sep 17 00:00:00 2001 From: Tohfa Rabab Date: Tue, 14 Sep 2021 09:26:41 +0530 Subject: [PATCH] update jackson version --- .../client/script/util/ScriptBridgeUtils.java | 12 +- .../deserializer/RecipientDeserializer.java | 11 +- gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 52818 bytes gradlew.bat | 180 +++++++++--------- sdk/build.gradle | 3 +- .../opsgenie/client/model/BaseRequest.java | 10 +- .../model/BaseRequestWithHttpParameters.java | 2 +- .../opsgenie/client/model/BaseResponse.java | 5 +- .../client/model/ObjectWithTimeZone.java | 2 +- .../opsgenie/client/model/Request.java | 3 +- .../model/account/GetAccountInfoResponse.java | 2 +- .../client/model/alert/AlertsRequest.java | 2 +- .../model/alert/BaseAlertRequestWithId.java | 2 +- .../client/model/alert/GetAlertResponse.java | 2 +- .../model/alert/ListAlertLogsRequest.java | 2 +- .../model/alert/ListAlertLogsResponse.java | 2 +- .../model/alert/ListAlertNotesRequest.java | 2 +- .../model/alert/ListAlertNotesResponse.java | 2 +- .../client/model/alert/ListAlertsRequest.java | 3 +- .../model/alert/RemoveDetailsRequest.java | 2 +- .../client/model/alert/RemoveTagsRequest.java | 2 +- .../client/model/alert/SnoozeRequest.java | 2 +- .../alertpolicy/EnableAlertPolicyRequest.java | 2 +- .../opsgenie/client/model/beans/Alert.java | 3 +- .../opsgenie/client/model/beans/Bean.java | 10 +- .../client/model/beans/Condition.java | 4 +- .../opsgenie/client/model/beans/Contact.java | 5 +- .../client/model/beans/EscalationRule.java | 5 +- .../client/model/beans/Forwarding.java | 2 +- .../client/model/beans/NotificationRule.java | 4 +- .../opsgenie/client/model/beans/Schedule.java | 2 +- .../client/model/beans/ScheduleOverride.java | 2 +- .../model/beans/ScheduleRestrictionTime.java | 5 +- .../client/model/beans/ScheduleRotation.java | 4 +- .../beans/ScheduleRotationRestriction.java | 6 +- .../opsgenie/client/model/beans/User.java | 8 +- .../opsgenie/client/model/beans/UserRole.java | 5 +- .../client/model/beans/WhoIsOnCall.java | 2 +- .../model/contact/GetContactResponse.java | 2 +- .../customer/EnableHeartbeatRequest.java | 2 +- .../model/customer/GetHeartbeatResponse.java | 2 +- .../model/customer/HeartbeatRequest.java | 2 +- .../escalation/GetEscalationResponse.java | 2 +- .../model/group/AddGroupMemberRequest.java | 2 +- .../client/model/group/GetGroupResponse.java | 2 +- .../integration/EnableIntegrationRequest.java | 2 +- .../integration/SendToIntegrationRequest.java | 2 +- .../GetNotificationRuleResponse.java | 2 +- .../schedule/AbstractWhoIsOnCallRequest.java | 2 +- .../schedule/AddScheduleOverrideRequest.java | 2 +- .../model/schedule/AddScheduleRequest.java | 2 +- .../model/schedule/ExportScheduleRequest.java | 2 +- .../schedule/FlatWhoIsOnCallResponse.java | 4 +- .../schedule/GetScheduleOverrideResponse.java | 2 +- .../model/schedule/GetScheduleResponse.java | 2 +- .../schedule/ListFlatWhoIsOnCallResponse.java | 2 +- .../ListScheduleOverridesResponse.java | 2 +- .../schedule/ListWhoIsOnCallResponse.java | 3 +- .../model/schedule/UpdateScheduleRequest.java | 2 +- .../model/schedule/WhoIsOnCallResponse.java | 2 +- .../client/model/team/GetTeamResponse.java | 2 +- .../model/team/ListTeamLogsRequest.java | 2 +- .../model/team/ListTeamLogsResponse.java | 2 +- .../GetTeamRoutingRuleResponse.java | 2 +- .../client/model/user/AddUserRequest.java | 4 +- .../client/model/user/GetUserResponse.java | 2 +- .../client/model/user/UpdateUserRequest.java | 4 +- .../user/forward/AddForwardingRequest.java | 2 +- .../user/forward/GetForwardingResponse.java | 2 +- .../user/forward/UpdateForwardingRequest.java | 2 +- .../opsgenie/client/rest/RestApiRequest.java | 5 +- .../rest/response/RestFailureResult.java | 4 +- .../rest/response/RestSuccessResult.java | 6 +- .../opsgenie/client/util/JsonUtils.java | 5 +- .../opsgenie/client/OpsGenieClientTest.groovy | 1 - .../opsgenie/client/test/util/JSON.java | 3 +- 76 files changed, 214 insertions(+), 203 deletions(-) diff --git a/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java b/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java index e55f8492..9f3944eb 100644 --- a/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java +++ b/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 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 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); } } diff --git a/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java b/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java index 062243df..fcf11c65 100644 --- a/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java +++ b/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; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..deedc7fa5e6310eac3148a7dd0b1f069b07364cb 100644 GIT binary patch delta 29691 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 WYLMroMqvVNSk#FI@(wk>zx*F;6?@YF diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..aec99730 100644 --- a/gradlew.bat +++ b/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 diff --git a/sdk/build.gradle b/sdk/build.gradle index 648f4325..6df977ed 100644 --- a/sdk/build.gradle +++ b/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') } diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java index 1313f86f..50e6f1dc 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java +++ b/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 implements Request { private String apiKey; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java index a0882fcf..d494c0da 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java index 326ffd52..8f040906 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java index b4da853c..2199ec43 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java index 417b9ac3..744bccd0 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java index d9ef519b..007ba514 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java index f2044aba..73c25458 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java index 9c1086f9..c5c60a14 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java index 3b61f1f9..b1904019 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java index dd8860a5..dde1f826 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java index e32b823d..f3a10b2a 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java index 2164609c..2c55fe7c 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java index 9f1ecf82..6ba0c364 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java +++ b/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; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java index 80a8760f..bcafdbf0 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java +++ b/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. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java index 6a0c534d..dc55d588 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java @@ -1,7 +1,7 @@ package com.ifountain.opsgenie.client.model.alert; import com.ifountain.opsgenie.client.util.Strings; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java index 8af7f6c3..aa042e43 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java @@ -1,7 +1,7 @@ package com.ifountain.opsgenie.client.model.alert; import com.ifountain.opsgenie.client.util.Strings; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java index 4c1622f7..470b2292 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java @@ -1,7 +1,7 @@ package com.ifountain.opsgenie.client.model.alert; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.Date; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java index 3a7b1ced..ac17c195 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.alertpolicy; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonIgnore; /** * Container for the parameters to enable/disable alert policy. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java index f6841393..c10b1008 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java @@ -1,6 +1,7 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; import java.util.Map; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java index fd1b9228..ecca8894 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java @@ -1,16 +1,16 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.ifountain.opsgenie.client.util.JsonUtils; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonPropertyOrder; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + import java.text.ParseException; import java.util.Map; @JsonPropertyOrder(alphabetic = true) -@JsonSerialize(include = Inclusion.NON_NULL) +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public abstract class Bean implements IBean { diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java index a564f5dd..0f1ef0ca 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java @@ -1,9 +1,9 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.ifountain.opsgenie.client.OpsGenieClientConstants; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; /** * Condition bean diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java index 3c2c8bc1..fe74b4e6 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java @@ -1,9 +1,10 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.ifountain.opsgenie.client.OpsGenieClientConstants; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; + /** * Contact bean diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java index 1f16289d..46e80035 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java @@ -1,7 +1,8 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; public class EscalationRule extends Bean { private String notify; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java index 1d6387b9..9457cbdd 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java @@ -1,9 +1,9 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.model.ConvertFromTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java index 7f0984a9..8095438f 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java @@ -1,9 +1,9 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.ifountain.opsgenie.client.OpsGenieClientConstants; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java index 71cb78bd..10156a00 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java @@ -3,7 +3,7 @@ import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.model.ConvertFromTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java index f432f133..fd1d4c21 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java @@ -3,7 +3,7 @@ import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.model.ConvertFromTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java index 5b53e008..6bda74cf 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java @@ -1,7 +1,8 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; @Deprecated public class ScheduleRestrictionTime { diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java index 54a9d565..2bff618e 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java @@ -2,8 +2,8 @@ import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.Date; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java index f17b84ea..2c034e21 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonValue; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonValue; /** * ScheduleRotationRestriction bean diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java index 83f2d640..856e0ec6 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java @@ -1,11 +1,11 @@ package com.ifountain.opsgenie.client.model.beans; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import com.ifountain.opsgenie.client.util.JsonUtils; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonValue; import java.util.ArrayList; import java.util.HashMap; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java index b26462a5..9d564427 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java @@ -1,7 +1,8 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * UserRole bean Users can use standard roles (admin-owner-user) or they can create their own custom diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java index a39de642..1ef7cb60 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java @@ -1,6 +1,6 @@ package com.ifountain.opsgenie.client.model.beans; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java index 2c2fab62..2f1d0847 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.contact; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Contact; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get contact request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java index 85cd04f8..67cdb5fb 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * Container for the parameters to make a enable/disable heartbeat monitor api call. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java index 8d1707f2..37af3cc3 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Heartbeat; -import org.codehaus.jackson.annotate.JsonUnwrapped; +import com.fasterxml.jackson.annotation.JsonUnwrapped; /** * Represents OpsGenie service response for get heartbeat request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java index 70afc38c..2ee3b8cd 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * Container for the parameters to make a heartbeat api call. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java index a4ee0132..a66d040e 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.escalation; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Escalation; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get escalation request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java index a92ecdd8..6193a6a1 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java @@ -1,9 +1,9 @@ package com.ifountain.opsgenie.client.model.group; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.util.Strings; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java index 1a34c51d..4f532006 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.group; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Group; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get group request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java index 27f80d5e..5e1441f1 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * Container for the parameters to make an enable/disable integration api call. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java index d753e21b..ae29ba42 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseRequestWithHttpParameters; -import org.codehaus.jackson.annotate.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnyGetter; import java.util.Map; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java index 51159ecb..3e68f35c 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.notification_rule; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.NotificationRule; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get notificationRule request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java index c11fb968..05891098 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java @@ -1,10 +1,10 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.Date; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java index 73c13de9..3b209a4a 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java @@ -3,7 +3,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java index f891c3b5..fa49f217 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java @@ -1,10 +1,10 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; import com.ifountain.opsgenie.client.model.beans.ScheduleRotation; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.List; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java index 674feab1..f4e05103 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java index 863ddeff..ca5fb159 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java @@ -1,8 +1,10 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonUnwrapped; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.FlatWhoIsOnCall; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for flat who is on call request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java index 367f264b..8fb6bd34 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.ScheduleOverride; -import org.codehaus.jackson.annotate.JsonUnwrapped; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import java.io.IOException; import java.text.ParseException; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java index d0833cbe..1c1a2273 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Schedule; -import org.codehaus.jackson.annotate.JsonUnwrapped; import java.io.IOException; import java.text.ParseException; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java index bfa3e663..068093de 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.FlatWhoIsOnCall; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java index 0e00e39e..8d1403d9 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java @@ -2,7 +2,7 @@ import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.ScheduleOverride; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.IOException; import java.text.ParseException; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java index 044b5f1a..747c598e 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java @@ -1,8 +1,9 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonProperty; + import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.WhoIsOnCall; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java index 914713bc..3a24d370 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java @@ -1,12 +1,12 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.OpsGenieClientValidationException; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; import com.ifountain.opsgenie.client.model.beans.ScheduleRotation; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.List; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java index 3e8dea3a..7ffc5357 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.schedule; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.WhoIsOnCall; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for who is on call request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java index 99e59871..de42d245 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.team; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Team; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get team request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java index ea0129b0..f783089c 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java @@ -1,7 +1,7 @@ package com.ifountain.opsgenie.client.model.team; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseRequest; -import org.codehaus.jackson.annotate.JsonProperty; /** * Container for the parameters to make a list team logs api call. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java index 28542316..d395b439 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.team; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.TeamLog; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.List; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java index b04765c4..7bef2de4 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.team.routing_rule; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.TeamRoutingRule; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get TeamRoutingRules request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java index 62893a39..0773bf84 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java @@ -1,11 +1,11 @@ package com.ifountain.opsgenie.client.model.user; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.beans.User; import com.ifountain.opsgenie.client.model.beans.UserRole; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.Locale; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java index 4a4a7679..23d6cbb4 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.user; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.User; -import org.codehaus.jackson.annotate.JsonUnwrapped; /** * Represents OpsGenie service response for get user request. diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java index 7a90923c..c1812553 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java @@ -1,13 +1,13 @@ package com.ifountain.opsgenie.client.model.user; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.OpsGenieClientValidationException; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.beans.User; import com.ifountain.opsgenie.client.model.beans.UserRole; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.Locale; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java index 3affbf84..4a63ff55 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java @@ -3,7 +3,7 @@ import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java index ddba153f..2446795d 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.model.user.forward; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.ifountain.opsgenie.client.model.BaseResponse; import com.ifountain.opsgenie.client.model.beans.Forwarding; -import org.codehaus.jackson.annotate.JsonUnwrapped; import java.io.IOException; import java.text.ParseException; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java index fd79889d..e41772ce 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java @@ -1,11 +1,11 @@ package com.ifountain.opsgenie.client.model.user.forward; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.OpsGenieClientValidationException; import com.ifountain.opsgenie.client.model.BaseRequest; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.annotate.JsonProperty; import java.util.Date; import java.util.TimeZone; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java index 1ec583e2..de909f34 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java @@ -1,5 +1,7 @@ package com.ifountain.opsgenie.client.rest; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.ifountain.opsgenie.client.OpsGenieClientException; import com.ifountain.opsgenie.client.OpsGenieClientValidationException; import com.ifountain.opsgenie.client.http.OpsGenieHttpClient; @@ -12,8 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; + import java.io.IOException; import java.net.URISyntaxException; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java index f9bf396e..6c449c50 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java @@ -1,8 +1,8 @@ package com.ifountain.opsgenie.client.rest.response; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java index 082af750..2892ab20 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java @@ -1,9 +1,9 @@ package com.ifountain.opsgenie.client.rest.response; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class RestSuccessResult { diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java b/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java index 531c4e5b..53cd0acc 100644 --- a/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java +++ b/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java @@ -1,10 +1,11 @@ package com.ifountain.opsgenie.client.util; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; import com.ifountain.opsgenie.client.OpsGenieClientConstants; import com.ifountain.opsgenie.client.model.ConvertFromTimeZone; import com.ifountain.opsgenie.client.model.ObjectWithTimeZone; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; + import java.io.IOException; import java.text.ParseException; diff --git a/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy b/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy index 0de8fa55..03f64568 100644 --- a/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy +++ b/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy @@ -8,7 +8,6 @@ import com.ifountain.opsgenie.client.model.customer.* import com.ifountain.opsgenie.client.test.util.JSON import com.ifountain.opsgenie.client.test.util.OpsGenieClientTestCase import com.ifountain.opsgenie.client.util.JsonUtils -import org.apache.commons.httpclient.util.URIUtil import org.apache.http.HttpHeaders import org.apache.http.client.methods.HttpDelete import org.apache.http.client.methods.HttpGet diff --git a/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java b/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java index efd4fa25..ca271cad 100644 --- a/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java +++ b/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java @@ -1,7 +1,6 @@ package com.ifountain.opsgenie.client.test.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.HashMap;