Merge remote-tracking branch 'origin/DEV/Akbar/master-slave-api-dgi-v123' into...

Merge remote-tracking branch 'origin/DEV/Akbar/master-slave-api-dgi-v123' into DEV/Akbar/master-slave-api-dgi-v123

pom.xml

@@ -60,10 +60,10 @@
         </dependency>
 
         <!-- Spring Kafka -->
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.kafka</groupId>-->
+<!--            <artifactId>spring-kafka</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>io.vertx</groupId>

src/main/java/com/eksad/masterdata/controller/SampleMasterdataWoController.java

 package com.eksad.masterdata.controller;
 
 import com.eksad.masterdata.domain.MstWo;
-import com.eksad.masterdata.service.KafkaProducerService;
 import com.eksad.masterdata.service.ProcessHelperService;
 import com.eksad.masterdata.service.WOService;
 import io.vertx.core.json.JsonObject;
@@ -19,9 +18,6 @@ public class SampleMasterdataWoController {
     @Autowired
     WOService woService;
 
-    @Autowired
-    KafkaProducerService kafkaProducerService;
-
     @GetMapping("/test")
     public ResponseEntity<String> test(){
         System.out.println("test admin");
@@ -40,15 +36,4 @@ public class SampleMasterdataWoController {
         return ResponseEntity.ok(response);
     }
 
-    @PostMapping("/mqSend")
-    public ResponseEntity<String> mqSend(@RequestBody String request){
-        //to simplyfy tracing request lets generate transactionId
-        JsonObject jsonRequest=new JsonObject(request)
-                .put("transactionId",processHelperService.createProcessId());
-        kafkaProducerService.sendMessage(jsonRequest.encode());
-        JsonObject jsonResponse=new JsonObject()
-                .put("status","SUCCESS")
-                .put("message","message send successfully");
-        return ResponseEntity.ok(jsonResponse.encode());
-    }
 }

src/main/java/com/eksad/masterdata/event/KafkaEvent.java

-package com.eksad.masterdata.event;
-import com.eksad.masterdata.common.Constants;
-import io.vertx.core.json.JsonObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.stereotype.Service;
-
-@Service
-public class KafkaEvent {
-
-    @Autowired
-    private KafkaTemplate<String, String> kafkaTemplate;
-
-    @KafkaListener(topics = Constants.topicStep1, groupId = "my-group")
-    public void listenStep1(String message) {
-        JsonObject jsonMessage=new JsonObject(message);
-        String transactionId=jsonMessage.getString("transactionId");
-        System.out.println(
-                String.format("Starting Step 1 - new taskid %s with paylod [[ %s ]]",
-                        transactionId,
-                        jsonMessage));
-        //do something here
-        jsonMessage.put("resultStep1","step 1 a success");
-
-        //lets continue to other queue
-        kafkaTemplate.send(Constants.topicStep2,jsonMessage.encode());
-
-        System.out.println(
-                String.format("done Step 1 for taskid %s %n%n",transactionId));
-    }
-
-    @KafkaListener(topics = Constants.topicStep2, groupId = "my-group")
-    public void listenStep2(String message) {
-        JsonObject jsonMessage=new JsonObject(message);
-        String transactionId=jsonMessage.getString("transactionId");
-        System.out.println(
-                String.format("Starting Step 2 - new taskid %s with paylod [[ %s ]]",
-                        transactionId,
-                        jsonMessage));
-        //do something here
-        jsonMessage.put("resultStep2","step 2 a success");
-
-        System.out.println(
-                String.format("done Step 2 for taskid %s with final result [[ %s ]] %n%n",
-                        transactionId,
-                        jsonMessage.encode()));
-    }
-}

src/main/java/com/eksad/masterdata/service/KafkaProducerService.java

-package com.eksad.masterdata.service;
-
-import com.eksad.masterdata.common.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.stereotype.Service;
-
-@Service
-public class KafkaProducerService {
-
-    @Autowired
-    private KafkaTemplate<String, String> kafkaTemplate;
-
-    public void sendMessage(String message) {
-        kafkaTemplate.send(Constants.topicStep1, message);
-        System.out.println(String.format("done sending for new incoming task [%s bytes] %n%n",message.length()));
-    }
-}

src/main/resources/application-dev.properties

@@ -19,20 +19,20 @@ ddms.auth.token=Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiJ9.5BG9SEVOGo_xRht
 #Kafka Config
 #-----------------------------------------------------------------------
 # Kafka Bootstrap Server
-spring.kafka.bootstrap-servers=localhost:9092
+#spring.kafka.bootstrap-servers=localhost:9092
 
 # Kafka Producer Configuration
-spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
-spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+#spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+#spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 
 # Kafka Consumer Configuration
-spring.kafka.consumer.group-id=my-group
-spring.kafka.consumer.auto-offset-reset=earliest
-spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
-spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+#spring.kafka.consumer.group-id=my-group
+#spring.kafka.consumer.auto-offset-reset=earliest
+#spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+#spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
 
 # Kafka Topic Name
-kafka.topic.name=pipeline-topic
+#kafka.topic.name=pipeline-topic
 
 dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
 dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}