Browse Source

Revert usage of TYPE_USE in Nullable and NonNull annotations

Using TYPE_USE causes compilation errors in Eclipse Neon.3 (JDT 3.12.3)
and Eclipse Oxygen.2 (JDT 3.13.2).

This reverts commit 8e217517e2.
This reverts commit 55eba8d0f5.

Reported-by: Thomas Wolf <thomas.wolf@paranor.ch>
Change-Id: I96869f80dd11ee238911706581b224bca4fb12cd
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
bd96feab24
  1. 2
      org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java
  2. 8
      org.eclipse.jgit/src/org/eclipse/jgit/annotations/NonNull.java
  3. 8
      org.eclipse.jgit/src/org/eclipse/jgit/annotations/Nullable.java
  4. 3
      org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java
  5. 3
      org.eclipse.jgit/src/org/eclipse/jgit/internal/fsck/FsckError.java
  6. 3
      org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java

2
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java

@ -82,7 +82,7 @@ public interface LargeFileRepository {
* @return Action for verifying the object, or {@code null} if the server * @return Action for verifying the object, or {@code null} if the server
* doesn't support or require verification * doesn't support or require verification
*/ */
public Response.@Nullable Action getVerifyAction(AnyLongObjectId id); public @Nullable Response.Action getVerifyAction(AnyLongObjectId id);
/** /**
* Get size of an object * Get size of an object

8
org.eclipse.jgit/src/org/eclipse/jgit/annotations/NonNull.java

@ -43,8 +43,12 @@
package org.eclipse.jgit.annotations; package org.eclipse.jgit.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@ -59,7 +63,7 @@ import java.lang.annotation.Target;
*/ */
@Documented @Documented
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE_USE) @Target({ FIELD, METHOD, PARAMETER, LOCAL_VARIABLE })
public @interface NonNull { public @interface NonNull {
// marker annotation with no members // marker annotation with no members
} }

8
org.eclipse.jgit/src/org/eclipse/jgit/annotations/Nullable.java

@ -43,8 +43,12 @@
package org.eclipse.jgit.annotations; package org.eclipse.jgit.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@ -89,7 +93,7 @@ import java.lang.annotation.Target;
*/ */
@Documented @Documented
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE_USE) @Target({ FIELD, METHOD, PARAMETER, LOCAL_VARIABLE })
public @interface Nullable { public @interface Nullable {
// marker annotation with no members // marker annotation with no members
} }

3
org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java

@ -140,7 +140,8 @@ public class CorruptObjectException extends IOException {
* @return error condition or null. * @return error condition or null.
* @since 4.2 * @since 4.2
*/ */
public ObjectChecker.@Nullable ErrorType getErrorType() { @Nullable
public ObjectChecker.ErrorType getErrorType() {
return errorType; return errorType;
} }
} }

3
org.eclipse.jgit/src/org/eclipse/jgit/internal/fsck/FsckError.java

@ -89,7 +89,8 @@ public class FsckError {
} }
/** @return error type of the corruption. */ /** @return error type of the corruption. */
public ObjectChecker.@Nullable ErrorType getErrorType() { @Nullable
public ObjectChecker.ErrorType getErrorType() {
return errorType; return errorType;
} }
} }

3
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java

@ -265,7 +265,8 @@ public class TransferConfig {
} }
} }
static ObjectChecker.@Nullable ErrorType parse(String key) { @Nullable
static ObjectChecker.ErrorType parse(String key) {
return errors.get(toLowerCase(key)); return errors.get(toLowerCase(key));
} }

Loading…
Cancel
Save