summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2021-03-12 09:43:52 +0100
committerManuel Bentele2021-03-12 09:43:52 +0100
commite407b878994fdd70bec72ba9b9f579751f4a6e36 (patch)
treebb8bae71ad3b79b32effb14485ca0fe14a803e8a
parentAdd support for Java 8 (diff)
downloadmasterserver-e407b878994fdd70bec72ba9b9f579751f4a6e36.tar.gz
masterserver-e407b878994fdd70bec72ba9b9f579751f4a6e36.tar.xz
masterserver-e407b878994fdd70bec72ba9b9f579751f4a6e36.zip
Fix warnings
-rw-r--r--src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java5
-rw-r--r--src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java
index 472d249..9ee00ca 100644
--- a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java
+++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java
@@ -10,6 +10,8 @@ import org.openslx.imagemaster.db.MysqlConnection;
import org.openslx.imagemaster.db.MysqlStatement;
import org.openslx.util.Json;
+import com.google.gson.annotations.SerializedName;
+
public class DbPendingSatellite
{
@@ -39,8 +41,11 @@ public class DbPendingSatellite
private static class KeyWrapper
{
+ @SerializedName( "type" )
public String type;
+ @SerializedName( "modulus" )
public String modulus;
+ @SerializedName( "exponent" )
public String exponent;
public KeyWrapper( String modulus, String exponent )
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
index a7c7fde..ea22765 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
@@ -66,6 +66,6 @@ public class ServerAuthenticator
log.info( "Server '" + satellite.satelliteName + "' (" + satellite.organizationId + ") authenticated." );
- authenticatingServers.remove( satellite.organizationId );
+ authenticatingServers.remove( Integer.valueOf( satellite.organizationId ) );
}
}