Change json logic

Author: jtbrain

CedarJava/src/main/java/com/cedarpolicy/model/entity/Entity.java

@@ -109,11 +109,11 @@ public JsonNode toJsonValue() throws NullPointerException, InternalException, Js
      * @throws JsonProcessingException if the Entity JSON is unable to be processed
      * @throws IOException if the Entity is unable to be written to the file
      */
-        public void writeToJson(File file) throws NullPointerException, InternalException, JsonProcessingException, IOException {
-            ObjectWriter writer = OBJECT_MAPPER.writer();
-            JsonNode entityJson = this.toJsonValue();
-            writer.writeValue(file, entityJson);
-        }
+    public void writeToJson(File file) throws NullPointerException, InternalException, JsonProcessingException, IOException {
+        ObjectWriter writer = OBJECT_MAPPER.writer();
+        JsonNode entityJson = this.toJsonValue();
+        writer.writeValue(file, entityJson);
+    }
 
     /**
      * Get the value for the given attribute, or null if not present.

CedarJavaFFI/src/interface.rs

@@ -462,23 +462,21 @@ fn from_json_internal<'a>(
 }
 
 #[jni_fn("com.cedarpolicy.model.entity.Entity")]
-pub fn toJsonEntityJni<'a>(mut env: JNIEnv<'a>, _: JClass, entity: JEntity<'a>) -> jvalue {
-    match to_json_entity_internal(&mut env, entity) {
+pub fn toJsonEntityJni<'a>(mut env: JNIEnv<'a>, _: JClass, obj: JObject<'a>) -> jvalue {
+    match to_json_entity_internal(&mut env, obj) {
         Ok(v) => v.as_jni(),
         Err(e) => jni_failed(&mut env, e.as_ref()),
     }
 }
 
-fn to_json_entity_internal<'a>(
-    env: &mut JNIEnv<'a>,
-    java_entity: JEntity<'a>,
-) -> Result<JValueOwned<'a>> {
-    if java_entity.as_ref().is_null() {
+fn to_json_entity_internal<'a>(env: &mut JNIEnv<'a>, obj: JObject<'a>) -> Result<JValueOwned<'a>> {
+    if obj.is_null() {
         raise_npe(env)
     } else {
+        let java_entity = JEntity::cast(env, obj)?;
         let entity = java_entity.to_entity(env)?;
-        let entity_json = serde_json::to_string(&entity.to_json_value()?)?;
-        Ok(JValueGen::Object(env.new_string(&entity_json)?.into()))
+        let entity_json = &entity.to_json_string()?;
+        Ok(JValueGen::Object(env.new_string(entity_json)?.into()))
     }
 }