Merge branch 'main' into main

Author: anishi1222

.gitignore

@@ -15,7 +15,8 @@ lerna-debug.log*
 # Deployment
 *.env
 .azure
-
+*.txt
+*.iml
 # DB Storage
 .qdrant/
 
@@ -25,6 +26,7 @@ lerna-debug.log*
 # IDE
 .vscode/settings.json
 .vscode/launch.json
+.idea/
 
 # Java compiled files
 *.class

code/quarkus-telemetry/quarkus-telemetry-superhero/Dockerfile

@@ -7,7 +7,7 @@ COPY --chown=quarkus:quarkus .mvn /code/.mvn
 COPY --chown=quarkus:quarkus pom.xml /code/
 USER quarkus
 WORKDIR /code
-RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline
+RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.8.0:go-offline
 COPY src /code/src
 RUN ./mvnw package -Dnative
 

code/quarkus-telemetry/quarkus-telemetry-superhero/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://db:5432/demo
       - QUARKUS_DATASOURCE_USERNAME=demo
       - QUARKUS_DATASOURCE_PASSWORD=demo
-      - QUARKUS_OTEL_AZURE_APPLICATIONINSIGHTS=InstrumentationKey=00000000-0000-0000-0000-000000000000
+      - QUARKUS_OTEL_AZURE_APPLICATIONINSIGHTS=InstrumentationKey=e6b68f56-3dea-4789-acb2-a1ffa1aacfc4;IngestionEndpoint=https://japaneast-1.in.applicationinsights.azure.com/;LiveEndpoint=https://japaneast.livediagnostics.monitor.azure.com/;ApplicationId=30235274-26b7-43e0-8378-75cf1374978d
     command:
       |
       /bin/bash -c "./application -Dquarkus.http.host=0.0.0.0 -Dquarkus.debug.print-startup-times=true"

code/quarkus-telemetry/quarkus-telemetry-superhero/pom.xml

@@ -9,7 +9,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.quarkiverse.opentelemetry.exporter</groupId>
       <artifactId>quarkus-opentelemetry-exporter-azure</artifactId>
-      <version>3.8.3.1</version>
+      <version>${quarkus-opentelemetry-exporter-azure.version}</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry.instrumentation</groupId>

code/quarkus-telemetry/quarkus-telemetry-superhero/src/main/java/com/azure/examples/quarkus/superhero/data/HeroItem.java

@@ -1,4 +1,3 @@
-
 package com.azure.examples.quarkus.superhero.data;
 
 import com.azure.examples.quarkus.superhero.model.CapeType;

code/quarkus-telemetry/quarkus-telemetry-superhero/src/main/java/com/azure/examples/quarkus/superhero/model/CapeType.java

@@ -1,4 +1,3 @@
-
 package com.azure.examples.quarkus.superhero.model;
 
 public enum CapeType {

code/quarkus-telemetry/quarkus-telemetry-superhero/src/main/java/com/azure/examples/quarkus/superhero/model/Hero.java

@@ -1,20 +1,17 @@
-
 package com.azure.examples.quarkus.superhero.model;
 
-import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import org.hibernate.annotations.GenericGenerator;
 
 @Entity
 public class Hero {
 
   @Id
-  @GeneratedValue(generator = "system-uuid")
-  @GenericGenerator(name = "system-uuid", strategy = "uuid")
+  @GeneratedValue(strategy = GenerationType.UUID)
   private String id;
 
   private String name;

code/quarkus-telemetry/quarkus-telemetry-superhero/src/main/java/com/azure/examples/quarkus/superhero/resource/HeroResource.java

@@ -14,20 +14,18 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
 import org.jboss.logging.Logger;
+import jakarta.ws.rs.core.Response.Status;
+import org.jboss.resteasy.reactive.RestResponse;
 
 import java.util.List;
-
-import static jakarta.transaction.Transactional.TxType.REQUIRED;
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static java.util.stream.Collectors.toList;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Path("/heroes")
-@Produces(APPLICATION_JSON)
-@Consumes(APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
 @ApplicationScoped
 public class HeroResource {
 
@@ -37,31 +35,31 @@ public class HeroResource {
   HeroRepository repository;
 
   @GET
-  public List<HeroItem> list(@QueryParam("veggieName") final String originalName,
+  public List<HeroItem> list(@QueryParam("veggieName") final Optional<String> originalName,
                              @QueryParam("pageIndex") int pageIndex) {
-    if (originalName == null || originalName.isBlank()) {
+    if (originalName.isEmpty()) {
       log.info("someone asked for a list for index: " + pageIndex);
       return repository.listHeroes(pageIndex).stream()
         .map(this::getHeroItem)
-        .collect(toList());
+        .collect(Collectors.toList());
     } else {
-      return findByOriginalName(originalName);
+      return findByOriginalName(originalName.get());
     }
   }
 
   @GET
   @Path("/i-want-a-raise")
-  @Consumes(TEXT_PLAIN)
+  @Produces(MediaType.TEXT_PLAIN)
   public String generateException() {
     log.info("Someone asked for a raise...");
     throw new ConferenceException("This is a generated exception, just for you!");
   }
 
   @POST
   @Path("/veggie")
-  @Consumes(TEXT_PLAIN)
-  @Transactional(REQUIRED)
-  public Response add(final String veggieName) {
+  @Consumes(MediaType.TEXT_PLAIN)
+  @Transactional(Transactional.TxType.REQUIRED)
+  public RestResponse<HeroItem> add(final String veggieName) {
     final Hero hero = Hero.builder()
       .name("SUPER-" + veggieName)
       .originalName(veggieName)
@@ -71,20 +69,19 @@ public Response add(final String veggieName) {
     final Hero createdHero = repository.create(hero);
     log.info("hero created: " + createdHero);
 
-    return Response.status(CREATED)
-      .entity(HeroItem.builder()
-        .id(createdHero.getId())
-        .name(createdHero.getName())
-        .originalName(createdHero.getOriginalName())
-        .capeType(createdHero.getCapeType())
-        .build())
-      .build();
+    return RestResponse.status(Status.CREATED,
+      HeroItem.builder()
+      .id(createdHero.getId())
+      .name(createdHero.getName())
+      .originalName(createdHero.getOriginalName())
+      .capeType(createdHero.getCapeType())
+      .build());
   }
 
   private List<HeroItem> findByOriginalName(final String originalName) {
     return repository.findByOriginalName(originalName).stream()
       .map(this::getHeroItem)
-      .collect(toList());
+      .collect(Collectors.toList());
   }
 
   private HeroItem getHeroItem(Hero h) {

code/quarkus-telemetry/quarkus-telemetry-superhero/src/main/resources/application.properties

@@ -1,14 +1,16 @@
 # DB
 quarkus.datasource.db-kind=postgresql
-%prod.quarkus.datasource.jdbc.url=jdbc:postgresql://db:5432/demo
-%prod.quarkus.datasource.username: demo
-%prod.quarkus.datasource.password: demo
-
+quarkus.datasource.username=demo
+quarkus.datasource.password=demo
+quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
+quarkus.datasource.jdbc.max-size=8
+quarkus.datasource.jdbc.min-size=2
 quarkus.hibernate-orm.database.generation=drop-and-create
 
 # Service
 quarkus.application.name=QuarkusSuperHeroService
 quarkus.http.port=8081
+quarkus.package.jar.type=uber-jar
 
 #OTel
 quarkus.otel.metrics.enabled=true

code/quarkus-telemetry/quarkus-telemetry-vegetable/Dockerfile

@@ -7,9 +7,9 @@ COPY --chown=quarkus:quarkus .mvn /code/.mvn
 COPY --chown=quarkus:quarkus pom.xml /code/
 USER quarkus
 WORKDIR /code
-RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline
+RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.8.0:go-offline
 COPY src /code/src
-RUN ./mvnw package -Dnative
+RUN ./mvnw package -Dnative -DskipTests=true
 
 ## Stage 2 : create the docker final image
 FROM quay.io/quarkus/quarkus-micro-image:2.0