Format @Nullable on return value as method annotation
For example, instead of using public @Nullable String getMyFavoriteString() { ... } use @Nullable public String getMyFavoriteString() { ... } This makes the style more consistent (the existing JGit code base tends to lean toward the second style) and makes the source code better reflect how the annotation is parsed, as a METHOD annotation. Longer term, we should switch to a TYPE_USE annotation and switch to the first style. Noticed using a style checker that follows https://google.github.io/styleguide/javaguide.html#s4.8.5-annotations Change-Id: I07f4e67cc149fb8007f696a4663e10d4bfc57e3a Reported-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com>
This commit is contained in:
parent
c58362c174
commit
608b6b03b1
|
@ -82,7 +82,8 @@ public interface LargeFileRepository {
|
|||
* @return Action for verifying the object, or {@code null} if the server
|
||||
* doesn't support or require verification
|
||||
*/
|
||||
public @Nullable Response.Action getVerifyAction(AnyLongObjectId id);
|
||||
@Nullable
|
||||
public Response.Action getVerifyAction(AnyLongObjectId id);
|
||||
|
||||
/**
|
||||
* Get size of an object
|
||||
|
|
|
@ -99,7 +99,8 @@ public Action getUploadAction(AnyLongObjectId id, long size) {
|
|||
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
public @Nullable Action getVerifyAction(AnyLongObjectId id) {
|
||||
@Nullable
|
||||
public Action getVerifyAction(AnyLongObjectId id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -99,7 +99,8 @@ public LfsInputStream applyCleanFilter(Repository db, InputStream input,
|
|||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PrePushHook getPrePushHook(Repository repo,
|
||||
@Nullable
|
||||
public PrePushHook getPrePushHook(Repository repo,
|
||||
PrintStream outputStream) {
|
||||
if (isEnabled(repo)) {
|
||||
return new LfsPrePushHook(repo, outputStream);
|
||||
|
|
|
@ -106,7 +106,8 @@ public AtomicObjectOutputStream(Path path) throws IOException {
|
|||
* stream. May return {@code null} if called before closing this
|
||||
* stream.
|
||||
*/
|
||||
public @Nullable AnyLongObjectId getId() {
|
||||
@Nullable
|
||||
public AnyLongObjectId getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
|
|
|
@ -106,7 +106,8 @@ enum ProtocolVersion {
|
|||
this.name = name;
|
||||
}
|
||||
|
||||
static @Nullable ProtocolVersion parse(@Nullable String name) {
|
||||
@Nullable
|
||||
static ProtocolVersion parse(@Nullable String name) {
|
||||
if (name == null) {
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -152,7 +152,8 @@ public ObjectLoader applySmudgeFilter(Repository db,
|
|||
* @param outputStream
|
||||
* @return a {@link PrePushHook} implementation or <code>null</code>
|
||||
*/
|
||||
public @Nullable PrePushHook getPrePushHook(Repository repo,
|
||||
@Nullable
|
||||
public PrePushHook getPrePushHook(Repository repo,
|
||||
PrintStream outputStream) {
|
||||
return null;
|
||||
}
|
||||
|
@ -163,7 +164,8 @@ public ObjectLoader applySmudgeFilter(Repository db,
|
|||
*
|
||||
* @return a command to install LFS support.
|
||||
*/
|
||||
public @Nullable LfsInstallCommand getInstallCommand() {
|
||||
@Nullable
|
||||
public LfsInstallCommand getInstallCommand() {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -729,7 +729,8 @@ public static final IntList lineMapOrBinary(byte[] buf, int ptr, int end)
|
|||
return map;
|
||||
}
|
||||
|
||||
private static @Nullable IntList lineMapOrNull(byte[] buf, int ptr, int end) {
|
||||
@Nullable
|
||||
private static IntList lineMapOrNull(byte[] buf, int ptr, int end) {
|
||||
// Experimentally derived from multiple source repositories
|
||||
// the average number of bytes/line is 36. Its a rough guess
|
||||
// to initially size our map close to the target.
|
||||
|
|
Loading…
Reference in New Issue