Some refactoring

- I didn't like the way the context was initialized
- The DatabaseRepository got too complicated

domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java

@@ -0,0 +1,174 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage;
+
+import ch.dissem.bitmessage.ports.AddressRepository;
+import ch.dissem.bitmessage.ports.Inventory;
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import ch.dissem.bitmessage.ports.NodeRegistry;
+
+import java.util.Collection;
+import java.util.TreeSet;
+
+/**
+ * Created by chris on 05.04.15.
+ */
+public class BitmessageContext {
+    public static final int CURRENT_VERSION = 3;
+
+    private Inventory inventory;
+    private NodeRegistry nodeRegistry;
+    private NetworkHandler networkHandler;
+    private AddressRepository addressRepo;
+
+    private Collection<Long> streams = new TreeSet<>();
+
+    private int port;
+
+    private long networkNonceTrialsPerByte = 1000;
+    private long networkExtraBytes = 1000;
+
+    private BitmessageContext(Builder builder) {
+        port = builder.port;
+        inventory = builder.inventory;
+        nodeRegistry = builder.nodeRegistry;
+        networkHandler = builder.networkHandler;
+        addressRepo = builder.addressRepo;
+        streams = builder.streams;
+
+        init(inventory, nodeRegistry, networkHandler, addressRepo);
+    }
+
+    private void init(Object... objects) {
+        for (Object o : objects) {
+            if (o instanceof ContextHolder) {
+                ((ContextHolder) o).setContext(this);
+            }
+        }
+    }
+
+    public Inventory getInventory() {
+        return inventory;
+    }
+
+    public NodeRegistry getAddressRepository() {
+        return nodeRegistry;
+    }
+
+    public NetworkHandler getNetworkHandler() {
+        return networkHandler;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public long[] getStreams() {
+        long[] result = new long[streams.size()];
+        int i = 0;
+        for (long stream : streams) {
+            result[i++] = stream;
+        }
+        return result;
+    }
+
+    public void addStream(long stream) {
+        streams.add(stream);
+    }
+
+    public void removeStream(long stream) {
+        streams.remove(stream);
+    }
+
+    public long getNetworkNonceTrialsPerByte() {
+        return networkNonceTrialsPerByte;
+    }
+
+    public long getNetworkExtraBytes() {
+        return networkExtraBytes;
+    }
+
+
+    public interface ContextHolder {
+        void setContext(BitmessageContext context);
+    }
+
+    public static final class Builder {
+        private int port = 8444;
+        private Inventory inventory;
+        private NodeRegistry nodeRegistry;
+        private NetworkHandler networkHandler;
+        private AddressRepository addressRepo;
+        private Collection<Long> streams;
+
+        public Builder() {
+        }
+
+        public Builder port(int port) {
+            this.port = port;
+            return this;
+        }
+
+        public Builder inventory(Inventory inventory) {
+            this.inventory = inventory;
+            return this;
+        }
+
+        public Builder nodeRegistry(NodeRegistry nodeRegistry) {
+            this.nodeRegistry = nodeRegistry;
+            return this;
+        }
+
+        public Builder networkHandler(NetworkHandler networkHandler) {
+            this.networkHandler = networkHandler;
+            return this;
+        }
+
+        public Builder addressRepo(AddressRepository addressRepo) {
+            this.addressRepo = addressRepo;
+            return this;
+        }
+
+        public Builder streams(Collection<Long> streams) {
+            this.streams = streams;
+            return this;
+        }
+
+        public Builder streams(long... streams) {
+            this.streams = new TreeSet<>();
+            for (long stream : streams) {
+                this.streams.add(stream);
+            }
+            return this;
+        }
+
+        public BitmessageContext build() {
+            nonNull("inventory", inventory);
+            nonNull("nodeRegistry", nodeRegistry);
+            nonNull("networkHandler", networkHandler);
+            nonNull("addressRepo", addressRepo);
+            if (streams == null) {
+                streams(1);
+            }
+            return new BitmessageContext(this);
+        }
+
+        private void nonNull(String name, Object o) {
+            if (o == null) throw new IllegalStateException(name + " must not be null");
+        }
+    }
+}

domain/src/main/java/ch/dissem/bitmessage/Context.java

@@ -1,97 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage;
-
-import ch.dissem.bitmessage.ports.NodeRegistry;
-import ch.dissem.bitmessage.ports.Inventory;
-import ch.dissem.bitmessage.ports.NetworkHandler;
-
-import java.util.Collection;
-import java.util.TreeSet;
-
-/**
- * Created by chris on 05.04.15.
- */
-public class Context {
-    public static final int CURRENT_VERSION = 3;
-
-    private static Context instance;
-
-    private Inventory inventory;
-    private NodeRegistry addressRepo;
-    private NetworkHandler networkHandler;
-
-    private Collection<Long> streams = new TreeSet<>();
-
-    private int port;
-
-    private long networkNonceTrialsPerByte = 1000;
-    private long networkExtraBytes = 1000;
-
-    private Context(Inventory inventory, NodeRegistry addressRepo,
-                    NetworkHandler networkHandler, int port) {
-        this.inventory = inventory;
-        this.addressRepo = addressRepo;
-        this.networkHandler = networkHandler;
-        this.port = port;
-    }
-
-    public static void init(Inventory inventory, NodeRegistry nodeRegistry, NetworkHandler networkHandler, int port) {
-        instance = new Context(inventory, nodeRegistry, networkHandler, port);
-    }
-
-    public static Context getInstance() {
-        return instance;
-    }
-
-    public Inventory getInventory() {
-        return inventory;
-    }
-
-    public NodeRegistry getAddressRepository() {
-        return addressRepo;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public long[] getStreams() {
-        long[] result = new long[streams.size()];
-        int i = 0;
-        for (long stream : streams) {
-            result[i++] = stream;
-        }
-        return result;
-    }
-
-    public void addStream(long stream) {
-        streams.add(stream);
-    }
-
-    public void removeStream(long stream) {
-        streams.remove(stream);
-    }
-
-    public long getNetworkNonceTrialsPerByte() {
-        return networkNonceTrialsPerByte;
-    }
-
-    public long getNetworkExtraBytes() {
-        return networkExtraBytes;
-    }
-}

domain/src/main/java/ch/dissem/bitmessage/entity/Version.java

@@ -16,7 +16,7 @@
 
 package ch.dissem.bitmessage.entity;
 
-import ch.dissem.bitmessage.Context;
+import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.utils.Encode;
 import ch.dissem.bitmessage.utils.UnixTime;
@@ -147,7 +147,7 @@ public class Version implements MessagePayload {
         }
 
         public Builder defaults() {
-            version = Context.CURRENT_VERSION;
+            version = BitmessageContext.CURRENT_VERSION;
             services = 1;
             timestamp = UnixTime.now();
             nonce = new Random().nextInt();

domain/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java

@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.ports;
 
+import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 
 /**

domain/src/main/java/ch/dissem/bitmessage/utils/Security.java

@@ -133,7 +133,7 @@ public class Security {
                                       long nonceTrialsPerByte, long extraBytes, Pubkey.Feature... features) {
         byte[] publicSigningKey = EC_PARAMETERS.getG().multiply(keyToBigInt(privateSigningKey)).getEncoded(false);
         byte[] publicEncryptionKey = EC_PARAMETERS.getG().multiply(keyToBigInt(privateEncryptionKey)).getEncoded(false);
-        return Factory.createPubkey(Bytes.subArray(publicSigningKey, 1, 64), Bytes.subArray(publicEncryptionKey, 1, 64),
+        return Factory.createPubkey(version, Bytes.subArray(publicSigningKey, 1, 64), Bytes.subArray(publicEncryptionKey, 1, 64),
                 nonceTrialsPerByte, extraBytes, features);
     }