FIXING : config application properties and swagger

pom.xml

@@ -9,9 +9,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.eksad</groupId>
-    <artifactId>ddms-h2-service-slave</artifactId>
+    <artifactId>ddms-h2-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>ddms-h2-service-slave</name>
+    <name>ddms-h2-service</name>
     <description></description>
     <properties>
         <java.version>17</java.version>
@@ -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>
@@ -117,6 +117,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/eksad/masterdata/config/SwaggerConfig.java

+package com.eksad.masterdata.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+@Configuration
+public class SwaggerConfig {
+    @Bean
+    public boolean disableSwaggerInProd(Environment env) {
+        return !env.acceptsProfiles("dev"); // Enable only in 'dev' profile
+    }
+}

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/java/com/eksad/masterdata/service/PullNJBNSCHystrixService.java

@@ -57,8 +57,8 @@ public class PullNJBNSCHystrixService {
     @Autowired
     private WorkOrderRepository woRepository;
 
-    @Value("${ddms.h2.service.slave}")
-    private String DDMS_H2_SERVICE_SLAVE;
+    @Value("${ddms.h2.service}")
+    private String DDMS_H2_SERVICE;
 
     @Value("${dam.masterdata.h1}")
     private String DAM_MASTERDATA_H1;
@@ -188,7 +188,7 @@ public class PullNJBNSCHystrixService {
     private SalesOrderDTO getSalesOrderByID(String soID) {
         if (StringUtil.hasValue(soID)) {
             ResponseEntity<ResponseSalesOrderGetDTO> resp = restTemplate.exchange(
-                    DDMS_H2_SERVICE_SLAVE + SalesOrderURI.SALES_ORDER_GET_BY_ID.getUri(),
+                    DDMS_H2_SERVICE + SalesOrderURI.SALES_ORDER_GET_BY_ID.getUri(),
                     HttpMethod.GET,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),
                     ResponseSalesOrderGetDTO.class, soID);

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

@@ -98,8 +98,8 @@ public class WorkOrderHystrixService {
     @Value("${dam.claim.h2}")
     private String claim_url;
 
-    @Value("${ddms.h2.service.slave}")
-    private String DDMS_H2_SERVICE_SLAVE;
+    @Value("${ddms.h2.service}")
+    private String DDMS_H2_SERVICE;
 
     @Autowired
     Environment env;
@@ -561,7 +561,7 @@ public class WorkOrderHystrixService {
     public String updateClaimC2Number(String ahassID, String code, String userID) {
         String receivingNumber;
         ResponseEntity<String> response = restTemplate.exchange(
-                DDMS_H2_SERVICE_SLAVE
+                DDMS_H2_SERVICE
                         + IntegrasiURI.UPDATE_GENERATE_SEQUENCE.getUri(),
                 HttpMethod.GET,
                 RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -573,7 +573,7 @@ public class WorkOrderHystrixService {
     private PartDTO findPartById(String partID) {
         if (StringUtil.hasValue(partID)) {
             ResponseEntity<ResponsePartGetDTO> response = restTemplate.exchange(
-                    DDMS_H2_SERVICE_SLAVE
+                    DDMS_H2_SERVICE
                             + PartURI.PART_GET_BY_ID.getUri(),
                     HttpMethod.GET,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),

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

@@ -57,8 +57,8 @@ public class WorkOrderOrafinHystrixService {
     @Autowired
     PullNJBNSCHystrixService pullNJBNSCHystrixService;
 
-    @Value("${ddms.h2.service.slave}")
-    private String DDMS_H2_SERVICE_SLAVE;
+    @Value("${ddms.h2.service}")
+    private String DDMS_H2_SERVICE;
 
     @Value("${dam.receipt.query.h3}")
     private String receipt_query_url;
@@ -323,7 +323,7 @@ public class WorkOrderOrafinHystrixService {
         try {
             if (StringUtil.hasValue(salesOrderID)) {
                 ResponseEntity<ResponseSalesOrderGetDTO> resp = restTemplate.exchange(
-                        DDMS_H2_SERVICE_SLAVE +
+                        DDMS_H2_SERVICE +
                                 SalesOrderURI.SALES_ORDER_GET_BY_ID.getUri(),
                         HttpMethod.GET,
                         RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -463,7 +463,7 @@ public class WorkOrderOrafinHystrixService {
         PickSlipDTO ps = new PickSlipDTO();
         if (soID != null && !soID.isEmpty()) {
             ResponseEntity<ResponsePickSlipGetDTO> resp = restTemplate.exchange(
-                    DDMS_H2_SERVICE_SLAVE +
+                    DDMS_H2_SERVICE +
                             PickSlipURI.PICKSLIP_GET_BY_SALESORDERID.getUri(),
                     HttpMethod.GET,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -523,7 +523,7 @@ public class WorkOrderOrafinHystrixService {
         String code = "";
         try {
             ResponseEntity<String> response = restTemplate.exchange(
-                    DDMS_H2_SERVICE_SLAVE +
+                    DDMS_H2_SERVICE +
                             SalesOrderURI.SOCOMPLETE.getUri(),
                     HttpMethod.PUT,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -598,7 +598,7 @@ public class WorkOrderOrafinHystrixService {
         try {
             if (StringUtil.hasValue(woID)) {
                 ResponseEntity<ResponseSalesOrderGetListDTO> resp = restTemplate.exchange(
-                        DDMS_H2_SERVICE_SLAVE +
+                        DDMS_H2_SERVICE +
                                 IntegrasiURI.GET_SO_BY_WO_AND_AHASSCODE.getUri(),
                         HttpMethod.GET,
                         RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -616,7 +616,7 @@ public class WorkOrderOrafinHystrixService {
 
     private List<WorkOrderSOHotlineDTO> getSOHotlineMap(String woID) {
         ResponseEntity<WorkOrderSOHotlineDTO[]> response = restTemplate.exchange(
-                DDMS_H2_SERVICE_SLAVE +
+                DDMS_H2_SERVICE +
                         PartWOHotlineURI.GET_SO_HOTLINE_BY_WOID.getUri(),
                 HttpMethod.GET,
                 RequestUtil.getPreFormattedRequestWithUserPassword(),
@@ -633,7 +633,7 @@ public class WorkOrderOrafinHystrixService {
         String status = "";
         try {
             ResponseEntity<String> response = restTemplate.exchange(
-                    DDMS_H2_SERVICE_SLAVE +
+                    DDMS_H2_SERVICE +
                             IntegrasiURI.UPDATE_COMPLETE_SO_BY_WO.getUri(),
                     HttpMethod.PUT,
                     RequestUtil.getPreFormattedRequestWithUserPassword(),

src/main/resources/application-dev.properties

@@ -5,44 +5,24 @@ spring.datasource.url           = ${DATASOURCE_URL:jdbc:postgresql://149.129.246
 spring.datasource.username      = ${DATASOURCE_USERNAME:ddmsh2app}
 spring.datasource.password      = ${DATASOURCE_PASSWORD:bandungh1h2h3}
 
-## System Config
-spring.jpa.generate-ddl=false
-spring.jpa.hibernate.ddl-auto = none
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.properties.hibernate.format_sql=true
-logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-
 # SERVICE - SPRINGBOOT
 #-----------------------------------------------------------------------------------------------------------------------
 ## POINTING
-ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
+ddms.h2.service                 = ${DDMS_H2_SERVICE:http://localhost:8081/}
 dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
 dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
 dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
-#dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
 dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
 dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
-#dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
 dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
-#dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
 
-# KAFKA
+## System Config
 #-----------------------------------------------------------------------------------------------------------------------
-# Kafka Bootstrap Server
-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
-
-# 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
-
-# Kafka Topic Name
-kafka.topic.name=pipeline-topic
+spring.jpa.generate-ddl=false
+spring.jpa.hibernate.ddl-auto = none
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.format_sql=true
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 spring.main.allow-circular-references=true
\ No newline at end of file

src/main/resources/application-prod.properties

@@ -5,43 +5,24 @@ spring.datasource.url           = ${DATASOURCE_URL:jdbc:postgresql://149.129.246
 spring.datasource.username      = ${DATASOURCE_USERNAME:ddmsh2app}
 spring.datasource.password      = ${DATASOURCE_PASSWORD:bandungh1h2h3}
 
-## System Config
-spring.jpa.generate-ddl=false
-spring.jpa.hibernate.ddl-auto = none
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.properties.hibernate.format_sql=true
-spring.main.allow-circular-references=true
-logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-
 # SERVICE - SPRINGBOOT
 #-----------------------------------------------------------------------------------------------------------------------
 ## POINTING
-ddms.h2.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8082/}
+ddms.h2.service                 = ${DDMS_H2_SERVICE:http://localhost:8082/}
 dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
 dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
 dam.receipt.query.h3            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
-dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
 dam.receipt.command.h3          = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
 dam.masterdata.h2               = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
-dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
 dam.claim.h2                    = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
-dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
 
-# KAFKA
+## System Config
 #-----------------------------------------------------------------------------------------------------------------------
-# Kafka Bootstrap Server
-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
-
-# 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.jpa.generate-ddl=false
+spring.jpa.hibernate.ddl-auto = none
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.format_sql=true
+spring.main.allow-circular-references=true
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-# Kafka Topic Name
-kafka.topic.name=pipeline-topic
\ No newline at end of file

src/main/resources/application.properties

@@ -2,3 +2,5 @@
 spring.profiles.active=dev
 server.port=8082
 ddms.auth.token=Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiJ9.5BG9SEVOGo_xRhtT8IkyoSy60kPg8HM9Vpvb0TdNew4
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.path=/swagger-ui.html
\ No newline at end of file