Merge branch 'main' into txeventq-docs-update

Author: anders-swanson

.github/actions/process-image/action.yml

@@ -16,7 +16,7 @@ inputs:
   pkg_command:
     description: Package manager command to run during updates (eg microdnf)
     required: false
-    default: microdnf
+    default: dnf
 runs:
   using: "composite"
   steps:

cloudbank-v4/account/pom.xml

@@ -48,6 +48,11 @@
 			<artifactId>datasource-micrometer-spring-boot</artifactId>
 			<version>${datasource-micrometer-spring-boot.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.example</groupId>
+			<artifactId>common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

cloudbank-v4/account/src/main/java/com/example/accounts/AccountsApplication.java

@@ -3,12 +3,15 @@
 
 package com.example.accounts;
 
+import com.example.common.filter.LoggingFilterConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Import;
 
 @EnableDiscoveryClient
 @SpringBootApplication
+@Import(LoggingFilterConfig.class)
 public class AccountsApplication {
 
     public static void main(String[] args) {

cloudbank-v4/account/src/main/java/com/example/accounts/controller/AccountController.java

@@ -186,7 +186,6 @@ public List<Journal> getJournalEntriesForAccount(@PathVariable("accountId") long
     @PostMapping("/account/journal/{journalId}/clear")
     public ResponseEntity<Journal> clearJournalEntry(@PathVariable long journalId) {
         try {
-            boolean exists = journalRepository.existsById(journalId);
             Optional<Journal> data = journalRepository.findById(journalId);
             if (data.isPresent()) {
                 Journal newJournalEntry = data.get();

cloudbank-v4/account/src/main/resources/application.yaml

@@ -4,9 +4,6 @@
 spring:
   application:
     name: account
-  threads:
-    virtual:
-      enabled: true
   jpa:
     hibernate:
       ddl-auto: validate
@@ -19,7 +16,9 @@ spring:
     lra:
       coordinator-url: ${MP_LRA_COORDINATOR_URL}
       propagation-active: true
-      headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"   
+      headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"
+  config:
+    import: classpath:common.yaml
 
   liquibase:
     change-log: classpath:db/changelog/controller.yaml
@@ -41,45 +40,4 @@ spring:
       min-pool-size: 10
       max-pool-size: 30
 
-eureka:
-  instance:
-    hostname: ${spring.application.name}
-    preferIpAddress: true
-  client:
-    service-url:
-      defaultZone: ${eureka.service-url}
-    fetch-registry: true
-    register-with-eureka: true
-    enabled: true
-
-management:
-  endpoint:
-    health:
-      show-details: always
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  metrics:
-    tags:
-      application: ${spring.application.name}
-  tracing:
-    sampling:
-      probability: 1.0
-  info:
-    os:
-      enabled: true
-    env:
-      enabled: true
-    java:
-      enabled: true
-  otlp:
-    tracing:
-      endpoint: ${otel.exporter.otlp.endpoint}
-
-logging:
-  level:
-    root: INFO
-    com.example: INFO
-
 

cloudbank-v4/chatbot/pom.xml

@@ -23,6 +23,11 @@ https://oss.oracle.com/licenses/upl/ -->
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.example</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <repositories>

cloudbank-v4/chatbot/src/main/java/com/example/chatbot/ChatbotApplication.java

@@ -3,10 +3,13 @@
 
 package com.example.chatbot;
 
+import com.example.common.filter.LoggingFilterConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
+@Import(LoggingFilterConfig.class)
 public class ChatbotApplication {
 
     public static void main(String[] args) {

cloudbank-v4/chatbot/src/main/resources/application.yaml

@@ -1,54 +1,12 @@
 spring:
   application:
     name: chatbot
-  threads:
-    virtual:
-      enabled: true
   ai:
     ollama:
       base-url: http://ollama.ollama.svc.cluster.local:11434
       chat:
         enabled: true
         options:
           model: llama3
-
-eureka:
-  instance:
-    hostname: ${spring.application.name}
-    preferIpAddress: true
-  client:
-    service-url:
-      defaultZone: ${eureka.service-url}
-    fetch-registry: true
-    register-with-eureka: true
-    enabled: true
-
-management:
-  endpoint:
-    health:
-      show-details: always
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  metrics:
-    tags:
-      application: ${spring.application.name}
-  tracing:
-    sampling:
-      probability: 1.0
-  info:
-    os:
-      enabled: true
-    env:
-      enabled: true
-    java:
-      enabled: true
-  otlp:
-    tracing:
-      endpoint: ${otel.exporter.otlp.endpoint}
-
-logging:
-  level:
-    root: INFO
-    com.example: INFO
+  config:
+    import: classpath:common.yaml

cloudbank-v4/checks/pom.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
-<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
-<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">
+<!-- Licensed under the Universal Permissive License v 1.0 as shown at
+https://oss.oracle.com/licenses/upl. -->
+<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>com.example</groupId>
@@ -33,10 +35,15 @@
             <artifactId>spring-boot-starter-data-jdbc</artifactId>
         </dependency>
         <dependency>
-			<groupId>com.oracle.database.spring</groupId>
-			<artifactId>oracle-spring-boot-starter-ucp</artifactId>
-			<version>${oracle-springboot-starter.version}</version>
-		</dependency>
+            <groupId>com.oracle.database.spring</groupId>
+            <artifactId>oracle-spring-boot-starter-ucp</artifactId>
+            <version>${oracle-springboot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.example</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -52,4 +59,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

cloudbank-v4/checks/src/main/java/com/example/checks/ChecksApplication.java

@@ -3,13 +3,15 @@
 
 package com.example.checks;
 
+import com.example.common.filter.LoggingFilterConfig;
 import jakarta.jms.ConnectionFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.jms.annotation.EnableJms;
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerContainerFactory;
@@ -18,10 +20,12 @@
 import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.jms.support.converter.MessageType;
 
+
 @SpringBootApplication
 @EnableFeignClients
 @EnableJms
 @EnableDiscoveryClient
+@Import(LoggingFilterConfig.class)
 public class ChecksApplication {
 
     public static void main(String[] args) {