summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-09-20 14:53:04 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-09-25 22:06:12 +0200
commitac3794bf01a9cd30d7cd0642cae8c530536edbd6 (patch)
tree4a94e3f7f5dc86c256fe0f97127b6fd9dc1f0458
parent049782743e78c81b0d8a1a8b566d56edbc83c6e6 (diff)
downloadjgit-ac3794bf01a9cd30d7cd0642cae8c530536edbd6.tar.gz
jgit-ac3794bf01a9cd30d7cd0642cae8c530536edbd6.zip
[errorprone] Suppress JavaLangClash to avoid breaking change
Renaming this class is a breaking change. Add a todo to rename it in next major release. See https://errorprone.info/bugpattern/JavaLangClash Change-Id: I3528fd654e30d98f4ea43e71107d83324942141c
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java2
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java2
-rw-r--r--org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java2
4 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
index d0b6d12ea2..1605a786a5 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
@@ -27,6 +27,8 @@ public interface Response {
public Map<String, String> header;
}
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
/** Describes an error to be returned by the LFS batch API */
class Error {
public int code;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
index b569416e89..c7e45043de 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
@@ -30,6 +30,8 @@ public class LfsGson {
/**
* Wrapper class only used for serialization of error messages.
*/
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
static class Error {
String message;
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
index f9bd1ba0f8..f3edf86cf0 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
@@ -87,6 +87,8 @@ public interface Protocol {
}
/** Describes an error to be returned by the LFS batch API */
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
class Error {
public int code;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
index 6c61cdf2bb..c18c83304c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
@@ -162,6 +162,8 @@ public class PatchApplier {
*
* @since 6.6
*/
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
public static class Error {
private String msg;