remove @serial annotation as it's only supported starting with Java 14

SAP · Jul 21, 2023 · 24e219f · 24e219f
1 parent c2bafc9
commit 24e219f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/env/src/main/java/com/sap/cloud/security/json/DefaultJsonObject.java b/env/src/main/java/com/sap/cloud/security/json/DefaultJsonObject.java
@@ -12,7 +12,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-import java.io.Serial;
 import java.time.DateTimeException;
 import java.time.Instant;
 import java.util.*;
@@ -24,7 +23,6 @@
  */
 public class DefaultJsonObject implements JsonObject {
 
-	@Serial
 	private static final long serialVersionUID = 2204172045251807L;
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultJsonObject.class);

diff --git a/java-security/src/main/java/com/sap/cloud/security/token/XsuaaScopeConverter.java b/java-security/src/main/java/com/sap/cloud/security/token/XsuaaScopeConverter.java
@@ -7,7 +7,6 @@
 
 import com.sap.cloud.security.xsuaa.Assertions;
 
-import java.io.Serial;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -20,7 +19,6 @@
  */
 public class XsuaaScopeConverter implements ScopeConverter {
 
-	@Serial
 	private static final long serialVersionUID = 2204172290850251807L;
 
 	private final Pattern globalScopePattern;

diff --git a/java-security/src/main/java/com/sap/cloud/security/token/XsuaaToken.java b/java-security/src/main/java/com/sap/cloud/security/token/XsuaaToken.java
@@ -13,7 +13,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.io.Serial;
 import java.security.Principal;
 import java.util.LinkedHashSet;
 import java.util.Optional;
@@ -28,7 +27,6 @@
  */
 public class XsuaaToken extends AbstractToken implements AccessToken {
 
-	@Serial
 	private static final long serialVersionUID = 3304172041930251807L;
 	static final String UNIQUE_USER_NAME_FORMAT = "user/%s/%s"; // user/<origin>/<logonName>
 	static final String UNIQUE_CLIENT_NAME_FORMAT = "client/%s"; // client/<clientid>

diff --git a/samples/deploy_and_test.py b/samples/deploy_and_test.py
@@ -785,8 +785,8 @@ def __panic_user_not_found(self, username):
     def __get_access_token(self):
         token = self.http_util.get_token(
             xsuaa_service_url=self.xsuaa_service_url,
-            clientid=self.data.get('credentials').get('clientid'),
-            clientsecret=self.data.get('credentials').get('clientsecret'),
+            clientid=self.data.get('clientid'),
+            clientsecret=self.data.get('clientsecret'),
             grant_type='client_credentials')
         return token.get('access_token')
 

diff --git a/token-client/src/main/java/com/sap/cloud/security/xsuaa/jwt/Base64JwtDecoder.java b/token-client/src/main/java/com/sap/cloud/security/xsuaa/jwt/Base64JwtDecoder.java
@@ -9,7 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Serial;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.regex.Pattern;
@@ -60,7 +59,6 @@ private String base64Decode(String encoded) {
 
 	static class DecodedJwtImpl implements DecodedJwt {
 
-		@Serial
 		private static final long serialVersionUID = 1454353454555430987L;
 
 		private final String header;