X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=67df46ef835194b14f6368fa035c955cb38fcbe3;hb=0d818df81100873fc9ab174c6047d64e30b18386;hp=1d5eb980575b73f7bb8972da48fcc5ffc9e13988;hpb=3c463114918a08d2e727e7e3a656363afb4a5452;p=demos%2Fkafka%2Fdemos-kafka-payment-system-setup

diff --git a/README.sh b/README.sh
index 1d5eb98..67df46e 100755
--- a/README.sh
+++ b/README.sh
@@ -4,34 +4,33 @@ if [ "$1" = "cleanup" ]
 then
   docker-compose down
   mvn clean
-  rm -rvf */src/main/java/de/trion/microservices/avro
   exit
 fi
 
 mvn package || exit 1
-if [ ! -e take-order/target/BUILD ] || [ "$(find take-order/target/classes/ -anewer take-order/target/BUILD | grep take-order/target/classes/de )" != "" ]
+if [ ! -e transfer/target/BUILD ] || [ "$(find transfer/target/classes/ -anewer transfer/target/BUILD | grep transfer/target/classes/de )" != "" ]
 then
-  docker build -t trion/take-order-service:01 take-order
-  touch take-order/target/BUILD
+  echo "Rebuilding Docker-Image..."
+  docker-compose rm -svf transfer
+  mvn -f transfer/pom.xml docker:build
+  touch transfer/target/BUILD
 fi
 if [ "$1" = "build" ]; then exit; fi
 
-trap 'kill $(jobs -p)' EXIT
+docker-compose up -d zookeeper kafka
 
-docker container start toolbox
-docker-compose up -d zookeeper kafka schema-registry
+while ! [[ $(docker-compose run --rm kafka zookeeper-shell zookeeper:2181 ls /brokers/ids 2> /dev/null) =~ 1001 ]]; do echo "Waiting for kafka..."; sleep 1; done
 
-while ! [[ $(zookeeper-shell zookeeper:2181 ls /brokers/ids 2> /dev/null) =~ 1001 ]]; do echo "Waiting for kafka..."; sleep 1; done
+docker-compose run --rm kafka kafka-topics --zookeeper zookeeper:2181 --if-not-exists --create --replication-factor 1 --partitions 5 --topic transfers
 
-kafka-topics --zookeeper zookeeper:2181 --if-not-exists --create --replication-factor 1 --partitions 5 --topic orders
+docker-compose up -d transfer
 
-docker-compose up -d take-order
+docker-compose run --name transferlog --rm kafka kafka-console-consumer --bootstrap-server kafka:9093 --topic transfers &
+while ! [[ $(http 0:8091/actuator/health 2> /dev/null | jq -r .status ) =~ "UP" ]]; do echo "Waiting for transfer..."; sleep 1; done
 
-kafka-avro-console-consumer --bootstrap-server kafka:9092 --topic orders &
-while ! [[ $(http 0:8091/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for take-order..."; sleep 1; done
+echo '{"id":1,"payer":1,"payee":2, "amount":10}' | http -v :8091/transfers
+http :8091/transfers/1
+http -v  :8091/transfers id=2 payer=2 payee=1 amount=5
+http :8091/transfers/2
 
-http -v post 0:8091/orders Accept:*/* id=1 customerId=2 productId=234 quantity=5
-http -v post 0:8091/orders Accept:*/* id=1 customerId=2 productId=234 quantity=
-http -v post 0:8091/orders Accept:*/* id=1 customerId=2 productId=234 quantity=-5
-http -v post 0:8091/orders Accept:*/* id=1 customerId=2 productId=-234 quantiyt=5
-http -v post 0:8091/orders Accept:*/* customerId=2 productId=234 quantity=5
+docker container stop transferlog