Moved functionallity from DbKey to DbSatellite

2 files changed, 14 insertions, 17 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/DbKey.java b/src/main/java/org/openslx/imagemaster/db/DbKey.java
deleted file mode 100644
index 837b9de..0000000
--- a/src/main/java/org/openslx/imagemaster/db/DbKey.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.openslx.imagemaster.db;
-
-
-public class DbKey
-{
-	
-	public final byte[] bytes;
-	
-	public DbKey(byte[] bytes) {
-		this.bytes = bytes;
-	}
-	
-	// TODO: One class per db-table (or per join). This should just be part of DbSatellite
-	public static DbKey fromOrganization(String organization) {
-		return MySQL.findUniqueOrNull( DbKey.class, "SELECT publickey FROM satellite WHERE organization = ?",	organization );
-	}
-}
diff --git a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java
index 2b155cf..15743c8 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java
@@ -1,5 +1,7 @@
 package org.openslx.imagemaster.db;
 
+import java.util.List;
+
 public class DbSatellite
 {
 
@@ -50,4 +52,16 @@ public class DbSatellite
 						"SELECT satellite.organization, satellite.address, satellite.name, satellite.prefix FROM satellite WHERE satellite.prefix = ? LIMIT 1",
 						prefix );
 	}
+	
+	public static byte[] getKeyfromOrganization(String organization) {
+		return MySQL.findUniqueOrNull( ByteArray.class, "SELECT publickey FROM satellite WHERE organization = ?",	organization ).array;
+	}
+	
+	class ByteArray {
+		public final byte[] array;
+		ByteArray(byte[] array)
+		{
+			this.array = array;
+		}
+	}
 }