From 4af5024c61c255f0270820ce51ac7898132b261b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 04:52:15 +0000 Subject: [PATCH 1/2] Bump com.spotify.fmt:fmt-maven-plugin from 2.22.1 to 2.23 Bumps [com.spotify.fmt:fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin) from 2.22.1 to 2.23. - [Release notes](https://github.com/spotify/fmt-maven-plugin/releases) - [Commits](https://github.com/spotify/fmt-maven-plugin/compare/2.22.1...2.23) --- updated-dependencies: - dependency-name: com.spotify.fmt:fmt-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6fafc115..c1bd3ff19 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ com.spotify.fmt fmt-maven-plugin - 2.22.1 + 2.23 From 3c02f3aa54eb6ef79220afe0376310cb3b1e276a Mon Sep 17 00:00:00 2001 From: Matthias Lindinger Date: Tue, 12 Mar 2024 08:33:59 +0100 Subject: [PATCH 2/2] Fix code style --- .../impl/jdbi/UniqueObjectRepositoryImpl.java | 3 +- .../IdentifiableRepositoryImpl.java | 15 ++++++---- .../entity/DigitalObjectRepositoryImpl.java | 9 ++++-- .../entity/WebsiteRepositoryImpl.java | 2 +- .../agent/CorporateBodyRepositoryImpl.java | 2 +- .../entity/agent/PersonRepositoryImpl.java | 3 +- .../entity/work/ItemRepositoryImpl.java | 9 ++++-- .../work/ManifestationRepositoryImpl.java | 30 ++++++++++++------- .../entity/work/WorkRepositoryImpl.java | 12 +++++--- .../semantic/SubjectRepositoryImpl.java | 3 +- .../jdbi/security/UserRepositoryImpl.java | 3 +- .../jdbi/semantic/HeadwordRepositoryImpl.java | 8 ++--- .../IdentifiableRepositoryImplTest.java | 3 +- 13 files changed, 66 insertions(+), 36 deletions(-) diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/UniqueObjectRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/UniqueObjectRepositoryImpl.java index 5e5e03a8b..ccd1649d4 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/UniqueObjectRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/UniqueObjectRepositoryImpl.java @@ -39,7 +39,8 @@ public abstract class UniqueObjectRepositoryImpl public static String sqlSelectReducedFields(String tableAlias, String mappingPrefix) { return " " - + """ + + + """ {{alias}}.uuid {{prefix}}_uuid, {{alias}}.created {{prefix}}_created, {{alias}}.last_modified {{prefix}}_lastModified""" .replace("{{alias}}", tableAlias) .replace("{{prefix}}", mappingPrefix); diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImpl.java index c8ef67762..58e33f257 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImpl.java @@ -427,7 +427,8 @@ public List getRandom(int count) throws RepositoryException { protected String getSqlInsertFields() { return super.getSqlInsertFields() + ", " - + """ + + + """ description, identifiable_objecttype, identifiable_type, label, previewfileresource, preview_hints, split_label, tags_uuids, subjects_uuids @@ -438,7 +439,8 @@ protected String getSqlInsertFields() { protected String getSqlInsertValues() { return super.getSqlInsertValues() + ", " - + """ + + + """ :description::JSONB, :identifiableObjectType, :type, :label::JSONB, :previewFileResource, :previewImageRenderingHints::JSONB, :split_label::TEXT[], :tags_uuids::UUID[], :subjects_uuids::UUID[] @@ -452,7 +454,8 @@ protected String getSqlInsertValues() { public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectReducedFields(tableAlias, mappingPrefix) + ", " - + """ + + + """ {{alias}}.description {{prefix}}_description, {{alias}}.identifiable_objecttype {{prefix}}_identifiableObjectType, {{alias}}.identifiable_type {{prefix}}_type, @@ -585,7 +588,8 @@ public List retrieveMultiple( throws RepositoryException { StringBuilder sql = new StringBuilder( - (""" + ( + """ SELECT {{fieldsSql}}, {{identifierFields}}, {{imageFileFields}}, get_identifiers(file.uuid) pi_identifiers, {{urlAliasFields}}, {{tagFields}}, {{subjectFields}} @@ -602,7 +606,8 @@ public List retrieveMultiple( ? "%s\n".formatted(getSqlSelectReducedFieldsJoins()) : "") // regular identifiable joins - + """ + + + """ LEFT JOIN {{identifierTable}} AS {{identifierAlias}} ON {{mainAlias}}.uuid = {{identifierAlias}}.identifiable LEFT JOIN {{imageFileTable}} AS file diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/DigitalObjectRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/DigitalObjectRepositoryImpl.java index 3bf3df91c..4bf0a48f8 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/DigitalObjectRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/DigitalObjectRepositoryImpl.java @@ -749,7 +749,8 @@ protected String getSqlInsertValues() { @Override public String getSqlSelectAllFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectAllFields(tableAlias, mappingPrefix) - + """ + + + """ , {{licenseTable}}.uuid {{licenseMapping}}_uuid, {{licenseTable}}.label {{licenseMapping}}_label, {{licenseTable}}.url {{licenseMapping}}_url, @@ -812,7 +813,8 @@ parent.item_uuid parent_itemUuid, get_identifiers(parent.item_uuid) parent_itemI @Override protected String getSqlSelectAllFieldsJoins() { return super.getSqlSelectAllFieldsJoins() - + """ + + + """ LEFT JOIN {{licenseTable}} {{licenseAlias}} ON {{tableAlias}}.license_uuid = {{licenseAlias}}.uuid -- creation info creator @@ -883,7 +885,8 @@ LEFT JOIN ( @Override public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , %1$s.parent_uuid %2$s_parent_uuid, %1$s.item_uuid %2$s_item_uuid, get_identifiers(%1$s.item_uuid) item_identifiers, %3$s.label item_label""" diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/WebsiteRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/WebsiteRepositoryImpl.java index a7161c2e7..d1864c03c 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/WebsiteRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/WebsiteRepositoryImpl.java @@ -116,7 +116,7 @@ public List getRootWebpages(UUID uuid) throws RepositoryException { StringBuilder innerQuery = new StringBuilder( - """ + """ SELECT {{webpageAlias}}.*, ww.sortindex wpidx FROM {{webpage}} {{webpageAlias}} INNER JOIN website_webpages ww ON {{webpageAlias}}.uuid = ww.webpage_uuid WHERE ww.website_uuid = :uuid diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/CorporateBodyRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/CorporateBodyRepositoryImpl.java index 8cb9b65e9..c1bcad70c 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/CorporateBodyRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/CorporateBodyRepositoryImpl.java @@ -111,7 +111,7 @@ public List findCollectionRelatedCorporateBodies( // between corporatebody and project StringBuilder innerQuery = new StringBuilder( - """ + """ SELECT * FROM {{tableName}} {{tableAlias}} LEFT JOIN rel_entity_entities AS r ON {{tableAlias}}.uuid = r.object_uuid LEFT JOIN rel_entity_entities AS rel ON r.subject_uuid = rel.subject_uuid diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/PersonRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/PersonRepositoryImpl.java index a8c2daa08..67d728277 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/PersonRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/agent/PersonRepositoryImpl.java @@ -213,7 +213,8 @@ public String getSqlSelectAllFields(String tableAlias, String mappingPrefix) { @Override protected String getSqlSelectAllFieldsJoins() { return super.getSqlSelectAllFieldsJoins() - + """ + + + """ LEFT JOIN geolocations AS glbirth ON glbirth.uuid = %1$s.locationofbirth LEFT JOIN geolocations AS gldeath ON gldeath.uuid = %1$s.locationofdeath LEFT JOIN ( diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ItemRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ItemRepositoryImpl.java index 813037603..ec252693d 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ItemRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ItemRepositoryImpl.java @@ -238,7 +238,8 @@ protected String getSqlInsertValues() { @Override public String getSqlSelectAllFields(String tableAlias, String mappingPrefix) { return getSqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , %1$s.exemplifies_manifestation %2$s_exemplifies_manifestation, poi.label poi_label, get_identifiers(poi.uuid) poi_identifiers, %3$s.label %2$s_manifestation_label, get_identifiers(%3$s.uuid) %2$s_manifestation_identifiers @@ -249,7 +250,8 @@ poi.label poi_label, get_identifiers(poi.uuid) poi_identifiers, @Override protected String getSqlSelectAllFieldsJoins() { return super.getSqlSelectAllFieldsJoins() - + """ + + + """ LEFT JOIN %1$s poi ON %2$s.part_of_item = poi.uuid LEFT JOIN %3$s %4$s ON %4$s.uuid = %2$s.manifestation """ @@ -282,7 +284,8 @@ public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) @Override protected String getSqlSelectReducedFieldsJoins() { return super.getSqlSelectReducedFieldsJoins() - + """ + + + """ LEFT JOIN %2$s %3$s ON %3$s.uuid = ANY(%1$s.holder_uuids) """ .formatted(tableAlias, AgentRepositoryImpl.TABLE_NAME, "holdertable"); diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ManifestationRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ManifestationRepositoryImpl.java index 60db466bf..cb923cc53 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ManifestationRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/ManifestationRepositoryImpl.java @@ -286,7 +286,8 @@ public List getLanguagesOfManifestationsForWork(UUID workUuid) { @Override protected String getSqlInsertFields() { return super.getSqlInsertFields() - + """ + + + """ , composition, dimensions, expressiontypes, language, manifestationtype, manufacturingtype, mediatypes, otherlanguages, @@ -301,7 +302,8 @@ protected String getSqlInsertFields() { @Override protected String getSqlInsertValues() { return super.getSqlInsertValues() - + """ + + + """ , :composition, :dimensions, :expressionTypes::mainsubtype[], :language, :manifestationType, :manufacturingType, :mediaTypes::varchar[], :otherLanguages::varchar[], @@ -316,7 +318,8 @@ protected String getSqlInsertValues() { @Override public String getSqlSelectAllFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectAllFields(tableAlias, mappingPrefix) - + """ + + + """ , %1$s.composition %2$s_composition, %1$s.dimensions %2$s_dimensions, %1$s.otherlanguages %2$s_otherLanguages, %1$s.scale %2$s_scale, %1$s.version %2$s_version """ @@ -326,7 +329,8 @@ public String getSqlSelectAllFields(String tableAlias, String mappingPrefix) { @Override public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , %1$s.expressiontypes %2$s_expressionTypes, %1$s.language %2$s_language, %1$s.manifestationtype %2$s_manifestationType, %1$s.manufacturingtype %2$s_manufacturingType, %1$s.mediatypes %2$s_mediaTypes, %1$s.titles %2$s_titles, @@ -340,7 +344,8 @@ public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) WorkRepositoryImpl.TABLE_ALIAS, WorkRepositoryImpl.MAPPING_PREFIX) // parents - + """ + + + """ mms.title parent_title, mms.sortKey parent_sortKey, parent.uuid parent_uuid, parent.label parent_label, parent.titles parent_titles, parent.manifestationtype parent_manifestationType, parent.refid parent_refId, parent.notes parent_notes, parent.created parent_created, parent.last_modified parent_lastModified, @@ -350,7 +355,8 @@ parentwork.uuid parentwork_uuid, get_identifiers(parentwork.uuid) parentwork_ide parentwork.titles parentwork_titles, """ // relations - + """ + + + """ {{entityRelationAlias}}.predicate {{entityRelationMap}}_predicate, {{entityRelationAlias}}.sortindex {{entityRelationMap}}_sortindex, {{entityRelationAlias}}.additional_predicates {{entityRelationMap}}_additionalPredicates, max({{entityRelationAlias}}.sortindex) OVER (PARTITION BY {{tableAlias}}.uuid) relation_max_sortindex, @@ -363,7 +369,8 @@ parentwork.uuid parentwork_uuid, get_identifiers(parentwork.uuid) parentwork_ide .replace("{{entityMapping}}", entityRepository.getMappingPrefix()) + entityRepository.getSqlSelectReducedFields() // publishing infos - + """ + + + """ , {{tableAlias}}.publication_info {{mappingPrefix}}_publicationInfo, {{tableAlias}}.production_info {{mappingPrefix}}_productionInfo, {{tableAlias}}.distribution_info {{mappingPrefix}}_distributionInfo, -- publisher @@ -386,7 +393,8 @@ parentwork.uuid parentwork_uuid, get_identifiers(parentwork.uuid) parentwork_ide @Override protected String getSqlSelectReducedFieldsJoins() { return super.getSqlSelectReducedFieldsJoins() - + """ + + + """ LEFT JOIN ( manifestation_manifestations mms INNER JOIN manifestations parent ON parent.uuid = mms.subject_uuid @@ -408,7 +416,8 @@ LEFT JOIN ( /* 6-7 */ WorkRepositoryImpl.TABLE_NAME, WorkRepositoryImpl.TABLE_ALIAS) - + """ + + + """ LEFT JOIN %2$s %3$s ON %3$s.uuid = ANY (%1$s.publishing_info_agent_uuids) LEFT JOIN %4$s %5$s ON %5$s.uuid = ANY (%1$s.publishing_info_locations_uuids) """ @@ -552,7 +561,8 @@ protected void basicReduceRowsBiConsumer(Map map, RowView r @Override public String getSqlUpdateFieldValues() { return super.getSqlUpdateFieldValues() - + """ + + + """ , composition=:composition, dimensions=:dimensions, expressiontypes=:expressionTypes::mainsubtype[], language=:language, manifestationtype=:manifestationType, manufacturingtype=:manufacturingType, mediatypes=:mediaTypes::varchar[], otherlanguages=:otherLanguages::varchar[], diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/WorkRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/WorkRepositoryImpl.java index f86ca4561..af108d685 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/WorkRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/entity/work/WorkRepositoryImpl.java @@ -337,7 +337,8 @@ protected String getSqlInsertValues() { @Override public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , %1$s.creation_daterange %2$s_creationDateRange , %1$s.creation_timevalue %2$s_creationTimeValue , %1$s.first_appeared_date %2$s_firstAppearedDate @@ -347,13 +348,15 @@ public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) """ .formatted(tableAlias, mappingPrefix) // parents - + """ + + + """ parent.uuid parent_uuid, parent.label parent_label, parent.titles parent_titles, parent.refid parent_refId, parent.notes parent_notes, parent.created parent_created, parent.last_modified parent_lastModified, parent.identifiable_objecttype parent_identifiableObjectType, get_identifiers(parent.uuid) parent_identifiers, """ // relations - + """ + + + """ {{entityRelationAlias}}.predicate {{entityRelationMap}}_predicate, {{entityRelationAlias}}.sortindex {{entityRelationMap}}_sortindex, {{entityRelationAlias}}.additional_predicates {{entityRelationMap}}_additionalPredicates, max({{entityRelationAlias}}.sortindex) OVER (PARTITION BY {{tableAlias}}.uuid) relation_max_sortindex, @@ -370,7 +373,8 @@ parent.identifiable_objecttype parent_identifiableObjectType, get_identifiers(pa @Override protected String getSqlSelectReducedFieldsJoins() { return super.getSqlSelectReducedFieldsJoins() - + """ + + + """ LEFT JOIN ( work_works wws INNER JOIN works parent ON parent.uuid = wws.subject_uuid diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/semantic/SubjectRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/semantic/SubjectRepositoryImpl.java index feb79fa5c..36239d0ba 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/semantic/SubjectRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/semantic/SubjectRepositoryImpl.java @@ -36,7 +36,8 @@ public static String sqlSelectAllFields(String tableAlias, String mappingPrefix) public static String sqlSelectReducedFields(String tableAlias, String mappingPrefix) { return UniqueObjectRepositoryImpl.sqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , dbidentifiers2jsonb({{tableAlias}}.identifiers) {{mappingPrefix}}_identifiers, {{tableAlias}}.label {{mappingPrefix}}_label, {{tableAlias}}.type {{mappingPrefix}}_subjectType diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/security/UserRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/security/UserRepositoryImpl.java index 93a066dc8..c89f2000e 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/security/UserRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/security/UserRepositoryImpl.java @@ -113,7 +113,8 @@ protected String getSqlInsertValues() { @Override public String getSqlSelectReducedFields(String tableAlias, String mappingPrefix) { return super.getSqlSelectReducedFields(tableAlias, mappingPrefix) - + """ + + + """ , {{tableAlias}}.email {{mappingPrefix}}_email, {{tableAlias}}.enabled {{mappingPrefix}}_enabled, {{tableAlias}}.firstname {{mappingPrefix}}_firstname, diff --git a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/semantic/HeadwordRepositoryImpl.java b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/semantic/HeadwordRepositoryImpl.java index fa0703fd8..50d1517bf 100644 --- a/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/semantic/HeadwordRepositoryImpl.java +++ b/metasvc-server/backend-jdbi/src/main/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/semantic/HeadwordRepositoryImpl.java @@ -164,7 +164,7 @@ public BucketObjectsResponse find(BucketObjectsRequest bucke } String baseQuery = - """ + """ WITH headwords_list AS (SELECT row_number() OVER (ORDER BY {{sortColumn}}) as num, {{tableAlias}}.uuid, {{selectForLabel}} FROM {{tableName}} AS {{tableAlias}}), hws AS (SELECT * FROM headwords_list WHERE num <@ int8range((SELECT num FROM headwords_list WHERE uuid = :startUuid), (SELECT num FROM headwords_list WHERE uuid = :endUuid), '[]')) """ @@ -244,7 +244,7 @@ public BucketsResponse find(BucketsRequest bucketsRequest) argumentMappings.put("endUuid", endUuid); sqlQuery.append( - """ + """ WITH headwords_list AS (SELECT row_number() OVER (ORDER BY {{sortColumn}}) AS num, {{tableAlias}}.uuid, {{selectForLabel}} FROM {{tableName}} AS {{tableAlias}}), hws AS (SELECT * FROM headwords_list WHERE num <@ int8range((SELECT num FROM headwords_list WHERE uuid = :startUuid), (SELECT num FROM headwords_list WHERE uuid = :endUuid), '[]')), """ @@ -254,7 +254,7 @@ hws AS (SELECT * FROM headwords_list WHERE num <@ int8range((SELECT num FROM hea .replace("{{tableName}}", tableName)); } else { sqlQuery.append( - """ + """ WITH hws AS (SELECT row_number() OVER (ORDER BY {{sortColumn}}) AS num, {{tableAlias}}.uuid, {{selectForLabel}} FROM {{tableName}} AS {{tableAlias}}), """ .replace("{{selectForLabel}}", selectForLabel) @@ -263,7 +263,7 @@ WITH hws AS (SELECT row_number() OVER (ORDER BY {{sortColumn}}) AS num, {{tableA .replace("{{tableName}}", tableName)); } sqlQuery.append( - """ + """ buckets AS (SELECT {{tableAlias}}.num, {{tableAlias}}.uuid, {{tableAlias}}.label, ntile(:numberOfBuckets) OVER (ORDER BY {{sortColumn}} ASC) AS tile_number FROM hws AS {{tableAlias}}), buckets_borders_nums AS (SELECT min(num) AS minNum, max(num) AS maxNum, tile_number FROM buckets GROUP BY tile_number ORDER BY tile_number) SELECT bu.num, bu.uuid, bu.label, bu.tile_number FROM buckets AS bu WHERE bu.num IN (SELECT minNum FROM buckets_borders_nums UNION SELECT maxNum FROM buckets_borders_nums) diff --git a/metasvc-server/backend-jdbi/src/test/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImplTest.java b/metasvc-server/backend-jdbi/src/test/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImplTest.java index 700bfb073..0553f0454 100644 --- a/metasvc-server/backend-jdbi/src/test/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImplTest.java +++ b/metasvc-server/backend-jdbi/src/test/java/io/github/dbmdz/metadata/server/backend/impl/jdbi/identifiable/IdentifiableRepositoryImplTest.java @@ -508,7 +508,8 @@ void testGetWhereClauses() { repo.addFiltering(f, actual, mappings); String expected = " " - + """ + + + """ WHERE (i.split_label::TEXT[] @> :searchTermArray_1::TEXT[] OR jsonb_path_exists(i.description, ('$.\"de-Latn\" ? (@ like_regex \"' || :searchTerm_2 || '\" flag \"iq\")')::jsonpath)) AND ((i.last_modified > :filtervalue_3))"""