Queue reader (#884)

tolldemo work

Author: andytael

tolldemo/data-generator/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.4</version>
+		<version>3.2.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>

tolldemo/data-generator/src/main/java/com/example/datagenerator/DataGeneratorApplication.java

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.datagenerator;
 
 import java.io.BufferedReader;
@@ -6,7 +9,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
+// import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 

tolldemo/data-generator/src/main/java/com/example/datagenerator/State.java

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.datagenerator;
 
 import java.util.Random;

tolldemo/data-generator/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring:
+    application:
+        name: data-generator

tolldemo/data-generator/src/main/resources/application.yaml

@@ -116,7 +116,7 @@
 08210	Cape May Court House
 08212	Cape May Point
 07072	Carlstadt
-08069	Carney's Point
+08069	Carneys Point
 07008	Carteret
 08018	Cedar Brook
 07009	Cedar Grove
@@ -828,7 +828,7 @@
 07512	Totowa
 07082	Towaco
 07052	Town Center
-08243	Townsend's Inlet
+08243	Townsends Inlet
 07879	Tranquility
 08600	Trenton
 08601	Trenton

tolldemo/data-generator/src/main/resources/nj-zipcodes-placenames.txt

@@ -33,7 +33,7 @@ Moorgate Street
 Hollytree Gardens
 Goldings Road
 Highmoor Close
-St James's Road
+St James Road
 Yardley Close
 St Leonards Avenue
 Althorp Road

tolldemo/data-generator/src/main/resources/street-names.txt

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.datagenerator;
 
 import org.junit.jupiter.api.Test;

tolldemo/data-generator/src/test/java/com/example/datagenerator/DataGeneratorApplicationTests.java

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.journalapp;
 
 import org.springframework.boot.SpringApplication;
@@ -9,5 +12,4 @@ public class JournalAppApplication {
     public static void main(String[] args) {
         SpringApplication.run(JournalAppApplication.class, args);
     }
-
 }

tolldemo/journal-app/src/main/java/com/example/journalapp/JournalAppApplication.java

@@ -1,9 +1,10 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.journalapp.controller;
 
 import com.example.journalapp.model.Journal;
-//import com.example.journalapp.model.JournalJDBC;
 import com.example.journalapp.repository.JournalRepository;
-//import com.example.journalapp.service.JournalService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -26,7 +27,7 @@ public JournalController(JournalRepository journalRepository) {
         this.journalRepository = journalRepository;
     }
 
-    // http POST :8080/api/v1/journal tagId=tagid licensePlate=licplate vehicleType=vtype tollDate=tdate
+    // http POST :8080/api/v1/journal tagId=tagid accountNumber=acctnum licensePlate=licplate vehicleType=vtype tollDate=tdate tollCost=1
     @PostMapping("/journal")
     public ResponseEntity<Journal> createAccount(@RequestBody Journal journal) {
         log.info("Creating journal {}", journal);

tolldemo/journal-app/src/main/java/com/example/journalapp/controller/JournalController.java

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.journalapp.model;
 
 import jakarta.persistence.Column;
@@ -21,6 +24,8 @@ public class Journal {
     @Column(name = "JOURNAL_ID")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer journalId;
+    @Column(name = "ACCOUNT_NUMBER")
+    private String accountNumber;
     @Column(name = "TAG_ID")
     private String tagId;
     @Column(name = "LICENSE_PLATE")
@@ -29,6 +34,7 @@ public class Journal {
     private String vehicleType;
     @Column(name = "TOLL_DATE")
     private String tollDate;
+    @Column(name = "TOLL_COST")
+    private Integer tollCost;
 
 }
-

tolldemo/journal-app/src/main/java/com/example/journalapp/model/Journal.java

@@ -1,7 +1,9 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.journalapp.repository;
 
 import com.example.journalapp.model.Journal;
-//import com.example.journalapp.model.JournalJDBC;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface JournalRepository extends JpaRepository<Journal, Long> {

tolldemo/journal-app/src/main/java/com/example/journalapp/repository/JournalRepository.java

@@ -0,0 +1,23 @@
+# mvn clean spring-boot:run -Dspring-boot.run.profiles=local
+spring:
+  application:
+    name: journal-app
+  threads:
+    virtual:
+      enabled: true
+  jpa:
+    hibernate:
+      ddl-auto: validate
+
+  datasource:
+    url: jdbc:oracle:thin:@//localhost:1521/orclpdb1
+    username: tolldemo
+    password: Welcome12345
+    driver-class-name: oracle.jdbc.OracleDriver
+    type: oracle.ucp.jdbc.PoolDataSource
+    oracleucp:
+      connection-factory-class-name: oracle.jdbc.pool.OracleDataSource
+      connection-pool-name: JournalAppConnectionPool
+      initial-pool-size: 15
+      min-pool-size: 10
+      max-pool-size: 30

tolldemo/journal-app/src/main/resources/application-local.yaml

@@ -9,14 +9,14 @@ spring:
       ddl-auto: validate
 
   datasource:
-    url: jdbc:oracle:thin:@//localhost:1521/orclpdb1
-    username: tolldemo
-    password: Welcome12345
+    url: ${spring.datasource.url}
+    username: ${spring.datasource.username}
+    password: ${spring.datasource.password}
     driver-class-name: oracle.jdbc.OracleDriver
     type: oracle.ucp.jdbc.PoolDataSource
     oracleucp:
       connection-factory-class-name: oracle.jdbc.pool.OracleDataSource
       connection-pool-name: JournalAppConnectionPool
       initial-pool-size: 15
       min-pool-size: 10
-      max-pool-size: 30
+      max-pool-size: 30

tolldemo/journal-app/src/main/resources/application.yaml

@@ -1,11 +1,11 @@
 drop table if exists journal cascade constraints;
 
 create table if not exists journal (
-    JOURNAL_ID NUMBER GENERATED ALWAYS AS IDENTITY (START WITH 1 CACHE 20),
+    JOURNAL_ID NUMBER GENERATED ALWAYS AS IDENTITY (START WITH 1 CACHE 20) primary key not null,
+    account_number varchar2(10),
     tag_id varchar2(64),
     license_plate varchar2(10),
     vehicle_type varchar2(10),
-    toll_date varchar2(25)
+    toll_date varchar2(25),
+    toll_cost number
 );
-
-ALTER TABLE journal ADD CONSTRAINT jounral_PK PRIMARY KEY (journal_id) USING INDEX LOGGING;

tolldemo/journal-app/src/main/resources/schema.sql

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.journalapp;
 
 import org.junit.jupiter.api.Test;

tolldemo/journal-app/src/test/java/com/example/journalapp/JournalAppApplicationTests.java

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.4</version>
+		<version>3.2.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>

tolldemo/label-generator/pom.xml

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.labelgenerator;
 
 import java.io.BufferedReader;

tolldemo/label-generator/src/main/java/com/example/labelgenerator/LabelGeneratorApplication.java

@@ -1,3 +1,6 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
 package com.example.labelgenerator;
 
 import org.junit.jupiter.api.Test;

tolldemo/label-generator/src/test/java/com/example/labelgenerator/LabelGeneratorApplicationTests.java

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

tolldemo/queue-reader/.gitignore

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.2.5</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.example</groupId>
+    <artifactId>queue-reader</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>queue-reader</name>
+    <description>queue-reader</description>
+    <properties>
+        <java.version>21</java.version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.spring</groupId>
+            <artifactId>oracle-spring-boot-starter-aqjms</artifactId>
+            <version>${oracle-springboot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

tolldemo/queue-reader/pom.xml

@@ -0,0 +1,20 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+package com.example.queuereader;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.jms.annotation.EnableJms;
+
+@EnableJms
+@SpringBootApplication
+@EnableFeignClients
+public class QueueReaderApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(QueueReaderApplication.class, args);
+    }
+
+}

tolldemo/queue-reader/src/main/java/com/example/queuereader/QueueReaderApplication.java

@@ -0,0 +1,16 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+package com.example.queuereader.client;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "journal", url = "http://localhost:8080")
+public interface JournalClient {
+
+    @PostMapping("/api/v1/journal")
+    void journal(@RequestBody JsonNode tollData);
+}