Changed Store -> StorageType to make more sense.

This commit is contained in:
nathan 2017-02-12 23:21:58 +01:00
parent 782ca1a8e3
commit 7c0d2d0493

View File

@ -15,6 +15,14 @@
*/ */
package dorkbox.network.connection; package dorkbox.network.connection;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.Map;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
import org.bouncycastle.crypto.params.ECPublicKeyParameters;
import dorkbox.network.util.store.SettingsStore; import dorkbox.network.util.store.SettingsStore;
import dorkbox.util.SerializationManager; import dorkbox.util.SerializationManager;
import dorkbox.util.bytes.ByteArrayWrapper; import dorkbox.util.bytes.ByteArrayWrapper;
@ -22,14 +30,7 @@ import dorkbox.util.database.DB_Server;
import dorkbox.util.database.DatabaseStorage; import dorkbox.util.database.DatabaseStorage;
import dorkbox.util.exceptions.SecurityException; import dorkbox.util.exceptions.SecurityException;
import dorkbox.util.storage.Storage; import dorkbox.util.storage.Storage;
import dorkbox.util.storage.Store; import dorkbox.util.storage.StorageType;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
import org.bouncycastle.crypto.params.ECPublicKeyParameters;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.Map;
/** /**
* The property store is the DEFAULT type of store for the network stack. * The property store is the DEFAULT type of store for the network stack.
@ -61,8 +62,8 @@ class PropertyStore extends SettingsStore {
serializationManager.register(DB_Server.class); serializationManager.register(DB_Server.class);
} }
this.storage = Store.Memory() this.storage = StorageType.Memory()
.make(); .make();
servers = this.storage.getAndPut(DatabaseStorage.SERVERS, new HashMap<ByteArrayWrapper, DB_Server>(16)); servers = this.storage.getAndPut(DatabaseStorage.SERVERS, new HashMap<ByteArrayWrapper, DB_Server>(16));
@ -209,6 +210,6 @@ class PropertyStore extends SettingsStore {
@Override @Override
public public
void close() { void close() {
Store.close(storage); StorageType.close(storage);
} }
} }