From 46915f3a8c3a624e27766e8f68d9d13d85da49b0 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 31 Mar 2025 11:35:02 -0700 Subject: [PATCH] Eliminate class-loading deadlock warning in ContainerFilter --- .../src/org/labkey/panoramapublic/PanoramaPublicSchema.java | 2 +- .../panoramapublic/query/ExperimentAnnotationsTableInfo.java | 2 +- .../labkey/panoramapublic/query/JournalExperimentTableInfo.java | 2 +- .../org/labkey/panoramapublic/query/PanoramaPublicTable.java | 2 +- .../org/labkey/panoramapublic/query/SubmissionTableInfo.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java index f5f138aa..ed731a4f 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java +++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java @@ -340,7 +340,7 @@ protected void applyContainerFilter(ContainerFilter filter) sql.append(super.getFromSQL("X")); sql.append(" "); - if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE) + if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter()) { SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN "); joinToExpAnnotSql.append(PanoramaPublicManager.getTableInfoSubmission(), "s"); diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java index 3ae59bf4..9f04bc68 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java +++ b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java @@ -432,7 +432,7 @@ private ExprColumn getAnnouncementIdCol() // Add a FK lookup so that we can access the "Modified" etc. columns on the "Announcement" table. announcementCol.setFk(QueryForeignKey.from(getUserSchema(), - ContainerFilter.EVERYTHING_UNSAFE) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests" + ContainerFilter.getUnsafeEverythingFilter()) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests" .schema("announcement") // Cannot use CommSchemma.getSchemaName() which returns "comm". This only works if we use "announcement". // AnnouncementSchema is not part of the LabKey API. .to("Announcement", // Table name cannot be the plural, "Announcements", returned by CommSchema.getInstance().getTableInfoAnnouncements().getName() diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java index 185a1e6e..5d302b6b 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java +++ b/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java @@ -76,7 +76,7 @@ public SQLFragment getFromSQL(String alias) sql.append(super.getFromSQL("X")); sql.append(" "); - if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE) + if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter()) { // Filter on the Container column of the associated ExperimentAnnotations row SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN "); diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java b/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java index 21ca6b79..9ab789df 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java +++ b/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java @@ -57,7 +57,7 @@ public SQLFragment getFromSQL(String alias) sql.append(super.getFromSQL(TABLE_ALIAS)); sql.append(" "); - if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE) + if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter()) { sql.append(_joinSql.getSQL()); sql.append(" WHERE "); diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java index 4159b01b..c975fe8a 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java +++ b/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java @@ -112,7 +112,7 @@ public SQLFragment getFromSQL(String alias) sql.append(super.getFromSQL("X")); sql.append(" "); - if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE) + if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter()) { SQLFragment joinSql = new SQLFragment("INNER JOIN "); joinSql.append(PanoramaPublicManager.getTableInfoJournalExperiment(), "je")