Add lots of synchronization.

[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 6a2d8a3..99ebc6d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -56,6 +56,16 @@ import freenet.keys.FreenetURI;
  */
 public class Core extends AbstractService {
 
+       /** The default Sones. */
+       private static final Set<String> defaultSones = new HashSet<String>();
+
+       static {
+               /* Sone of Sone. */
+               defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/3");
+               /* Sone of Bombe. */
+               defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/24");
+       }
+
        /**
         * Enumeration for the possible states of a {@link Sone}.
         *
@@ -92,13 +102,13 @@ public class Core extends AbstractService {
        private SoneDownloader soneDownloader;
 
        /** The Sone blacklist. */
-       private final Set<Sone> blacklistedSones = new HashSet<Sone>();
+       private final Set<Sone> blacklistedSones = Collections.synchronizedSet(new HashSet<Sone>());
 
        /** The local Sones. */
-       private final Set<Sone> localSones = new HashSet<Sone>();
+       private final Set<Sone> localSones = Collections.synchronizedSet(new HashSet<Sone>());
 
        /** Sone inserters. */
-       private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
+       private final Map<Sone, SoneInserter> soneInserters = Collections.synchronizedMap(new HashMap<Sone, SoneInserter>());
 
        /** The Sones’ statuses. */
        private final Map<Sone, SoneStatus> soneStatuses = Collections.synchronizedMap(new HashMap<Sone, SoneStatus>());
@@ -106,13 +116,13 @@ public class Core extends AbstractService {
        /* various caches follow here. */
 
        /** Cache for all known Sones. */
-       private final Map<String, Sone> soneCache = new HashMap<String, Sone>();
+       private final Map<String, Sone> soneCache = Collections.synchronizedMap(new HashMap<String, Sone>());
 
        /** Cache for all known posts. */
-       private final Map<String, Post> postCache = new HashMap<String, Post>();
+       private final Map<String, Post> postCache = Collections.synchronizedMap(new HashMap<String, Post>());
 
        /** Cache for all known replies. */
-       private final Map<String, Reply> replyCache = new HashMap<String, Reply>();
+       private final Map<String, Reply> replyCache = Collections.synchronizedMap(new HashMap<String, Reply>());
 
        /**
         * Creates a new core.
@@ -505,6 +515,7 @@ public class Core extends AbstractService {
                                                } else {
                                                        addSone(parsedSone);
                                                }
+                                               setSoneStatus(parsedSone, SoneStatus.idle);
                                        }
                                } catch (MalformedURLException mue1) {
                                        logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
@@ -574,6 +585,8 @@ public class Core extends AbstractService {
                SoneInserter soneInserter = soneInserters.remove(sone);
                soneInserter.stop();
                localSones.remove(sone);
+               soneStatuses.remove(sone);
+               soneCache.remove(sone.getId());
        }
 
        /**
@@ -640,8 +653,8 @@ public class Core extends AbstractService {
         *            The post to check for
         * @return All Sones that like the post
         */
-       public Set<Sone> getLikes(final Post post) {
-               return Filters.filteredSet(getSones(), new Filter<Sone>() {
+       public Collection<Sone> getLikes(final Post post) {
+               return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
 
                        @Override
                        public boolean filterObject(Sone sone) {
@@ -657,8 +670,8 @@ public class Core extends AbstractService {
         *            The reply to check for
         * @return All Sones that like the reply
         */
-       public Set<Sone> getLikes(final Reply reply) {
-               return Filters.filteredSet(getSones(), new Filter<Sone>() {
+       public Collection<Sone> getLikes(final Reply reply) {
+               return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
 
                        @Override
                        public boolean filterObject(Sone sone) {
@@ -709,12 +722,32 @@ public class Core extends AbstractService {
        //
 
        /**
+        * Adds some default Sones.
+        */
+       private void addDefaultSones() {
+               for (String soneUri : defaultSones) {
+                       loadSone(soneUri);
+               }
+       }
+
+       /**
         * Loads the configuration.
         */
        @SuppressWarnings("unchecked")
        private void loadConfiguration() {
                logger.entering(Core.class.getName(), "loadConfiguration()");
 
+               boolean firstStart = configuration.getBooleanValue("FirstStart").getValue(true);
+               if (firstStart) {
+                       logger.log(Level.INFO, "First start of Sone, adding a couple of default Sones…");
+                       addDefaultSones();
+                       try {
+                               configuration.getBooleanValue("FirstStart").setValue(false);
+                       } catch (ConfigurationException ce1) {
+                               logger.log(Level.WARNING, "Could not clear “first start” flag!");
+                       }
+               }
+
                options.addIntegerOption("InsertionDelay", new DefaultOption<Integer>(60, new OptionWatcher<Integer>() {
 
                        @Override
@@ -724,14 +757,21 @@ public class Core extends AbstractService {
 
                }));
 
-               options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
-               options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
+               options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
+               options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
+
+               if (firstStart) {
+                       return;
+               }
 
+               options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
+               options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
                boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
                options.getBooleanOption("ClearOnNextRestart").set(null);
                options.getBooleanOption("ReallyClearOnNextRestart").set(null);
                if (clearConfiguration) {
                        /* stop loading the configuration. */
+                       addDefaultSones();
                        return;
                }
 
@@ -997,7 +1037,7 @@ public class Core extends AbstractService {
                                configuration.getStringValue(blacklistedSonePrefix + "/ID").setValue(blacklistedSone.getId());
                                configuration.getStringValue(blacklistedSonePrefix + "/Name").setValue(blacklistedSone.getName());
                                configuration.getStringValue(blacklistedSonePrefix + "/Key").setValue(blacklistedSone.getRequestUri().toString());
-                               configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue(blacklistedSone.getInsertUri().toString());
+                               configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue((blacklistedSone.getInsertUri() != null) ? blacklistedSone.getInsertUri().toString() : null);
                                /* TODO - store all known stuff? */
                        }
                        configuration.getStringValue("BlacklistedSone." + blacklistedSonesCounter + "/ID").setValue(null);