Autowire service.

Author: Victor Santiago Martinez Picardo

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.em7</groupId>
 	<artifactId>wol</artifactId>
-	<version>0.0.8</version>
+	<version>0.0.9</version>
 	<packaging>jar</packaging>
 	<name>wol</name>
 	<description>Wake on Lan</description>

src/main/java/com/em7/wol/controller/devices/DevicesController.java

@@ -1,29 +1,24 @@
 package com.em7.wol.controller.devices;
 
 
+import com.em7.wol.dto.out.OutDeviceDTO;
 import com.em7.wol.service.PingService;
 import com.em7.wol.util.RestUtils;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import com.em7.wol.dto.out.OutDeviceDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
-import java.net.InetAddress;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -40,6 +35,9 @@ public class DevicesController {
     @Value("${shutdown.port}")
     private Integer shutdownPort;
 
+    @Autowired
+    private PingService pingService;
+
     @RequestMapping(value = "/getDevices", method = RequestMethod.GET)
     @ResponseBody
     public List<OutDeviceDTO> getDevices(HttpServletRequest request) {
@@ -78,7 +76,6 @@ public List<OutDeviceDTO> getAllDevices() {
         List<OutDeviceDTO> outDeviceDTOs = gson.fromJson(RestUtils.asString(deviceListJSON), listType);
 
         try {
-            PingService pingService = new PingService();
             pingService.pingDevicesConcurrently(outDeviceDTOs);
         } catch (Exception e) {
             String methodName = new Object() {}.getClass().getEnclosingMethod().getName();

src/main/java/com/em7/wol/service/PingService.java

@@ -1,6 +1,7 @@
 package com.em7.wol.service;
 
 import com.em7.wol.dto.out.OutDeviceDTO;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -15,12 +16,12 @@
 @Service
 public class PingService {
 
-    private final Integer shutdownPort = 7801;
+    @Value("${shutdown.port}")
+    private Integer shutdownPort;
 
     public void pingDevicesConcurrently(List<OutDeviceDTO> outDeviceDTOs) {
         // Create a thread pool with a fixed number of threads (can be customized)
         ExecutorService executorService = Executors.newFixedThreadPool(10);
-
         try {
             // Loop through each device and submit a callable task to the executor
             for (OutDeviceDTO device : outDeviceDTOs) {

src/main/resources/application.properties

@@ -1,4 +1,4 @@
-version=0.0.8
+version=0.0.9
 spring.profiles.active=default
 
 wol.user=admin