From 18233593251f80a374fc6a3e15b25cd688673242 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Tue, 11 Mar 2025 09:53:49 -0400 Subject: [PATCH 01/15] Update Dockerfile FOLREL-651 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b97bdb6..758ad41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM folioci/alpine-jre-openjdk17:latest +FROM folioci/alpine-jre-openjdk21:latest # Install latest patch versions of packages: https://pythonspeed.com/articles/security-updates-in-docker/ USER root From 1202b7a9201e099df87c0d341cbba36030123db6 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Tue, 11 Mar 2025 09:54:13 -0400 Subject: [PATCH 02/15] Update Jenkinsfile FOLREL-651 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c986414..89833f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ buildMvn { publishModDescriptor = true mvnDeploy = true - buildNode = 'jenkins-agent-java17' + buildNode = 'jenkins-agent-java21' doDocker = { buildJavaDocker { From abb5d3d96ef1bd6f8bff9918179dce2904d22f9e Mon Sep 17 00:00:00 2001 From: mis306lu Date: Tue, 11 Mar 2025 09:54:32 -0400 Subject: [PATCH 03/15] Update pom.xml FOLREL-651 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e021a1..33b7463 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.5.10 UTF-8 UTF-8 - 17 + 21 4.1.0 From 61bd01be01684f55a85eb746ead03dd44025ba3d Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 12 Mar 2025 10:38:58 -0400 Subject: [PATCH 04/15] Update NEWS.md FOLREL-651 --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 019cf10..603bb17 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## 1.15.7 2025-03-12 +* [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 + ## 1.15.6 2024-11-21 * Fix missing permission issue * Use item call number from AcceptItem request if it is provided From 025110d0eab763d625d11815f5834a24b13cb3a8 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 12 Mar 2025 10:51:48 -0400 Subject: [PATCH 05/15] Update NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 603bb17..d8a9802 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ ## 1.15.7 2025-03-12 -* [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 +* [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 test build ## 1.15.6 2024-11-21 * Fix missing permission issue From 99ef62f4348a4755c2cf6a2f5295d8fa3a0254d0 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 12 Mar 2025 10:56:09 -0400 Subject: [PATCH 06/15] Update NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index d8a9802..603bb17 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ ## 1.15.7 2025-03-12 -* [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 test build +* [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 ## 1.15.6 2024-11-21 * Fix missing permission issue From e0c81602952b029bbf91c2a4849a72632c567fac Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 12 Mar 2025 11:05:48 -0400 Subject: [PATCH 07/15] [maven-release-plugin] prepare release v1.15.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 33b7463..b03a8fd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.15.7-SNAPSHOT + 1.15.7 NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.15.7 From c067c45103020286f1523074221641747582ed06 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:18:20 -0400 Subject: [PATCH 08/15] Update NEWS.md --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 603bb17..ce6e1a3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## 1.16.0 2025-09-25 +* Copy of 1.15.7 - version correction for Sunflower + ## 1.15.7 2025-03-12 * [FOLREL-651](https://folio-org.atlassian.net/browse/FOLREL-651) Update to Java 21 From 40099c0cf7c9e2437a3250da3397cc0f87882484 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:22:06 -0400 Subject: [PATCH 09/15] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b03a8fd..64412ff 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.15.7 + 1.16.0-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.15.7 + HEAD From fce7e175f6f0e8cb4c3ea90584d56bbd50c29d0c Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:26:50 -0400 Subject: [PATCH 10/15] [maven-release-plugin] prepare release v1.16.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 64412ff..6e2968a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.16.0-SNAPSHOT + 1.16.0 NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.16.0 From 711adfed0e8a4e3c5e77663fa01ecbb02253491f Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:36:54 -0400 Subject: [PATCH 11/15] Update FolioRemoteServiceManager.java MODNCIP-90 --- .../org/folio/ncip/FolioRemoteServiceManager.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java b/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java index f7cd202..3d95a80 100644 --- a/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java +++ b/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java @@ -724,6 +724,20 @@ public JsonObject requestItem(RequestItemInitiationData initData) throws Excepti String searchUrl = baseUrl + (titleRequest ? Constants.INSTANCE_SEARCH_URL : Constants.ITEM_SEARCH_URL) .replace("$hrid$", hrid); + + // This allows the place request service to work with only the barcode in the request. This is a fallback when hrid is missing. + if ((hrid == null || hrid.isEmpty()) && !titleRequest) { + if (initData != null && initData.getRequestId() != null) { + String barcode = initData.getRequestId().getRequestIdentifierValue(); + if (barcode != null && !barcode.isEmpty()) { + searchUrl = baseUrl + (Constants.ITEM_SEARCH_BY_BARCODE_URL) + .replace("$barcode$", barcode); + logger.info("using barcode"); + logger.info(searchUrl); + } + } + } + String responseString = callApiGet(searchUrl); JsonObject response = new JsonObject(responseString); From aa36fa1a746b29adf8669800a8c14dc339ffc01b Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:37:47 -0400 Subject: [PATCH 12/15] Update NEWS.md --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index ce6e1a3..de01d1d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## 1.16.1 2025-09-25 +* [MODNCIP-90](https://folio-org.atlassian.net/browse/MODNCIP-90) RequestItem service - make hrid optional (Sunflower) + ## 1.16.0 2025-09-25 * Copy of 1.15.7 - version correction for Sunflower From e46f64f766f4c69e348a7bc16e5d07a0ac2d2b9b Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 08:38:27 -0400 Subject: [PATCH 13/15] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e2968a..32bf1ed 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.16.0 + 1.16.1-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.16.0 + HEAD From 74fc4ab87cc109552c1b75f5b43d2acdf33d02c2 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 09:03:59 -0400 Subject: [PATCH 14/15] [maven-release-plugin] prepare release v1.16.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 32bf1ed..497a5df 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.16.1-SNAPSHOT + 1.16.1 NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.16.1 From 4a1d06252d7aac5b90b1939376468e8a7b21826f Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 29 Sep 2025 09:04:03 -0400 Subject: [PATCH 15/15] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 497a5df..b0f07e1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.16.1 + 1.17.0-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -224,7 +224,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.16.1 + HEAD