From e407b878994fdd70bec72ba9b9f579751f4a6e36 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 12 Mar 2021 09:43:52 +0100 Subject: Fix warnings --- .../java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java | 5 +++++ .../org/openslx/imagemaster/serversession/ServerAuthenticator.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 ) ); } } -- cgit v1.2.3-55-g7522