Merge branch 'master' of https://github.com/OtusTeam/Spring

 Conflicts:

	2023-01/spring-13-data-jpa/demo/pom.xml

	2023-01/spring-13-data-jpa/exercise/pom.xml

	2023-01/spring-13-data-jpa/solution-01/pom.xml

	2023-01/spring-13-data-jpa/solution-02/pom.xml

	2023-01/spring-13-data-jpa/solution-03/pom.xml

	2023-01/spring-13-data-jpa/solution-04/pom.xml

2022-08/spring-31/spring-31-exercise/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
@@ -19,10 +20,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-integration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-messaging</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/App.java

@@ -1,70 +1,16 @@
 package ru.otus.spring.integration;
 
-import org.apache.commons.lang3.RandomUtils;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.integration.annotation.IntegrationComponentScan;
-
-import org.springframework.integration.channel.PublishSubscribeChannel;
-import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.config.EnableIntegration;
-import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.IntegrationFlows;
-
-import org.springframework.integration.dsl.MessageChannels;
-import ru.otus.spring.integration.domain.Food;
-import ru.otus.spring.integration.domain.OrderItem;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import ru.otus.spring.integration.services.OrderService;
 
 
-@IntegrationComponentScan
-@SuppressWarnings({"resource", "Duplicates", "InfiniteLoopStatement"})
-@ComponentScan
-@Configuration
-@EnableIntegration
+@SpringBootApplication
 public class App {
-    private static final String[] MENU = {"coffee", "tea", "smoothie", "whiskey", "beer", "cola", "water"};
-
-    @Bean
-    public QueueChannel itemsChannel() {
-        return MessageChannels.queue(10).get();
-    }
-
-    @Bean
-    public PublishSubscribeChannel foodChannel() {
-        return MessageChannels.publishSubscribe().get();
-    }
-
-    // TODO: create default poller
-
-    @Bean
-    public IntegrationFlow cafeFlow() {
-        return IntegrationFlows.from("itemsChannel")
-                // TODO: cook OrderItem in the kitchen
-                // TODO*: add splitter and aggregator
-                // TODO: forward it to the publish subscriber channel
-                .get();
-    }
-
-    public static void main(String[] args) throws Exception {
-        AbstractApplicationContext ctx = new AnnotationConfigApplicationContext(App.class);
-
-        // here we works with cafe using interface
-        Cafe cafe = ctx.getBean(Cafe.class);
-
-        while (true) {
-            Thread.sleep(1000);
-
-            OrderItem orderItem = generateOrderItem();
-            System.out.println("New orderItem: " + orderItem.getItemName());
-            Food food = cafe.process(orderItem);
-            System.out.println("Ready food: " + food.getName());
-        }
-    }
-
-    private static OrderItem generateOrderItem() {
-        return new OrderItem(MENU[RandomUtils.nextInt(0, MENU.length)]);
+    public static void main(String[] args) {
+        ConfigurableApplicationContext ctx = SpringApplication.run(App.class, args);
+        OrderService orderService = ctx.getBean(OrderService.class);
+        orderService.startGenerateOrdersLoop();
     }
 }

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java

@@ -0,0 +1,33 @@
+package ru.otus.spring.integration.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.dsl.MessageChannels;
+
+@Configuration
+public class IntegrationConfig {
+    @Bean
+    public QueueChannel itemsChannel() {
+        return MessageChannels.queue(10).get();
+    }
+
+    @Bean
+    public PublishSubscribeChannel foodChannel() {
+        return MessageChannels.publishSubscribe().get();
+    }
+
+    // TODO: create default poller
+
+    @Bean
+    public IntegrationFlow cafeFlow() {
+        return IntegrationFlows.from("itemsChannel")
+                // TODO: cook OrderItem in the kitchen
+                // TODO*: add splitter and aggregator
+                // TODO: forward it to the publish subscriber channel
+                .get();
+    }
+}

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/kitchen/KitchenService.java

@@ -1,16 +0,0 @@
-package ru.otus.spring.integration.kitchen;
-
-import org.springframework.stereotype.Service;
-import ru.otus.spring.integration.domain.Food;
-import ru.otus.spring.integration.domain.OrderItem;
-
-@Service
-public class KitchenService {
-
-    public Food cook(OrderItem orderItem) throws Exception {
-        System.out.println("Cooking " + orderItem.getItemName());
-        Thread.sleep(3000);
-        System.out.println("Cooking " + orderItem.getItemName() + " done");
-        return new Food(orderItem.getItemName());
-    }
-}

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/services/CafeGateway.java

@@ -1,11 +1,11 @@
-package ru.otus.spring.integration;
+package ru.otus.spring.integration.services;
 
 
 import ru.otus.spring.integration.domain.Food;
 import ru.otus.spring.integration.domain.OrderItem;
 
 // TODO: add messaging gateway annotation
-public interface Cafe {
+public interface CafeGateway {
 
     // TODO: add gateway annotation with required channels
     Food process(OrderItem orderItem);

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/services/KitchenService.java

@@ -0,0 +1,9 @@
+package ru.otus.spring.integration.services;
+
+import ru.otus.spring.integration.domain.Food;
+import ru.otus.spring.integration.domain.OrderItem;
+
+public interface KitchenService {
+
+    Food cook(OrderItem orderItem);
+}

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/services/KitchenServiceImpl.java

@@ -1,17 +1,25 @@
-package ru.otus.spring.integration.kitchen;
+package ru.otus.spring.integration.services;
 
 import org.springframework.stereotype.Service;
 import ru.otus.spring.integration.domain.Food;
 import ru.otus.spring.integration.domain.OrderItem;
 
 @Service
-public class KitchenServiceImpl implements KitchenService{
+public class KitchenServiceImpl implements KitchenService {
 
     @Override
-    public Food cook(OrderItem orderItem) throws Exception {
+    public Food cook(OrderItem orderItem) {
         System.out.println("Cooking " + orderItem.getItemName());
-        Thread.sleep(3000);
+        delay();
         System.out.println("Cooking " + orderItem.getItemName() + " done");
         return new Food(orderItem.getItemName());
     }
+
+    private static void delay() {
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/services/OrderService.java

@@ -0,0 +1,5 @@
+package ru.otus.spring.integration.services;
+
+public interface OrderService {
+    void startGenerateOrdersLoop();
+}

2022-08/spring-31/spring-31-exercise/src/main/java/ru/otus/spring/integration/services/OrderServiceImpl.java

@@ -0,0 +1,40 @@
+package ru.otus.spring.integration.services;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.stereotype.Service;
+import ru.otus.spring.integration.domain.Food;
+import ru.otus.spring.integration.domain.OrderItem;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+    private static final String[] MENU = {"coffee", "tea", "smoothie", "whiskey", "beer", "cola", "water"};
+
+    private final CafeGateway cafe;
+
+    public OrderServiceImpl(CafeGateway cafe) {
+        this.cafe = cafe;
+    }
+
+    public void startGenerateOrdersLoop() {
+        for (int i = 0; i < 10; i++) {
+            delay();
+
+            OrderItem orderItem = generateOrderItem();
+            System.out.println("New orderItem: " + orderItem.getItemName());
+            Food food = cafe.process(orderItem);
+            System.out.println("Ready food: " + food.getName());
+        }
+    }
+
+    private static OrderItem generateOrderItem() {
+        return new OrderItem(MENU[RandomUtils.nextInt(0, MENU.length)]);
+    }
+
+    private void delay() {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

2022-08/spring-31/spring-31-solution/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
@@ -19,10 +20,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-integration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-messaging</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/App.java

@@ -1,96 +1,17 @@
 package ru.otus.spring.integration;
 
-import org.apache.commons.lang3.RandomUtils;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.integration.annotation.IntegrationComponentScan;
-import org.springframework.integration.channel.PublishSubscribeChannel;
-import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.config.EnableIntegration;
-import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.IntegrationFlows;
-import org.springframework.integration.dsl.MessageChannels;
-import org.springframework.integration.dsl.Pollers;
-import org.springframework.integration.scheduling.PollerMetadata;
-import ru.otus.spring.integration.domain.Food;
-import ru.otus.spring.integration.domain.OrderItem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ForkJoinPool;
-import java.util.stream.Collectors;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import ru.otus.spring.integration.services.OrderService;
 
 
-@IntegrationComponentScan
-@SuppressWarnings({ "resource", "Duplicates", "InfiniteLoopStatement" })
-@ComponentScan
-@Configuration
-@EnableIntegration
+@SpringBootApplication
 public class App {
-    private static final String[] MENU = { "coffee", "tea", "smoothie", "whiskey", "beer", "cola", "water" };
 
-    @Bean
-    public QueueChannel itemsChannel() {
-        return MessageChannels.queue( 10 ).get();
-    }
-
-    @Bean
-    public PublishSubscribeChannel foodChannel() {
-        return MessageChannels.publishSubscribe().get();
-    }
-
-    @Bean(name = PollerMetadata.DEFAULT_POLLER)
-    public PollerMetadata poller() {
-        return Pollers.fixedRate( 100 ).maxMessagesPerPoll( 2 ).get();
-    }
-
-    @Bean
-    public IntegrationFlow cafeFlow() {
-        return IntegrationFlows.from( "itemsChannel" )
-                .split()
-                .handle( "kitchenService", "cook" )
-                .aggregate()
-                .channel( "foodChannel" )
-                .get();
-    }
-
-    public static void main( String[] args ) throws Exception {
-        AbstractApplicationContext ctx = new AnnotationConfigApplicationContext( App.class );
-
-        // here we works with cafe using interface
-        Cafe cafe = ctx.getBean( Cafe.class );
-
-        ForkJoinPool pool = ForkJoinPool.commonPool();
-
-        while ( true ) {
-            Thread.sleep( 7000 );
-
-            pool.execute( () -> {
-                Collection<OrderItem> items = generateOrderItems();
-                System.out.println( "New orderItems: " +
-                        items.stream().map( OrderItem::getItemName )
-                                .collect( Collectors.joining( "," ) ) );
-                Collection<Food> food = cafe.process( items );
-                System.out.println( "Ready food: " + food.stream()
-                        .map( Food::getName )
-                        .collect( Collectors.joining( "," ) ) );
-            } );
-        }
-    }
-
-    private static OrderItem generateOrderItem() {
-        return new OrderItem( MENU[ RandomUtils.nextInt( 0, MENU.length ) ] );
-    }
-
-    private static Collection<OrderItem> generateOrderItems() {
-        List<OrderItem> items = new ArrayList<>();
-        for ( int i = 0; i < RandomUtils.nextInt( 1, 5 ); ++ i ) {
-            items.add( generateOrderItem() );
-        }
-        return items;
+    public static void main(String[] args) {
+        ConfigurableApplicationContext ctx = SpringApplication.run(App.class, args);
+        OrderService orderService = ctx.getBean(OrderService.class);
+        orderService.startGenerateOrdersLoop();
     }
 }

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/config/IntegrationConfig.java

@@ -0,0 +1,41 @@
+package ru.otus.spring.integration.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.dsl.MessageChannels;
+import org.springframework.integration.dsl.Pollers;
+import org.springframework.integration.scheduling.PollerMetadata;
+import ru.otus.spring.integration.services.KitchenServiceImpl;
+
+@Configuration
+public class IntegrationConfig {
+
+    @Bean
+    public QueueChannel itemsChannel() {
+        return MessageChannels.queue(10).get();
+    }
+
+    @Bean
+    public PublishSubscribeChannel foodChannel() {
+        return MessageChannels.publishSubscribe().get();
+    }
+
+    @Bean(name = PollerMetadata.DEFAULT_POLLER)
+    public PollerMetadata poller() {
+        return Pollers.fixedRate(100).maxMessagesPerPoll(2).get();
+    }
+
+    @Bean
+    public IntegrationFlow cafeFlow(KitchenServiceImpl kitchenService) {
+        return IntegrationFlows.from(itemsChannel())
+                .split()
+                .handle(kitchenService, "cook")
+                .aggregate()
+                .channel(foodChannel())
+                .get();
+    }
+}

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/kitchen/KitchenService.java

@@ -1,16 +0,0 @@
-package ru.otus.spring.integration.kitchen;
-
-import org.springframework.stereotype.Service;
-import ru.otus.spring.integration.domain.Food;
-import ru.otus.spring.integration.domain.OrderItem;
-
-@Service
-public class KitchenService {
-
-    public Food cook(OrderItem orderItem) throws Exception {
-        System.out.println("Cooking " + orderItem.getItemName());
-        Thread.sleep(3000);
-        System.out.println("Cooking " + orderItem.getItemName() + " done");
-        return new Food(orderItem.getItemName());
-    }
-}

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/services/CafeGateway.java

@@ -1,4 +1,4 @@
-package ru.otus.spring.integration;
+package ru.otus.spring.integration.services;
 
 
 import org.springframework.integration.annotation.Gateway;
@@ -9,7 +9,7 @@ import ru.otus.spring.integration.domain.OrderItem;
 import java.util.Collection;
 
 @MessagingGateway
-public interface Cafe {
+public interface CafeGateway {
 
     @Gateway(requestChannel = "itemsChannel", replyChannel = "foodChannel")
     Collection<Food> process(Collection<OrderItem> orderItem);

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/services/KitchenService.java

@@ -0,0 +1,9 @@
+package ru.otus.spring.integration.services;
+
+import ru.otus.spring.integration.domain.Food;
+import ru.otus.spring.integration.domain.OrderItem;
+
+public interface KitchenService {
+
+    Food cook(OrderItem orderItem);
+}

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/services/KitchenServiceImpl.java

@@ -0,0 +1,25 @@
+package ru.otus.spring.integration.services;
+
+import org.springframework.stereotype.Service;
+import ru.otus.spring.integration.domain.Food;
+import ru.otus.spring.integration.domain.OrderItem;
+
+@Service
+public class KitchenServiceImpl implements KitchenService {
+
+    @Override
+    public Food cook(OrderItem orderItem) {
+        System.out.println("Cooking " + orderItem.getItemName());
+        delay();
+        System.out.println("Cooking " + orderItem.getItemName() + " done");
+        return new Food(orderItem.getItemName());
+    }
+
+    private static void delay() {
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/services/OrderService.java

@@ -0,0 +1,5 @@
+package ru.otus.spring.integration.services;
+
+public interface OrderService {
+    void startGenerateOrdersLoop();
+}

2022-08/spring-31/spring-31-solution/src/main/java/ru/otus/spring/integration/services/OrderServiceImpl.java

@@ -0,0 +1,61 @@
+package ru.otus.spring.integration.services;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.stereotype.Service;
+import ru.otus.spring.integration.domain.Food;
+import ru.otus.spring.integration.domain.OrderItem;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ForkJoinPool;
+import java.util.stream.Collectors;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+    private static final String[] MENU = {"coffee", "tea", "smoothie", "whiskey", "beer", "cola", "water"};
+
+    private final CafeGateway cafe;
+
+    public OrderServiceImpl(CafeGateway cafe) {
+        this.cafe = cafe;
+    }
+
+    public void startGenerateOrdersLoop() {
+        ForkJoinPool pool = ForkJoinPool.commonPool();
+        for (int i = 0; i < 10; i++) {
+            delay();
+            pool.execute(() -> {
+                Collection<OrderItem> items = generateOrderItems();
+                System.out.println("New orderItems: " +
+                        items.stream().map(OrderItem::getItemName)
+                                .collect(Collectors.joining(",")));
+                Collection<Food> food = cafe.process(items);
+                System.out.println("Ready food: " + food.stream()
+                        .map(Food::getName)
+                        .collect(Collectors.joining(",")));
+            });
+        }
+    }
+
+    private static OrderItem generateOrderItem() {
+        return new OrderItem(MENU[RandomUtils.nextInt(0, MENU.length)]);
+    }
+
+    private static Collection<OrderItem> generateOrderItems() {
+        List<OrderItem> items = new ArrayList<>();
+        for (int i = 0; i < RandomUtils.nextInt(1, 5); ++i) {
+            items.add(generateOrderItem());
+        }
+        return items;
+    }
+
+    private void delay() {
+        try {
+            Thread.sleep(7000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}

2023-01/spring-13-data-jpa/demo/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>

2023-01/spring-13-data-jpa/exercise/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>

2023-01/spring-13-data-jpa/solution-01/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>

2023-01/spring-13-data-jpa/solution-02/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>

2023-01/spring-13-data-jpa/solution-03/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>

2023-01/spring-13-data-jpa/solution-04/pom.xml

@@ -11,7 +11,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.8</version>
+        <relativePath/>
     </parent>
 
     <properties>