projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Load bookmarked posts in configuration loader, too.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
database
/
memory
/
MemoryDatabase.java
diff --git
a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index
3c1dc74
..
6481a1b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@
-82,6
+82,7
@@
public class MemoryDatabase extends AbstractService implements Database {
/** The configuration. */
private final Configuration configuration;
/** The configuration. */
private final Configuration configuration;
+ private final ConfigurationLoader configurationLoader;
private final Map<String, Sone> allSones = new HashMap<String, Sone>();
private final Map<String, Sone> allSones = new HashMap<String, Sone>();
@@
-115,8
+116,7
@@
public class MemoryDatabase extends AbstractService implements Database {
private final Map<String, Image> allImages = new HashMap<String, Image>();
private final Multimap<String, Image> soneImages = HashMultimap.create();
private final Map<String, Image> allImages = new HashMap<String, Image>();
private final Multimap<String, Image> soneImages = HashMultimap.create();
- private final MemoryBookmarkDatabase memoryBookmarkDatabase =
- new MemoryBookmarkDatabase(this);
+ private final MemoryBookmarkDatabase memoryBookmarkDatabase;
/**
* Creates a new memory database.
/**
* Creates a new memory database.
@@
-130,6
+130,9
@@
public class MemoryDatabase extends AbstractService implements Database {
public MemoryDatabase(SoneProvider soneProvider, Configuration configuration) {
this.soneProvider = soneProvider;
this.configuration = configuration;
public MemoryDatabase(SoneProvider soneProvider, Configuration configuration) {
this.soneProvider = soneProvider;
this.configuration = configuration;
+ this.configurationLoader = new ConfigurationLoader(configuration);
+ memoryBookmarkDatabase =
+ new MemoryBookmarkDatabase(this, configurationLoader);
}
//
}
//
@@
-155,6
+158,7
@@
public class MemoryDatabase extends AbstractService implements Database {
/** {@inheritDocs} */
@Override
protected void doStart() {
/** {@inheritDocs} */
@Override
protected void doStart() {
+ memoryBookmarkDatabase.start();
loadKnownPosts();
loadKnownPostReplies();
notifyStarted();
loadKnownPosts();
loadKnownPostReplies();
notifyStarted();
@@
-731,16
+735,11
@@
public class MemoryDatabase extends AbstractService implements Database {
/** Loads the known posts. */
private void loadKnownPosts() {
/** Loads the known posts. */
private void loadKnownPosts() {
+ Set<String> knownPosts = configurationLoader.loadKnownPosts();
lock.writeLock().lock();
try {
lock.writeLock().lock();
try {
- int postCounter = 0;
- while (true) {
- String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
- if (knownPostId == null) {
- break;
- }
- knownPosts.add(knownPostId);
- }
+ this.knownPosts.clear();
+ this.knownPosts.addAll(knownPosts);
} finally {
lock.writeLock().unlock();
}
} finally {
lock.writeLock().unlock();
}
@@
-785,16
+784,11
@@
public class MemoryDatabase extends AbstractService implements Database {
/** Loads the known post replies. */
private void loadKnownPostReplies() {
/** Loads the known post replies. */
private void loadKnownPostReplies() {
+ Set<String> knownPostReplies = configurationLoader.loadKnownPostReplies();
lock.writeLock().lock();
try {
lock.writeLock().lock();
try {
- int replyCounter = 0;
- while (true) {
- String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
- if (knownReplyId == null) {
- break;
- }
- knownPostReplies.add(knownReplyId);
- }
+ this.knownPostReplies.clear();
+ this.knownPostReplies.addAll(knownPostReplies);
} finally {
lock.writeLock().unlock();
}
} finally {
lock.writeLock().unlock();
}