From 2e120f752c433358666dc734a12c82c66cb44730 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 20 Sep 2018 15:19:22 +0100 Subject: [PATCH] Add parameterised return type. --- .../briar/api/blog/BlogInvitationRequest.java | 4 ++-- .../api/blog/BlogInvitationResponse.java | 4 ++-- .../api/forum/ForumInvitationRequest.java | 4 ++-- .../api/forum/ForumInvitationResponse.java | 4 ++-- .../api/introduction/IntroductionRequest.java | 4 ++-- .../introduction/IntroductionResponse.java | 4 ++-- .../api/messaging/PrivateMessageHeader.java | 4 ++-- .../api/messaging/PrivateMessageVisitor.java | 22 ++++++++++--------- .../invitation/GroupInvitationRequest.java | 4 ++-- .../invitation/GroupInvitationResponse.java | 4 ++-- 10 files changed, 30 insertions(+), 28 deletions(-) diff --git a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java index 1d50cd24f..b77e05bd7 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java @@ -21,7 +21,7 @@ public class BlogInvitationRequest extends InvitationRequest { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitBlogInvitatioRequest(this); + public T accept(PrivateMessageVisitor v) { + return v.visitBlogInvitationRequest(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java index 266382131..b760b9ec9 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java @@ -18,7 +18,7 @@ public class BlogInvitationResponse extends InvitationResponse { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitBlogInvitationResponse(this); + public T accept(PrivateMessageVisitor v) { + return v.visitBlogInvitationResponse(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java index 41f9919c5..3944eca74 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationRequest.java @@ -23,7 +23,7 @@ public class ForumInvitationRequest extends InvitationRequest { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitForumInvitationRequest(this); + public T accept(PrivateMessageVisitor v) { + return v.visitForumInvitationRequest(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java index 1539ba206..3cb26c700 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java @@ -21,7 +21,7 @@ public class ForumInvitationResponse extends InvitationResponse { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitForumInvitationResponse(this); + public T accept(PrivateMessageVisitor v) { + return v.visitForumInvitationResponse(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java index 3350ac1b6..fe7de46de 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java @@ -31,7 +31,7 @@ public class IntroductionRequest extends PrivateRequest { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitIntroductionRequest(this); + public T accept(PrivateMessageVisitor v) { + return v.visitIntroductionRequest(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java index 8e26d4bfb..b03f8d7ca 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java @@ -37,7 +37,7 @@ public class IntroductionResponse extends PrivateResponse { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitIntroductionResponse(this); + public T accept(PrivateMessageVisitor v) { + return v.visitIntroductionResponse(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java index b9f5110a6..3c5a16ed3 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java @@ -54,7 +54,7 @@ public class PrivateMessageHeader { return read; } - public void accept(PrivateMessageVisitor v) { - v.visitPrivateMessageHeader(this); + public T accept(PrivateMessageVisitor v) { + return v.visitPrivateMessageHeader(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageVisitor.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageVisitor.java index d1e059745..f16566930 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageVisitor.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageVisitor.java @@ -1,5 +1,6 @@ package org.briarproject.briar.api.messaging; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.blog.BlogInvitationRequest; import org.briarproject.briar.api.blog.BlogInvitationResponse; import org.briarproject.briar.api.forum.ForumInvitationRequest; @@ -9,23 +10,24 @@ import org.briarproject.briar.api.introduction.IntroductionResponse; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; -public interface PrivateMessageVisitor { +@NotNullByDefault +public interface PrivateMessageVisitor { - void visitPrivateMessageHeader(PrivateMessageHeader h); + T visitPrivateMessageHeader(PrivateMessageHeader h); - void visitBlogInvitatioRequest(BlogInvitationRequest r); + T visitBlogInvitationRequest(BlogInvitationRequest r); - void visitBlogInvitationResponse(BlogInvitationResponse r); + T visitBlogInvitationResponse(BlogInvitationResponse r); - void visitForumInvitationRequest(ForumInvitationRequest r); + T visitForumInvitationRequest(ForumInvitationRequest r); - void visitForumInvitationResponse(ForumInvitationResponse r); + T visitForumInvitationResponse(ForumInvitationResponse r); - void visitGroupInvitationRequest(GroupInvitationRequest r); + T visitGroupInvitationRequest(GroupInvitationRequest r); - void visitGroupInvitationResponse(GroupInvitationResponse r); + T visitGroupInvitationResponse(GroupInvitationResponse r); - void visitIntroductionRequest(IntroductionRequest r); + T visitIntroductionRequest(IntroductionRequest r); - void visitIntroductionResponse(IntroductionResponse r); + T visitIntroductionResponse(IntroductionResponse r); } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java index 39c51f159..794b005af 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationRequest.java @@ -24,7 +24,7 @@ public class GroupInvitationRequest extends InvitationRequest { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitGroupInvitationRequest(this); + public T accept(PrivateMessageVisitor v) { + return v.visitGroupInvitationRequest(this); } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java index e74b0c67f..776993b14 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java @@ -21,7 +21,7 @@ public class GroupInvitationResponse extends InvitationResponse { } @Override - public void accept(PrivateMessageVisitor v) { - v.visitGroupInvitationResponse(this); + public T accept(PrivateMessageVisitor v) { + return v.visitGroupInvitationResponse(this); } }