diff --git a/ramls/alternative-title-type.raml b/ramls/alternative-title-type.raml index afd0cec8c..042235172 100644 --- a/ramls/alternative-title-type.raml +++ b/ramls/alternative-title-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/async-migration.raml b/ramls/async-migration.raml index 7327a2911..74e1d2233 100644 --- a/ramls/async-migration.raml +++ b/ramls/async-migration.raml @@ -16,7 +16,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml /inventory-storage/migrations: diff --git a/ramls/bound-with-part.raml b/ramls/bound-with-part.raml index 349f8e808..1d4d91cf3 100644 --- a/ramls/bound-with-part.raml +++ b/ramls/bound-with-part.raml @@ -17,7 +17,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/call-number-type.raml b/ramls/call-number-type.raml index 82ad206f4..250eda081 100644 --- a/ramls/call-number-type.raml +++ b/ramls/call-number-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/classification-type.raml b/ramls/classification-type.raml index 6a2d1c718..b920b2cfb 100644 --- a/ramls/classification-type.raml +++ b/ramls/classification-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/contributor-name-type.raml b/ramls/contributor-name-type.raml index 76528ee5b..83afc0395 100644 --- a/ramls/contributor-name-type.raml +++ b/ramls/contributor-name-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/contributor-type.raml b/ramls/contributor-type.raml index 20203ba12..e4d31c882 100644 --- a/ramls/contributor-type.raml +++ b/ramls/contributor-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/electronic-access-relationship.raml b/ramls/electronic-access-relationship.raml index bcabcd719..a0cefc4f6 100644 --- a/ramls/electronic-access-relationship.raml +++ b/ramls/electronic-access-relationship.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/holdings-note-type.raml b/ramls/holdings-note-type.raml index f9417fb14..5da725e07 100644 --- a/ramls/holdings-note-type.raml +++ b/ramls/holdings-note-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/holdings-sources.raml b/ramls/holdings-sources.raml index b436c8f05..ee96542d2 100644 --- a/ramls/holdings-sources.raml +++ b/ramls/holdings-sources.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/holdings-storage.raml b/ramls/holdings-storage.raml index 332c42a22..813fc05c6 100755 --- a/ramls/holdings-storage.raml +++ b/ramls/holdings-storage.raml @@ -16,7 +16,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/holdings-type.raml b/ramls/holdings-type.raml index 0e6f925f8..29a7ec789 100644 --- a/ramls/holdings-type.raml +++ b/ramls/holdings-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/identifier-type.raml b/ramls/identifier-type.raml index 8f800c591..da112faa1 100644 --- a/ramls/identifier-type.raml +++ b/ramls/identifier-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/ill-policy.raml b/ramls/ill-policy.raml index 48c746734..5f15ef2c0 100644 --- a/ramls/ill-policy.raml +++ b/ramls/ill-policy.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/instance-format.raml b/ramls/instance-format.raml index a70f48a39..1cfe805e4 100644 --- a/ramls/instance-format.raml +++ b/ramls/instance-format.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/instance-iteration.raml b/ramls/instance-iteration.raml index 93c6e89cd..08912246b 100644 --- a/ramls/instance-iteration.raml +++ b/ramls/instance-iteration.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml /instance-storage/instances/iteration: diff --git a/ramls/instance-note-type.raml b/ramls/instance-note-type.raml index 8b8465b51..365ef4832 100644 --- a/ramls/instance-note-type.raml +++ b/ramls/instance-note-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/instance-preceding-succeeding-titles.raml b/ramls/instance-preceding-succeeding-titles.raml index c77ce48ab..526279ab9 100644 --- a/ramls/instance-preceding-succeeding-titles.raml +++ b/ramls/instance-preceding-succeeding-titles.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml @@ -105,7 +104,6 @@ resourceTypes: example: "Internal server error, contact administrator" delete: description: Delete a preceding/succeeding title by id - is: [language] responses: 204: description: "The preceding/succeeding title has been deleted" diff --git a/ramls/instance-reindex.raml b/ramls/instance-reindex.raml index 507674f02..6083bf206 100644 --- a/ramls/instance-reindex.raml +++ b/ramls/instance-reindex.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml diff --git a/ramls/instance-relationship-type.raml b/ramls/instance-relationship-type.raml index dec85c0eb..d1eb46b3f 100644 --- a/ramls/instance-relationship-type.raml +++ b/ramls/instance-relationship-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/instance-set.raml b/ramls/instance-set.raml index ce83c71ce..6dfa2f7d1 100644 --- a/ramls/instance-set.raml +++ b/ramls/instance-set.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml searchable: !include raml-util/traits/searchable.raml diff --git a/ramls/instance-status.raml b/ramls/instance-status.raml index dfc2df5a1..58bb8f31a 100644 --- a/ramls/instance-status.raml +++ b/ramls/instance-status.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -41,7 +40,6 @@ resourceTypes: description: Create a new instance status is: [validate] delete: - is: [language] description: "Delete all instance statuses" responses: 204: diff --git a/ramls/instance-storage.raml b/ramls/instance-storage.raml index a51262f0a..09e0e3343 100644 --- a/ramls/instance-storage.raml +++ b/ramls/instance-storage.raml @@ -16,7 +16,6 @@ types: instanceRelationships: !include instancerelationships.json traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml @@ -102,7 +101,6 @@ resourceTypes: the storage layer only knows how to insert or retrieve instance records by ID. /source-record: delete: - is: [language] responses: 204: description: "Source record deleted" @@ -126,14 +124,12 @@ resourceTypes: Note: When the Inventory instance record is deleted, its source record in mod-inventory-storage is automatically deleted. If the Inventory instance record is linked to a corresponding record in mod-source-record-storage, that SRS record is NOT automatically deleted. /marc-json: displayName: MARC source record as JSON - is: [language] type: collection-item: exampleItem: !include examples/marc.json schema: marcJson /mods: displayName: MODS source record - not implemented yet - is: [language] get: responses: 500: diff --git a/ramls/instance-type.raml b/ramls/instance-type.raml index 267ccfebb..09f15d36d 100644 --- a/ramls/instance-type.raml +++ b/ramls/instance-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/inventory-hierarchy.raml b/ramls/inventory-hierarchy.raml index 6d5d8814d..f4b04c798 100644 --- a/ramls/inventory-hierarchy.raml +++ b/ramls/inventory-hierarchy.raml @@ -15,7 +15,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/inventory-view.raml b/ramls/inventory-view.raml index 66501e8f7..b0c6a7a84 100644 --- a/ramls/inventory-view.raml +++ b/ramls/inventory-view.raml @@ -13,7 +13,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml diff --git a/ramls/item-damaged-statuses.raml b/ramls/item-damaged-statuses.raml index 60dcaa26e..65ae28460 100644 --- a/ramls/item-damaged-statuses.raml +++ b/ramls/item-damaged-statuses.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/item-note-type.raml b/ramls/item-note-type.raml index f355f3d7a..fe0fad3b4 100644 --- a/ramls/item-note-type.raml +++ b/ramls/item-note-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/item-storage-dereferenced.raml b/ramls/item-storage-dereferenced.raml index c71a374f9..ed618e597 100644 --- a/ramls/item-storage-dereferenced.raml +++ b/ramls/item-storage-dereferenced.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/item-storage.raml b/ramls/item-storage.raml index a73a00618..7e2bea972 100644 --- a/ramls/item-storage.raml +++ b/ramls/item-storage.raml @@ -14,7 +14,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/loan-type.raml b/ramls/loan-type.raml index 9fa4c5833..8b57805c0 100644 --- a/ramls/loan-type.raml +++ b/ramls/loan-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -38,7 +37,6 @@ resourceTypes: ] description: Return a list of loan types delete: - is: [language] description: "Delete all loan types" responses: 204: diff --git a/ramls/location.raml b/ramls/location.raml index 7a1d97001..7d3ba6f76 100644 --- a/ramls/location.raml +++ b/ramls/location.raml @@ -17,7 +17,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -42,7 +41,6 @@ resourceTypes: description: Create a new location is: [validate] delete: - is: [language] description: "Delete all locations" responses: 204: diff --git a/ramls/locationunit.raml b/ramls/locationunit.raml index 3ffe8f1fa..6075941c2 100644 --- a/ramls/locationunit.raml +++ b/ramls/locationunit.raml @@ -21,7 +21,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -48,7 +47,6 @@ resourceTypes: is: [validate] delete: description: "Delete all institutions" - is: [language] responses: 204: description: "All institutions deleted" @@ -84,7 +82,6 @@ resourceTypes: is: [validate] delete: description: "Delete all campuses" - is: [language] responses: 204: description: "All campuses deleted" @@ -120,7 +117,6 @@ resourceTypes: is: [validate] delete: description: "Delete all libraries" - is: [language] responses: 204: description: "All libraries deleted" diff --git a/ramls/material-type.raml b/ramls/material-type.raml index 8499bd92b..432780e92 100644 --- a/ramls/material-type.raml +++ b/ramls/material-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -41,7 +40,6 @@ resourceTypes: is: [validate] delete: description: "Delete all material types" - is: [language] responses: 204: description: "All material types deleted" diff --git a/ramls/mode-of-issuance.raml b/ramls/mode-of-issuance.raml index 76f06cb50..a2559d151 100644 --- a/ramls/mode-of-issuance.raml +++ b/ramls/mode-of-issuance.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -40,7 +39,6 @@ resourceTypes: description: Create a new mode of issuance is: [validate] delete: - is: [language] description: "Delete all modes of issuance" responses: 204: diff --git a/ramls/nature-of-content-term.raml b/ramls/nature-of-content-term.raml index 1cfdc520c..27366fa65 100644 --- a/ramls/nature-of-content-term.raml +++ b/ramls/nature-of-content-term.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/oai-pmh-view.raml b/ramls/oai-pmh-view.raml index 3523ea5f9..d8dbad307 100644 --- a/ramls/oai-pmh-view.raml +++ b/ramls/oai-pmh-view.raml @@ -16,7 +16,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/ramls/raml-util b/ramls/raml-util index 0b1259759..c113f109d 160000 --- a/ramls/raml-util +++ b/ramls/raml-util @@ -1 +1 @@ -Subproject commit 0b125975982df99324c88c200d50abe2b22f7688 +Subproject commit c113f109d1379d15230f3f8a3485e61ffccc0ad8 diff --git a/ramls/record-bulk.raml b/ramls/record-bulk.raml index 6c0082914..f72c7efe4 100644 --- a/ramls/record-bulk.raml +++ b/ramls/record-bulk.raml @@ -13,7 +13,6 @@ types: errors: !include raml-util/schemas/errors.schema traits: - language: !include raml-util/traits/language.raml orderable: !include raml-util/traits/orderable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/service-point.raml b/ramls/service-point.raml index 57b67d27d..7f04a4ddd 100644 --- a/ramls/service-point.raml +++ b/ramls/service-point.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -47,7 +46,6 @@ resourceTypes: type: errors delete: description: "Delete all service points" - is: [language] responses: 204: description: "All service points delete" diff --git a/ramls/service-points-user.raml b/ramls/service-points-user.raml index 429e817ad..fef43dba6 100644 --- a/ramls/service-points-user.raml +++ b/ramls/service-points-user.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -41,7 +40,6 @@ resourceTypes: is: [validate] delete: description: "Delete all service points users" - is: [language] responses: 204: description: "All service points users delete" diff --git a/ramls/shelf-location.raml b/ramls/shelf-location.raml index cc7672302..07527b56f 100644 --- a/ramls/shelf-location.raml +++ b/ramls/shelf-location.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -41,7 +40,6 @@ resourceTypes: is: [validate] delete: description: "DEPRECATED and NOT IMPLEMENTED: Delete all shelf locations" - is: [language] responses: 204: description: "All shelf locations deleted" diff --git a/ramls/statistical-code-type.raml b/ramls/statistical-code-type.raml index e8092416d..9b0617a41 100644 --- a/ramls/statistical-code-type.raml +++ b/ramls/statistical-code-type.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: @@ -41,7 +40,6 @@ resourceTypes: is: [validate] delete: description: "Delete all statistical code types" - is: [language] responses: 204: description: "All statistical code types deleted" diff --git a/ramls/statistical-code.raml b/ramls/statistical-code.raml index c9aa33deb..5ca2e52cb 100644 --- a/ramls/statistical-code.raml +++ b/ramls/statistical-code.raml @@ -16,7 +16,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/src/main/java/org/folio/rest/impl/AlternativeTitleTypeApi.java b/src/main/java/org/folio/rest/impl/AlternativeTitleTypeApi.java index f95407f6d..696914b0c 100644 --- a/src/main/java/org/folio/rest/impl/AlternativeTitleTypeApi.java +++ b/src/main/java/org/folio/rest/impl/AlternativeTitleTypeApi.java @@ -6,6 +6,8 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -34,7 +36,7 @@ public class AlternativeTitleTypeApi implements org.folio.rest.jaxrs.resource.Al @Validate @Override - public void getAlternativeTitleTypes(String query, int offset, int limit, String lang, + public void getAlternativeTitleTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.get(REFERENCE_TABLE, AlternativeTitleType.class, AlternativeTitleTypes.class, query, offset, limit, @@ -43,7 +45,7 @@ public void getAlternativeTitleTypes(String query, int offset, int limit, String @Validate @Override - public void postAlternativeTitleTypes(String lang, AlternativeTitleType entity, Map okapiHeaders, + public void postAlternativeTitleTypes(AlternativeTitleType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -66,7 +68,7 @@ public void postAlternativeTitleTypes(String lang, AlternativeTitleType entity, } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -74,18 +76,18 @@ public void postAlternativeTitleTypes(String lang, AlternativeTitleType entity, .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getAlternativeTitleTypesById(String id, String lang, Map okapiHeaders, + public void getAlternativeTitleTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, AlternativeTitleType.class, id, okapiHeaders, vertxContext, GetAlternativeTitleTypesByIdResponse.class, asyncResultHandler); @@ -93,7 +95,7 @@ public void getAlternativeTitleTypesById(String id, String lang, Map okapiHeaders, + public void deleteAlternativeTitleTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -105,7 +107,7 @@ public void deleteAlternativeTitleTypesById(String id, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -150,7 +152,7 @@ public void putAlternativeTitleTypesById(String id, String lang, AlternativeTitl if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutAlternativeTitleTypesByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutAlternativeTitleTypesByIdResponse .respond204())); @@ -158,7 +160,7 @@ public void putAlternativeTitleTypesById(String id, String lang, AlternativeTitl } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -166,31 +168,31 @@ public void putAlternativeTitleTypesById(String id, String lang, AlternativeTitl .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostAlternativeTitleTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteAlternativeTitleTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutAlternativeTitleTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/BoundWithPartApi.java b/src/main/java/org/folio/rest/impl/BoundWithPartApi.java index 56b8fd3c4..a7ddad47f 100644 --- a/src/main/java/org/folio/rest/impl/BoundWithPartApi.java +++ b/src/main/java/org/folio/rest/impl/BoundWithPartApi.java @@ -20,7 +20,7 @@ public class BoundWithPartApi implements org.folio.rest.jaxrs.resource.Inventory @Validate @Override - public void getInventoryStorageBoundWithParts(String query, int offset, int limit, String lang, + public void getInventoryStorageBoundWithParts(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -31,7 +31,7 @@ public void getInventoryStorageBoundWithParts(String query, int offset, int limi @Validate @Override - public void postInventoryStorageBoundWithParts(String lang, BoundWithPart entity, Map okapiHeaders, + public void postInventoryStorageBoundWithParts(BoundWithPart entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { new BoundWithPartService(vertxContext, okapiHeaders).create(entity) @@ -41,7 +41,7 @@ public void postInventoryStorageBoundWithParts(String lang, BoundWithPart entity @Validate @Override - public void getInventoryStorageBoundWithPartsById(String id, String lang, Map okapiHeaders, + public void getInventoryStorageBoundWithPartsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(BOUND_WITH_TABLE, BoundWithPart.class, id, @@ -50,7 +50,7 @@ public void getInventoryStorageBoundWithPartsById(String id, String lang, Map okapiHeaders, + public void deleteInventoryStorageBoundWithPartsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { new BoundWithPartService(vertxContext, okapiHeaders).delete(id) @@ -60,7 +60,7 @@ public void deleteInventoryStorageBoundWithPartsById(String id, String lang, Map @Validate @Override - public void putInventoryStorageBoundWithPartsById(String id, String lang, BoundWithPart entity, + public void putInventoryStorageBoundWithPartsById(String id, BoundWithPart entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/CallNumberTypeApi.java b/src/main/java/org/folio/rest/impl/CallNumberTypeApi.java index cbb680ddc..da8e9f566 100644 --- a/src/main/java/org/folio/rest/impl/CallNumberTypeApi.java +++ b/src/main/java/org/folio/rest/impl/CallNumberTypeApi.java @@ -7,6 +7,7 @@ package org.folio.rest.impl; import static org.folio.rest.support.EndpointFailureHandler.handleFailure; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -37,7 +38,8 @@ public class CallNumberTypeApi implements org.folio.rest.jaxrs.resource.CallNumb @Validate @Override - public void getCallNumberTypes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getCallNumberTypes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.get(REFERENCE_TABLE, CallNumberType.class, CallNumberTypes.class, query, offset, limit, okapiHeaders, vertxContext, GetCallNumberTypesResponse.class, asyncResultHandler); @@ -45,7 +47,7 @@ public void getCallNumberTypes(String query, int offset, int limit, String lang, @Validate @Override - public void postCallNumberTypes(String lang, CallNumberType entity, Map okapiHeaders, + public void postCallNumberTypes(CallNumberType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.post(REFERENCE_TABLE, entity, okapiHeaders, vertxContext, PostCallNumberTypesResponse.class, asyncResultHandler); @@ -53,7 +55,7 @@ public void postCallNumberTypes(String lang, CallNumberType entity, Map okapiHeaders, + public void getCallNumberTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, CallNumberType.class, id, okapiHeaders, vertxContext, GetCallNumberTypesByIdResponse.class, asyncResultHandler); @@ -61,7 +63,7 @@ public void getCallNumberTypesById(String id, String lang, Map o @Validate @Override - public void deleteCallNumberTypesById(String id, String lang, Map okapiHeaders, + public void deleteCallNumberTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -71,14 +73,13 @@ public void deleteCallNumberTypesById(String id, String lang, Map asyncResultHandler.handle(Future.succeededFuture(event))); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } } @Validate @Override public void putCallNumberTypesById(String id, - String lang, CallNumberType entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -95,7 +96,7 @@ public void putCallNumberTypesById(String id, .onFailure(handleFailure(asyncResultHandler)) .onSuccess(event -> asyncResultHandler.handle(Future.succeededFuture(event))); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } } @@ -115,15 +116,15 @@ private boolean isSystemSource(CallNumberType callNumberType) { return SYSTEM_CALL_NUMBER_TYPE_SOURCE.equals(callNumberType.getSource()); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteCallNumberTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutCallNumberTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/ClassificationTypeApi.java b/src/main/java/org/folio/rest/impl/ClassificationTypeApi.java index 07e952428..cf710d1c6 100644 --- a/src/main/java/org/folio/rest/impl/ClassificationTypeApi.java +++ b/src/main/java/org/folio/rest/impl/ClassificationTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -39,7 +41,7 @@ public class ClassificationTypeApi implements org.folio.rest.jaxrs.resource.Clas @Validate @Override - public void getClassificationTypes(String query, int offset, int limit, String lang, + public void getClassificationTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -69,12 +71,12 @@ public void getClassificationTypes(String query, int offset, int limit, String l log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetClassificationTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -86,7 +88,7 @@ public void getClassificationTypes(String query, int offset, int limit, String l @Validate @Override - public void postClassificationTypes(String lang, ClassificationType entity, Map okapiHeaders, + public void postClassificationTypes(ClassificationType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -111,7 +113,7 @@ public void postClassificationTypes(String lang, ClassificationType entity, Map< } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -119,18 +121,18 @@ public void postClassificationTypes(String lang, ClassificationType entity, Map< .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getClassificationTypesByClassificationTypeId(String instanceTypeId, String lang, + public void getClassificationTypesByClassificationTypeId(String instanceTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -141,7 +143,7 @@ public void getClassificationTypesByClassificationTypeId(String instanceTypeId, @Validate @Override - public void deleteClassificationTypesByClassificationTypeId(String instanceTypeId, String lang, + public void deleteClassificationTypesByClassificationTypeId(String instanceTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -156,7 +158,7 @@ public void deleteClassificationTypesByClassificationTypeId(String instanceTypeI if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -166,7 +168,7 @@ public void deleteClassificationTypesByClassificationTypeId(String instanceTypeI } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteClassificationTypesByClassificationTypeIdResponse .respond404WithTextPlain(msg))); @@ -175,18 +177,18 @@ public void deleteClassificationTypesByClassificationTypeId(String instanceTypeI asyncResultHandler.handle(Future.succeededFuture(DeleteClassificationTypesByClassificationTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putClassificationTypesByClassificationTypeId(String instanceTypeId, String lang, + public void putClassificationTypesByClassificationTypeId(String instanceTypeId, ClassificationType entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -206,7 +208,7 @@ public void putClassificationTypesByClassificationTypeId(String instanceTypeId, if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutClassificationTypesByClassificationTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutClassificationTypesByClassificationTypeIdResponse @@ -215,7 +217,7 @@ public void putClassificationTypesByClassificationTypeId(String instanceTypeId, } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -223,11 +225,11 @@ public void putClassificationTypesByClassificationTypeId(String instanceTypeId, .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -237,21 +239,21 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostClassificationTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteClassificationTypesByClassificationTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutClassificationTypesByClassificationTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/ContributorNameTypeApi.java b/src/main/java/org/folio/rest/impl/ContributorNameTypeApi.java index ae906ec17..9bb74c007 100644 --- a/src/main/java/org/folio/rest/impl/ContributorNameTypeApi.java +++ b/src/main/java/org/folio/rest/impl/ContributorNameTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -32,7 +34,7 @@ public class ContributorNameTypeApi implements org.folio.rest.jaxrs.resource.Con @Validate @Override - public void getContributorNameTypes(String query, int offset, int limit, String lang, + public void getContributorNameTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -42,7 +44,7 @@ public void getContributorNameTypes(String query, int offset, int limit, String @Validate @Override - public void postContributorNameTypes(String lang, ContributorNameType entity, Map okapiHeaders, + public void postContributorNameTypes(ContributorNameType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -66,7 +68,7 @@ public void postContributorNameTypes(String lang, ContributorNameType entity, Ma } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -74,18 +76,18 @@ public void postContributorNameTypes(String lang, ContributorNameType entity, Ma .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, String lang, + public void getContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -96,7 +98,7 @@ public void getContributorNameTypesByContributorNameTypeId(String contributorNam @Validate @Override - public void deleteContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, String lang, + public void deleteContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -111,7 +113,7 @@ public void deleteContributorNameTypesByContributorNameTypeId(String contributor if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -122,7 +124,7 @@ public void deleteContributorNameTypesByContributorNameTypeId(String contributor } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle( Future.succeededFuture(DeleteContributorNameTypesByContributorNameTypeIdResponse @@ -132,18 +134,18 @@ public void deleteContributorNameTypesByContributorNameTypeId(String contributor asyncResultHandler.handle(Future.succeededFuture(DeleteContributorNameTypesByContributorNameTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, String lang, + public void putContributorNameTypesByContributorNameTypeId(String contributorNameTypeId, ContributorNameType entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -163,7 +165,7 @@ public void putContributorNameTypesByContributorNameTypeId(String contributorNam if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutContributorNameTypesByContributorNameTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutContributorNameTypesByContributorNameTypeIdResponse @@ -172,7 +174,7 @@ public void putContributorNameTypesByContributorNameTypeId(String contributorNam } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -180,30 +182,30 @@ public void putContributorNameTypesByContributorNameTypeId(String contributorNam .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostContributorNameTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteContributorNameTypesByContributorNameTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutContributorNameTypesByContributorNameTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/ContributorTypeApi.java b/src/main/java/org/folio/rest/impl/ContributorTypeApi.java index b196d8798..cc4f13a1e 100644 --- a/src/main/java/org/folio/rest/impl/ContributorTypeApi.java +++ b/src/main/java/org/folio/rest/impl/ContributorTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -39,7 +41,7 @@ public class ContributorTypeApi implements org.folio.rest.jaxrs.resource.Contrib @Validate @Override - public void getContributorTypes(String query, int offset, int limit, String lang, + public void getContributorTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -67,12 +69,12 @@ public void getContributorTypes(String query, int offset, int limit, String lang log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetContributorTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -84,7 +86,7 @@ public void getContributorTypes(String query, int offset, int limit, String lang @Validate @Override - public void postContributorTypes(String lang, ContributorType entity, Map okapiHeaders, + public void postContributorTypes(ContributorType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -109,7 +111,7 @@ public void postContributorTypes(String lang, ContributorType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -138,7 +140,7 @@ public void getContributorTypesByContributorTypeId(String contributorTypeId, Str @Validate @Override - public void deleteContributorTypesByContributorTypeId(String contributorTypeId, String lang, + public void deleteContributorTypesByContributorTypeId(String contributorTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +155,7 @@ public void deleteContributorTypesByContributorTypeId(String contributorTypeId, if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -163,7 +165,7 @@ public void deleteContributorTypesByContributorTypeId(String contributorTypeId, } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteContributorTypesByContributorTypeIdResponse .respond404WithTextPlain(msg))); @@ -172,18 +174,18 @@ public void deleteContributorTypesByContributorTypeId(String contributorTypeId, asyncResultHandler.handle(Future.succeededFuture(DeleteContributorTypesByContributorTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putContributorTypesByContributorTypeId(String contributorTypeId, String lang, ContributorType entity, + public void putContributorTypesByContributorTypeId(String contributorTypeId, ContributorType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -202,7 +204,7 @@ public void putContributorTypesByContributorTypeId(String contributorTypeId, Str if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutContributorTypesByContributorTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutContributorTypesByContributorTypeIdResponse @@ -211,7 +213,7 @@ public void putContributorTypesByContributorTypeId(String contributorTypeId, Str } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -219,11 +221,11 @@ public void putContributorTypesByContributorTypeId(String contributorTypeId, Str .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -233,21 +235,21 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostContributorTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteContributorTypesByContributorTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutContributorTypesByContributorTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/ElectronicAccessRelationshipApi.java b/src/main/java/org/folio/rest/impl/ElectronicAccessRelationshipApi.java index 662e61062..613d59881 100644 --- a/src/main/java/org/folio/rest/impl/ElectronicAccessRelationshipApi.java +++ b/src/main/java/org/folio/rest/impl/ElectronicAccessRelationshipApi.java @@ -6,6 +6,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import static org.folio.rest.tools.utils.ValidationHelper.isDuplicate; import io.vertx.core.AsyncResult; @@ -42,7 +43,7 @@ public class ElectronicAccessRelationshipApi implements org.folio.rest.jaxrs.res @Validate @Override - public void getElectronicAccessRelationships(String query, int offset, int limit, String lang, + public void getElectronicAccessRelationships(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -73,12 +74,12 @@ public void getElectronicAccessRelationships(String query, int offset, int limit LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetElectronicAccessRelationshipsResponse .respond500WithTextPlain(MESSAGES.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); - String message = MESSAGES.getMessage(lang, MessageConsts.InternalServerError); + String message = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() != null && e.getCause().getClass().getSimpleName().endsWith("CQLParseException")) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -90,7 +91,7 @@ public void getElectronicAccessRelationships(String query, int offset, int limit @Validate @Override - public void postElectronicAccessRelationships(String lang, ElectronicAccessRelationship entity, + public void postElectronicAccessRelationships(ElectronicAccessRelationship entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -124,19 +125,20 @@ public void postElectronicAccessRelationships(String lang, ElectronicAccessRelat } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PostElectronicAccessRelationshipsResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, + MessageConsts.InternalServerError)))); } } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostElectronicAccessRelationshipsResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostElectronicAccessRelationshipsResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @@ -145,7 +147,7 @@ public void postElectronicAccessRelationships(String lang, ElectronicAccessRelat @Override public void getElectronicAccessRelationshipsByElectronicAccessRelationshipId( String electronicAccessRelationshipId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -158,7 +160,7 @@ public void getElectronicAccessRelationshipsByElectronicAccessRelationshipId( @Override public void deleteElectronicAccessRelationshipsByElectronicAccessRelationshipId( String electronicAccessRelationshipId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -175,30 +177,34 @@ public void deleteElectronicAccessRelationshipsByElectronicAccessRelationshipId( DeleteElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse .respond204())); } else { - LOG.error(MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())); + LOG.error(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( DeleteElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse .respond404WithTextPlain( - MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())))); + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())))); } } else { LOG.error(reply.cause().getMessage(), reply.cause()); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( DeleteElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, + MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( DeleteElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( DeleteElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @@ -207,7 +213,7 @@ public void deleteElectronicAccessRelationshipsByElectronicAccessRelationshipId( @Override public void putElectronicAccessRelationshipsByElectronicAccessRelationshipId( String electronicAccessRelationshipId, - String lang, + ElectronicAccessRelationship entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -226,7 +232,8 @@ public void putElectronicAccessRelationshipsByElectronicAccessRelationshipId( if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( PutElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond404WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( PutElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse @@ -236,20 +243,22 @@ public void putElectronicAccessRelationshipsByElectronicAccessRelationshipId( LOG.error(reply.cause().getMessage()); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( PutElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture( PutElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutElectronicAccessRelationshipsByElectronicAccessRelationshipIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } diff --git a/src/main/java/org/folio/rest/impl/HoldingsNoteTypeApi.java b/src/main/java/org/folio/rest/impl/HoldingsNoteTypeApi.java index b278ff97e..dd62cff91 100644 --- a/src/main/java/org/folio/rest/impl/HoldingsNoteTypeApi.java +++ b/src/main/java/org/folio/rest/impl/HoldingsNoteTypeApi.java @@ -6,6 +6,8 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -42,7 +44,8 @@ public class HoldingsNoteTypeApi implements org.folio.rest.jaxrs.resource.Holdin @Validate @Override - public void getHoldingsNoteTypes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getHoldingsNoteTypes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -68,12 +71,12 @@ public void getHoldingsNoteTypes(String query, int offset, int limit, String lan log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetHoldingsNoteTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -85,7 +88,7 @@ public void getHoldingsNoteTypes(String query, int offset, int limit, String lan @Validate @Override - public void postHoldingsNoteTypes(String lang, HoldingsNoteType entity, Map okapiHeaders, + public void postHoldingsNoteTypes(HoldingsNoteType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -108,7 +111,7 @@ public void postHoldingsNoteTypes(String lang, HoldingsNoteType entity, Map okapiHeaders, + public void getHoldingsNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, HoldingsNoteType.class, id, okapiHeaders, vertxContext, GetHoldingsNoteTypesByIdResponse.class, asyncResultHandler); @@ -135,7 +138,7 @@ public void getHoldingsNoteTypesById(String id, String lang, Map @Validate @Override - public void deleteHoldingsNoteTypesById(String id, String lang, Map okapiHeaders, + public void deleteHoldingsNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -147,7 +150,7 @@ public void deleteHoldingsNoteTypesById(String id, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -192,7 +195,7 @@ public void putHoldingsNoteTypesById(String id, String lang, HoldingsNoteType en if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutHoldingsNoteTypesByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutHoldingsNoteTypesByIdResponse .respond204())); @@ -200,7 +203,7 @@ public void putHoldingsNoteTypesById(String id, String lang, HoldingsNoteType en } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), DEFAULT_LANGUAGE, asyncResultHandler); return; } log.info(msg); @@ -208,11 +211,11 @@ public void putHoldingsNoteTypesById(String id, String lang, HoldingsNoteType en .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, DEFAULT_LANGUAGE, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, DEFAULT_LANGUAGE, asyncResultHandler); } }); } diff --git a/src/main/java/org/folio/rest/impl/HoldingsRecordsSourceApi.java b/src/main/java/org/folio/rest/impl/HoldingsRecordsSourceApi.java index 99aac4791..2033eff12 100755 --- a/src/main/java/org/folio/rest/impl/HoldingsRecordsSourceApi.java +++ b/src/main/java/org/folio/rest/impl/HoldingsRecordsSourceApi.java @@ -1,6 +1,7 @@ package org.folio.rest.impl; import static io.vertx.core.Future.succeededFuture; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -28,7 +29,7 @@ public class HoldingsRecordsSourceApi implements org.folio.rest.jaxrs.resource.H @Validate @Override - public void getHoldingsSources(String query, int offset, int limit, String lang, + public void getHoldingsSources(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.get(REFERENCE_TABLE, HoldingsRecordsSource.class, HoldingsRecordsSources.class, query, offset, limit, @@ -37,7 +38,7 @@ public void getHoldingsSources(String query, int offset, int limit, String lang, @Validate @Override - public void postHoldingsSources(String lang, HoldingsRecordsSource entity, + public void postHoldingsSources(HoldingsRecordsSource entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.post(REFERENCE_TABLE, entity, okapiHeaders, vertxContext, PostHoldingsSourcesResponse.class, @@ -46,7 +47,7 @@ public void postHoldingsSources(String lang, HoldingsRecordsSource entity, @Validate @Override - public void getHoldingsSourcesById(String id, String lang, + public void getHoldingsSourcesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, HoldingsRecordsSource.class, id, okapiHeaders, @@ -55,7 +56,7 @@ public void getHoldingsSourcesById(String id, String lang, @Validate @Override - public void deleteHoldingsSourcesById(String id, String lang, + public void deleteHoldingsSourcesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -84,14 +85,14 @@ public void deleteHoldingsSourcesById(String id, String lang, } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(succeededFuture(DeleteHoldingsSourcesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void putHoldingsSourcesById(String id, String lang, + public void putHoldingsSourcesById(String id, HoldingsRecordsSource entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.put(REFERENCE_TABLE, entity, id, okapiHeaders, vertxContext, PutHoldingsSourcesByIdResponse.class, diff --git a/src/main/java/org/folio/rest/impl/HoldingsStorageApi.java b/src/main/java/org/folio/rest/impl/HoldingsStorageApi.java index f5396b995..5c665ba26 100644 --- a/src/main/java/org/folio/rest/impl/HoldingsStorageApi.java +++ b/src/main/java/org/folio/rest/impl/HoldingsStorageApi.java @@ -24,11 +24,10 @@ public class HoldingsStorageApi implements HoldingsStorage { @Validate @Override - public void getHoldingsStorageHoldings( - int offset, int limit, String query, String lang, - RoutingContext routingContext, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getHoldingsStorageHoldings(String totalRecords, int offset, int limit, String query, + RoutingContext routingContext, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { PgUtil.streamGet(HOLDINGS_RECORD_TABLE, HoldingsRecordView.class, query, offset, limit, null, "holdingsRecords", routingContext, okapiHeaders, vertxContext); @@ -36,7 +35,7 @@ public void getHoldingsStorageHoldings( @Validate @Override - public void postHoldingsStorageHoldings(String lang, + public void postHoldingsStorageHoldings( HoldingsRecord entity, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, @@ -63,7 +62,7 @@ public void deleteHoldingsStorageHoldings(String query, @Validate @Override public void getHoldingsStorageHoldingsByHoldingsRecordId( - String holdingsRecordId, String lang, + String holdingsRecordId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -76,7 +75,7 @@ public void getHoldingsStorageHoldingsByHoldingsRecordId( @Validate @Override public void deleteHoldingsStorageHoldingsByHoldingsRecordId( - String holdingsRecordId, String lang, + String holdingsRecordId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -89,7 +88,7 @@ public void deleteHoldingsStorageHoldingsByHoldingsRecordId( @Validate @Override public void putHoldingsStorageHoldingsByHoldingsRecordId( - String holdingsRecordId, String lang, + String holdingsRecordId, HoldingsRecord entity, Map okapiHeaders, Handler> asyncResultHandler, diff --git a/src/main/java/org/folio/rest/impl/HoldingsTypeApi.java b/src/main/java/org/folio/rest/impl/HoldingsTypeApi.java index b715aca53..4b696fd05 100644 --- a/src/main/java/org/folio/rest/impl/HoldingsTypeApi.java +++ b/src/main/java/org/folio/rest/impl/HoldingsTypeApi.java @@ -2,6 +2,7 @@ import static java.util.Collections.singletonList; import static org.folio.rest.persist.PgUtil.postgresClient; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -32,7 +33,6 @@ import org.folio.rest.tools.utils.TenantTool; import org.z3950.zing.cql.CQLParseException; - public class HoldingsTypeApi implements org.folio.rest.jaxrs.resource.HoldingsTypes { public static final String REFERENCE_TABLE = "holdings_type"; @@ -42,7 +42,8 @@ public class HoldingsTypeApi implements org.folio.rest.jaxrs.resource.HoldingsTy @Validate @Override - public void getHoldingsTypes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getHoldingsTypes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -68,12 +69,12 @@ public void getHoldingsTypes(String query, int offset, int limit, String lang, M log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetHoldingsTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -85,11 +86,11 @@ public void getHoldingsTypes(String query, int offset, int limit, String lang, M @Validate @Override - public void postHoldingsTypes(String lang, - HoldingsType entity, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void postHoldingsTypes( + HoldingsType entity, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { if (entity.getId() == null) { entity.setId(UUID.randomUUID().toString()); @@ -105,7 +106,7 @@ public void postHoldingsTypes(String lang, @Validate @Override - public void getHoldingsTypesById(String id, String lang, Map okapiHeaders, + public void getHoldingsTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, HoldingsType.class, id, okapiHeaders, vertxContext, GetHoldingsTypesByIdResponse.class, asyncResultHandler); @@ -113,7 +114,7 @@ public void getHoldingsTypesById(String id, String lang, Map oka @Validate @Override - public void deleteHoldingsTypesById(String id, String lang, Map okapiHeaders, + public void deleteHoldingsTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -125,7 +126,7 @@ public void deleteHoldingsTypesById(String id, String lang, Map if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -135,7 +136,7 @@ public void deleteHoldingsTypesById(String id, String lang, Map } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteHoldingsTypesByIdResponse .respond404WithTextPlain(msg))); @@ -144,18 +145,18 @@ public void deleteHoldingsTypesById(String id, String lang, Map asyncResultHandler.handle(Future.succeededFuture(DeleteHoldingsTypesByIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putHoldingsTypesById(String id, String lang, HoldingsType entity, Map okapiHeaders, + public void putHoldingsTypesById(String id, HoldingsType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -169,7 +170,7 @@ public void putHoldingsTypesById(String id, String lang, HoldingsType entity, Ma if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutHoldingsTypesByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutHoldingsTypesByIdResponse .respond204())); @@ -177,7 +178,7 @@ public void putHoldingsTypesById(String id, String lang, HoldingsType entity, Ma } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -185,11 +186,11 @@ public void putHoldingsTypesById(String id, String lang, HoldingsType entity, Ma .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -199,16 +200,16 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteHoldingsTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutHoldingsTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } private Future saveHoldingsType(PostgresClient pgClient, HoldingsType entity) { diff --git a/src/main/java/org/folio/rest/impl/IdentifierTypeApi.java b/src/main/java/org/folio/rest/impl/IdentifierTypeApi.java index d086889d3..625ea0e04 100644 --- a/src/main/java/org/folio/rest/impl/IdentifierTypeApi.java +++ b/src/main/java/org/folio/rest/impl/IdentifierTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -39,7 +41,7 @@ public class IdentifierTypeApi implements org.folio.rest.jaxrs.resource.Identifi @Validate @Override - public void getIdentifierTypes(String query, int offset, int limit, String lang, + public void getIdentifierTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -67,12 +69,12 @@ public void getIdentifierTypes(String query, int offset, int limit, String lang, log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetIdentifierTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -84,7 +86,7 @@ public void getIdentifierTypes(String query, int offset, int limit, String lang, @Validate @Override - public void postIdentifierTypes(String lang, IdentifierType entity, Map okapiHeaders, + public void postIdentifierTypes(IdentifierType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -109,7 +111,7 @@ public void postIdentifierTypes(String lang, IdentifierType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -138,7 +140,7 @@ public void getIdentifierTypesByIdentifierTypeId(String identifierTypeId, String @Validate @Override - public void deleteIdentifierTypesByIdentifierTypeId(String identifierTypeId, String lang, + public void deleteIdentifierTypesByIdentifierTypeId(String identifierTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +155,7 @@ public void deleteIdentifierTypesByIdentifierTypeId(String identifierTypeId, Str if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -163,7 +165,7 @@ public void deleteIdentifierTypesByIdentifierTypeId(String identifierTypeId, Str } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteIdentifierTypesByIdentifierTypeIdResponse .respond404WithTextPlain(msg))); @@ -172,18 +174,18 @@ public void deleteIdentifierTypesByIdentifierTypeId(String identifierTypeId, Str asyncResultHandler.handle(Future.succeededFuture(DeleteIdentifierTypesByIdentifierTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putIdentifierTypesByIdentifierTypeId(String identifierTypeId, String lang, IdentifierType entity, + public void putIdentifierTypesByIdentifierTypeId(String identifierTypeId, IdentifierType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -202,7 +204,7 @@ public void putIdentifierTypesByIdentifierTypeId(String identifierTypeId, String if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutIdentifierTypesByIdentifierTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutIdentifierTypesByIdentifierTypeIdResponse @@ -211,7 +213,7 @@ public void putIdentifierTypesByIdentifierTypeId(String identifierTypeId, String } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -219,11 +221,11 @@ public void putIdentifierTypesByIdentifierTypeId(String identifierTypeId, String .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -233,21 +235,21 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostIdentifierTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteIdentifierTypesByIdentifierTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutIdentifierTypesByIdentifierTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/IllPolicyApi.java b/src/main/java/org/folio/rest/impl/IllPolicyApi.java index 938d2b76c..61341b543 100644 --- a/src/main/java/org/folio/rest/impl/IllPolicyApi.java +++ b/src/main/java/org/folio/rest/impl/IllPolicyApi.java @@ -6,6 +6,8 @@ package org.folio.rest.impl; +import static org.folio.okapi.common.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -42,7 +44,7 @@ public class IllPolicyApi implements org.folio.rest.jaxrs.resource.IllPolicies { @Validate @Override - public void getIllPolicies(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getIllPolicies(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -69,12 +71,12 @@ public void getIllPolicies(String query, int offset, int limit, String lang, Map log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetIllPoliciesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + "en", MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage("en", MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -86,7 +88,7 @@ public void getIllPolicies(String query, int offset, int limit, String lang, Map @Validate @Override - public void postIllPolicies(String lang, IllPolicy entity, Map okapiHeaders, + public void postIllPolicies(IllPolicy entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -109,7 +111,7 @@ public void postIllPolicies(String lang, IllPolicy entity, Map o } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -117,18 +119,18 @@ public void postIllPolicies(String lang, IllPolicy entity, Map o .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getIllPoliciesById(String id, String lang, Map okapiHeaders, + public void getIllPoliciesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, IllPolicy.class, id, okapiHeaders, vertxContext, GetIllPoliciesByIdResponse.class, asyncResultHandler); @@ -136,7 +138,7 @@ public void getIllPoliciesById(String id, String lang, Map okapi @Validate @Override - public void deleteIllPoliciesById(String id, String lang, Map okapiHeaders, + public void deleteIllPoliciesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -148,7 +150,7 @@ public void deleteIllPoliciesById(String id, String lang, Map ok if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -158,7 +160,7 @@ public void deleteIllPoliciesById(String id, String lang, Map ok } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteIllPoliciesByIdResponse .respond404WithTextPlain(msg))); @@ -167,18 +169,18 @@ public void deleteIllPoliciesById(String id, String lang, Map ok asyncResultHandler.handle(Future.succeededFuture(DeleteIllPoliciesByIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putIllPoliciesById(String id, String lang, IllPolicy entity, Map okapiHeaders, + public void putIllPoliciesById(String id, IllPolicy entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -192,7 +194,7 @@ public void putIllPoliciesById(String id, String lang, IllPolicy entity, Map> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostIllPoliciesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteIllPoliciesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutIllPoliciesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/InstanceFormatApi.java b/src/main/java/org/folio/rest/impl/InstanceFormatApi.java index c408262b0..77a778ab0 100644 --- a/src/main/java/org/folio/rest/impl/InstanceFormatApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceFormatApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -39,7 +41,7 @@ public class InstanceFormatApi implements org.folio.rest.jaxrs.resource.Instance @Validate @Override - public void getInstanceFormats(String query, int offset, int limit, String lang, + public void getInstanceFormats(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -67,12 +69,12 @@ public void getInstanceFormats(String query, int offset, int limit, String lang, log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetInstanceFormatsResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -84,7 +86,7 @@ public void getInstanceFormats(String query, int offset, int limit, String lang, @Validate @Override - public void postInstanceFormats(String lang, InstanceFormat entity, Map okapiHeaders, + public void postInstanceFormats(InstanceFormat entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -109,7 +111,7 @@ public void postInstanceFormats(String lang, InstanceFormat entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -138,7 +140,7 @@ public void getInstanceFormatsByInstanceFormatId(String instanceFormatId, String @Validate @Override - public void deleteInstanceFormatsByInstanceFormatId(String instanceFormatId, String lang, + public void deleteInstanceFormatsByInstanceFormatId(String instanceFormatId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +155,7 @@ public void deleteInstanceFormatsByInstanceFormatId(String instanceFormatId, Str if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -163,7 +165,7 @@ public void deleteInstanceFormatsByInstanceFormatId(String instanceFormatId, Str } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteInstanceFormatsByInstanceFormatIdResponse .respond404WithTextPlain(msg))); @@ -172,18 +174,18 @@ public void deleteInstanceFormatsByInstanceFormatId(String instanceFormatId, Str asyncResultHandler.handle(Future.succeededFuture(DeleteInstanceFormatsByInstanceFormatIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putInstanceFormatsByInstanceFormatId(String instanceFormatId, String lang, InstanceFormat entity, + public void putInstanceFormatsByInstanceFormatId(String instanceFormatId, InstanceFormat entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -202,7 +204,7 @@ public void putInstanceFormatsByInstanceFormatId(String instanceFormatId, String if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceFormatsByInstanceFormatIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceFormatsByInstanceFormatIdResponse @@ -211,7 +213,7 @@ public void putInstanceFormatsByInstanceFormatId(String instanceFormatId, String } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -219,11 +221,11 @@ public void putInstanceFormatsByInstanceFormatId(String instanceFormatId, String .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -233,21 +235,21 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostInstanceFormatsResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteInstanceFormatsByInstanceFormatIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutInstanceFormatsByInstanceFormatIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/InstanceNoteTypeApi.java b/src/main/java/org/folio/rest/impl/InstanceNoteTypeApi.java index 2434d7d6c..3d6dde9ad 100644 --- a/src/main/java/org/folio/rest/impl/InstanceNoteTypeApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceNoteTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -37,7 +39,8 @@ public class InstanceNoteTypeApi implements org.folio.rest.jaxrs.resource.Instan @Validate @Override - public void getInstanceNoteTypes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getInstanceNoteTypes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -61,7 +64,7 @@ public void getInstanceNoteTypes(String query, int offset, int limit, String lan }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -73,7 +76,7 @@ public void getInstanceNoteTypes(String query, int offset, int limit, String lan @Validate @Override - public void postInstanceNoteTypes(String lang, InstanceNoteType entity, Map okapiHeaders, + public void postInstanceNoteTypes(InstanceNoteType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -103,14 +106,14 @@ public void postInstanceNoteTypes(String lang, InstanceNoteType entity, Map okapiHeaders, + public void getInstanceNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, InstanceNoteType.class, id, okapiHeaders, @@ -119,7 +122,7 @@ public void getInstanceNoteTypesById(String id, String lang, Map @Validate @Override - public void deleteInstanceNoteTypesById(String id, String lang, Map okapiHeaders, + public void deleteInstanceNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -137,7 +140,7 @@ public void deleteInstanceNoteTypesById(String id, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -170,7 +173,7 @@ public void putInstanceNoteTypesById(String id, String lang, InstanceNoteType en if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutInstanceNoteTypesByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutInstanceNoteTypesByIdResponse .respond204())); @@ -186,7 +189,7 @@ public void putInstanceNoteTypesById(String id, String lang, InstanceNoteType en } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(Future.succeededFuture(PutInstanceNoteTypesByIdResponse.respond500WithTextPlain( - messages.getMessage(lang, MessageConsts.InternalServerError)))); + messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); diff --git a/src/main/java/org/folio/rest/impl/InstanceRelationshipTypeApi.java b/src/main/java/org/folio/rest/impl/InstanceRelationshipTypeApi.java index b725fa99b..899b15093 100644 --- a/src/main/java/org/folio/rest/impl/InstanceRelationshipTypeApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceRelationshipTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -26,7 +28,6 @@ import org.folio.rest.tools.utils.TenantTool; import org.z3950.zing.cql.CQLParseException; - public class InstanceRelationshipTypeApi implements org.folio.rest.jaxrs.resource.InstanceRelationshipTypes { public static final String INSTANCE_RELATIONSHIP_TYPE_TABLE = "instance_relationship_type"; @@ -37,7 +38,7 @@ public class InstanceRelationshipTypeApi implements org.folio.rest.jaxrs.resourc @Validate @Override - public void getInstanceRelationshipTypes(String query, int offset, int limit, String lang, + public void getInstanceRelationshipTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -67,12 +68,12 @@ public void getInstanceRelationshipTypes(String query, int offset, int limit, St log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetInstanceRelationshipTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -84,7 +85,7 @@ public void getInstanceRelationshipTypes(String query, int offset, int limit, St @Validate @Override - public void postInstanceRelationshipTypes(String lang, InstanceRelationshipType entity, + public void postInstanceRelationshipTypes(InstanceRelationshipType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -109,7 +110,7 @@ public void postInstanceRelationshipTypes(String lang, InstanceRelationshipType } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -117,18 +118,18 @@ public void postInstanceRelationshipTypes(String lang, InstanceRelationshipType .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, String lang, + public void getInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -138,7 +139,7 @@ public void getInstanceRelationshipTypesByRelationshipTypeId(String relationship @Validate @Override - public void deleteInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, String lang, + public void deleteInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +154,7 @@ public void deleteInstanceRelationshipTypesByRelationshipTypeId(String relations if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -164,7 +165,7 @@ public void deleteInstanceRelationshipTypesByRelationshipTypeId(String relations } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle( Future.succeededFuture(DeleteInstanceRelationshipTypesByRelationshipTypeIdResponse @@ -175,18 +176,18 @@ public void deleteInstanceRelationshipTypesByRelationshipTypeId(String relations Future.succeededFuture(DeleteInstanceRelationshipTypesByRelationshipTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, String lang, + public void putInstanceRelationshipTypesByRelationshipTypeId(String relationshipTypeId, InstanceRelationshipType entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -206,7 +207,8 @@ public void putInstanceRelationshipTypesByRelationshipTypeId(String relationship if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceRelationshipTypesByRelationshipTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain( + messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceRelationshipTypesByRelationshipTypeIdResponse @@ -215,7 +217,7 @@ public void putInstanceRelationshipTypesByRelationshipTypeId(String relationship } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -224,11 +226,11 @@ public void putInstanceRelationshipTypesByRelationshipTypeId(String relationship .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -238,22 +240,22 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostInstanceRelationshipTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteInstanceRelationshipTypesByRelationshipTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutInstanceRelationshipTypesByRelationshipTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/InstanceSetApi.java b/src/main/java/org/folio/rest/impl/InstanceSetApi.java index 3b33d830c..9ba1f5284 100644 --- a/src/main/java/org/folio/rest/impl/InstanceSetApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceSetApi.java @@ -17,7 +17,7 @@ public class InstanceSetApi implements InventoryViewInstanceSet { public void getInventoryViewInstanceSet(boolean instance, boolean holdingsRecords, boolean items, boolean precedingTitles, boolean succeedingTitles, boolean superInstanceRelationships, boolean subInstanceRelationships, - int offset, int limit, String query, String lang, + int offset, int limit, String query, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/InstanceStatusApi.java b/src/main/java/org/folio/rest/impl/InstanceStatusApi.java index 13c7faf87..38ce19400 100644 --- a/src/main/java/org/folio/rest/impl/InstanceStatusApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceStatusApi.java @@ -1,5 +1,6 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import static org.folio.rest.tools.utils.ValidationHelper.isDuplicate; import io.vertx.core.AsyncResult; @@ -37,7 +38,8 @@ public class InstanceStatusApi implements org.folio.rest.jaxrs.resource.Instance @Validate @Override - public void getInstanceStatuses(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getInstanceStatuses(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -64,12 +66,12 @@ public void getInstanceStatuses(String query, int offset, int limit, String lang LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetInstanceStatusesResponse .respond500WithTextPlain(MESSAGES.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); - String message = MESSAGES.getMessage(lang, MessageConsts.InternalServerError); + String message = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() != null && e.getCause().getClass().getSimpleName().endsWith("CQLParseException")) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -81,7 +83,7 @@ public void getInstanceStatuses(String query, int offset, int limit, String lang @Validate @Override - public void postInstanceStatuses(String lang, InstanceStatus entity, Map okapiHeaders, + public void postInstanceStatuses(InstanceStatus entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -111,26 +113,27 @@ public void postInstanceStatuses(String lang, InstanceStatus entity, Map okapiHeaders, + public void deleteInstanceStatuses(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -159,7 +162,7 @@ public void deleteInstanceStatuses(String lang, Map okapiHeaders @Validate @Override - public void getInstanceStatusesByInstanceStatusId(String instanceStatusId, String lang, + public void getInstanceStatusesByInstanceStatusId(String instanceStatusId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -169,7 +172,7 @@ public void getInstanceStatusesByInstanceStatusId(String instanceStatusId, Strin @Validate @Override - public void deleteInstanceStatusesByInstanceStatusId(String instanceStatusId, String lang, + public void deleteInstanceStatusesByInstanceStatusId(String instanceStatusId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -185,36 +188,39 @@ public void deleteInstanceStatusesByInstanceStatusId(String instanceStatusId, St io.vertx.core.Future.succeededFuture(DeleteInstanceStatusesByInstanceStatusIdResponse .respond204())); } else { - LOG.error(MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())); + LOG.error(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteInstanceStatusesByInstanceStatusIdResponse .respond404WithTextPlain( - MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())))); + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())))); } } else { LOG.error(reply.cause().getMessage(), reply.cause()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteInstanceStatusesByInstanceStatusIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, + MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteInstanceStatusesByInstanceStatusIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(DeleteInstanceStatusesByInstanceStatusIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void putInstanceStatusesByInstanceStatusId(String instanceStatusId, String lang, InstanceStatus entity, + public void putInstanceStatusesByInstanceStatusId(String instanceStatusId, InstanceStatus entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -231,7 +237,7 @@ public void putInstanceStatusesByInstanceStatusId(String instanceStatusId, Strin if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStatusesByInstanceStatusIdResponse - .respond404WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStatusesByInstanceStatusIdResponse @@ -241,19 +247,20 @@ public void putInstanceStatusesByInstanceStatusId(String instanceStatusId, Strin LOG.error(reply.cause().getMessage()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStatusesByInstanceStatusIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, + MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStatusesByInstanceStatusIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutInstanceStatusesByInstanceStatusIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } diff --git a/src/main/java/org/folio/rest/impl/InstanceStorageApi.java b/src/main/java/org/folio/rest/impl/InstanceStorageApi.java index d6b9c08ad..9ef8a103e 100644 --- a/src/main/java/org/folio/rest/impl/InstanceStorageApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceStorageApi.java @@ -5,6 +5,7 @@ import static org.folio.persist.InstanceRelationshipRepository.INSTANCE_RELATIONSHIP_TABLE; import static org.folio.persist.InstanceRepository.INSTANCE_TABLE; import static org.folio.rest.support.EndpointFailureHandler.handleFailure; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -41,22 +42,9 @@ public class InstanceStorageApi implements InstanceStorage { private static final Logger log = LogManager.getLogger(); private final Messages messages = Messages.getInstance(); - private static CQLWrapper createCqlWrapper( - String query, - int limit, - int offset, - String tableName) throws FieldException { - - CQL2PgJSON cql2pgJson = new CQL2PgJSON(tableName + ".jsonb"); - - return new CQLWrapper(cql2pgJson, query) - .setLimit(new Limit(limit)) - .setOffset(new Offset(offset)); - } - @Validate @Override - public void getInstanceStorageInstanceRelationships(int offset, int limit, String query, String lang, + public void getInstanceStorageInstanceRelationships(String totalRecords, int offset, int limit, String query, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -111,7 +99,7 @@ public void getInstanceStorageInstanceRelationships(int offset, int limit, Strin @Validate @Override - public void postInstanceStorageInstanceRelationships(String lang, InstanceRelationship entity, + public void postInstanceStorageInstanceRelationships(InstanceRelationship entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -121,7 +109,7 @@ public void postInstanceStorageInstanceRelationships(String lang, InstanceRelati @Validate @Override - public void getInstanceStorageInstanceRelationshipsByRelationshipId(String relationshipId, String lang, + public void getInstanceStorageInstanceRelationshipsByRelationshipId(String relationshipId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -132,7 +120,7 @@ public void getInstanceStorageInstanceRelationshipsByRelationshipId(String relat @Validate @Override public void deleteInstanceStorageInstanceRelationshipsByRelationshipId( - String relationshipId, String lang, + String relationshipId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +141,7 @@ public void deleteInstanceStorageInstanceRelationshipsByRelationshipId( @Validate @Override - public void putInstanceStorageInstanceRelationshipsByRelationshipId(String relationshipId, String lang, + public void putInstanceStorageInstanceRelationshipsByRelationshipId(String relationshipId, InstanceRelationship entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -172,7 +160,7 @@ public void putInstanceStorageInstanceRelationshipsByRelationshipId(String relat if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStorageInstanceRelationshipsByRelationshipIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceStorageInstanceRelationshipsByRelationshipIdResponse @@ -183,7 +171,8 @@ public void putInstanceStorageInstanceRelationshipsByRelationshipId(String relat if (msg == null) { asyncResultHandler.handle( Future.succeededFuture(PutInstanceStorageInstanceRelationshipsByRelationshipIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, + MessageConsts.InternalServerError)))); } log.info(msg); asyncResultHandler.handle( @@ -193,27 +182,23 @@ public void putInstanceStorageInstanceRelationshipsByRelationshipId(String relat } catch (Exception e) { asyncResultHandler.handle( Future.succeededFuture(PutInstanceStorageInstanceRelationshipsByRelationshipIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { asyncResultHandler.handle(Future.succeededFuture(PutInstanceStorageInstanceRelationshipsByRelationshipIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void getInstanceStorageInstances( - int offset, - int limit, - String query, - String lang, - RoutingContext routingContext, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getInstanceStorageInstances(String totalRecords, int offset, int limit, String query, + RoutingContext routingContext, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { if (PgUtil.checkOptimizedCQL(query, "title") != null) { // Until RMB-573 is fixed try { @@ -236,7 +221,7 @@ public void getInstanceStorageInstances( @Validate @Override public void postInstanceStorageInstances( - String lang, + Instance entity, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, @@ -265,7 +250,7 @@ public void deleteInstanceStorageInstances( @Override public void getInstanceStorageInstancesByInstanceId( String instanceId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -279,7 +264,7 @@ public void getInstanceStorageInstancesByInstanceId( @Override public void deleteInstanceStorageInstancesByInstanceId( String instanceId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -294,7 +279,7 @@ public void deleteInstanceStorageInstancesByInstanceId( @Override public void putInstanceStorageInstancesByInstanceId( String instanceId, - String lang, + Instance entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -310,7 +295,7 @@ public void putInstanceStorageInstancesByInstanceId( @Override public void deleteInstanceStorageInstancesSourceRecordByInstanceId( String instanceId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -322,7 +307,7 @@ public void deleteInstanceStorageInstancesSourceRecordByInstanceId( @Validate @Override public void getInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( - String instanceId, String lang, Map okapiHeaders, + String instanceId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(INSTANCE_SOURCE_MARC_TABLE, MarcJson.class, instanceId, @@ -334,7 +319,7 @@ public void getInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( @Override public void deleteInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( String instanceId, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -347,7 +332,7 @@ public void deleteInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( @Override public void putInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( String instanceId, - String lang, + MarcJson entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -362,7 +347,7 @@ public void putInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( return; } if (PgExceptionUtil.isForeignKeyViolation(reply.cause()) - && reply.cause().getMessage().contains(INSTANCE_SOURCE_MARC_TABLE)) { + && reply.cause().getMessage().contains(INSTANCE_SOURCE_MARC_TABLE)) { asyncResultHandler.handle(Future.succeededFuture( PutInstanceStorageInstancesSourceRecordMarcJsonByInstanceIdResponse .respond404WithTextPlain(reply.cause().getMessage()))); @@ -380,7 +365,7 @@ public void putInstanceStorageInstancesSourceRecordMarcJsonByInstanceId( @Validate @Override public void getInstanceStorageInstancesSourceRecordModsByInstanceId( - String instanceId, String lang, Map okapiHeaders, + String instanceId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { asyncResultHandler.handle(Future.succeededFuture( @@ -394,7 +379,7 @@ public void getInstanceStorageInstancesSourceRecordModsByInstanceId( @Validate @Override public void putInstanceStorageInstancesSourceRecordModsByInstanceId( - String instanceId, String lang, Map okapiHeaders, + String instanceId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { asyncResultHandler.handle(Future.succeededFuture( @@ -406,6 +391,19 @@ PreparedCql handleCql(String query, int limit, int offset) throws FieldException return new PreparedCql(INSTANCE_TABLE, query, limit, offset); } + private static CQLWrapper createCqlWrapper( + String query, + int limit, + int offset, + String tableName) throws FieldException { + + CQL2PgJSON cql2pgJson = new CQL2PgJSON(tableName + ".jsonb"); + + return new CQLWrapper(cql2pgJson, query) + .setLimit(new Limit(limit)) + .setOffset(new Offset(offset)); + } + static class PreparedCql { private final String tableName; private final CQLWrapper cqlWrapper; diff --git a/src/main/java/org/folio/rest/impl/InstanceTypeApi.java b/src/main/java/org/folio/rest/impl/InstanceTypeApi.java index dc7a44936..2f3a2187e 100644 --- a/src/main/java/org/folio/rest/impl/InstanceTypeApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -39,7 +41,7 @@ public class InstanceTypeApi implements org.folio.rest.jaxrs.resource.InstanceTy @Validate @Override - public void getInstanceTypes(String query, int offset, int limit, String lang, + public void getInstanceTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -67,12 +69,12 @@ public void getInstanceTypes(String query, int offset, int limit, String lang, log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetInstanceTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -84,7 +86,7 @@ public void getInstanceTypes(String query, int offset, int limit, String lang, @Validate @Override - public void postInstanceTypes(String lang, InstanceType entity, Map okapiHeaders, + public void postInstanceTypes(InstanceType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -109,7 +111,7 @@ public void postInstanceTypes(String lang, InstanceType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -138,7 +140,7 @@ public void getInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, @Validate @Override - public void deleteInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, + public void deleteInstanceTypesByInstanceTypeId(String instanceTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -153,7 +155,7 @@ public void deleteInstanceTypesByInstanceTypeId(String instanceTypeId, String la if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -163,7 +165,7 @@ public void deleteInstanceTypesByInstanceTypeId(String instanceTypeId, String la } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteInstanceTypesByInstanceTypeIdResponse .respond404WithTextPlain(msg))); @@ -172,18 +174,18 @@ public void deleteInstanceTypesByInstanceTypeId(String instanceTypeId, String la asyncResultHandler.handle(Future.succeededFuture(DeleteInstanceTypesByInstanceTypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, InstanceType entity, + public void putInstanceTypesByInstanceTypeId(String instanceTypeId, InstanceType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -202,7 +204,7 @@ public void putInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceTypesByInstanceTypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutInstanceTypesByInstanceTypeIdResponse @@ -211,7 +213,7 @@ public void putInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -219,11 +221,11 @@ public void putInstanceTypesByInstanceTypeId(String instanceTypeId, String lang, .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -233,21 +235,21 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostInstanceTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteInstanceTypesByInstanceTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutInstanceTypesByInstanceTypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/InventoryHierarchyApi.java b/src/main/java/org/folio/rest/impl/InventoryHierarchyApi.java index c0e0d9eb2..ce000cdbb 100644 --- a/src/main/java/org/folio/rest/impl/InventoryHierarchyApi.java +++ b/src/main/java/org/folio/rest/impl/InventoryHierarchyApi.java @@ -41,7 +41,7 @@ public class InventoryHierarchyApi extends AbstractInstanceRecordsApi implements @Override public void getInventoryHierarchyUpdatedInstanceIds(String startDate, String endDate, boolean deletedRecordSupport, boolean skipSuppressedFromDiscoveryRecords, - boolean onlyInstanceUpdateDate, String source, String lang, + boolean onlyInstanceUpdateDate, String source, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/InventoryViewApi.java b/src/main/java/org/folio/rest/impl/InventoryViewApi.java index e02fe7751..b7dd7aae9 100644 --- a/src/main/java/org/folio/rest/impl/InventoryViewApi.java +++ b/src/main/java/org/folio/rest/impl/InventoryViewApi.java @@ -15,7 +15,7 @@ public class InventoryViewApi implements InventoryViewInstances { @Validate @Override - public void getInventoryViewInstances(int offset, int limit, String query, String lang, + public void getInventoryViewInstances(String totalRecords, int offset, int limit, String query, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/ItemDamagedStatusApi.java b/src/main/java/org/folio/rest/impl/ItemDamagedStatusApi.java index b8d9baae3..0baad5ad0 100644 --- a/src/main/java/org/folio/rest/impl/ItemDamagedStatusApi.java +++ b/src/main/java/org/folio/rest/impl/ItemDamagedStatusApi.java @@ -9,6 +9,7 @@ import static org.folio.rest.jaxrs.resource.ItemDamagedStatuses.PostItemDamagedStatusesResponse.respond500WithTextPlain; import static org.folio.rest.tools.messages.MessageConsts.DeletedCountError; import static org.folio.rest.tools.messages.MessageConsts.InternalServerError; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -42,14 +43,10 @@ public class ItemDamagedStatusApi implements ItemDamagedStatuses { @Validate @Override - public void getItemDamagedStatuses( - String query, - int offset, - int limit, - String lang, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getItemDamagedStatuses(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -63,7 +60,7 @@ public void getItemDamagedStatuses( .onComplete(asyncResultHandler); } catch (Exception ex) { LOGGER.error(ex.getMessage(), ex); - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, InternalServerError); Response response = GetItemDamagedStatusesResponse.respond500WithTextPlain(message); asyncResultHandler.handle(succeededFuture(response)); } @@ -72,12 +69,9 @@ public void getItemDamagedStatuses( @Validate @Override - public void postItemDamagedStatuses( - String lang, - ItemDamageStatus entity, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void postItemDamagedStatuses(ItemDamageStatus entity, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -86,13 +80,13 @@ public void postItemDamagedStatuses( .otherwise(ex -> ofNullable(PgExceptionUtil.badRequestMessage(ex)) .map(PostItemDamagedStatusesResponse::respond400WithTextPlain) - .orElseGet(() -> respond500WithTextPlain(messages.getMessage(lang, InternalServerError))) + .orElseGet(() -> respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, InternalServerError))) ) .map(Response.class::cast) .onComplete(asyncResultHandler); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, InternalServerError); asyncResultHandler.handle(succeededFuture(respond500WithTextPlain(message))); } }); @@ -100,12 +94,9 @@ public void postItemDamagedStatuses( @Validate @Override - public void getItemDamagedStatusesById( - String id, - String lang, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getItemDamagedStatusesById(String id, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -119,7 +110,7 @@ public void getItemDamagedStatusesById( .onComplete(asyncResultHandler); } catch (Exception e) { LOGGER.error(e.getMessage(), e); - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, InternalServerError); Response response = GetItemDamagedStatusesByIdResponse.respond500WithTextPlain(message); asyncResultHandler.handle(succeededFuture(response)); } @@ -129,23 +120,20 @@ public void getItemDamagedStatusesById( @Validate @Override - public void deleteItemDamagedStatusesById( - String id, - String lang, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void deleteItemDamagedStatusesById(String id, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { vertxContext.runOnContext(v -> { try { deleteItemDamagedStatus(id, okapiHeaders, vertxContext) - .map(updatedCount -> handleDeleteItemDamagedStatusResult(lang, updatedCount)) - .otherwise(ex -> handleDeleteDamagedStatusException(lang, ex)) + .map(updatedCount -> handleDeleteItemDamagedStatusResult(updatedCount)) + .otherwise(ex -> handleDeleteDamagedStatusException(ex)) .map(Response.class::cast) .onComplete(asyncResultHandler); } catch (Exception ex) { LOGGER.error(ex.getMessage(), ex); - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, InternalServerError); Response response = DeleteItemDamagedStatusesByIdResponse.respond500WithTextPlain(message); asyncResultHandler.handle(succeededFuture(response)); } @@ -154,24 +142,21 @@ public void deleteItemDamagedStatusesById( @Validate @Override - public void putItemDamagedStatusesById( - String id, - String lang, - ItemDamageStatus entity, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void putItemDamagedStatusesById(String id, ItemDamageStatus entity, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { vertxContext.runOnContext(v -> { try { updateItemDamagedStatus(id, entity, okapiHeaders, vertxContext) - .map(updatedCount -> handleUpdateItemDamagedStatusResult(lang, updatedCount)) - .otherwise(ex -> handleUpdateItemDamagedStatusesException(lang, ex)) + .map(updatedCount -> handleUpdateItemDamagedStatusResult(updatedCount)) + .otherwise(ex -> handleUpdateItemDamagedStatusesException(ex)) .map(Response.class::cast) .onComplete(asyncResultHandler); } catch (Exception ex) { LOGGER.error(ex.getMessage(), ex); - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, InternalServerError); Response response = PutItemDamagedStatusesByIdResponse.respond500WithTextPlain(message); asyncResultHandler.handle(succeededFuture(response)); } @@ -222,24 +207,24 @@ private Future saveItemDamagedStatus(ItemDamageStatus entity, .map(entity::withId); } - private Response handleDeleteDamagedStatusException(String lang, Throwable ex) { + private Response handleDeleteDamagedStatusException(Throwable ex) { return ofNullable(PgExceptionUtil.badRequestMessage(ex)) .map(badRequestMessage -> { LOGGER.error(badRequestMessage, ex); return DeleteItemDamagedStatusesByIdResponse.respond400WithTextPlain(badRequestMessage); }).orElseGet(() -> { - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(Messages.DEFAULT_LANGUAGE, InternalServerError); LOGGER.error(message, ex); return DeleteItemDamagedStatusesByIdResponse.respond500WithTextPlain(message); }); } - private Response handleDeleteItemDamagedStatusResult(String lang, Integer updatedCount) { + private Response handleDeleteItemDamagedStatusResult(Integer updatedCount) { Response response; if (updatedCount == 1) { response = DeleteItemDamagedStatusesByIdResponse.respond204(); } else { - String msg = messages.getMessage(lang, DeletedCountError, 1, updatedCount); + String msg = messages.getMessage(Messages.DEFAULT_LANGUAGE, DeletedCountError, 1, updatedCount); LOGGER.error(msg); response = DeleteItemDamagedStatusesByIdResponse.respond404WithTextPlain(msg); } @@ -256,22 +241,22 @@ private Future deleteItemDamagedStatus( .map(RowSet::rowCount); } - private Response handleUpdateItemDamagedStatusesException(String lang, Throwable ex) { + private Response handleUpdateItemDamagedStatusesException(Throwable ex) { return ofNullable(PgExceptionUtil.badRequestMessage(ex)) .map(badRequestMessage -> { LOGGER.error(badRequestMessage, ex); return PutItemDamagedStatusesByIdResponse.respond400WithTextPlain(badRequestMessage); }).orElseGet(() -> { - String message = messages.getMessage(lang, InternalServerError); + String message = messages.getMessage(Messages.DEFAULT_LANGUAGE, InternalServerError); LOGGER.error(message, ex); return PutItemDamagedStatusesByIdResponse.respond500WithTextPlain(message); }); } - private Response handleUpdateItemDamagedStatusResult(String lang, Integer updatedCount) { + private Response handleUpdateItemDamagedStatusResult(Integer updatedCount) { Response response; if (updatedCount == 0) { - String message = messages.getMessage(lang, MessageConsts.NoRecordsUpdated); + String message = messages.getMessage(Messages.DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated); LOGGER.error(message); response = PutItemDamagedStatusesByIdResponse.respond404WithTextPlain(message); } else { diff --git a/src/main/java/org/folio/rest/impl/ItemNoteTypeApi.java b/src/main/java/org/folio/rest/impl/ItemNoteTypeApi.java index 38fe9b93f..7b419c153 100644 --- a/src/main/java/org/folio/rest/impl/ItemNoteTypeApi.java +++ b/src/main/java/org/folio/rest/impl/ItemNoteTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -36,7 +38,8 @@ public class ItemNoteTypeApi implements org.folio.rest.jaxrs.resource.ItemNoteTy @Validate @Override - public void getItemNoteTypes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getItemNoteTypes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -62,12 +65,12 @@ public void getItemNoteTypes(String query, int offset, int limit, String lang, M log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetItemNoteTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -79,7 +82,7 @@ public void getItemNoteTypes(String query, int offset, int limit, String lang, M @Validate @Override - public void postItemNoteTypes(String lang, ItemNoteType entity, Map okapiHeaders, + public void postItemNoteTypes(ItemNoteType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -102,7 +105,7 @@ public void postItemNoteTypes(String lang, ItemNoteType entity, Map okapiHeaders, + public void getItemNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, ItemNoteType.class, id, okapiHeaders, vertxContext, GetItemNoteTypesByIdResponse.class, asyncResultHandler); @@ -129,7 +132,7 @@ public void getItemNoteTypesById(String id, String lang, Map oka @Validate @Override - public void deleteItemNoteTypesById(String id, String lang, Map okapiHeaders, + public void deleteItemNoteTypesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -141,7 +144,7 @@ public void deleteItemNoteTypesById(String id, String lang, Map if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -151,7 +154,7 @@ public void deleteItemNoteTypesById(String id, String lang, Map } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteItemNoteTypesByIdResponse .respond404WithTextPlain(msg))); @@ -160,18 +163,18 @@ public void deleteItemNoteTypesById(String id, String lang, Map asyncResultHandler.handle(Future.succeededFuture(DeleteItemNoteTypesByIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putItemNoteTypesById(String id, String lang, ItemNoteType entity, Map okapiHeaders, + public void putItemNoteTypesById(String id, ItemNoteType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -185,7 +188,7 @@ public void putItemNoteTypesById(String id, String lang, ItemNoteType entity, Ma if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutItemNoteTypesByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutItemNoteTypesByIdResponse .respond204())); @@ -193,7 +196,7 @@ public void putItemNoteTypesById(String id, String lang, ItemNoteType entity, Ma } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -201,11 +204,11 @@ public void putItemNoteTypesById(String id, String lang, ItemNoteType entity, Ma .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -215,22 +218,22 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostItemNoteTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteItemNoteTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutItemNoteTypesByIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/ItemStorageApi.java b/src/main/java/org/folio/rest/impl/ItemStorageApi.java index 8051ae45f..89e8b41ab 100644 --- a/src/main/java/org/folio/rest/impl/ItemStorageApi.java +++ b/src/main/java/org/folio/rest/impl/ItemStorageApi.java @@ -24,11 +24,10 @@ public class ItemStorageApi implements ItemStorage { @Validate @Override - public void getItemStorageItems( - int offset, int limit, String query, String lang, - RoutingContext routingContext, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getItemStorageItems(String totalRecords, int offset, int limit, String query, + RoutingContext routingContext, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { PgUtil.streamGet(ITEM_TABLE, Item.class, query, offset, limit, null, "items", routingContext, okapiHeaders, vertxContext); @@ -37,7 +36,7 @@ public void getItemStorageItems( @Validate @Override public void postItemStorageItems( - String lang, Item entity, + Item entity, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -61,7 +60,7 @@ public void deleteItemStorageItems(String query, @Validate @Override public void getItemStorageItemsByItemId( - String itemId, String lang, java.util.Map okapiHeaders, + String itemId, java.util.Map okapiHeaders, io.vertx.core.Handler> asyncResultHandler, Context vertxContext) { @@ -72,7 +71,7 @@ public void getItemStorageItemsByItemId( @Validate @Override public void deleteItemStorageItemsByItemId( - String itemId, String lang, java.util.Map okapiHeaders, + String itemId, java.util.Map okapiHeaders, io.vertx.core.Handler> asyncResultHandler, Context vertxContext) { @@ -84,7 +83,7 @@ public void deleteItemStorageItemsByItemId( @Validate @Override public void putItemStorageItemsByItemId( - String itemId, String lang, Item entity, java.util.Map okapiHeaders, + String itemId, Item entity, java.util.Map okapiHeaders, io.vertx.core.Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/ItemStorageDereferencedApi.java b/src/main/java/org/folio/rest/impl/ItemStorageDereferencedApi.java index 9b26c6690..0f6eb5f8d 100644 --- a/src/main/java/org/folio/rest/impl/ItemStorageDereferencedApi.java +++ b/src/main/java/org/folio/rest/impl/ItemStorageDereferencedApi.java @@ -75,11 +75,10 @@ public class ItemStorageDereferencedApi implements ItemStorageDereferenced { @Validate @Override - public void getItemStorageDereferencedItems( - int offset, int limit, String query, String lang, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getItemStorageDereferencedItems(String totalRecords, int offset, int limit, String query, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { List mappedResults = new ArrayList<>(); String whereClause; @@ -118,7 +117,7 @@ public void getItemStorageDereferencedItems( @Validate @Override public void getItemStorageDereferencedItemsByItemId( - String itemId, String lang, java.util.Map okapiHeaders, + String itemId, java.util.Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/LoanTypeApi.java b/src/main/java/org/folio/rest/impl/LoanTypeApi.java index 1e5e23db3..b8415b66d 100644 --- a/src/main/java/org/folio/rest/impl/LoanTypeApi.java +++ b/src/main/java/org/folio/rest/impl/LoanTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -42,7 +44,7 @@ public class LoanTypeApi implements org.folio.rest.jaxrs.resource.LoanTypes { @Validate @Override - public void getLoanTypes(String query, int offset, int limit, String lang, + public void getLoanTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -69,12 +71,12 @@ public void getLoanTypes(String query, int offset, int limit, String lang, log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetLoanTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -86,7 +88,7 @@ public void getLoanTypes(String query, int offset, int limit, String lang, @Validate @Override - public void deleteLoanTypes(String lang, Map okapiHeaders, + public void deleteLoanTypes(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { @@ -113,7 +115,7 @@ public void deleteLoanTypes(String lang, Map okapiHeaders, @Validate @Override - public void postLoanTypes(String lang, Loantype entity, Map okapiHeaders, + public void postLoanTypes(Loantype entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -137,7 +139,7 @@ public void postLoanTypes(String lang, Loantype entity, Map okap } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPost(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPost(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -145,18 +147,18 @@ public void postLoanTypes(String lang, Loantype entity, Map okap .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPost(e, lang, asyncResultHandler); + internalServerErrorDuringPost(e, asyncResultHandler); } }); } @Validate @Override - public void getLoanTypesByLoantypeId(String loantypeId, String lang, + public void getLoanTypesByLoantypeId(String loantypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -166,7 +168,7 @@ public void getLoanTypesByLoantypeId(String loantypeId, String lang, @Validate @Override - public void deleteLoanTypesByLoantypeId(String loantypeId, String lang, + public void deleteLoanTypesByLoantypeId(String loantypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -180,7 +182,7 @@ public void deleteLoanTypesByLoantypeId(String loantypeId, String lang, if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -190,7 +192,7 @@ public void deleteLoanTypesByLoantypeId(String loantypeId, String lang, } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = messages.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); log.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteLoanTypesByLoantypeIdResponse .respond404WithTextPlain(msg))); @@ -199,18 +201,18 @@ public void deleteLoanTypesByLoantypeId(String loantypeId, String lang, asyncResultHandler.handle(Future.succeededFuture(DeleteLoanTypesByLoantypeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putLoanTypesByLoantypeId(String loantypeId, String lang, Loantype entity, + public void putLoanTypesByLoantypeId(String loantypeId, Loantype entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -227,7 +229,7 @@ public void putLoanTypesByLoantypeId(String loantypeId, String lang, Loantype en if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutLoanTypesByLoantypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutLoanTypesByLoantypeIdResponse .respond204())); @@ -235,7 +237,7 @@ public void putLoanTypesByLoantypeId(String loantypeId, String lang, Loantype en } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } log.info(msg); @@ -243,11 +245,11 @@ public void putLoanTypesByLoantypeId(String loantypeId, String lang, Loantype en .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -264,22 +266,22 @@ PostgresClient getPostgresClient(Context vertxContext, Map okapi return PostgresClient.getInstance(vertxContext.owner(), tenantId); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostLoanTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteLoanTypesByLoantypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { log.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutLoanTypesByLoantypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } private CQLWrapper getCql(String query, int limit, int offset) throws FieldException { diff --git a/src/main/java/org/folio/rest/impl/LocationApi.java b/src/main/java/org/folio/rest/impl/LocationApi.java index a14d22aa1..36377b9c7 100644 --- a/src/main/java/org/folio/rest/impl/LocationApi.java +++ b/src/main/java/org/folio/rest/impl/LocationApi.java @@ -42,9 +42,9 @@ public class LocationApi implements org.folio.rest.jaxrs.resource.Locations { @Override public void getLocations( String query, + String totalRecords, int offset, int limit, - String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -82,7 +82,6 @@ public void getLocations( @Validate @Override public void postLocations( - String lang, Location entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -130,8 +129,7 @@ public void postLocations( @Validate @Override - public void deleteLocations(String lang, - Map okapiHeaders, + public void deleteLocations(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -152,7 +150,6 @@ public void deleteLocations(String lang, @Override public void getLocationsById( String id, - String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -165,7 +162,6 @@ public void getLocationsById( @Override public void putLocationsById( String id, - String lang, Location entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -190,7 +186,6 @@ public void putLocationsById( @Override public void deleteLocationsById( String id, - String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/LocationUnitApi.java b/src/main/java/org/folio/rest/impl/LocationUnitApi.java index 333aaa303..3dbe9a824 100644 --- a/src/main/java/org/folio/rest/impl/LocationUnitApi.java +++ b/src/main/java/org/folio/rest/impl/LocationUnitApi.java @@ -32,11 +32,10 @@ public class LocationUnitApi implements LocationUnits { @Validate @Override - public void getLocationUnitsInstitutions( - String query, int offset, int limit, - String lang, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getLocationUnitsInstitutions(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); CQLWrapper cql; try { @@ -69,8 +68,7 @@ public void getLocationUnitsInstitutions( @Validate @Override - public void postLocationUnitsInstitutions(String lang, - Locinst entity, Map okapiHeaders, + public void postLocationUnitsInstitutions(Locinst entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -109,8 +107,7 @@ public void postLocationUnitsInstitutions(String lang, @Validate @Override - public void deleteLocationUnitsInstitutions(String lang, - Map okapiHeaders, + public void deleteLocationUnitsInstitutions(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -131,8 +128,7 @@ public void deleteLocationUnitsInstitutions(String lang, @Validate @Override - public void getLocationUnitsInstitutionsById(String id, - String lang, Map okapiHeaders, + public void getLocationUnitsInstitutionsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -142,11 +138,9 @@ public void getLocationUnitsInstitutionsById(String id, @Validate @Override - public void putLocationUnitsInstitutionsById( - String id, - String lang, Locinst entity, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void putLocationUnitsInstitutionsById(String id, Locinst entity, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { if (!id.equals(entity.getId())) { String message = "Illegal operation: Institution id cannot be changed"; @@ -162,8 +156,7 @@ public void putLocationUnitsInstitutionsById( @Validate @Override - public void deleteLocationUnitsInstitutionsById(String id, - String lang, Map okapiHeaders, + public void deleteLocationUnitsInstitutionsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -173,11 +166,10 @@ public void deleteLocationUnitsInstitutionsById(String id, @Validate @Override - public void getLocationUnitsCampuses( - String query, int offset, int limit, - String lang, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getLocationUnitsCampuses(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); CQLWrapper cql; @@ -211,8 +203,7 @@ public void getLocationUnitsCampuses( @Validate @Override - public void postLocationUnitsCampuses(String lang, - Loccamp entity, Map okapiHeaders, + public void postLocationUnitsCampuses(Loccamp entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -248,11 +239,9 @@ public void postLocationUnitsCampuses(String lang, }); } - //////////////////////////////////////////// @Validate @Override - public void deleteLocationUnitsCampuses(String lang, - Map okapiHeaders, + public void deleteLocationUnitsCampuses(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -274,8 +263,7 @@ public void deleteLocationUnitsCampuses(String lang, @Validate @Override - public void getLocationUnitsCampusesById(String id, - String lang, Map okapiHeaders, + public void getLocationUnitsCampusesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -285,11 +273,9 @@ public void getLocationUnitsCampusesById(String id, @Validate @Override - public void putLocationUnitsCampusesById( - String id, - String lang, Loccamp entity, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void putLocationUnitsCampusesById(String id, Loccamp entity, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { if (!id.equals(entity.getId())) { String message = "Illegal operation:Campus id cannot be changed"; @@ -303,8 +289,7 @@ public void putLocationUnitsCampusesById( @Validate @Override - public void deleteLocationUnitsCampusesById(String id, - String lang, Map okapiHeaders, + public void deleteLocationUnitsCampusesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.deleteById(CAMPUS_TABLE, id, okapiHeaders, vertxContext, @@ -313,11 +298,10 @@ public void deleteLocationUnitsCampusesById(String id, @Validate @Override - public void getLocationUnitsLibraries( - String query, int offset, int limit, - String lang, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getLocationUnitsLibraries(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); CQLWrapper cql; @@ -351,8 +335,7 @@ public void getLocationUnitsLibraries( @Validate @Override - public void postLocationUnitsLibraries(String lang, - Loclib entity, Map okapiHeaders, + public void postLocationUnitsLibraries(Loclib entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -391,8 +374,7 @@ public void postLocationUnitsLibraries(String lang, //////////////////////////////////////////// @Validate @Override - public void deleteLocationUnitsLibraries(String lang, - Map okapiHeaders, + public void deleteLocationUnitsLibraries(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -415,8 +397,7 @@ public void deleteLocationUnitsLibraries(String lang, @Validate @Override - public void getLocationUnitsLibrariesById(String id, - String lang, Map okapiHeaders, + public void getLocationUnitsLibrariesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -426,11 +407,9 @@ public void getLocationUnitsLibrariesById(String id, @Validate @Override - public void putLocationUnitsLibrariesById( - String id, - String lang, Loclib entity, Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void putLocationUnitsLibrariesById(String id, Loclib entity, Map okapiHeaders, + Handler> asyncResultHandler, + Context vertxContext) { if (!id.equals(entity.getId())) { String message = "Illegal operation: Library id cannot be changed"; @@ -444,8 +423,7 @@ public void putLocationUnitsLibrariesById( @Validate @Override - public void deleteLocationUnitsLibrariesById(String id, - String lang, Map okapiHeaders, + public void deleteLocationUnitsLibrariesById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/MaterialTypeApi.java b/src/main/java/org/folio/rest/impl/MaterialTypeApi.java index 003adb57e..d4979eff1 100644 --- a/src/main/java/org/folio/rest/impl/MaterialTypeApi.java +++ b/src/main/java/org/folio/rest/impl/MaterialTypeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -36,7 +38,7 @@ public class MaterialTypeApi implements MaterialTypes { @Validate @Override - public void getMaterialTypes(String query, int offset, int limit, String lang, + public void getMaterialTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -64,12 +66,12 @@ public void getMaterialTypes(String query, int offset, int limit, String lang, log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetMaterialTypesResponse .respond500WithTextPlain(messages.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() != null && e.getCause().getClass().getSimpleName().endsWith("CQLParseException")) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -81,7 +83,7 @@ public void getMaterialTypes(String query, int offset, int limit, String lang, @Validate @Override - public void postMaterialTypes(String lang, Mtype entity, Map okapiHeaders, + public void postMaterialTypes(Mtype entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -113,26 +115,27 @@ public void postMaterialTypes(String lang, Mtype entity, Map oka "name", entity.getName(), "Material Type exists")))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostMaterialTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain( + messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostMaterialTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostMaterialTypesResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void deleteMaterialTypes(String lang, Map okapiHeaders, + public void deleteMaterialTypes(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -161,7 +164,7 @@ public void deleteMaterialTypes(String lang, Map okapiHeaders, @Validate @Override - public void getMaterialTypesByMaterialtypeId(String materialtypeId, String lang, + public void getMaterialTypesByMaterialtypeId(String materialtypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -172,7 +175,7 @@ public void getMaterialTypesByMaterialtypeId(String materialtypeId, String lang, @Validate @Override - public void deleteMaterialTypesByMaterialtypeId(String materialtypeId, String lang, + public void deleteMaterialTypesByMaterialtypeId(String materialtypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -182,7 +185,7 @@ public void deleteMaterialTypesByMaterialtypeId(String materialtypeId, String la @Validate @Override - public void putMaterialTypesByMaterialtypeId(String materialtypeId, String lang, Mtype entity, + public void putMaterialTypesByMaterialtypeId(String materialtypeId, Mtype entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -201,7 +204,7 @@ public void putMaterialTypesByMaterialtypeId(String materialtypeId, String lang, if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutMaterialTypesByMaterialtypeIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutMaterialTypesByMaterialtypeIdResponse @@ -210,18 +213,18 @@ public void putMaterialTypesByMaterialtypeId(String materialtypeId, String lang, } else { log.error(reply.cause().getMessage()); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutMaterialTypesByMaterialtypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutMaterialTypesByMaterialtypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutMaterialTypesByMaterialtypeIdResponse - .respond500WithTextPlain(messages.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } diff --git a/src/main/java/org/folio/rest/impl/ModeOfIssuanceApi.java b/src/main/java/org/folio/rest/impl/ModeOfIssuanceApi.java index 82d777212..0867beffa 100644 --- a/src/main/java/org/folio/rest/impl/ModeOfIssuanceApi.java +++ b/src/main/java/org/folio/rest/impl/ModeOfIssuanceApi.java @@ -1,5 +1,6 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import static org.folio.rest.tools.utils.ValidationHelper.isDuplicate; import io.vertx.core.AsyncResult; @@ -37,7 +38,7 @@ public class ModeOfIssuanceApi implements ModesOfIssuance { @Validate @Override - public void getModesOfIssuance(String query, int offset, int limit, String lang, + public void getModesOfIssuance(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -66,12 +67,12 @@ public void getModesOfIssuance(String query, int offset, int limit, String lang, LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetModesOfIssuanceResponse .respond500WithTextPlain(MESSAGES.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); - String message = MESSAGES.getMessage(lang, MessageConsts.InternalServerError); + String message = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() != null && e.getCause().getClass().getSimpleName().endsWith("CQLParseException")) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -83,7 +84,7 @@ public void getModesOfIssuance(String query, int offset, int limit, String lang, @Validate @Override - public void postModesOfIssuance(String lang, IssuanceMode entity, Map okapiHeaders, + public void postModesOfIssuance(IssuanceMode entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -115,26 +116,27 @@ public void postModesOfIssuance(String lang, IssuanceMode entity, Map okapiHeaders, + public void deleteModesOfIssuance(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); @@ -163,7 +165,7 @@ public void deleteModesOfIssuance(String lang, Map okapiHeaders, @Validate @Override - public void getModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String lang, + public void getModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -173,7 +175,7 @@ public void getModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String @Validate @Override - public void deleteModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String lang, + public void deleteModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -189,36 +191,39 @@ public void deleteModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, Str io.vertx.core.Future.succeededFuture(DeleteModesOfIssuanceByModeOfIssuanceIdResponse .respond204())); } else { - LOG.error(MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())); + LOG.error(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, + reply.result().rowCount())); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteModesOfIssuanceByModeOfIssuanceIdResponse .respond404WithTextPlain( - MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())))); + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, + reply.result().rowCount())))); } } else { LOG.error(reply.cause().getMessage(), reply.cause()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteModesOfIssuanceByModeOfIssuanceIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteModesOfIssuanceByModeOfIssuanceIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(DeleteModesOfIssuanceByModeOfIssuanceIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void putModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String lang, IssuanceMode entity, + public void putModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, IssuanceMode entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -235,7 +240,7 @@ public void putModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutModesOfIssuanceByModeOfIssuanceIdResponse - .respond404WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutModesOfIssuanceByModeOfIssuanceIdResponse @@ -245,19 +250,20 @@ public void putModesOfIssuanceByModeOfIssuanceId(String modeOfIssuanceId, String LOG.error(reply.cause().getMessage()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutModesOfIssuanceByModeOfIssuanceIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutModesOfIssuanceByModeOfIssuanceIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutModesOfIssuanceByModeOfIssuanceIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } diff --git a/src/main/java/org/folio/rest/impl/NatureOfContentTermApi.java b/src/main/java/org/folio/rest/impl/NatureOfContentTermApi.java index 391595e20..86f310177 100644 --- a/src/main/java/org/folio/rest/impl/NatureOfContentTermApi.java +++ b/src/main/java/org/folio/rest/impl/NatureOfContentTermApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -37,7 +39,7 @@ public class NatureOfContentTermApi implements org.folio.rest.jaxrs.resource.Nat @Validate @Override - public void getNatureOfContentTerms(String query, int offset, int limit, String lang, + public void getNatureOfContentTerms(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -62,7 +64,7 @@ public void getNatureOfContentTerms(String query, int offset, int limit, String }); } catch (Exception e) { log.error(e.getMessage(), e); - String message = messages.getMessage(lang, MessageConsts.InternalServerError); + String message = messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -74,7 +76,7 @@ public void getNatureOfContentTerms(String query, int offset, int limit, String @Validate @Override - public void postNatureOfContentTerms(String lang, NatureOfContentTerm entity, Map okapiHeaders, + public void postNatureOfContentTerms(NatureOfContentTerm entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -104,14 +106,14 @@ public void postNatureOfContentTerms(String lang, NatureOfContentTerm entity, Ma } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(Future.succeededFuture(PostNatureOfContentTermsResponse.respond500WithTextPlain( - messages.getMessage(lang, MessageConsts.InternalServerError)))); + messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void getNatureOfContentTermsById(String id, String lang, Map okapiHeaders, + public void getNatureOfContentTermsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, NatureOfContentTerm.class, id, okapiHeaders, vertxContext, GetNatureOfContentTermsByIdResponse.class, asyncResultHandler); @@ -119,7 +121,7 @@ public void getNatureOfContentTermsById(String id, String lang, Map okapiHeaders, + public void deleteNatureOfContentTermsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -137,7 +139,7 @@ public void deleteNatureOfContentTermsById(String id, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -170,7 +172,7 @@ public void putNatureOfContentTermsById(String id, String lang, NatureOfContentT if (reply.succeeded()) { if (reply.result().rowCount() == 0) { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutNatureOfContentTermsByIdResponse - .respond404WithTextPlain(messages.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PutNatureOfContentTermsByIdResponse .respond204())); @@ -186,7 +188,7 @@ public void putNatureOfContentTermsById(String id, String lang, NatureOfContentT } catch (Exception e) { log.error(e.getMessage(), e); asyncResultHandler.handle(Future.succeededFuture(PutNatureOfContentTermsByIdResponse.respond500WithTextPlain( - messages.getMessage(lang, MessageConsts.InternalServerError)))); + messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); diff --git a/src/main/java/org/folio/rest/impl/OaiPmhViewInstancesApi.java b/src/main/java/org/folio/rest/impl/OaiPmhViewInstancesApi.java index 1c70f8464..07b93c134 100644 --- a/src/main/java/org/folio/rest/impl/OaiPmhViewInstancesApi.java +++ b/src/main/java/org/folio/rest/impl/OaiPmhViewInstancesApi.java @@ -20,7 +20,7 @@ public class OaiPmhViewInstancesApi extends AbstractInstanceRecordsApi implement @Validate @Override public void getOaiPmhViewInstances(String startDate, String endDate, boolean deletedRecordSupport, - boolean skipSuppressedFromDiscoveryRecords, String lang, + boolean skipSuppressedFromDiscoveryRecords, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -33,7 +33,7 @@ public void getOaiPmhViewInstances(String startDate, String endDate, boolean del @Validate @Override public void getOaiPmhViewUpdatedInstanceIds(String startDate, String endDate, boolean deletedRecordSupport, - boolean skipSuppressedFromDiscoveryRecords, String lang, + boolean skipSuppressedFromDiscoveryRecords, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/PrecedingSucceedingTitleApi.java b/src/main/java/org/folio/rest/impl/PrecedingSucceedingTitleApi.java index 69144bf92..b58fd3796 100644 --- a/src/main/java/org/folio/rest/impl/PrecedingSucceedingTitleApi.java +++ b/src/main/java/org/folio/rest/impl/PrecedingSucceedingTitleApi.java @@ -24,7 +24,7 @@ public class PrecedingSucceedingTitleApi implements org.folio.rest.jaxrs.resourc @Validate @Override - public void getPrecedingSucceedingTitles(int offset, int limit, String query, String lang, + public void getPrecedingSucceedingTitles(String totalRecords, int offset, int limit, String query, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.get(PRECEDING_SUCCEEDING_TITLE_TABLE, PrecedingSucceedingTitle.class, PrecedingSucceedingTitles.class, query, @@ -34,7 +34,7 @@ public void getPrecedingSucceedingTitles(int offset, int limit, String query, St @Validate @Override - public void postPrecedingSucceedingTitles(String lang, PrecedingSucceedingTitle entity, + public void postPrecedingSucceedingTitles(PrecedingSucceedingTitle entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -48,7 +48,7 @@ public void postPrecedingSucceedingTitles(String lang, PrecedingSucceedingTitle @Validate @Override - public void getPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String precedingSucceedingTitleId, String lang, + public void getPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String precedingSucceedingTitleId, Map okapiHeaders, Handler> resultHandler, Context vertxContext) { @@ -59,7 +59,7 @@ public void getPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String prec @Validate @Override - public void putPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String precedingSucceedingTitleId, String lang, + public void putPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String precedingSucceedingTitleId, PrecedingSucceedingTitle entity, Map okapiHeaders, Handler> resultHandler, @@ -76,7 +76,7 @@ public void putPrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String prec @Validate @Override public void deletePrecedingSucceedingTitlesByPrecedingSucceedingTitleId(String precedingSucceedingTitleId, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> resultHandler, Context vertxContext) { PgUtil.deleteById(PRECEDING_SUCCEEDING_TITLE_TABLE, precedingSucceedingTitleId, okapiHeaders, vertxContext, diff --git a/src/main/java/org/folio/rest/impl/RecordBulkApi.java b/src/main/java/org/folio/rest/impl/RecordBulkApi.java index 321244005..e83101cbd 100644 --- a/src/main/java/org/folio/rest/impl/RecordBulkApi.java +++ b/src/main/java/org/folio/rest/impl/RecordBulkApi.java @@ -32,7 +32,7 @@ public class RecordBulkApi implements org.folio.rest.jaxrs.resource.RecordBulk { @Override public void getRecordBulkIds(RecordBulkIdsGetField field, RecordBulkIdsGetRecordType recordType, int limit, String query, - int offset, String lang, RoutingContext routingContext, + String totalRecords, int offset, RoutingContext routingContext, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { diff --git a/src/main/java/org/folio/rest/impl/ReindexInstanceApi.java b/src/main/java/org/folio/rest/impl/ReindexInstanceApi.java index cc8ce259e..80243e8b8 100644 --- a/src/main/java/org/folio/rest/impl/ReindexInstanceApi.java +++ b/src/main/java/org/folio/rest/impl/ReindexInstanceApi.java @@ -34,8 +34,8 @@ public void postInstanceStorageReindex(Map okapiHeaders, @Validate @Override - public void getInstanceStorageReindex(String query, int offset, int limit, - String lang, + public void getInstanceStorageReindex(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/ServicePointApi.java b/src/main/java/org/folio/rest/impl/ServicePointApi.java index 6c4b3e5d4..661b7d704 100644 --- a/src/main/java/org/folio/rest/impl/ServicePointApi.java +++ b/src/main/java/org/folio/rest/impl/ServicePointApi.java @@ -35,7 +35,7 @@ public class ServicePointApi implements org.folio.rest.jaxrs.resource.ServicePoi @Validate @Override - public void getServicePoints(String query, int offset, int limit, String lang, + public void getServicePoints(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -46,7 +46,7 @@ public void getServicePoints(String query, int offset, int limit, String lang, @Validate @Override - public void postServicePoints(String lang, Servicepoint entity, + public void postServicePoints(Servicepoint entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -102,7 +102,7 @@ public void postServicePoints(String lang, Servicepoint entity, @Validate @Override - public void deleteServicePoints(String lang, Map okapiHeaders, + public void deleteServicePoints(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -132,7 +132,7 @@ public void deleteServicePoints(String lang, Map okapiHeaders, @Validate @Override - public void putServicePointsByServicepointId(String servicepointId, String lang, + public void putServicePointsByServicepointId(String servicepointId, Servicepoint entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -162,7 +162,7 @@ public void putServicePointsByServicepointId(String servicepointId, String lang, @Validate @Override public void getServicePointsByServicepointId(String servicepointId, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -173,7 +173,7 @@ public void getServicePointsByServicepointId(String servicepointId, @Validate @Override public void deleteServicePointsByServicepointId(String servicepointId, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { diff --git a/src/main/java/org/folio/rest/impl/ServicePointsUserApi.java b/src/main/java/org/folio/rest/impl/ServicePointsUserApi.java index 09c7542d3..d2b0bef61 100644 --- a/src/main/java/org/folio/rest/impl/ServicePointsUserApi.java +++ b/src/main/java/org/folio/rest/impl/ServicePointsUserApi.java @@ -22,8 +22,8 @@ public class ServicePointsUserApi implements org.folio.rest.jaxrs.resource.Servi @Validate @Override - public void getServicePointsUsers(String query, int offset, int limit, - String lang, Map okapiHeaders, + public void getServicePointsUsers(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.get(SERVICE_POINT_USER_TABLE, ServicePointsUser.class, ServicePointsUsers.class, @@ -33,7 +33,7 @@ public void getServicePointsUsers(String query, int offset, int limit, @Validate @Override - public void postServicePointsUsers(String lang, ServicePointsUser entity, + public void postServicePointsUsers(ServicePointsUser entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -43,7 +43,7 @@ public void postServicePointsUsers(String lang, ServicePointsUser entity, @Validate @Override - public void deleteServicePointsUsers(String lang, Map okapiHeaders, + public void deleteServicePointsUsers(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { final PostgresClient pgClient = PgUtil.postgresClient(vertxContext, okapiHeaders); @@ -63,7 +63,7 @@ public void deleteServicePointsUsers(String lang, Map okapiHeade @Validate @Override public void getServicePointsUsersByServicePointsUserId(String servicePointsUserId, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -75,7 +75,7 @@ public void getServicePointsUsersByServicePointsUserId(String servicePointsUserI @Validate @Override public void deleteServicePointsUsersByServicePointsUserId(String servicePointsUserId, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -86,7 +86,7 @@ public void deleteServicePointsUsersByServicePointsUserId(String servicePointsUs @Validate @Override public void putServicePointsUsersByServicePointsUserId(String servicePointsUserId, - String lang, ServicePointsUser entity, + ServicePointsUser entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { diff --git a/src/main/java/org/folio/rest/impl/ShelfLocationApi.java b/src/main/java/org/folio/rest/impl/ShelfLocationApi.java index c5c6a3d14..7f9575ccb 100644 --- a/src/main/java/org/folio/rest/impl/ShelfLocationApi.java +++ b/src/main/java/org/folio/rest/impl/ShelfLocationApi.java @@ -42,14 +42,9 @@ public class ShelfLocationApi implements ShelfLocations { */ @Validate @Override - public void getShelfLocations( - String query, - int offset, - int limit, - String lang, - Map okapiHeaders, - Handler> asyncResultHandler, - Context vertxContext) { + public void getShelfLocations(String totalRecords, String query, int offset, int limit, + Map okapiHeaders, + Handler> asyncResultHandler, Context vertxContext) { try { String tenantId = TenantTool.tenantId(okapiHeaders); CQLWrapper cql = getCql(query, limit, offset, LocationApi.LOCATION_TABLE); @@ -93,7 +88,7 @@ public void getShelfLocations( @Validate @Override public void postShelfLocations( - String lang, + Shelflocation entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -104,7 +99,7 @@ public void postShelfLocations( @Validate @Override public void deleteShelfLocations( - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -119,7 +114,7 @@ public void deleteShelfLocations( @Override public void getShelfLocationsById( String id, - String lang, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -146,7 +141,7 @@ public void getShelfLocationsById( @Override public void putShelfLocationsById( String id, - String lang, + Shelflocation entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -158,7 +153,7 @@ public void putShelfLocationsById( @Override public void deleteShelfLocationsById( String id, - String lang, Map okapiHeaders, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { throw new NotImplementedException("Deleting shelf-locations is DEPRECATED. " + USE_NEW); diff --git a/src/main/java/org/folio/rest/impl/StatisticalCodeApi.java b/src/main/java/org/folio/rest/impl/StatisticalCodeApi.java index d0e0f9ff5..1dcd30c14 100644 --- a/src/main/java/org/folio/rest/impl/StatisticalCodeApi.java +++ b/src/main/java/org/folio/rest/impl/StatisticalCodeApi.java @@ -1,5 +1,7 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; + import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Future; @@ -26,7 +28,6 @@ import org.folio.rest.tools.utils.TenantTool; import org.z3950.zing.cql.CQLParseException; - public class StatisticalCodeApi implements org.folio.rest.jaxrs.resource.StatisticalCodes { public static final String REFERENCE_TABLE = "statistical_code"; @@ -36,7 +37,8 @@ public class StatisticalCodeApi implements org.folio.rest.jaxrs.resource.Statist @Validate @Override - public void getStatisticalCodes(String query, int offset, int limit, String lang, Map okapiHeaders, + public void getStatisticalCodes(String query, String totalRecords, int offset, int limit, + Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -62,12 +64,12 @@ public void getStatisticalCodes(String query, int offset, int limit, String lang LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetStatisticalCodesResponse .respond500WithTextPlain(MESSAGES.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); - String message = MESSAGES.getMessage(lang, MessageConsts.InternalServerError); + String message = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() instanceof CQLParseException) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -80,7 +82,7 @@ public void getStatisticalCodes(String query, int offset, int limit, String lang @Validate @Override - public void postStatisticalCodes(String lang, StatisticalCode entity, Map okapiHeaders, + public void postStatisticalCodes(StatisticalCode entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -103,7 +105,7 @@ public void postStatisticalCodes(String lang, StatisticalCode entity, Map okapiHeaders, + public void getStatisticalCodesByStatisticalCodeId(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { PgUtil.getById(REFERENCE_TABLE, StatisticalCode.class, id, okapiHeaders, vertxContext, @@ -131,7 +133,7 @@ public void getStatisticalCodesByStatisticalCodeId(String id, String lang, Map okapiHeaders, + public void deleteStatisticalCodesByStatisticalCodeId(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -144,7 +146,7 @@ public void deleteStatisticalCodesByStatisticalCodeId(String id, String lang, Ma if (reply.failed()) { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringDelete(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringDelete(reply.cause(), asyncResultHandler); return; } LOG.info(msg); @@ -154,7 +156,7 @@ public void deleteStatisticalCodesByStatisticalCodeId(String id, String lang, Ma } int updated = reply.result().rowCount(); if (updated != 1) { - String msg = MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, updated); + String msg = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, 1, updated); LOG.error(msg); asyncResultHandler.handle(Future.succeededFuture(DeleteStatisticalCodesByStatisticalCodeIdResponse .respond404WithTextPlain(msg))); @@ -163,18 +165,18 @@ public void deleteStatisticalCodesByStatisticalCodeId(String id, String lang, Ma asyncResultHandler.handle(Future.succeededFuture(DeleteStatisticalCodesByStatisticalCodeIdResponse .respond204())); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringDelete(e, lang, asyncResultHandler); + internalServerErrorDuringDelete(e, asyncResultHandler); } }); } @Validate @Override - public void putStatisticalCodesByStatisticalCodeId(String id, String lang, StatisticalCode entity, + public void putStatisticalCodesByStatisticalCodeId(String id, StatisticalCode entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -191,7 +193,7 @@ public void putStatisticalCodesByStatisticalCodeId(String id, String lang, Stati if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodesByStatisticalCodeIdResponse - .respond404WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodesByStatisticalCodeIdResponse @@ -200,7 +202,7 @@ public void putStatisticalCodesByStatisticalCodeId(String id, String lang, Stati } else { String msg = PgExceptionUtil.badRequestMessage(reply.cause()); if (msg == null) { - internalServerErrorDuringPut(reply.cause(), lang, asyncResultHandler); + internalServerErrorDuringPut(reply.cause(), asyncResultHandler); return; } LOG.info(msg); @@ -208,11 +210,11 @@ public void putStatisticalCodesByStatisticalCodeId(String id, String lang, Stati .respond400WithTextPlain(msg))); } } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } catch (Exception e) { - internalServerErrorDuringPut(e, lang, asyncResultHandler); + internalServerErrorDuringPut(e, asyncResultHandler); } }); } @@ -222,22 +224,22 @@ private CQLWrapper getCql(String query, int limit, int offset) throws FieldExcep return new CQLWrapper(cql2pgJson, query).setLimit(new Limit(limit)).setOffset(new Offset(offset)); } - private void internalServerErrorDuringPost(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPost(Throwable e, Handler> handler) { LOG.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PostStatisticalCodesResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringDelete(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringDelete(Throwable e, Handler> handler) { LOG.error(e.getMessage(), e); handler.handle(Future.succeededFuture(DeleteStatisticalCodesByStatisticalCodeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } - private void internalServerErrorDuringPut(Throwable e, String lang, Handler> handler) { + private void internalServerErrorDuringPut(Throwable e, Handler> handler) { LOG.error(e.getMessage(), e); handler.handle(Future.succeededFuture(PutStatisticalCodesByStatisticalCodeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } diff --git a/src/main/java/org/folio/rest/impl/StatisticalCodeTypeApi.java b/src/main/java/org/folio/rest/impl/StatisticalCodeTypeApi.java index ee71cdb13..bb6244918 100644 --- a/src/main/java/org/folio/rest/impl/StatisticalCodeTypeApi.java +++ b/src/main/java/org/folio/rest/impl/StatisticalCodeTypeApi.java @@ -1,5 +1,6 @@ package org.folio.rest.impl; +import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE; import static org.folio.rest.tools.utils.ValidationHelper.isDuplicate; import io.vertx.core.AsyncResult; @@ -36,7 +37,7 @@ public class StatisticalCodeTypeApi implements org.folio.rest.jaxrs.resource.Sta @Validate @Override - public void getStatisticalCodeTypes(String query, int offset, int limit, String lang, + public void getStatisticalCodeTypes(String query, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { @@ -64,12 +65,12 @@ public void getStatisticalCodeTypes(String query, int offset, int limit, String LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(GetStatisticalCodeTypesResponse .respond500WithTextPlain(MESSAGES.getMessage( - lang, MessageConsts.InternalServerError)))); + DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); - String message = MESSAGES.getMessage(lang, MessageConsts.InternalServerError); + String message = MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError); if (e.getCause() != null && e.getCause().getClass().getSimpleName().endsWith("CQLParseException")) { message = " CQL parse error " + e.getLocalizedMessage(); } @@ -81,7 +82,7 @@ public void getStatisticalCodeTypes(String query, int offset, int limit, String @Validate @Override - public void postStatisticalCodeTypes(String lang, StatisticalCodeType entity, Map okapiHeaders, + public void postStatisticalCodeTypes(StatisticalCodeType entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { @@ -111,26 +112,27 @@ public void postStatisticalCodeTypes(String lang, StatisticalCodeType entity, Ma "name", entity.getName(), "Statistical Code Type exists")))); } else { asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostStatisticalCodeTypesResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostStatisticalCodeTypesResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(PostStatisticalCodeTypesResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void deleteStatisticalCodeTypes(String lang, Map okapiHeaders, + public void deleteStatisticalCodeTypes(Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { String tenantId = TenantTool.tenantId(okapiHeaders); try { @@ -158,7 +160,7 @@ public void deleteStatisticalCodeTypes(String lang, Map okapiHea @Validate @Override - public void getStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, String lang, + public void getStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -168,7 +170,7 @@ public void getStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCod @Validate @Override - public void deleteStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, String lang, + public void deleteStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { @@ -184,37 +186,40 @@ public void deleteStatisticalCodeTypesByStatisticalCodeTypeId(String statistical io.vertx.core.Future.succeededFuture(DeleteStatisticalCodeTypesByStatisticalCodeTypeIdResponse .respond204())); } else { - LOG.error(MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())); + LOG.error(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteStatisticalCodeTypesByStatisticalCodeTypeIdResponse .respond404WithTextPlain( - MESSAGES.getMessage(lang, MessageConsts.DeletedCountError, 1, reply.result().rowCount())))); + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.DeletedCountError, + 1, reply.result().rowCount())))); } } else { LOG.error(reply.cause().getMessage(), reply.cause()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(DeleteStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } @Validate @Override - public void putStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, String lang, + public void putStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCodeTypeId, StatisticalCodeType entity, Map okapiHeaders, Handler> asyncResultHandler, @@ -232,7 +237,7 @@ public void putStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCod if (reply.result().rowCount() == 0) { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond404WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.NoRecordsUpdated)))); + .respond404WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.NoRecordsUpdated)))); } else { asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodeTypesByStatisticalCodeTypeIdResponse @@ -242,20 +247,21 @@ public void putStatisticalCodeTypesByStatisticalCodeTypeId(String statisticalCod LOG.error(reply.cause().getMessage()); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond400WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond400WithTextPlain( + MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } catch (Exception e) { LOG.error(e.getMessage(), e); asyncResultHandler.handle( io.vertx.core.Future.succeededFuture(PutStatisticalCodeTypesByStatisticalCodeTypeIdResponse - .respond500WithTextPlain(MESSAGES.getMessage(lang, MessageConsts.InternalServerError)))); + .respond500WithTextPlain(MESSAGES.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError)))); } }); } diff --git a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java index 5b3610d11..3979e77e8 100644 --- a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java +++ b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java @@ -567,28 +567,6 @@ public void cannotPageWithNegativeOffset() throws Exception { is("'offset' parameter is incorrect. parameter value {-3} is not valid: must be greater than or equal to 0")); } - @Test - public void cannotDeleteHoldingWhenLangParameterIsTooLong() throws Exception { - UUID instanceId = UUID.randomUUID(); - - instancesClient.create(smallAngryPlanet(instanceId)); - - UUID holdingId = holdingsClient.create(new HoldingRequestBuilder() - .forInstance(instanceId) - .withPermanentLocation(MAIN_LIBRARY_LOCATION_ID)).getId(); - - CompletableFuture getCompleted = new CompletableFuture<>(); - - getClient().delete(holdingsStorageUrl("/" + holdingId + "?lang=eng"), - TENANT_ID, ResponseHandler.text(getCompleted)); - - Response response = getCompleted.get(TIMEOUT, TimeUnit.SECONDS); - - assertThat(response.getStatusCode(), is(400)); - assertThat(response.getBody(), - containsString("'lang' parameter is incorrect.")); - } - @Test public void canPageAllHoldings() throws InterruptedException, diff --git a/src/test/java/org/folio/rest/impl/CallNumberTypeApiTest.java b/src/test/java/org/folio/rest/impl/CallNumberTypeApiTest.java index 19d1eb310..c0c3ec0ec 100644 --- a/src/test/java/org/folio/rest/impl/CallNumberTypeApiTest.java +++ b/src/test/java/org/folio/rest/impl/CallNumberTypeApiTest.java @@ -95,7 +95,6 @@ public void shouldHandleException_whenPut() { mockedTenantTool.when(() -> TenantTool.tenantId(any())).thenThrow(new RuntimeException("Test")); callNumberTypesApi.putCallNumberTypesById(null, - null, null, null, errorHandler, @@ -113,7 +112,6 @@ public void shouldHandleException_whenDelete() { mockedTenantTool.when(() -> TenantTool.tenantId(any())).thenThrow(new RuntimeException("Test")); callNumberTypesApi.deleteCallNumberTypesById(null, - null, null, errorHandler, null); @@ -151,7 +149,6 @@ public void shouldCallPgUtilPutWithProperArgumentsAndHandleError() { //When callNumberTypesApi.putCallNumberTypesById(id, - "us", entity, okapiHeaders, errorHandler, diff --git a/src/test/java/org/folio/rest/unit/ItemDamagedStatusApiUnitTest.java b/src/test/java/org/folio/rest/unit/ItemDamagedStatusApiUnitTest.java index fe4fee01d..b046f0dc9 100644 --- a/src/test/java/org/folio/rest/unit/ItemDamagedStatusApiUnitTest.java +++ b/src/test/java/org/folio/rest/unit/ItemDamagedStatusApiUnitTest.java @@ -81,9 +81,9 @@ public void getItemDamagedStatusesShouldRespondWithBadRequestWhenQueryIsBadForma itemDamagedStatusApi.getItemDamagedStatuses( "cql=bad*?/format", + null, DEFAULT_OFFSET, DEFAULT_LIMIT, - DEFAULT_LANGUAGE, DEFAULT_HEADERS, assertStatus(testContext, 400), rule.vertx().getOrCreateContext() @@ -96,9 +96,9 @@ public void getItemDamagedStatusesShouldRespondWithServerErrorWhenUnexpectedExce new FailingItemDamagedStatusApi().getItemDamagedStatuses( DEFAULT_QUERY, + null, DEFAULT_OFFSET, DEFAULT_LIMIT, - DEFAULT_LANGUAGE, DEFAULT_HEADERS, assertStatus(testContext, 500), rule.vertx().getOrCreateContext() @@ -117,7 +117,6 @@ public void postItemDamagedStatusesShouldReturnBadRequestWhenInputDataIsCorrupte any(Handler.class) ); itemDamagedStatusApi.postItemDamagedStatuses( - DEFAULT_LANGUAGE, new ItemDamageStatus(), DEFAULT_HEADERS, assertStatus(testContext, 400), @@ -137,7 +136,6 @@ public void postItemDamagedStatusesShouldReturnInternalServerErrorWhenUnexpected any(Handler.class) ); itemDamagedStatusApi.postItemDamagedStatuses( - DEFAULT_LANGUAGE, new ItemDamageStatus(), DEFAULT_HEADERS, assertStatus(testContext, 500), @@ -150,7 +148,6 @@ public void getItemDamagedStatusesByIdShouldReturnInternalServerErrorWhenUnexpec TestContext testContext) { new FailingItemDamagedStatusApi().getItemDamagedStatusesById( UUID.randomUUID().toString(), - DEFAULT_LANGUAGE, DEFAULT_HEADERS, assertStatus(testContext, 500), rule.vertx().getOrCreateContext() @@ -169,7 +166,6 @@ public void deleteItemDamagedStatusesByIdShouldReturnInternalServerErrorWhenUnex ); itemDamagedStatusApi.deleteItemDamagedStatusesById( UUID.randomUUID().toString(), - DEFAULT_LANGUAGE, DEFAULT_HEADERS, assertStatus(testContext, 500), rule.vertx().getOrCreateContext() @@ -188,7 +184,6 @@ public void deleteItemDamagedStatusesByIdShouldReturnBadRequestWhenInputDataIsCo ); itemDamagedStatusApi.deleteItemDamagedStatusesById( UUID.randomUUID().toString(), - DEFAULT_LANGUAGE, DEFAULT_HEADERS, assertStatus(testContext, 400), rule.vertx().getOrCreateContext() @@ -208,7 +203,6 @@ public void putItemDamagedStatusesByIdShouldReturnBadRequestWhenInputDataIsCorru ); itemDamagedStatusApi.putItemDamagedStatusesById( UUID.randomUUID().toString(), - DEFAULT_LANGUAGE, new ItemDamageStatus(), DEFAULT_HEADERS, assertStatus(testContext, 400), @@ -229,7 +223,6 @@ public void putItemDamagedStatusesByIdShouldInternalServerErrorWhenUnexpectedExc ); itemDamagedStatusApi.putItemDamagedStatusesById( UUID.randomUUID().toString(), - DEFAULT_LANGUAGE, new ItemDamageStatus(), DEFAULT_HEADERS, assertStatus(testContext, 500),