src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java

@@ -38,7 +38,7 @@ public class UserDAO {
         return namedParameterJdbcTemplate.query( SELECT_BY_USERNAME, params, new UserRowMapper() )
                 .stream()
                 .findAny()
-                .orElse( null );
+                .orElse( new User() );
     }
 
     public List<User> findAll() {

src/main/java/com/utopiaindustries/service/BarcodeService.java

@@ -13,7 +13,6 @@ import com.zebra.sdk.comm.TcpConnection;
 import com.zebra.sdk.graphics.internal.ZebraImage;
 import com.zebra.sdk.printer.ZebraPrinter;
 import com.zebra.sdk.printer.ZebraPrinterFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.imageio.ImageIO;
@@ -28,12 +27,6 @@ import java.util.List;
 @Service
 public class BarcodeService {
 
-    @Value("${ctp.printer.ipAdd}")
-    private String ipAddress;
-
-    @Value("${ctp.printer.port}")
-    private int port;
-
     private final BundleDAO bundleDAO;
     private final MasterBundleDAO masterBundleDAO;
     private final FinishedItemDAO finishedItemDAO;
@@ -130,7 +123,9 @@ public class BarcodeService {
     }
 
     public void printLabel( BufferedImage bufferedImage ) throws Exception {
-        Connection connection = new TcpConnection( ipAddress, port );
+        String ipAddr = "192.168.90.160";
+        int port = 9100;
+        Connection connection = new TcpConnection( ipAddr, port );
         connection.open();
         ZebraPrinter printer = ZebraPrinterFactory.getInstance( connection );
         ZebraImage zebraImage = new ZebraImage( bufferedImage );

src/main/resources/application-dev.yml

@@ -1,34 +0,0 @@
-spring:
-  uinddatasource:
-    jdbcUrl: jdbc:mysql://192.168.90.147:3306
-    username: utopia
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    logbackUrl: jdbc:mysql://192.168.90.147:3306/uind_logs?serverTimezone=Asia/Karachi
-    hikari:
-      maximum-pool-size: 5
-      pool-name: UINDMainPool
-      leak-detection-threshold: 2000
-  cosmosdatasource:
-    jdbcUrl: jdbc:mysql://192.168.90.147:3307
-    username: utopia
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    hikari:
-      maximum-pool-size: 5
-      pool-name: UINDCosmosPool
-      leak-detection-threshold: 2000
-  localdatasource:
-    jdbcUrl: jdbc:mysql://192.168.90.147:3306/cut_to_pack
-    username: utopia
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    hikari:
-      maximum-pool-size: 5
-      pool-name: CTPPool
-      leak-detection-threshold: 2000
-
-ctp:
-  printer:
-    ipAdd: 192.168.90.160
-    port: 9100

src/main/resources/application-prod.yml

@@ -1,34 +0,0 @@
-spring:
-  uinddatasource:
-    jdbcUrl: jdbc:mysql://localhost:3306
-    username: root
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    logbackUrl: jdbc:mysql://localhost:3306/uind_logs?serverTimezone=Asia/Karachi
-    hikari:
-      maximum-pool-size: 5
-      pool-name: UINDMainPool
-      leak-detection-threshold: 2000
-  cosmosdatasource:
-    jdbcUrl: jdbc:mysql://localhost:3307
-    username: root
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    hikari:
-      maximum-pool-size: 5
-      pool-name: UINDCosmosPool
-      leak-detection-threshold: 2000
-  localdatasource:
-    jdbcUrl: jdbc:mysql://localhost:3306/cut_to_pack
-    username: root
-    password: Utopia01
-    driverClassName: com.mysql.cj.jdbc.Driver
-    hikari:
-      maximum-pool-size: 5
-      pool-name: CTPPool
-      leak-detection-threshold: 2000
-
-ctp:
-  printer:
-    ipAdd: 172.16.53.32
-    port: 9100

src/main/resources/application.yaml

@@ -1,12 +1,8 @@
 application:
   title: Cut To Pack Service
   version: v1.0
-  name: application-dev
 
 spring:
-  profiles:
-    active: dev
-
   resources:
     chain:
       cache: false
@@ -23,6 +19,34 @@ spring:
     check-template-location: true
     cache: false
     prefix: classpath:/templates/
+  uinddatasource:
+    jdbcUrl: jdbc:mysql://192.168.90.108:3306/uind_vms
+    username: utopia
+    password: Utopia01
+    driverClassName: com.mysql.cj.jdbc.Driver
+    logbackUrl: jdbc:mysql://192.168.90.108:3306/uind_logs?serverTimezone=Asia/Karachi
+    hikari:
+      maximum-pool-size: 5
+      pool-name: UINDMainPool
+      leak-detection-threshold: 2000
+  cosmosdatasource:
+    jdbcUrl: jdbc:mysql://192.168.90.108:3307
+    username: utopia
+    password: Utopia01
+    driverClassName: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5
+      pool-name: UINDCosmosPool
+      leak-detection-threshold: 2000
+  localdatasource:
+    jdbcUrl: jdbc:mysql://192.168.90.108:3306/cut_to_pack
+    username: utopia
+    password: Utopia01
+    driverClassName: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5
+      pool-name: CTPPool
+      leak-detection-threshold: 2000
 
 server:
   servlet: