Merge pull request #9 from piomin/renovate/spring-boot

Update dependency org.springframework.boot:spring-boot-starter-parent to v2.7.11
piomin · Apr 23, 2023 · 0fc3fe6 · 0fc3fe6
2 parents 12f4f8c + 4b0fe96
commit 0fc3fe6
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 39 deletions.
diff --git a/account/pom.xml b/account/pom.xml
@@ -8,6 +8,10 @@
 	</parent>
 	<artifactId>account</artifactId>
 
+	<properties>
+		<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.camel</groupId>

diff --git a/camel-common/pom.xml b/camel-common/pom.xml
@@ -8,6 +8,10 @@
 	</parent>
 	<artifactId>camel-common</artifactId>
 
+	<properties>
+		<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+	</properties>
+
 <!--	<dependencies>-->
 <!--		<dependency>-->
 <!--			<groupId>org.projectlombok</groupId>-->

diff --git a/customer/pom.xml b/customer/pom.xml
@@ -8,6 +8,10 @@
 	</parent>
 	<artifactId>customer</artifactId>
 
+	<properties>
+		<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.camel</groupId>

diff --git a/gateway/pom.xml b/gateway/pom.xml
@@ -8,6 +8,10 @@
 	</parent>
 	<artifactId>gateway</artifactId>
 
+	<properties>
+		<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+	</properties>
+
 	<dependencies>	
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/gateway/src/main/java/pl/piomin/services/camel/gateway/RouteGateway.java b/gateway/src/main/java/pl/piomin/services/camel/gateway/RouteGateway.java
@@ -37,43 +37,43 @@ public void configure() throws Exception {
 		JacksonDataFormat formatCusList = new JacksonDataFormat(Customer.class);
 		formatAccList.useList();
 
-		rest("/account")
-			.get("/{id}").description("Find account by id").outType(Account.class)
-				.param().name("id").type(RestParamType.path).description("Account identificator").dataType("int").endParam()
-				.route().serviceCall("account").unmarshal(formatAcc)
-				.endRest()
-			.get("/customer/{customerId}").description("Find account by customer id").outType(Account.class)
-				.param().name("customerId").type(RestParamType.path).description("Customer identificator").dataType("int").endParam()
-				.route().serviceCall("account").unmarshal(formatAcc)
-				.endRest()				
-			.get("/").description("Find all accounts").outType(List.class)
-				.route().serviceCall("account").unmarshal(formatAccList)
-				.endRest()
-			.post("/").description("Add new account").outType(List.class)
-				.param().name("account").type(RestParamType.body).description("Account JSON object").dataType("Account").endParam()
-				.route().serviceCall("account").unmarshal(formatAcc)
-				.endRest();
+//		rest("/account")
+//			.get("/{id}").description("Find account by id").outType(Account.class)
+//				.param().name("id").type(RestParamType.path).description("Account identificator").dataType("int").endParam()
+//				.route().serviceCall("account").unmarshal(formatAcc)
+//				.endRest()
+//			.get("/customer/{customerId}").description("Find account by customer id").outType(Account.class)
+//				.param().name("customerId").type(RestParamType.path).description("Customer identificator").dataType("int").endParam()
+//				.route().serviceCall("account").unmarshal(formatAcc)
+//				.endRest()
+//			.get("/").description("Find all accounts").outType(List.class)
+//				.route().serviceCall("account").unmarshal(formatAccList)
+//				.endRest()
+//			.post("/").description("Add new account").outType(List.class)
+//				.param().name("account").type(RestParamType.body).description("Account JSON object").dataType("Account").endParam()
+//				.route().serviceCall("account").unmarshal(formatAcc)
+//				.endRest();
+//
+//		rest("/customer")
+//			.get("/{id}").description("Find customer by id").outType(Customer.class)
+//				.param().name("id").type(RestParamType.path).description("Customer identificator").dataType("int").endParam()
+//				.route().serviceCall("customer").unmarshal(formatCus)
+//				.endRest()
+//			.get("/").description("Find all customers").outType(List.class)
+//				.route().serviceCall("customer").unmarshal(formatCusList)
+//				.endRest()
+//			.post("/").description("Add new customer").outType(List.class)
+//				.param().name("customer").type(RestParamType.body).description("Customer JSON object").dataType("Account").endParam()
+//				.route().serviceCall("customer").unmarshal(formatCus)
+//				.endRest();
 
-		rest("/customer")
-			.get("/{id}").description("Find customer by id").outType(Customer.class)
-				.param().name("id").type(RestParamType.path).description("Customer identificator").dataType("int").endParam()
-				.route().serviceCall("customer").unmarshal(formatCus)
-				.endRest()
-			.get("/").description("Find all customers").outType(List.class)
-				.route().serviceCall("customer").unmarshal(formatCusList)
-				.endRest()
-			.post("/").description("Add new customer").outType(List.class)
-				.param().name("customer").type(RestParamType.body).description("Customer JSON object").dataType("Account").endParam()
-				.route().serviceCall("customer").unmarshal(formatCus)
-				.endRest();
-
-//		from("rest:get:account:/{id}").serviceCall("account");
-//		from("rest:get:account:/customer/{customerId}").serviceCall("account");
-//		from("rest:get:account:/").serviceCall("account");
-//		from("rest:post:account:/").serviceCall("account");
-//		from("rest:get:customer:/{id}").serviceCall("customer");
-//		from("rest:get:customer:/").serviceCall("customer");
-//		from("rest:post:customer:/").serviceCall("customer");
+		from("rest:get:account:/{id}").serviceCall("account");
+		from("rest:get:account:/customer/{customerId}").serviceCall("account");
+		from("rest:get:account:/").serviceCall("account");
+		from("rest:post:account:/").serviceCall("account");
+		from("rest:get:customer:/{id}").serviceCall("customer");
+		from("rest:get:customer:/").serviceCall("customer");
+		from("rest:post:customer:/").serviceCall("customer");
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.5.RELEASE</version>
+		<version>2.7.11</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>11</java.version>
-		<camel.version>3.6.0</camel.version>
+		<java.version>17</java.version>
+		<camel.version>3.20.3</camel.version>
 		<sonar.projectKey>piomin_sample-camel-spring-boot</sonar.projectKey>
 		<sonar.organization>piomin</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>