Moved classes that should not have been in the Utilities project.
This commit is contained in:
parent
efe31d4818
commit
d3169e95bc
@ -6,7 +6,7 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
|
||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="bouncyCastle bcprov-jdk15on" level="application" />
|
||||
<orderEntry type="library" name="jna" level="application" />
|
||||
@ -14,9 +14,11 @@
|
||||
<orderEntry type="library" scope="TEST" name="junit-4.12" level="application" />
|
||||
<orderEntry type="library" name="netty-all" level="application" />
|
||||
<orderEntry type="library" name="logging slf4j-api" level="application" />
|
||||
<orderEntry type="library" name="logging logback" level="application" />
|
||||
<orderEntry type="library" name="bouncyCastle bcpg-jdk15on" level="application" />
|
||||
<orderEntry type="library" name="bouncyCastle bcpkix-jdk15on" level="application" />
|
||||
<orderEntry type="library" name="kryo" level="application" />
|
||||
<orderEntry type="library" name="dorkbox minlog_slf4j" level="application" />
|
||||
<orderEntry type="library" name="lz4_xxhash" level="application" />
|
||||
<orderEntry type="library" name="lzma-java" level="application" />
|
||||
<orderEntry type="library" name="reflectasm" level="application" />
|
||||
@ -24,6 +26,7 @@
|
||||
<orderEntry type="library" name="dorkbox object_pool" level="application" />
|
||||
<orderEntry type="library" name="asm" level="application" />
|
||||
<orderEntry type="library" name="javassist" level="application" />
|
||||
<orderEntry type="library" name="objenesis" level="application" />
|
||||
<orderEntry type="library" name="swt" level="application" />
|
||||
</component>
|
||||
</module>
|
@ -1,131 +0,0 @@
|
||||
/*
|
||||
* Copyright 2014 dorkbox, llc
|
||||
*
|
||||
* 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 dorkbox.util.database;
|
||||
|
||||
import dorkbox.util.bytes.ByteArrayWrapper;
|
||||
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
|
||||
import org.bouncycastle.crypto.params.ECPublicKeyParameters;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public
|
||||
class DB_Server {
|
||||
/**
|
||||
* Address 0.0.0.0/32 may be used as a source address for this host on this network.
|
||||
*/
|
||||
public static final ByteArrayWrapper IP_SELF = ByteArrayWrapper.wrap(new byte[] {0, 0, 0, 0});
|
||||
|
||||
// salt + IP address is used for equals!
|
||||
private byte[] ipAddress;
|
||||
private byte[] salt;
|
||||
|
||||
private ECPrivateKeyParameters privateKey;
|
||||
private ECPublicKeyParameters publicKey;
|
||||
|
||||
// must have empty constructor
|
||||
public
|
||||
DB_Server() {
|
||||
}
|
||||
|
||||
public
|
||||
byte[] getAddress() {
|
||||
if (this.ipAddress == null) {
|
||||
return null;
|
||||
}
|
||||
return this.ipAddress;
|
||||
}
|
||||
|
||||
public
|
||||
void setAddress(byte[] ipAddress) {
|
||||
this.ipAddress = ipAddress;
|
||||
}
|
||||
|
||||
public
|
||||
byte[] getSalt() {
|
||||
return this.salt;
|
||||
}
|
||||
|
||||
public
|
||||
void setSalt(byte[] salt) {
|
||||
this.salt = salt;
|
||||
}
|
||||
|
||||
|
||||
public
|
||||
ECPrivateKeyParameters getPrivateKey() {
|
||||
return this.privateKey;
|
||||
}
|
||||
|
||||
public
|
||||
void setPrivateKey(ECPrivateKeyParameters privateKey) {
|
||||
this.privateKey = privateKey;
|
||||
}
|
||||
|
||||
|
||||
public
|
||||
ECPublicKeyParameters getPublicKey() {
|
||||
return this.publicKey;
|
||||
}
|
||||
|
||||
public
|
||||
void setPublicKey(ECPublicKeyParameters publicKey) {
|
||||
this.publicKey = publicKey;
|
||||
}
|
||||
|
||||
@Override
|
||||
public
|
||||
int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + (this.ipAddress == null ? 0 : Arrays.hashCode(this.ipAddress));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public
|
||||
boolean equals(Object obj) {
|
||||
if (this == obj) {
|
||||
return true;
|
||||
}
|
||||
if (obj == null) {
|
||||
return false;
|
||||
}
|
||||
if (getClass() != obj.getClass()) {
|
||||
return false;
|
||||
}
|
||||
DB_Server other = (DB_Server) obj;
|
||||
if (this.ipAddress == null) {
|
||||
if (other.ipAddress != null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (!Arrays.equals(this.ipAddress, other.ipAddress)) {
|
||||
return false;
|
||||
}
|
||||
return Arrays.equals(this.salt, other.salt);
|
||||
}
|
||||
|
||||
@Override
|
||||
public
|
||||
String toString() {
|
||||
byte[] bytes = this.ipAddress;
|
||||
if (bytes != null) {
|
||||
return "DB_Server " + Arrays.toString(bytes);
|
||||
}
|
||||
|
||||
return "DB_Server [no-ip-set]";
|
||||
}
|
||||
}
|
@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Copyright 2014 dorkbox, llc
|
||||
*
|
||||
* 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 dorkbox.util.database;
|
||||
|
||||
import dorkbox.util.bytes.ByteArrayWrapper;
|
||||
|
||||
/**
|
||||
* A list of all of the keys used by the storage database
|
||||
*/
|
||||
public
|
||||
class DatabaseStorage {
|
||||
public static final ByteArrayWrapper SERVERS = ByteArrayWrapper.wrap("servers");
|
||||
public static final ByteArrayWrapper ROOT = ByteArrayWrapper.wrap("root");
|
||||
public static final ByteArrayWrapper USERS = ByteArrayWrapper.wrap("users");
|
||||
public static final ByteArrayWrapper ADMIN_HASH = ByteArrayWrapper.wrap("adminHash");
|
||||
public static final ByteArrayWrapper FILES = ByteArrayWrapper.wrap("files");
|
||||
public static final ByteArrayWrapper GENERIC = ByteArrayWrapper.wrap("generic");
|
||||
}
|
Loading…
Reference in New Issue
Block a user