From 42d04a67cefcd1ec4fa78b63ea9449ea6f5cf666 Mon Sep 17 00:00:00 2001 From: Ameen Mohamed Date: Sat, 21 Dec 2024 01:21:27 +0000 Subject: [PATCH 1/4] fix: [DHIS2-18690] Re-add TESchemaDescriptor to avoid in-memory query planner (2.41) --- .../dhis/schema/DefaultSchemaService.java | 2 + .../TrackedEntitySchemaDescriptor.java | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java index 35962e032d20..4532337086bb 100644 --- a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java @@ -167,6 +167,7 @@ import org.hisp.dhis.schema.descriptors.TrackedEntityDataElementDimensionSchemaDescriptor; import org.hisp.dhis.schema.descriptors.TrackedEntityFilterSchemaDescriptor; import org.hisp.dhis.schema.descriptors.TrackedEntityProgramIndicatorDimensionSchemaDescriptor; +import org.hisp.dhis.schema.descriptors.TrackedEntitySchemaDescriptor; import org.hisp.dhis.schema.descriptors.TrackedEntityTypeAttributeSchemaDescriptor; import org.hisp.dhis.schema.descriptors.TrackedEntityTypeSchemaDescriptor; import org.hisp.dhis.schema.descriptors.UserAccessSchemaDescriptor; @@ -281,6 +282,7 @@ private void init() { register(new SqlViewSchemaDescriptor()); register(new TrackedEntityAttributeSchemaDescriptor()); register(new TrackedEntityAttributeValueSchemaDescriptor()); + register(new TrackedEntitySchemaDescriptor()); register(new TrackedEntityFilterSchemaDescriptor()); register(new TrackedEntityTypeSchemaDescriptor()); register(new TrackedEntityTypeAttributeSchemaDescriptor()); diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java new file mode 100644 index 000000000000..3f21057bd70b --- /dev/null +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2004-2022, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.hisp.dhis.schema.descriptors; + +import org.hisp.dhis.schema.Schema; +import org.hisp.dhis.schema.SchemaDescriptor; +import org.hisp.dhis.trackedentity.TrackedEntity; + +/** + * @author Morten Olav Hansen + */ +public class TrackedEntitySchemaDescriptor implements SchemaDescriptor { + + public static final String SINGULAR = "trackedEntityInstance"; + + public static final String PLURAL = "trackedEntityInstances"; + + public static final String API_ENDPOINT = "/" + PLURAL; + + @Override + public Schema getSchema() { + Schema schema = new Schema(TrackedEntity.class, SINGULAR, PLURAL); + schema.setRelativeApiEndpoint(API_ENDPOINT); + + return schema; + } +} From 4d4e2e87e031d5bc6f5465bb6844d6ab613af22f Mon Sep 17 00:00:00 2001 From: Ameen Mohamed Date: Sat, 21 Dec 2024 12:23:06 +0000 Subject: [PATCH 2/4] fix integration test schema based controller to ignore TEISchemaDescriptor --- .../hisp/dhis/webapi/controller/SchemaBasedControllerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/SchemaBasedControllerTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/SchemaBasedControllerTest.java index eb50326262a1..840e0c3b5aec 100644 --- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/SchemaBasedControllerTest.java +++ b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/SchemaBasedControllerTest.java @@ -81,7 +81,8 @@ class SchemaBasedControllerTest extends DhisControllerIntegrationTest { "programStageWorkingList", // same reason as programStage "dataElement", // non-postgres SQL in deletion handler "predictor", // NPE in preheat when creating objects - "aggregateDataExchange" // required JSONB objects not working + "aggregateDataExchange", // required JSONB objects not working + "trackedEntityInstance" // needs TrackedEntityType ); /** From 983ae629c5397d2ac5a75ea51a8f8ba55fc208a6 Mon Sep 17 00:00:00 2001 From: Ameen Mohamed Date: Mon, 23 Dec 2024 12:52:20 +0100 Subject: [PATCH 3/4] Re-add Enrollment and Event Schema descriptor --- .../dhis/schema/DefaultSchemaService.java | 4 ++ .../EnrollmentSchemaDescriptor.java | 46 +++++++++++++++++++ .../descriptors/EventSchemaDescriptor.java | 45 ++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java create mode 100644 dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java index 4532337086bb..2d6055267373 100644 --- a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java @@ -90,11 +90,13 @@ import org.hisp.dhis.schema.descriptors.DataSetNotificationTemplateSchemaDescriptor; import org.hisp.dhis.schema.descriptors.DataSetSchemaDescriptor; import org.hisp.dhis.schema.descriptors.DocumentSchemaDescriptor; +import org.hisp.dhis.schema.descriptors.EnrollmentSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventChartSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventFilterSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventHookSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventRepetitionSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventReportSchemaDescriptor; +import org.hisp.dhis.schema.descriptors.EventSchemaDescriptor; import org.hisp.dhis.schema.descriptors.EventVisualizationSchemaDescriptor; import org.hisp.dhis.schema.descriptors.ExpressionDimensionItemSchemaDescriptor; import org.hisp.dhis.schema.descriptors.ExpressionSchemaDescriptor; @@ -314,6 +316,8 @@ private void init() { register(new OrganisationUnitGroupSetDimensionSchemaDescriptor()); register(new RelationshipSchemaDescriptor()); register(new KeyJsonValueSchemaDescriptor()); + register(new EnrollmentSchemaDescriptor()); + register(new EventSchemaDescriptor()); register(new EventFilterSchemaDescriptor()); register(new VisualizationSchemaDescriptor()); register(new ApiTokenSchemaDescriptor()); diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java new file mode 100644 index 000000000000..77d96bad094e --- /dev/null +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2004-2022, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.hisp.dhis.schema.descriptors; + +import org.hisp.dhis.program.Enrollment; +import org.hisp.dhis.schema.Schema; +import org.hisp.dhis.schema.SchemaDescriptor; + +public class EnrollmentSchemaDescriptor implements SchemaDescriptor { + public static final String SINGULAR = "programInstance"; + + public static final String PLURAL = "programInstances"; + + public static final String API_ENDPOINT = "/" + PLURAL; + + @Override + public Schema getSchema() { + return new Schema(Enrollment.class, SINGULAR, PLURAL); + } +} + diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java new file mode 100644 index 000000000000..12dd036eaeeb --- /dev/null +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2004-2022, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.hisp.dhis.schema.descriptors; + +import org.hisp.dhis.program.Event; +import org.hisp.dhis.schema.Schema; +import org.hisp.dhis.schema.SchemaDescriptor; + +public class EventSchemaDescriptor implements SchemaDescriptor { + public static final String SINGULAR = "programStageInstance"; + + public static final String PLURAL = "programStageInstances"; + + public static final String API_ENDPOINT = "/" + PLURAL; + + @Override + public Schema getSchema() { + return new Schema(Event.class, SINGULAR, PLURAL); + } +} From e66577d75ca90d63d814294c52e2801d42e0d3a7 Mon Sep 17 00:00:00 2001 From: Ameen Mohamed Date: Mon, 23 Dec 2024 12:55:46 +0100 Subject: [PATCH 4/4] Checkstyle fix --- .../descriptors/EnrollmentSchemaDescriptor.java | 15 +++++++-------- .../schema/descriptors/EventSchemaDescriptor.java | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java index 77d96bad094e..c92a250ae222 100644 --- a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EnrollmentSchemaDescriptor.java @@ -32,15 +32,14 @@ import org.hisp.dhis.schema.SchemaDescriptor; public class EnrollmentSchemaDescriptor implements SchemaDescriptor { - public static final String SINGULAR = "programInstance"; + public static final String SINGULAR = "programInstance"; - public static final String PLURAL = "programInstances"; + public static final String PLURAL = "programInstances"; - public static final String API_ENDPOINT = "/" + PLURAL; + public static final String API_ENDPOINT = "/" + PLURAL; - @Override - public Schema getSchema() { - return new Schema(Enrollment.class, SINGULAR, PLURAL); - } + @Override + public Schema getSchema() { + return new Schema(Enrollment.class, SINGULAR, PLURAL); + } } - diff --git a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java index 12dd036eaeeb..4452e89d80f2 100644 --- a/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java +++ b/dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/descriptors/EventSchemaDescriptor.java @@ -32,14 +32,14 @@ import org.hisp.dhis.schema.SchemaDescriptor; public class EventSchemaDescriptor implements SchemaDescriptor { - public static final String SINGULAR = "programStageInstance"; + public static final String SINGULAR = "programStageInstance"; - public static final String PLURAL = "programStageInstances"; + public static final String PLURAL = "programStageInstances"; - public static final String API_ENDPOINT = "/" + PLURAL; + public static final String API_ENDPOINT = "/" + PLURAL; - @Override - public Schema getSchema() { - return new Schema(Event.class, SINGULAR, PLURAL); - } + @Override + public Schema getSchema() { + return new Schema(Event.class, SINGULAR, PLURAL); + } }