remove usages of new ObjectMapper

LabKeyObjectMapper.locked
LabKey · Feb 5, 2024 · e25f9db · e25f9db
1 parent 345409e
commit e25f9db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/GoogleDrive/src/org/labkey/googledrive/GoogleDriveController.java b/GoogleDrive/src/org/labkey/googledrive/GoogleDriveController.java
@@ -12,6 +12,7 @@
 import org.labkey.api.security.RequiresPermission;
 import org.labkey.api.security.RequiresSiteAdmin;
 import org.labkey.api.security.permissions.ReadPermission;
+import org.labkey.api.util.JsonUtil;
 import org.labkey.api.view.JspView;
 import org.labkey.api.view.NavTree;
 import org.labkey.googledrive.api.GoogleDriveService;
@@ -83,10 +84,9 @@ public class AddAccount extends MutatingApiAction<SimpleApiJsonForm>
     {
         @Override
         public Object execute(SimpleApiJsonForm form, BindException errors) throws Exception {
-            ObjectMapper mapper = new ObjectMapper();
             JSONObject object = (form.getJsonObject() == null) ? new JSONObject() : form.getJsonObject();
 
-            RegisterServiceAccountForm registerForm = mapper.readValue(object.toString(), RegisterServiceAccountForm.class);
+            RegisterServiceAccountForm registerForm = JsonUtil.DEFAULT_MAPPER.readValue(object.toString(), RegisterServiceAccountForm.class);
 
             String id = GoogleDriveService.get().registerServiceAccount(registerForm.getDisplayName(), registerForm, getUser());
             JSONObject json = new JSONObject();

diff --git a/GoogleDrive/src/org/labkey/googledrive/GoogleDriveServiceImpl.java b/GoogleDrive/src/org/labkey/googledrive/GoogleDriveServiceImpl.java
@@ -117,8 +117,7 @@ public String registerServiceAccount(String displayName, ServiceAccountForm form
 
         String id = UUID.randomUUID().toString();
 
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectNode row = mapper.valueToTree(form);
+        ObjectNode row = JsonUtil.DEFAULT_MAPPER.valueToTree(form);
 
         row.put("id", id);
         row.put("display_name", displayName);