Merge pull request #20 from oracle-devrel/J17

atimgraves · web-flow · commit 04f32b382ac1 · 2025-03-28T15:00:06.000Z
J17
diff --git a/helidon-storefront-full/.classpath b/helidon-storefront-full/.classpath
@@ -1,37 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/helidon-storefront-full/.factorypath b/helidon-storefront-full/.factorypath
diff --git a/helidon-storefront-full/.settings/org.eclipse.jdt.apt.core.prefs b/helidon-storefront-full/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
+org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
diff --git a/helidon-storefront-full/.settings/org.eclipse.jdt.core.prefs b/helidon-storefront-full/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,14 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
diff --git a/helidon-storefront-full/pom.xml b/helidon-storefront-full/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- Copyright (c) 2023 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
@@ -34,65 +35,119 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
-    <parent>
-        <groupId>io.helidon.applications</groupId>
-        <artifactId>helidon-mp</artifactId>
-        <version>3.1.2</version>
-        <relativePath/>
-    </parent>
+	<parent>
+		<groupId>io.helidon.applications</groupId>
+		<artifactId>helidon-mp</artifactId>
+		<version>3.2.12</version>
+		<relativePath />
+	</parent>
+
 	<properties>
 		<mainClass>com.oracle.labs.helidon.storefront.Main</mainClass>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
-		<version.lombok>1.18.26</version.lombok>
+		<version.lombok>1.18.36</version.lombok>
 		<version.jib>3.3.1</version.jib>
+		<version.jandex>3.1.2</version.jandex>
 		<sonar.skip>true</sonar.skip>
-		<container.image>ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.1</container.image>
+		<container.image>ghcr.io/graalvm/jdk-community:17</container.image>
 	</properties>
 	<groupId>com.oracle.labs.helidon</groupId>
 	<artifactId>storefront</artifactId>
-	<version>${project.parent.version}</version>
-	<name>${project.artifactId}</name>
-
 	<dependencies>
 		<dependency>
 			<groupId>io.helidon.microprofile.bundles</groupId>
 			<artifactId>helidon-microprofile</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.helidon.microprofile.bundles</groupId>
+			<artifactId>helidon-microprofile-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.helidon.microprofile.openapi</groupId>
+			<artifactId>helidon-microprofile-openapi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.helidon.microprofile.health</groupId>
+			<artifactId>helidon-microprofile-health</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.json.bind</groupId>
+			<artifactId>jakarta.json.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-binding</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.helidon.logging</groupId>
+			<artifactId>helidon-logging-jul</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- this is for pre helidon 4 -->
 		<dependency>
 			<groupId>org.jboss</groupId>
 			<artifactId>jandex</artifactId>
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
+		<!-- this is for helidon 4 and later
+		<dependency>
+			<groupId>io.smallrye</groupId>
+			<artifactId>jandex</artifactId>
+			<scope>runtime</scope>
+		</dependency>-->
 		<dependency>
 			<groupId>jakarta.activation</groupId>
 			<artifactId>jakarta.activation-api</artifactId>
-			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.microprofile.metrics</groupId>
+			<artifactId>microprofile-metrics-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.helidon.microprofile.metrics</groupId>
+			<artifactId>helidon-microprofile-metrics</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
 			<scope>test</scope>
-		</dependency> <!-- Utilities -->
+		</dependency>
+		<!-- for helidon 4 and later 
+		<dependency>
+			<groupId>io.helidon.microprofile.testing</groupId>
+			<artifactId>helidon-microprofile-testing-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- Utilities -->
 		<!-- Lombok does the auto method creation -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<version>${version.lombok}</version>
 			<scope>provided</scope>
 		</dependency>
-		<!-- not quite sure why it fails to run withouh this entry, given this package is imported elsewhere, 
+		<!-- not quite sure why it fails to run withouh this entry, given this
+	package is imported elsewhere, 
           but it seems to fail if this isn't present on my system at least -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<!-- SLF4J is a logging facade that let's us change the actual logger used 
+		<!-- SLF4J is a logging facade that let's us change the actual logger
+		used 
 			under the covers without changing our code, slf4j-jdk14 is for output to 
 			the standard Java logging utilities. By making the dependency declaration 
 			below Maven will bring in the core SLF4J jar files, and also the SLJ4J to 
@@ -105,11 +160,20 @@ SOFTWARE. -->
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-jdk14</artifactId>
 		</dependency>
-		<!-- tracing calls -->
-		<dependency>
-			<groupId>io.helidon.tracing</groupId>
-			<artifactId>helidon-tracing-zipkin</artifactId>
-		</dependency>
+
+		<!--		<dependency>-->
+		<!--			<groupId>org.jboss</groupId>-->
+		<!--			<artifactId>jandex</artifactId>-->
+		<!--			<version>${version.jandex}</version>-->
+		<!--			<scope>runtime</scope>-->
+		<!--			<optional>true</optional>-->
+		<!--		</dependency>-->
+
+		<!--		 tracing calls -->
+		<!--		<dependency>-->
+		<!--			<groupId>io.helidon.tracing</groupId>-->
+		<!--			<artifactId>helidon-tracing-zipkin</artifactId>-->
+		<!--		</dependency>-->
 	</dependencies>
 
 	<build>
@@ -123,6 +187,17 @@ SOFTWARE. -->
 					</execution>
 				</executions>
 			</plugin>
+			<!-- post helidon 4
+			<plugin>
+				<groupId>io.smallrye</groupId>
+				<artifactId>jandex-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>make-index</id>
+					</execution>
+				</executions>
+			</plugin>-->
+			<!-- pre helidon 4 -->
 			<plugin>
 				<groupId>org.jboss.jandex</groupId>
 				<artifactId>jandex-maven-plugin</artifactId>
diff --git a/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/Main.java b/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/Main.java
@@ -95,8 +95,7 @@ private static Config buildConfig() {
 		// need to
 		// build it before we can add it to the list. again if there were three or less
 		// we could pass the ConfigSource builder directly into the sources method of
-		// the
-		// config builder.
+		// the config builder.
 		List<Supplier<? extends ConfigSource>> configSourcesToScan = new ArrayList<>(5);
 		configSourcesToScan.add(ConfigSources.file("conf/storefront-config.yaml")
 				.pollingStrategy(PollingStrategies.regular(Duration.ofSeconds(5))).optional().build());
diff --git a/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/data/ItemRequest.java b/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/data/ItemRequest.java
@@ -45,7 +45,7 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(name = "ItemRequest", description = "Details of a Item reservation request", example = "{\"requestedItem\", \"Pin\", \"requestedCount\",5}")
+@Schema(name = "ItemRequest", description = "Details of a Item reservation request", example = "{\"requestedItem\": \"Pin\", \"requestedCount\": 5}")
 public class ItemRequest {
 	@Schema(required = true, description = "Name of the item being requested", example = "Pin")
 	private String requestedItem;
diff --git a/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/resources/StorefrontResource.java b/helidon-storefront-full/src/main/java/com/oracle/labs/helidon/storefront/resources/StorefrontResource.java
@@ -45,7 +45,6 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 import org.eclipse.microprofile.faulttolerance.Fallback;
 import org.eclipse.microprofile.faulttolerance.Timeout;
 import org.eclipse.microprofile.metrics.annotation.Counted;
-import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
@@ -137,9 +136,6 @@ public class StorefrontResource {
 	@Fallback(fallbackMethod = "failedListStockItem")
 	// add a timer to track how long is spent in this call
 	@Timed(name = "listAllStockTimer")
-	// add a Meter to track how often we're called, absolute=true means the name
-	// given is used directly and not added to the class
-	@Metered(name = "listAllStockMeter", absolute = true)
 	@Operation(summary = "List stock items", description = "Returns a list of all of the stock items currently held in the database (the list may be empty if there are no items)")
 	@APIResponse(description = "A set of ItemDetails representing the current data in the database", responseCode = "200", content = @Content(schema = @Schema(name = "ItemDetails", implementation = ItemDetails.class, type = SchemaType.ARRAY), example = "[{\"itemCount\": 10, \"itemName\": \"Pencil\"},"
 			+ "{\"itemCount\": 50, \"itemName\": \"Eraser\"}," + "{\"itemCount\": 4600, \"itemName\": \"Pin\"},"
@@ -191,7 +187,7 @@ public Collection<ItemDetails> listAllStock() {
 	@APIResponse(description = "The requested change does not meet the minimum level required for the change (i.e. is <= the minimumChange value)", responseCode = "406")
 	@APIResponse(description = "There are not enough of the requested item to fulfil your request", responseCode = "409")
 	public ItemDetails reserveStockItem(
-			@RequestBody(description = "The details of the item being requested", required = true, content = @Content(schema = @Schema(name = "ItemRequest", implementation = ItemRequest.class), example = "{\"requestedItem\",\"Pencil\",\"requestedCount\",5}")) ItemRequest itemRequest,
+			@RequestBody(description = "The details of the item being requested", required = true, content = @Content(schema = @Schema(name = "ItemRequest", implementation = ItemRequest.class), example = "{\"requestedItem\": \"Pencil\",\"requestedCount\": 5}")) ItemRequest itemRequest,
 			@Context SecurityContext securityContext)
 			throws MinimumChangeException, UnknownItemException, NotEnoughItemsException {
 		log.info("Requesting the reservation of " + itemRequest.getRequestedCount() + " items of "
