From: David ‘Bombe’ Roden Date: Wed, 13 Feb 2013 18:03:17 +0000 (+0100) Subject: Move memory post builder to its own file. X-Git-Tag: 0.8.5^2~3^2~10 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3ff261bd1cdb77acd9e4015ec0c5b98a1c487f9a Move memory post builder to its own file. --- 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 35d3c37..264571e 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java @@ -37,7 +37,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.AbstractPostBuilder; import net.pterodactylus.sone.data.impl.AbstractPostReplyBuilder; import net.pterodactylus.sone.database.Database; import net.pterodactylus.sone.database.DatabaseException; @@ -194,7 +193,7 @@ public class MemoryDatabase extends AbstractService implements Database { */ @Override public PostBuilder newPostBuilder() { - return new MemoryPostBuilder(soneProvider); + return new MemoryPostBuilder(this, soneProvider); } // @@ -658,36 +657,6 @@ public class MemoryDatabase extends AbstractService implements Database { } /** - * {@link PostBuilder} implementation that creates a {@link MemoryPost}. - * - * @author David ‘Bombe’ Roden - */ - private class MemoryPostBuilder extends AbstractPostBuilder { - - /** - * Creates a new memory post builder. - * - * @param soneProvider - * The Sone provider - */ - public MemoryPostBuilder(SoneProvider soneProvider) { - super(soneProvider); - } - - /** - * {@inheritDocs} - */ - @Override - public Post build() throws IllegalStateException { - validate(); - Post post = new MemoryPost(MemoryDatabase.this, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, recipientId, currentTime ? System.currentTimeMillis() : time, text); - post.setKnown(isPostKnown(post)); - return post; - } - - } - - /** * {@link PostReplyBuilder} implementation that creates * {@link MemoryPostReply} objects. * diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostBuilder.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostBuilder.java new file mode 100644 index 0000000..d0b2c9f --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPostBuilder.java @@ -0,0 +1,61 @@ +/* + * Sone - MemoryPostBuilder.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.Post; +import net.pterodactylus.sone.data.impl.AbstractPostBuilder; +import net.pterodactylus.sone.database.PostBuilder; +import net.pterodactylus.sone.database.SoneProvider; + +/** + * {@link PostBuilder} implementation that creates a {@link MemoryPost}. + * + * @author David ‘Bombe’ Roden + */ +class MemoryPostBuilder extends AbstractPostBuilder { + + /** The database. */ + private final MemoryDatabase database; + + /** + * Creates a new memory post builder. + * + * @param memoryDatabase + * The database + * @param soneProvider + * The Sone provider + */ + public MemoryPostBuilder(MemoryDatabase memoryDatabase, SoneProvider soneProvider) { + super(soneProvider); + database = memoryDatabase; + } + + /** + * {@inheritDocs} + */ + @Override + public Post build() throws IllegalStateException { + validate(); + Post post = new MemoryPost(database, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, recipientId, currentTime ? System.currentTimeMillis() : time, text); + post.setKnown(database.isPostKnown(post)); + return post; + } + +}