Repackage JSONObject and JSONArray (#140)

labkey-adam · web-flow · commit b1333ae6bea5 · 2022-09-21T14:58:55.000-07:00
diff --git a/LDK/src/org/labkey/ldk/LDKController.java b/LDK/src/org/labkey/ldk/LDKController.java
@@ -20,8 +20,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.action.ApiResponse;
 import org.labkey.api.action.ApiSimpleResponse;
 import org.labkey.api.action.ConfirmAction;
diff --git a/LDK/src/org/labkey/ldk/LDKServiceImpl.java b/LDK/src/org/labkey/ldk/LDKServiceImpl.java
@@ -6,8 +6,8 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.ColumnInfo;
diff --git a/LDK/src/org/labkey/ldk/notification/NotificationServiceImpl.java b/LDK/src/org/labkey/ldk/notification/NotificationServiceImpl.java
@@ -21,7 +21,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
diff --git a/LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java b/LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java
@@ -21,8 +21,8 @@
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.audit.AuditLogService;
 import org.labkey.api.audit.AuditTypeProvider;
diff --git a/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java b/LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java
@@ -23,7 +23,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.assay.AssayResultTable;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.BuiltInButtonConfig;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/AbstractImportingNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/AbstractImportingNavItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
 
diff --git a/laboratory/api-src/org/labkey/api/laboratory/AbstractQueryNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/AbstractQueryNavItem.java
@@ -15,12 +15,11 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.query.QueryAction;
 import org.labkey.api.query.QueryService;
-import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
 import org.labkey.api.view.ActionURL;
 
diff --git a/laboratory/api-src/org/labkey/api/laboratory/AbstractUrlNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/AbstractUrlNavItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.security.User;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/JSTabbedReportItem.java b/laboratory/api-src/org/labkey/api/laboratory/JSTabbedReportItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
 
diff --git a/laboratory/api-src/org/labkey/api/laboratory/QueryImportNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/QueryImportNavItem.java
@@ -15,17 +15,14 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.ldk.table.QueryCache;
 import org.labkey.api.query.QueryAction;
-import org.labkey.api.query.QueryDefinition;
 import org.labkey.api.query.QueryParseException;
 import org.labkey.api.query.QueryService;
-import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
-import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 
diff --git a/laboratory/api-src/org/labkey/api/laboratory/QueryTabbedReportItem.java b/laboratory/api-src/org/labkey/api/laboratory/QueryTabbedReportItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.ldk.table.QueryCache;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/ReportItem.java b/laboratory/api-src/org/labkey/api/laboratory/ReportItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.ldk.table.QueryCache;
 import org.labkey.api.security.User;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/AbstractAssayDataProvider.java b/laboratory/api-src/org/labkey/api/laboratory/assay/AbstractAssayDataProvider.java
@@ -18,7 +18,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.PropertyManager;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/AssayNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/assay/AssayNavItem.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory.assay;
 
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.exp.api.ExpProtocol;
 import org.labkey.api.laboratory.AbstractImportingNavItem;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayImportMethod.java b/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayImportMethod.java
@@ -17,8 +17,8 @@
 
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.ExcelWriter;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java b/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java
@@ -23,8 +23,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ConvertHelper;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/ImportContext.java b/laboratory/api-src/org/labkey/api/laboratory/assay/ImportContext.java
@@ -16,9 +16,8 @@
 package org.labkey.api.laboratory.assay;
 
 import org.apache.logging.log4j.Level;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.view.ViewContext;
 
 import java.io.File;
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/ParserErrors.java b/laboratory/api-src/org/labkey/api/laboratory/assay/ParserErrors.java
@@ -16,14 +16,10 @@
 package org.labkey.api.laboratory.assay;
 
 import org.apache.logging.log4j.Level;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
 import org.labkey.api.query.BatchValidationException;
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.util.Pair;
-import org.labkey.api.view.ViewContext;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/laboratory/src/org/labkey/laboratory/AbstractDataSource.java b/laboratory/src/org/labkey/laboratory/AbstractDataSource.java
@@ -3,7 +3,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.TableInfo;
diff --git a/laboratory/src/org/labkey/laboratory/AdditionalDataSource.java b/laboratory/src/org/labkey/laboratory/AdditionalDataSource.java
@@ -4,8 +4,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.old.JSONException;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.laboratory.LaboratoryService;
diff --git a/laboratory/src/org/labkey/laboratory/DemographicsSource.java b/laboratory/src/org/labkey/laboratory/DemographicsSource.java
@@ -4,8 +4,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.old.JSONException;
+import org.json.old.JSONObject;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
diff --git a/laboratory/src/org/labkey/laboratory/ExtraDataSourcesDataProvider.java b/laboratory/src/org/labkey/laboratory/ExtraDataSourcesDataProvider.java
@@ -1,18 +1,15 @@
 package org.labkey.laboratory;
 
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.laboratory.AbstractDataProvider;
-import org.labkey.api.laboratory.AbstractUrlNavItem;
-import org.labkey.api.laboratory.DetailsUrlWithLabelNavItem;
 import org.labkey.api.laboratory.DetailsUrlWithoutLabelNavItem;
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.QueryCountNavItem;
-import org.labkey.api.laboratory.QueryImportNavItem;
 import org.labkey.api.laboratory.QueryTabbedReportItem;
 import org.labkey.api.laboratory.ReportItem;
 import org.labkey.api.laboratory.StaticURLNavItem;
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java
@@ -21,9 +21,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONException;
+import org.json.old.JSONObject;
 import org.labkey.api.action.AbstractFileUploadAction;
 import org.labkey.api.action.ApiJsonWriter;
 import org.labkey.api.action.ApiResponse;
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryDataProvider.java b/laboratory/src/org/labkey/laboratory/LaboratoryDataProvider.java
@@ -16,7 +16,7 @@
 package org.labkey.laboratory;
 
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryModule.java b/laboratory/src/org/labkey/laboratory/LaboratoryModule.java
@@ -17,7 +17,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.UpgradeCode;
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java b/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java
@@ -17,7 +17,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.assay.AssayFileWriter;
 import org.labkey.api.assay.AssayProvider;
 import org.labkey.api.assay.AssayService;
diff --git a/laboratory/src/org/labkey/laboratory/SampleTypeDataProvider.java b/laboratory/src/org/labkey/laboratory/SampleTypeDataProvider.java
@@ -16,7 +16,7 @@
 package org.labkey.laboratory;
 
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.SimpleFilter;
diff --git a/laboratory/src/org/labkey/laboratory/URLDataSource.java b/laboratory/src/org/labkey/laboratory/URLDataSource.java
@@ -3,16 +3,13 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.old.JSONException;
+import org.json.old.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.query.DetailsURL;
-import org.labkey.api.security.User;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.StringExpressionFactory;
-import org.labkey.api.view.ActionURL;
 
 /**
  * User: bimber
diff --git a/laboratory/src/org/labkey/laboratory/assay/AssayHelper.java b/laboratory/src/org/labkey/laboratory/assay/AssayHelper.java
@@ -18,7 +18,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
+import org.json.old.JSONObject;
 import org.labkey.api.assay.AssayBatchDomainKind;
 import org.labkey.api.assay.AssayDataCollector;
 import org.labkey.api.assay.AssayProvider;
diff --git a/laboratory/src/org/labkey/laboratory/notification/LabSummaryNotification.java b/laboratory/src/org/labkey/laboratory/notification/LabSummaryNotification.java
@@ -4,12 +4,11 @@
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.json.old.JSONArray;
+import org.json.old.JSONObject;
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.CoreSchema;
-import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.PropertyManager;
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.TableInfo;
