Kubernetes and Spring cloud gateway added

Author: Nasruddin

.idea/compiler.xml

@@ -1,6 +1,6 @@
 services:
   course:
-    build: microservices/course-service
+    build: ../microservices/course-service
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
@@ -11,7 +11,7 @@ services:
       #  condition: service_healthy
 
   review:
-    build: microservices/review-service
+    build: ../microservices/review-service
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
@@ -22,7 +22,7 @@ services:
       #  condition: service_healthy
 
   course-composite:
-    build: microservices/course-composite-service
+    build: ../microservices/course-composite-service
     mem_limit: 512m
     ports:
       - "8080:8080"
@@ -31,6 +31,16 @@ services:
     networks:
       - shared-network
 
+  gateway-service:
+    build: ../spring-cloud/gateway-service
+    mem_limit: 512m
+    ports:
+      - "9000:9000"
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
+    networks:
+      - shared-network
+
 networks:
   shared-network:
     name: shared-network

.idea/encodings.xml

@@ -26,6 +26,8 @@ services:
       timeout: 5s
       retries: 5
       start_period: 30s
+    volumes:
+      - ./postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql
     networks:
       - shared-network
 networks:

.idea/workspace.xml

@@ -0,0 +1,6 @@
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_database WHERE datname = 'course_db') THEN
+      CREATE DATABASE course_db;
+   END IF;
+END $$;

docker-compose-base.yml renamed to docker/docker-compose-base.yml

@@ -10,11 +10,6 @@
 @ComponentScan({"io.javatab"})
 public class CourseCompositeServiceApplication {
 
-	@Bean
-	RestTemplate restTemplate() {
-		return new RestTemplate();
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(CourseCompositeServiceApplication.class, args);
 	}

docker-compose-infra.yml renamed to docker/docker-compose-infra.yml

@@ -0,0 +1,12 @@
+package io.javatab.microservices.composite.course.web;
+
+import lombok.Data;
+
+@Data
+public class Course {
+    private Long id;
+    private String title;
+    private String author;
+    private Double price;
+    private String publisher;
+}

docker/postgresql/init.sql

@@ -1,13 +1,14 @@
 package io.javatab.microservices.composite.course.web;
 
 
+import lombok.Builder;
+import lombok.Data;
+
 import java.util.List;
 
+@Data
+@Builder
 public class CourseAggregate {
-    private Long id;
-    private String title;
-    private String author;
-    private Double price;
-    private String publisher;
+    private Course course;
     private List<Review> reviews;
 }

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/CourseCompositeServiceApplication.java

@@ -0,0 +1,35 @@
+package io.javatab.microservices.composite.course.web;
+
+import io.javatab.util.http.NetworkUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/course-aggregate")
+public class CourseAggregateController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CourseAggregateController.class);
+
+
+    private final CourseCompositeIntegration integration;
+    private final NetworkUtility utility;
+
+    public CourseAggregateController(CourseCompositeIntegration integration, NetworkUtility utility) {
+        this.integration = integration;
+        this.utility = utility;
+    }
+
+    @GetMapping("/{id}/with-details")
+    public Mono<CourseAggregate> getCourses(@PathVariable Long id) {
+        logger.info("Fetching course and review details for course id : {}", id);
+        return integration.getCourseDetails(id);
+    }
+}

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/Course.java

@@ -3,11 +3,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
 
 import java.util.List;
 
@@ -18,37 +17,39 @@ public class CourseCompositeIntegration {
 
     private final String courseServiceUrl;
     private final String reviewServiceUrl;
-    private final RestTemplate restTemplate;
+    private final WebClient webClient;
 
     public CourseCompositeIntegration(
             @Value("${app.course-service.host}") String courseServiceHost,
             @Value("${app.course-service.port}") String courseServicePort,
             @Value("${app.review-service.host}") String reviewServiceHost,
-            @Value("${app.review-service.port}") String reviewServicePort, RestTemplate restTemplate
+            @Value("${app.review-service.port}") String reviewServicePort,
+            WebClient.Builder webClient
     ) {
-        this.restTemplate = restTemplate;
+        this.webClient = webClient.build();
         courseServiceUrl = "http://" + courseServiceHost + ":" + courseServicePort;
         reviewServiceUrl = "http://" + reviewServiceHost + ":" + reviewServicePort;
     }
 
-    public String getCourse() {
-        return restTemplate.getForObject(courseServiceUrl, String.class);
-    }
-
-    public String getReview() {
-        return restTemplate.getForObject(reviewServiceUrl, String.class);
-    }
-
-    public List<Review> getReviewsByCourseId(Long courseId) {
-        String url = reviewServiceUrl + "/api/reviews?courseId=" + courseId;
-
-        ResponseEntity<List<Review>> response = restTemplate.exchange(
-                url,
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<>() {} // Helps deserialize JSON List
-        );
-
-        return response.getBody(); // Returns list of reviews
+    public Mono<CourseAggregate> getCourseDetails(Long id) {
+        String courseUrl = courseServiceUrl + "/api/courses/" + id;
+        String reviewUrl = reviewServiceUrl + "/api/reviews?course=" + id;
+        Mono<Course> courseMono = webClient.get()
+                .uri(courseUrl)
+                .retrieve()
+                .bodyToMono(Course.class);
+
+        Mono<List<Review>> reviewsMono = webClient.get()
+                .uri(reviewUrl)
+                .retrieve()
+                .bodyToFlux(Review.class)
+                .collectList();
+
+        return Mono.zip(courseMono, reviewsMono)
+                .map(tuple -> CourseAggregate
+                        .builder()
+                        .course(tuple.getT1())
+                        .reviews(tuple.getT2())
+                        .build());
     }
 }

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregate.java

@@ -69,6 +69,11 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregateController.java

@@ -8,8 +8,10 @@
 public interface CourseRepository extends CrudRepository<Course,Long> {
 
     Optional<Course> findByTitle(String title);
+    Optional<Course> findById(Long id);
     boolean existsByTitle(String title);
 
+
     @Transactional
     void deleteById(Long id);
 

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java

@@ -20,6 +20,11 @@ public Course viewCourseDetails(String title) {
                 .orElseThrow(() -> new CourseNotFoundException(title));
     }
 
+    public Course viewCourseDetailsById(Long id) {
+        return courseRepository.findById(id)
+                .orElseThrow(() -> new CourseNotFoundException(String.valueOf(id)));
+    }
+
     public Course addCourse(Course course) {
         if (courseRepository.existsByTitle(course.getTitle())) {
             throw new CourseAlreadyExitsException(course.getTitle());

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/HomeController.java

@@ -4,13 +4,17 @@
 import io.javatab.microservices.core.course.domain.CourseService;
 import io.javatab.util.http.NetworkUtility;
 import jakarta.validation.Valid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 @RestController()
 @RequestMapping("/api/courses")
 public class CourseController {
 
+    private final Logger logger = LoggerFactory.getLogger(CourseController.class);
+
     private final NetworkUtility utility;
     private CourseService courseService;
 
@@ -21,18 +25,24 @@ public CourseController(NetworkUtility utility, CourseService courseService) {
 
     @GetMapping
     public Iterable<Course> get() {
+        logger.info("Fetching courses");
         return courseService.viewCourses();
     }
 
     /*
     * Make sure application is running in localhost mode to test and not in docker
     * http GET ':9001/api/courses/Microservices with Spring Boot'
     * */
-    @GetMapping("/{title}")
+    @GetMapping("/title/{title}")
     public Course getByTitle(@PathVariable String title) {
         return courseService.viewCourseDetails(title);
     }
 
+    @GetMapping("/{id}")
+    public Course getById(@PathVariable Long id) {
+        return courseService.viewCourseDetailsById(id);
+    }
+
     /*
     * http POST :9001/api/courses title="Microservices with Spring Boot" author="John Doe" price:=29.79 publisher="Manning"
     * */

microservices/course-service/Tiltfile

@@ -19,17 +19,27 @@ spring:
  # flyway: # Only in dev env. Never have them in prod
  #   validate-on-migrate: false
  #   outOfOrder: true
+logging:
+  level:
+    org.springframework: INFO
+    com.javatab: DEBUG
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+
 ---
 spring:
   config:
     activate:
       on-profile: docker
   datasource:
-    username: user
-    password: pwd
     url: jdbc:postgresql://postgres:5432/course_db
-    hikari:
-      connection-timeout: 2000
-      maximum-pool-size: 5 #https://github.com/brettwooldridge/HikariCP/wiki/About-Pool-Sizing
 server:
   port: 8080