Fixed rest jpa example
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java b/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
index 4b988db..1b4f1dc 100644
--- a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
+++ b/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
@@ -16,17 +16,19 @@
*/
package org.apache.camel.example.spring.boot.rest.jpa;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class Database {
- @Autowired
- BookRepository books;
+ private final BookRepository books;
- @Autowired
- OrderRepository orders;
+ private final OrderRepository orders;
+
+ public Database(BookRepository books, OrderRepository orders) {
+ this.books = books;
+ this.orders = orders;
+ }
public Iterable<Book> findBooks() {
return books.findAll();
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java b/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
index 8c173f8..94ac142 100644
--- a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
+++ b/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
@@ -24,11 +24,14 @@
@Component
public class OrderService {
- @Autowired
- private BookRepository books;
+ private final BookRepository books;
private final Random amount = new Random();
+ public OrderService(BookRepository books) {
+ this.books = books;
+ }
+
public Order generateOrder() {
Order order = new Order();
order.setAmount(amount.nextInt(10) + 1);
diff --git a/camel-example-spring-boot-rest-jpa/src/main/resources/application.yml b/camel-example-spring-boot-rest-jpa/src/main/resources/application.yml
index badb2fd..f473f45 100644
--- a/camel-example-spring-boot-rest-jpa/src/main/resources/application.yml
+++ b/camel-example-spring-boot-rest-jpa/src/main/resources/application.yml
@@ -19,7 +19,8 @@
springboot:
# The Camel context name
name: CamelRestJpa
-
+ rest:
+ component: servlet
component:
servlet:
mapping:
diff --git a/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java b/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
index 0894e2d..a41e13e 100644
--- a/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
+++ b/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
@@ -39,7 +39,6 @@
@CamelSpringBootTest
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@Disabled("Remove if you have running MySQL v8 instance on port 3306 and with user cameluser")
public class ApplicationTest {
@Autowired
diff --git a/camel-example-spring-boot-rest-jpa/src/test/resources/application.yml b/camel-example-spring-boot-rest-jpa/src/test/resources/application.yml
index acfe10e..12613e3 100644
--- a/camel-example-spring-boot-rest-jpa/src/test/resources/application.yml
+++ b/camel-example-spring-boot-rest-jpa/src/test/resources/application.yml
@@ -18,7 +18,8 @@
camel:
springboot:
name: CamelRestJpa
-
+ rest:
+ component: servlet
component:
servlet:
mapping: