projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove javadoc comments from overriding methods.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
9a8b7f9
..
ed75f5e
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-333,7
+333,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
}
}
}
- /** {@inheritDocs} */
@Override
public Collection<Sone> getSones() {
synchronized (sones) {
@Override
public Collection<Sone> getSones() {
synchronized (sones) {
@@
-341,15
+340,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
}
}
}
- /**
- * Returns the Sone with the given ID, regardless whether it’s local or
- * remote.
- *
- * @param id
- * The ID of the Sone to get
- * @return The Sone with the given ID, or {@code null} if there is no such
- * Sone
- */
@Override
public Optional<Sone> getSone(String id) {
synchronized (sones) {
@Override
public Optional<Sone> getSone(String id) {
synchronized (sones) {
@@
-357,7
+347,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
}
}
}
- /** {@inheritDocs} */
@Override
public Collection<Sone> getLocalSones() {
synchronized (sones) {
@Override
public Collection<Sone> getLocalSones() {
synchronized (sones) {
@@
-382,7
+371,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
return from(database.getSone(id).asSet()).firstMatch(LOCAL_SONE_FILTER);
}
return from(database.getSone(id).asSet()).firstMatch(LOCAL_SONE_FILTER);
}
- /** {@inheritDocs} */
@Override
public Collection<Sone> getRemoteSones() {
synchronized (sones) {
@Override
public Collection<Sone> getRemoteSones() {
synchronized (sones) {
@@
-449,32
+437,27
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity());
}
return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity());
}
- /** {@inheritDoc} */
@Override
public Optional<Post> getPost(String postId) {
return database.getPost(postId);
}
@Override
public Optional<Post> getPost(String postId) {
return database.getPost(postId);
}
- /** {@inheritDocs} */
@Override
public Collection<Post> getPosts(String soneId) {
return database.getPosts(soneId);
}
@Override
public Collection<Post> getPosts(String soneId) {
return database.getPosts(soneId);
}
- /** {@inheritDoc} */
@Override
public Collection<Post> getDirectedPosts(final String recipientId) {
checkNotNull(recipientId, "recipient must not be null");
return database.getDirectedPosts(recipientId);
}
@Override
public Collection<Post> getDirectedPosts(final String recipientId) {
checkNotNull(recipientId, "recipient must not be null");
return database.getDirectedPosts(recipientId);
}
- /** {@inheritDoc} */
@Override
public Optional<PostReply> getPostReply(String replyId) {
return database.getPostReply(replyId);
}
@Override
public Optional<PostReply> getPostReply(String replyId) {
return database.getPostReply(replyId);
}
- /** {@inheritDoc} */
@Override
public List<PostReply> getReplies(final String postId) {
return database.getReplies(postId);
@Override
public List<PostReply> getReplies(final String postId) {
return database.getReplies(postId);
@@
-1419,7
+1402,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
// SERVICE METHODS
//
// SERVICE METHODS
//
- /** Starts the core. */
@Override
public void serviceStart() {
loadConfiguration();
@Override
public void serviceStart() {
loadConfiguration();
@@
-1430,7
+1412,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
database.start();
}
database.start();
}
- /** {@inheritDoc} */
@Override
public void serviceRun() {
long lastSaved = System.currentTimeMillis();
@Override
public void serviceRun() {
long lastSaved = System.currentTimeMillis();
@@
-1447,7
+1428,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
}
}
}
- /** Stops the core. */
@Override
public void serviceStop() {
localElementTicker.shutdownNow();
@Override
public void serviceStop() {
localElementTicker.shutdownNow();