From: Kai Moritz <kai@juplo.de>
Date: Sat, 23 Jul 2022 13:35:01 +0000 (+0200)
Subject: Merge der überarbeiteten Compose-Konfiguration ('counting-consumer')
X-Git-Tag: sumup-requests---lvm-2-tage~5^2^2~1
X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=66863e3169440f73ff450c7ba8ea4b9662b180e0;hp=-c;p=demos%2Fkafka%2Ftraining

Merge der überarbeiteten Compose-Konfiguration ('counting-consumer')
---

66863e3169440f73ff450c7ba8ea4b9662b180e0
diff --combined docker-compose.yml
index 1392ae2,f9eeedd..1b067cd
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -1,14 -1,14 +1,14 @@@
  version: '3.2'
  services:
    zookeeper:
-     image: confluentinc/cp-zookeeper:7.0.2
+     image: confluentinc/cp-zookeeper:7.1.3
      environment:
        ZOOKEEPER_CLIENT_PORT: 2181
      ports:
        - 2181:2181
  
    kafka:
-     image: confluentinc/cp-kafka:7.0.2
+     image: confluentinc/cp-kafka:7.1.3
      environment:
        KAFKA_BROKER_ID: 1
        KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
@@@ -39,8 -39,9 +39,9 @@@
    producer:
      image: juplo/endless-producer:1.0-SNAPSHOT
      ports:
-       - 8080:8880
 -      - 8000:8080
++      - 8080:8080
      environment:
+       server.port: 8080
        producer.bootstrap-server: kafka:9092
        producer.client-id: producer
        producer.topic: test
@@@ -50,8 -51,9 +51,9 @@@
    consumer:
      image: juplo/endless-consumer:1.0-SNAPSHOT
      ports:
-       - 8081:8881
+       - 8081:8080
      environment:
+       server.port: 8080
        consumer.bootstrap-server: kafka:9092
        consumer.client-id: my-group
        consumer.client-id: consumer
diff --combined src/main/java/de/juplo/kafka/DriverController.java
index 1525f5a,06e562c..1fb2a1b
--- a/src/main/java/de/juplo/kafka/DriverController.java
+++ b/src/main/java/de/juplo/kafka/DriverController.java
@@@ -1,9 -1,9 +1,9 @@@
  package de.juplo.kafka;
  
  import lombok.RequiredArgsConstructor;
 -import org.springframework.web.bind.annotation.GetMapping;
  import org.springframework.http.HttpStatus;
  import org.springframework.web.bind.annotation.ExceptionHandler;
 +import org.springframework.web.bind.annotation.GetMapping;
  import org.springframework.web.bind.annotation.PostMapping;
  import org.springframework.web.bind.annotation.ResponseStatus;
  import org.springframework.web.bind.annotation.RestController;
@@@ -31,12 -31,14 +31,14 @@@ public class DriverControlle
      consumer.stop();
    }
  
+ 
    @GetMapping("seen")
    public Map<Integer, Map<String, Integer>> seen()
    {
      return consumer.getSeen();
    }
  
+ 
    @ExceptionHandler
    @ResponseStatus(HttpStatus.BAD_REQUEST)
    public ErrorResponse illegalStateException(IllegalStateException e)