From 0b7beeb8f42d014750a296f6537fd8816e34be9f Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 14 Nov 2024 11:36:48 -0500 Subject: [PATCH 01/18] use versionless feature Signed-off-by: Gilbert Kwan --- .github/workflows/test.yml | 9 +++++---- finish/src/main/liberty/config/server.xml | 9 +++++---- finish/src/main/webapp/index.html | 8 ++++---- start/src/main/liberty/config/server.xml | 9 +++++---- start/src/main/webapp/index.html | 8 ++++---- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 986d5e4..ddbe1eb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,9 +12,9 @@ jobs: canSkip: ${{ steps.Checker.outputs.canSkip }} steps: - name: Get files - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get tools - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: tools/ repository: openliberty/guides-common @@ -45,10 +45,11 @@ jobs: working-directory: finish steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'semeru' java-version: 11 - run: unset _JAVA_OPTIONS diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index 324569e..012ebd5 100755 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -1,10 +1,11 @@ - restfulWS-3.1 - jsonb-3.0 - jsonp-2.1 - cdi-4.0 + jakartaee-10.0 + restfulWS + jsonb + jsonp + cdi diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html index c099a75..2b01b23 100755 --- a/finish/src/main/webapp/index.html +++ b/finish/src/main/webapp/index.html @@ -36,10 +36,10 @@

Eclipse MicroProfile

For more information about the features used in this application, see the Open Liberty documentation:

diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index 324569e..012ebd5 100755 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -1,10 +1,11 @@ - restfulWS-3.1 - jsonb-3.0 - jsonp-2.1 - cdi-4.0 + jakartaee-10.0 + restfulWS + jsonb + jsonp + cdi diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html index c099a75..2b01b23 100755 --- a/start/src/main/webapp/index.html +++ b/start/src/main/webapp/index.html @@ -36,10 +36,10 @@

Eclipse MicroProfile

For more information about the features used in this application, see the Open Liberty documentation:

From cef88e9efa2cfb2cfe8464fa72d1bc8f1739f8d1 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Tue, 19 Nov 2024 12:35:05 -0500 Subject: [PATCH 02/18] use versionless feature Signed-off-by: Gilbert Kwan --- finish/src/main/webapp/favicon.ico | Bin 0 -> 15086 bytes finish/src/main/webapp/index.html | 2 +- start/src/main/webapp/favicon.ico | Bin 0 -> 15086 bytes start/src/main/webapp/index.html | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 finish/src/main/webapp/favicon.ico create mode 100644 start/src/main/webapp/favicon.ico diff --git a/finish/src/main/webapp/favicon.ico b/finish/src/main/webapp/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c8652f35e0552d6ea391e0202f15cd5dbb63f5da GIT binary patch literal 15086 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 MicroProfile

For more information about the features used in this application, see the Open Liberty documentation:

    -
  • MicroProfile 6.1
    • +
  • MicroProfile
  • Jakarta RESTful Web Services
  • Jakarta JSON Processing
  • Jakarta Contexts and Dependency Injection
    • diff --git a/start/src/main/webapp/favicon.ico b/start/src/main/webapp/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c8652f35e0552d6ea391e0202f15cd5dbb63f5da GIT binary patch literal 15086 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 MicroProfile

    For more information about the features used in this application, see the Open Liberty documentation:

      -
    • MicroProfile 6.1
      • +
    • MicroProfile
    • Jakarta RESTful Web Services
    • Jakarta JSON Processing
    • Jakarta Contexts and Dependency Injection
      • From f81a5ac3e5d81a0a42f97d8dfbb0dc02063571d6 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 29 Nov 2024 10:10:35 -0500 Subject: [PATCH 03/18] use versionless feature Signed-off-by: Gilbert Kwan --- .../guides/microprofile/util/InventoryUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 4ba0679..5a9da61 100755 --- a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -35,9 +35,11 @@ public class InventoryUtil { public static JsonObject getProperties(String hostname) { Client client = ClientBuilder.newClient(); URI propURI = InventoryUtil.buildUri(hostname); - return client.target(propURI) - .request(MediaType.APPLICATION_JSON) - .get(JsonObject.class); + JsonObject properties = client.target(propURI) + .request(MediaType.APPLICATION_JSON) + .get(JsonObject.class); + client.close(); + return properties; } // tag::buildLinksForHost[] From 41400c4d29b1f17bdd4cc123f993a70404096f94 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 29 Nov 2024 10:24:11 -0500 Subject: [PATCH 04/18] use versionless feature Signed-off-by: Gilbert Kwan --- .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 5a9da61..45ef4f0 100755 --- a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -71,7 +71,7 @@ public static boolean responseOk(String hostname) { HttpURLConnection http = (HttpURLConnection) target.openConnection(); http.setConnectTimeout(50); int response = http.getResponseCode(); - return (response != 200) ? false : true; + return response == 200; } catch (Exception e) { return false; } From 0d2a1d6206c06d99e07cb43077eac24e599b88c4 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 29 Nov 2024 10:38:59 -0500 Subject: [PATCH 05/18] use versionless feature Signed-off-by: Gilbert Kwan --- .../microprofile/InventoryApplication.java | 4 +--- .../guides/microprofile/InventoryManager.java | 21 +------------------ .../microprofile/InventoryResource.java | 19 +---------------- .../microprofile/util/InventoryUtil.java | 14 ++++++------- .../guides/microprofile/util/ReadyJson.java | 2 -- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java index 7158d79..3050399 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java @@ -1,6 +1,5 @@ -// tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -8,7 +7,6 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -// end::copyright[] package io.openliberty.guides.microprofile; import jakarta.ws.rs.ApplicationPath; diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java index 3f73102..847d8fd 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java @@ -1,6 +1,5 @@ -// tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -8,7 +7,6 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -// end::copyright[] package io.openliberty.guides.microprofile; import java.util.concurrent.ConcurrentHashMap; @@ -22,18 +20,12 @@ import io.openliberty.guides.microprofile.util.InventoryUtil; import io.openliberty.guides.microprofile.util.ReadyJson; -// tag::header[] -// tag::cdi-scope[] @ApplicationScoped -// end::cdi-scope[] public class InventoryManager { -// end::header[] private ConcurrentMap inv = new ConcurrentHashMap<>(); - // tag::get[] public JsonObject get(String hostname) { - // tag::method-contents[] JsonObject properties = inv.get(hostname); if (properties == null) { if (InventoryUtil.responseOk(hostname)) { @@ -44,21 +36,12 @@ public JsonObject get(String hostname) { } } return properties; - // end::method-contents[] } - // end::get[] - // tag::add[] public void add(String hostname, JsonObject systemProps) { - // tag::method-contents[] inv.putIfAbsent(hostname, systemProps); - // end::method-contents[] } - // end::add[] - - // tag::list[] public JsonObject list() { - // tag::method-contents[] JsonObjectBuilder systems = Json.createObjectBuilder(); inv.forEach((host, props) -> { JsonObject systemProps = Json.createObjectBuilder() @@ -70,8 +53,6 @@ public JsonObject list() { systems.add("hosts", systems); systems.add("total", inv.size()); return systems.build(); - // end::method-contents[] } - // end::list[] } diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java index 269a74c..8d059cc 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java @@ -1,6 +1,5 @@ -// tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -8,7 +7,6 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -// end::copyright[] package io.openliberty.guides.microprofile; import jakarta.enterprise.context.ApplicationScoped; @@ -20,38 +18,23 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -// tag::header[] -// tag::cdi-scope[] @ApplicationScoped -// end::cdi-scope[] @Path("hosts") public class InventoryResource { -// end::header[] - - // tag::injection[] @Inject InventoryManager manager; - // end::injection[] - // tag::getPropertiesForHost[] @GET @Path("{hostname}") @Produces(MediaType.APPLICATION_JSON) public JsonObject getPropertiesForHost(@PathParam("hostname") String hostname) { - // tag::method-contents[] return manager.get(hostname); - // end::method-contents[] } - // end::getPropertiesForHost[] - // tag::listContents[] @GET @Produces(MediaType.APPLICATION_JSON) public JsonObject listContents() { - // tag::method-contents[] return manager.list(); - // end::method-contents[] } - // end::listContents[] } diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index c6c44c2..41b9c0b 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,5 @@ -// tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -8,7 +7,6 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -// end::copyright[] package io.openliberty.guides.microprofile.util; import java.net.HttpURLConnection; @@ -30,9 +28,11 @@ public class InventoryUtil { public static JsonObject getProperties(String hostname) { Client client = ClientBuilder.newClient(); URI propURI = InventoryUtil.buildUri(hostname); - return client.target(propURI) - .request(MediaType.APPLICATION_JSON) - .get(JsonObject.class); + JsonObject properties = client.target(propURI) + .request(MediaType.APPLICATION_JSON) + .get(JsonObject.class); + client.close(); + return properties; } public static boolean responseOk(String hostname) { @@ -41,7 +41,7 @@ public static boolean responseOk(String hostname) { HttpURLConnection http = (HttpURLConnection) target.openConnection(); http.setConnectTimeout(50); int response = http.getResponseCode(); - return (response != 200) ? false : true; + return response == 200; } catch (Exception e) { return false; } diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java index e7e0860..1bfc818 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java @@ -1,4 +1,3 @@ -// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -8,7 +7,6 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -// end::copyright[] package io.openliberty.guides.microprofile.util; import jakarta.json.Json; From 96ecba3fd03cf7e77e3bc695475c9bb3a98bdb2b Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 29 Nov 2024 10:40:32 -0500 Subject: [PATCH 06/18] use versionless feature Signed-off-by: Gilbert Kwan --- .../java/io/openliberty/guides/microprofile/util/ReadyJson.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java index 1bfc818..6a6677a 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 969e82c17d1ecf209b5891c353d10749158160d3 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 29 Nov 2024 10:45:43 -0500 Subject: [PATCH 07/18] use versionless feature Signed-off-by: Gilbert Kwan --- .../openliberty/guides/microprofile/InventoryApplication.java | 2 ++ .../io/openliberty/guides/microprofile/InventoryManager.java | 2 ++ .../io/openliberty/guides/microprofile/InventoryResource.java | 2 ++ .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 ++ .../java/io/openliberty/guides/microprofile/util/ReadyJson.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java index 3050399..20ac38e 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java @@ -1,3 +1,4 @@ +// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -7,6 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ +// end::copyright[] package io.openliberty.guides.microprofile; import jakarta.ws.rs.ApplicationPath; diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java index 847d8fd..9789d50 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java @@ -1,3 +1,4 @@ +// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -7,6 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ +// end::copyright[] package io.openliberty.guides.microprofile; import java.util.concurrent.ConcurrentHashMap; diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java index 8d059cc..16c415d 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java @@ -1,3 +1,4 @@ +// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -7,6 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ +// end::copyright[] package io.openliberty.guides.microprofile; import jakarta.enterprise.context.ApplicationScoped; diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 41b9c0b..567a106 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,3 +1,4 @@ +// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -7,6 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ +// end::copyright[] package io.openliberty.guides.microprofile.util; import java.net.HttpURLConnection; diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java index 6a6677a..522824e 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java @@ -1,3 +1,4 @@ +// tag::copyright[] /******************************************************************************* * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -7,6 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ +// end::copyright[] package io.openliberty.guides.microprofile.util; import jakarta.json.Json; From 49fa71d30419227a1d92493a826845cba75eaff7 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:08:00 -0500 Subject: [PATCH 08/18] use versionless feature Signed-off-by: Gilbert Kwan --- finish/pom.xml | 2 +- start/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index b77b896..10d1cef 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -30,7 +30,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/start/pom.xml b/start/pom.xml index b77b896..10d1cef 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -30,7 +30,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided From 1431156f0780a6583ea69c7a71a20e3bd15d6a97 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:29:45 -0500 Subject: [PATCH 09/18] Update InventoryUtil.java --- .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 45ef4f0..6700b10 100755 --- a/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/finish/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 8a0cf0317028d24bb889e20410e8f4b4ef41b777 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:30:21 -0500 Subject: [PATCH 10/18] Update InventoryApplication.java --- .../openliberty/guides/microprofile/InventoryApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java index 20ac38e..eeab602 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 15894187e7febfed904e0e8e5026bcc2aa2b13c2 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:30:40 -0500 Subject: [PATCH 11/18] Update InventoryManager.java --- .../io/openliberty/guides/microprofile/InventoryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java index 9789d50..d90dd84 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 08cd244c29a0bab06bb1e8cdcbe2cc5695c7864c Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:31:14 -0500 Subject: [PATCH 12/18] Update InventoryResource.java --- .../io/openliberty/guides/microprofile/InventoryResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java index 16c415d..64de67d 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryResource.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 1f54394c57556e85d406de37cb17a44198315f57 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:31:41 -0500 Subject: [PATCH 13/18] Update InventoryUtil.java --- .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 567a106..1bce562 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 1b4f1886de750f574c66c5966aafa31707e152d8 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:32:09 -0500 Subject: [PATCH 14/18] Update InventoryUtil.java --- .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 1bce562..837042d 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2025 IBM Corporation and others. + * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 6031014d58760011828fc11afcb5f26af6a3f380 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:32:27 -0500 Subject: [PATCH 15/18] Update ReadyJson.java --- .../java/io/openliberty/guides/microprofile/util/ReadyJson.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java index 522824e..e7e0860 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/ReadyJson.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2024 IBM Corporation and others. + * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From ffe83956ff507eeee1cb8849523607e856fb7736 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:32:57 -0500 Subject: [PATCH 16/18] Update InventoryApplication.java --- .../openliberty/guides/microprofile/InventoryApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java index eeab602..7158d79 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryApplication.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2025 IBM Corporation and others. + * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From b04b5a610246dd617ad6af5212b9f6a40a1beb39 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:33:31 -0500 Subject: [PATCH 17/18] Update InventoryUtil.java --- .../io/openliberty/guides/microprofile/util/InventoryUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java index 837042d..1bce562 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/util/InventoryUtil.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 723bb2b30bef88bcaa1690b8fe2b91916e002d7c Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 23 Jan 2025 14:41:04 -0500 Subject: [PATCH 18/18] add a space line Signed-off-by: Gilbert Kwan --- .../io/openliberty/guides/microprofile/InventoryManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java index d90dd84..f21a840 100755 --- a/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java +++ b/start/src/main/java/io/openliberty/guides/microprofile/InventoryManager.java @@ -43,6 +43,7 @@ public JsonObject get(String hostname) { public void add(String hostname, JsonObject systemProps) { inv.putIfAbsent(hostname, systemProps); } + public JsonObject list() { JsonObjectBuilder systems = Json.createObjectBuilder(); inv.forEach((host, props) -> {