get it to compile

opentdf · Jul 23, 2024 · 5e04c5e · 5e04c5e
1 parent f61e646
commit 5e04c5e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java b/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java
@@ -37,7 +37,7 @@ static public class KeyAccess {
         public String url;
         public String protocol;
         public String wrappedKey;
-        public Object policyBinding;
+        public PolicyBinding policyBinding;
         public String encryptedMetadata;
         public String kid;
     }

diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java b/sdk/src/main/java/io/opentdf/platform/sdk/TDF.java
@@ -3,6 +3,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
 import com.nimbusds.jose.*;
 import com.nimbusds.jose.crypto.MACVerifier;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
@@ -26,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
@@ -69,21 +74,26 @@ public TDF() {
 
     private static final SecureRandom sRandom = new SecureRandom();
 
-    public class PolicyBindingDeserializer implements JsonDeserializer<Object> {
+    public static class PolicyBindingDeserializer implements JsonDeserializer<Object> {
         @Override
         public Object deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
             if (json.isJsonObject()) {
-                return context.deserialize(json, PolicyBinding.class);
+                return context.deserialize(json, Manifest.PolicyBinding.class);
             } else if (json.isJsonPrimitive() && json.getAsJsonPrimitive().isString()) {
                 return json.getAsString();
             } else {
                 throw new JsonParseException("Unexpected type for policyBinding");
             }
         }
     }
-    private static final Gson gson = new GsonBuilder();
-    gson.registerTypeAdapter(Object.class, new PolicyBindingDeserializer());
-    gson.create();
+
+    private static final Gson gson;
+
+    static {
+        gson = new GsonBuilder()
+                .registerTypeAdapter(Object.class, new PolicyBindingDeserializer())
+                .create();
+    }
 
     public static class DataSizeNotSupported extends RuntimeException {
         public DataSizeNotSupported(String errorMessage) {