Item 5015: Assay without Study

Repackage Assay API classes from .study to .assay

SVN r64227 |2019-07-27 05:13:55 +0000

Author: labkey-adam

LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java

@@ -27,7 +27,6 @@
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
-import org.labkey.api.data.ContainerFilterable;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.DbScope;
@@ -54,9 +53,9 @@
 import org.labkey.api.settings.LookAndFeelProperties;
 import org.labkey.api.study.Study;
 import org.labkey.api.study.StudyService;
-import org.labkey.api.study.assay.AssayProtocolSchema;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayProtocolSchema;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.ldk.LDKServiceImpl;
 
 import java.sql.ResultSet;

LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java

@@ -23,6 +23,7 @@
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
+import org.labkey.api.assay.AssayResultTable;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.BuiltInButtonConfig;
 import org.labkey.api.data.ButtonBarConfig;
@@ -41,8 +42,6 @@
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.UserSchema;
-import org.labkey.api.security.permissions.InsertPermission;
-import org.labkey.api.study.assay.AssayResultTable;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.view.NavTree;
 import org.labkey.api.view.template.ClientDependency;

laboratory/api-src/org/labkey/api/laboratory/assay/AbstractAssayDataProvider.java

@@ -39,9 +39,9 @@
 import org.labkey.api.query.QueryDefinition;
 import org.labkey.api.query.QueryException;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayProtocolSchema;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayProtocolSchema;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.template.ClientDependency;

laboratory/api-src/org/labkey/api/laboratory/assay/AssayNavItem.java

@@ -22,9 +22,9 @@
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.LaboratoryUrls;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssaySchema;
-import org.labkey.api.study.assay.AssayUrls;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssaySchema;
+import org.labkey.api.assay.AssayUrls;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 

laboratory/api-src/org/labkey/api/laboratory/assay/AssaySummaryNavItem.java

@@ -21,7 +21,7 @@
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.QueryCountNavItem;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayUrls;
+import org.labkey.api.assay.AssayUrls;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 

laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayImportMethod.java

@@ -34,8 +34,8 @@
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.reader.ExcelFactory;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.api.view.ViewContext;
 
 import javax.servlet.http.HttpServletRequest;

laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java

@@ -49,8 +49,8 @@
 import org.labkey.api.reader.Readers;
 import org.labkey.api.reader.TabLoader;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.api.util.FileType;
 import org.labkey.api.util.Pair;
 import org.labkey.api.view.NotFoundException;

laboratory/api-src/org/labkey/api/laboratory/assay/PivotingImportMethod.java

@@ -15,9 +15,6 @@
  */
 package org.labkey.api.laboratory.assay;
 
-import com.google.gwt.codegen.server.StringGenerator;
-import org.json.JSONObject;
-import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.Sort;
 import org.labkey.api.data.TableInfo;
@@ -26,15 +23,12 @@
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainProperty;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayService;
-import org.labkey.api.util.Pair;
 import org.labkey.api.view.ViewContext;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * User: bimber

laboratory/src/org/labkey/laboratory/LaboratoryController.java

@@ -68,9 +68,9 @@
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
-import org.labkey.api.study.assay.AssayFileWriter;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayFileWriter;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;

laboratory/src/org/labkey/laboratory/LaboratoryManager.java

@@ -50,8 +50,8 @@
 import org.labkey.api.query.QueryUpdateServiceException;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
-import org.labkey.api.study.assay.AssayProvider;
-import org.labkey.api.study.assay.AssayService;
+import org.labkey.api.assay.AssayProvider;
+import org.labkey.api.assay.AssayService;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.ResultSetUtil;
 import org.labkey.api.view.Portal;