Clean up imports.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneParser.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneParser.java b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
index 7640ebd..470e163 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
@@ -36,12 +36,12 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.DefaultSone;
+import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.ImageBuilder.ImageCreated;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostBuilder.PostCreated;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder.PostReplyCreated;
-import net.pterodactylus.sone.database.memory.MemoryDatabase;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.xml.SimpleXML;
 import net.pterodactylus.util.xml.XML;
@@ -60,11 +60,6 @@ public class SoneParser {
 
        private static final Logger logger = Logger.getLogger(SoneParser.class.getName());
        private static final int MAX_PROTOCOL_VERSION = 0;
-       private final Core core;
-
-       public SoneParser(Core core) {
-               this.core = core;
-       }
 
        /**
         * Parses a Sone from the given input stream and creates a new Sone from the
@@ -75,10 +70,8 @@ public class SoneParser {
         * @param soneInputStream
         *              The input stream to parse the Sone from
         * @return The parsed Sone
-        * @throws SoneException
-        *              if a parse error occurs, or the protocol is invalid
         */
-       public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
+       public Sone parseSone(Database database, Sone originalSone, InputStream soneInputStream) {
                /* TODO - impose a size limit? */
 
                Document document;
@@ -88,27 +81,27 @@ public class SoneParser {
                }
                if (document == null) {
                        /* TODO - mark Sone as bad. */
-                       logger.log(Level.WARNING, String.format("Could not parse XML for Sone %s!", originalSone));
+                       logger.log(Level.WARNING, String.format("Could not parse XML for Sone %s!", originalSone.getId()));
                        return null;
                }
 
                Optional<SimpleXML> soneXml = parseXml(originalSone, document);
                if (!soneXml.isPresent()) {
-                       logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", originalSone));
+                       logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", originalSone.getId()));
                        return null;
                }
 
                Optional<Client> parsedClient = parseClient(originalSone, soneXml.get());
-               Sone sone = new DefaultSone(new MemoryDatabase(null), originalSone.getId(), originalSone.isLocal(), parsedClient.or(originalSone.getClient()));
+               Sone sone = new DefaultSone(database, originalSone.getId(), originalSone.isLocal(), parsedClient.or(originalSone.getClient()));
 
-               Optional<Integer> protocolVersion = parseProtocolVersion(originalSone, soneXml.get());
+               Optional<Integer> protocolVersion = parseProtocolVersion(soneXml.get());
                if (protocolVersion.isPresent()) {
                        if (protocolVersion.get() < 0) {
-                               logger.log(Level.WARNING, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion));
+                               logger.log(Level.WARNING, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion.get()));
                                return null;
                        }
                        if (protocolVersion.get() > MAX_PROTOCOL_VERSION) {
-                               logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion));
+                               logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion.get()));
                                return null;
                        }
                }
@@ -307,9 +300,7 @@ public class SoneParser {
                }
 
                /* process avatar. */
-               if (avatarId != null) {
-                       profile.setAvatar(core.getImage(avatarId).orNull());
-               }
+               profile.setAvatar(fromNullable(avatarId));
 
                /* okay, apparently everything was parsed correctly. Now import. */
                sone.setProfile(profile);
@@ -321,7 +312,7 @@ public class SoneParser {
                return sone;
        }
 
-       private Optional<Integer> parseProtocolVersion(Sone originalSone, SimpleXML soneXml) {
+       private Optional<Integer> parseProtocolVersion(SimpleXML soneXml) {
                String soneProtocolVersion = soneXml.getValue("protocol-version", null);
                if (soneProtocolVersion == null) {
                        logger.log(Level.INFO, "No protocol version found, assuming 0.");