MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move mandatory json check into platform

Browse Source 
EA-87425 - CNFE: PluginClassLoader.loadClass
This commit is contained in:
Aleksey Pivovarov
2016-08-29 14:57:51 +03:00
parent 538f0fcd82
commit 882feaad6d
29 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/JsonMandatoryException.java → platform/platform-impl/src/org/jetbrains/io/mandatory/JsonMandatoryException.java
+1 -1
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/Mandatory.java → platform/platform-impl/src/org/jetbrains/io/mandatory/Mandatory.java
+1 -1
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/NullCheckingFactory.java → platform/platform-impl/src/org/jetbrains/io/mandatory/NullCheckingFactory.java
+1 -1
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/RestModel.java → platform/platform-impl/src/org/jetbrains/io/mandatory/RestModel.java
+1 -1
View File
@@ -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;
plugins/tasks/tasks-tests/test/com/intellij/tasks/impl/gson/MandatoryTest.java → platform/platform-tests/testSrc/org/jetbrains/io/mandatory/MandatoryTest.java
+5 -2
View File
@@ -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 {
plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java
+1 -1
View File
@@ -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.*;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubAuthorization.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubBranch.java
+2 -2
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommit.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitComment.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitDetailed.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubCommitSha.java
+2 -2
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubErrorMessage.java
+1 -1
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubFile.java
+2 -2
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssue.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueComment.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssuesSearchResult.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubOrg.java
+2 -2
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubPullRequest.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepo.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoDetailed.java
+1 -1
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoOrg.java
+2 -2
View File
@@ -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")
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java
+2 -2
View File
@@ -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;
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUserDetailed.java
+2 -2
View File
@@ -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")
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/gson/TaskGsonUtil.java
+3
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineIssue.java
+2 -2
View File
@@ -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;
plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java
+2 -2
View File
@@ -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
plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineResponseWrapper.java
+2 -2
View File
@@ -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;