diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/JsonMandatoryException.java b/platform/platform-impl/src/org/jetbrains/io/mandatory/JsonMandatoryException.java similarity index 95% rename from plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/JsonMandatoryException.java rename to platform/platform-impl/src/org/jetbrains/io/mandatory/JsonMandatoryException.java index 2cb17bd0a7f8..b2c9a562b6e2 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/JsonMandatoryException.java +++ b/platform/platform-impl/src/org/jetbrains/io/mandatory/JsonMandatoryException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tasks.impl.gson; +package org.jetbrains.io.mandatory; import com.google.gson.JsonParseException; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/Mandatory.java b/platform/platform-impl/src/org/jetbrains/io/mandatory/Mandatory.java similarity index 92% rename from plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/Mandatory.java rename to platform/platform-impl/src/org/jetbrains/io/mandatory/Mandatory.java index 6b738c005e43..bc7fcccc2c91 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/Mandatory.java +++ b/platform/platform-impl/src/org/jetbrains/io/mandatory/Mandatory.java @@ -1,4 +1,4 @@ -package com.intellij.tasks.impl.gson; +package org.jetbrains.io.mandatory; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/NullCheckingFactory.java b/platform/platform-impl/src/org/jetbrains/io/mandatory/NullCheckingFactory.java similarity index 97% rename from plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/NullCheckingFactory.java rename to platform/platform-impl/src/org/jetbrains/io/mandatory/NullCheckingFactory.java index 5a570ba771b2..b5c6c32791a8 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/NullCheckingFactory.java +++ b/platform/platform-impl/src/org/jetbrains/io/mandatory/NullCheckingFactory.java @@ -1,4 +1,4 @@ -package com.intellij.tasks.impl.gson; +package org.jetbrains.io.mandatory; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/RestModel.java b/platform/platform-impl/src/org/jetbrains/io/mandatory/RestModel.java similarity index 88% rename from plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/RestModel.java rename to platform/platform-impl/src/org/jetbrains/io/mandatory/RestModel.java index 5428c1f6c740..4bcc4c47bbd9 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/RestModel.java +++ b/platform/platform-impl/src/org/jetbrains/io/mandatory/RestModel.java @@ -1,4 +1,4 @@ -package com.intellij.tasks.impl.gson; +package org.jetbrains.io.mandatory; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/impl/gson/MandatoryTest.java b/platform/platform-tests/testSrc/org/jetbrains/io/mandatory/MandatoryTest.java similarity index 94% rename from plugins/tasks/tasks-tests/test/com/intellij/tasks/impl/gson/MandatoryTest.java rename to platform/platform-tests/testSrc/org/jetbrains/io/mandatory/MandatoryTest.java index 3f167b744e53..51e87ec70244 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/impl/gson/MandatoryTest.java +++ b/platform/platform-tests/testSrc/org/jetbrains/io/mandatory/MandatoryTest.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tasks.impl.gson; +package org.jetbrains.io.mandatory; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; @@ -96,7 +97,9 @@ public class MandatoryTest extends TestCase { } private static void doTest(@NotNull String json, @NotNull Class clazz, boolean expectedSuccess) { - Gson gson = TaskGsonUtil.createDefaultBuilder().create(); + Gson gson = new GsonBuilder() + .registerTypeAdapterFactory(NullCheckingFactory.INSTANCE) + .create(); boolean success; try { diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java b/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java index fb9a13ca3149..20ba58c85a2a 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java @@ -19,13 +19,13 @@ import com.google.gson.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; -import com.intellij.tasks.impl.gson.NullCheckingFactory; import com.intellij.util.containers.ContainerUtil; import org.apache.http.Header; import org.apache.http.HeaderElement; import org.apache.http.message.BasicHeader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.NullCheckingFactory; import org.jetbrains.plugins.github.api.GithubConnection.ArrayPagedRequest; import org.jetbrains.plugins.github.api.GithubConnection.PagedRequest; import org.jetbrains.plugins.github.api.data.*; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubAuthorization.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubAuthorization.java index a26267971f2a..0a0ccd25ec59 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubAuthorization.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubAuthorization.java @@ -15,10 +15,10 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.List; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubBranch.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubBranch.java index df62ce78ba5a..a6ae0d8825be 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubBranch.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubBranch.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommit.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommit.java index fa4a21e58efd..d667f4fa1c98 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommit.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommit.java @@ -15,10 +15,10 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; import java.util.List; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitComment.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitComment.java index 76d77688da94..0025656cf1b4 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitComment.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitComment.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitDetailed.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitDetailed.java index 4cfc96207aa5..56736ef82b3e 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitDetailed.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitDetailed.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.List; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitSha.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitSha.java index e1e7d41e85eb..817899a12a3c 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitSha.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitSha.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubErrorMessage.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubErrorMessage.java index 77bdad469219..690ea636d7f4 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubErrorMessage.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubErrorMessage.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.RestModel; import java.util.List; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubFile.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubFile.java index 4b946f229be8..1d17f5e14950 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubFile.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubFile.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java index cdc8ebd74718..1bf295768864 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java @@ -17,10 +17,10 @@ package org.jetbrains.plugins.github.api.data; import com.google.gson.annotations.SerializedName; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.ArrayList; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssue.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssue.java index 28f4c0c21852..d0030abbd87e 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssue.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssue.java @@ -16,10 +16,10 @@ package org.jetbrains.plugins.github.api.data; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueComment.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueComment.java index ccbbca4bea08..8e2d43f54526 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueComment.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueComment.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssuesSearchResult.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssuesSearchResult.java index c4827dce110f..a99d014f2892 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssuesSearchResult.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssuesSearchResult.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.List; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubOrg.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubOrg.java index 2c159488ebe6..bf664537ccfd 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubOrg.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubOrg.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubPullRequest.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubPullRequest.java index ae97e09f6042..713a663a0d90 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubPullRequest.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubPullRequest.java @@ -16,10 +16,10 @@ package org.jetbrains.plugins.github.api.data; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepo.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepo.java index ede0f5b6879e..8caa8b9ab732 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepo.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepo.java @@ -17,10 +17,10 @@ package org.jetbrains.plugins.github.api.data; import com.google.gson.annotations.SerializedName; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import org.jetbrains.plugins.github.api.GithubFullPath; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoDetailed.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoDetailed.java index 9c37682177fa..1292b12dabd3 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoDetailed.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoDetailed.java @@ -15,8 +15,8 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoOrg.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoOrg.java index 43304d74b112..b0dfbf738035 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoOrg.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoOrg.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java index fab1bd02d750..2c13a2c8b223 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java @@ -15,10 +15,10 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUserDetailed.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUserDetailed.java index 6dff0a604a9b..f6e232a53dfc 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUserDetailed.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUserDetailed.java @@ -15,9 +15,9 @@ */ package org.jetbrains.plugins.github.api.data; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; @RestModel @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/TaskGsonUtil.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/TaskGsonUtil.java index 330d9b793f38..0bb2bfd3b091 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/TaskGsonUtil.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/TaskGsonUtil.java @@ -2,6 +2,9 @@ package com.intellij.tasks.impl.gson; import com.google.gson.*; import com.intellij.tasks.impl.TaskUtil; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.NullCheckingFactory; +import org.jetbrains.io.mandatory.RestModel; import java.lang.reflect.Type; import java.util.Date; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineIssue.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineIssue.java index aea41bdb6ca8..3a4f0ba88cbc 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineIssue.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineIssue.java @@ -1,10 +1,10 @@ package com.intellij.tasks.redmine.model; import com.google.gson.annotations.SerializedName; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.Date; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java index bee3d35dbeb9..528191523c9a 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java @@ -1,10 +1,10 @@ package com.intellij.tasks.redmine.model; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import com.intellij.util.xmlb.annotations.Attribute; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; /** * @author Mikhail Golubev diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineResponseWrapper.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineResponseWrapper.java index d469f1c68c5e..8854085f6542 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineResponseWrapper.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineResponseWrapper.java @@ -1,9 +1,9 @@ package com.intellij.tasks.redmine.model; import com.google.gson.annotations.SerializedName; -import com.intellij.tasks.impl.gson.Mandatory; -import com.intellij.tasks.impl.gson.RestModel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.io.mandatory.Mandatory; +import org.jetbrains.io.mandatory.RestModel; import java.util.List;