From 42d04a67cefcd1ec4fa78b63ea9449ea6f5cf666 Mon Sep 17 00:00:00 2001 From: Ameen Mohamed Date: Sat, 21 Dec 2024 01:21:27 +0000 Subject: [PATCH] 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; + } +}