From 17fbcb0c451e801501b7075501299d96ffa2d455 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 13 Feb 2013 19:06:23 +0100 Subject: [PATCH] Move memory post reply builder to its own file. --- .../sone/database/memory/MemoryDatabase.java | 26 +-------- .../database/memory/MemoryPostReplyBuilder.java | 66 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 25 deletions(-) create mode 100644 src/main/java/net/pterodactylus/sone/database/memory/MemoryPostReplyBuilder.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 264571e..2f77eed 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.UUID; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -37,7 +36,6 @@ import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.data.impl.AbstractPostReplyBuilder; import net.pterodactylus.sone.database.Database; import net.pterodactylus.sone.database.DatabaseException; import net.pterodactylus.sone.database.PostBuilder; @@ -337,7 +335,7 @@ public class MemoryDatabase extends AbstractService implements Database { */ @Override public PostReplyBuilder newPostReplyBuilder() { - return new MemoryPostReplyBuilder(); + return new MemoryPostReplyBuilder(this, soneProvider); } // @@ -656,26 +654,4 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** - * {@link PostReplyBuilder} implementation that creates - * {@link MemoryPostReply} objects. - * - * @author David ‘Bombe’ Roden - */ - private class MemoryPostReplyBuilder extends AbstractPostReplyBuilder { - - /** - * {@inheritDocs} - */ - @Override - public PostReply build() throws IllegalStateException { - validate(); - - PostReply postReply = new MemoryPostReply(MemoryDatabase.this, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, currentTime ? System.currentTimeMillis() : time, text, postId); - postReply.setKnown(isPostReplyKnown(postReply)); - return postReply; - } - - } - } diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostReplyBuilder.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostReplyBuilder.java new file mode 100644 index 0000000..32ab1e0 --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostReplyBuilder.java @@ -0,0 +1,66 @@ +/* + * Sone - MemoryPostReplyBuilder.java - Copyright © 2013 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.database.memory; + +import java.util.UUID; + +import net.pterodactylus.sone.data.PostReply; +import net.pterodactylus.sone.data.impl.AbstractPostReplyBuilder; +import net.pterodactylus.sone.database.PostReplyBuilder; +import net.pterodactylus.sone.database.SoneProvider; + +/** + * {@link PostReplyBuilder} implementation that creates {@link MemoryPostReply} + * objects. + * + * @author David ‘Bombe’ Roden + */ +class MemoryPostReplyBuilder extends AbstractPostReplyBuilder { + + /** The database. */ + private final MemoryDatabase database; + + /** The Sone provider. */ + private final SoneProvider soneProvider; + + /** + * Creates a new {@link MemoryPostReply} builder. + * + * @param database + * The database + * @param soneProvider + * The Sone provider + */ + public MemoryPostReplyBuilder(MemoryDatabase database, SoneProvider soneProvider) { + this.database = database; + this.soneProvider = soneProvider; + } + + /** + * {@inheritDocs} + */ + @Override + public PostReply build() throws IllegalStateException { + validate(); + + PostReply postReply = new MemoryPostReply(database, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, currentTime ? System.currentTimeMillis() : time, text, postId); + postReply.setKnown(database.isPostReplyKnown(postReply)); + return postReply; + } + +} -- 2.7.4