+ Enable concurrent HTTPS+HTTP serving

+ Code refactor.

Signed-off-by: elmodo7 <elmodo7yt@gmail.com>

Author: elModo7

pom.xml

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

src/main/java/com/em7/wol/config/AppConfiguration.java

@@ -0,0 +1,34 @@
+package com.em7.wol.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.connector.Connector;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+@ConditionalOnProperty(
+    value="server.insecure.enabled",
+    havingValue = "true",
+    matchIfMissing = false)
+public class AppConfiguration {
+
+    @Value("${server.http.port}")
+    private int httpPort;
+
+    @Bean
+    public WebServerFactoryCustomizer<TomcatServletWebServerFactory> cookieProcessorCustomizer() {
+        return (TomcatServletWebServerFactory factory) -> {
+            // also listen on http
+            final Connector connector = new Connector();
+            log.info(String.valueOf(httpPort));
+
+            connector.setPort(httpPort);
+            factory.addAdditionalTomcatConnectors(connector);
+        };
+    }
+}

src/main/java/com/em7/wol/util/RestUtils.java

@@ -14,10 +14,10 @@
 @Slf4j
 public class RestUtils {
     public static String doPost(String urlString, JsonObject params) {
-        String nombreMetodo = new Object() {
+        String methodName = new Object() {
         }.getClass().getEnclosingMethod().getName();
-        log.info(nombreMetodo + " Entrada datos: " + " - url: " + urlString + " - params: " + params.toString());
-        String respuesta = "";
+        log.info(methodName + " Data input: " + " - url: " + urlString + " - params: " + params.toString());
+        String response = "";
         try {
             URL url = new URL(urlString);
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -27,33 +27,33 @@ public static String doPost(String urlString, JsonObject params) {
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             wr.write(params.toString());
             wr.flush();
-            respuesta = obtenerRespuesta(conn);
+            response = getResponse(conn);
             conn.disconnect();
         } catch (Exception e) {
             log.error("", e);
         }
-        log.info(nombreMetodo + " - Salida datos: " + respuesta);
-        return respuesta;
+        log.info(methodName + " - Data output: " + response);
+        return response;
     }
 
     public static String doGet(String urlString) {
-        log.info("Entrada GET a " + urlString);
+        log.info("GET to " + urlString);
         String respuesta = "";
         try {
             URL url = new URL(urlString);
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("GET");
-            respuesta = obtenerRespuesta(conn);
+            respuesta = getResponse(conn);
             conn.disconnect();
         } catch (Exception e) {
             log.error("", e);
         }
         return respuesta;
     }
 
-    private static String obtenerRespuesta(HttpURLConnection conn) throws Exception {
+    private static String getResponse(HttpURLConnection conn) throws Exception {
         if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-            log.error("Error al conectar con el servidor");
+            log.error("Error connecting to the server");
         } else {
             BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), UTF_8));
             String strCurrentLine;

src/main/resources/application.properties

@@ -1,10 +1,12 @@
-version=0.1.2
+version=0.1.4
 spring.profiles.active=default
 
 wol.user=admin
 wol.password=admin
 server.port=7800
 shutdown.port=7801
+server.insecure.enabled=true
+server.http.port=7802
 security.require-ssl=false
 server.ssl.enabled=false
 spring.thymeleaf.cache=true

src/main/resources/devices.json

@@ -8,11 +8,11 @@
     "status": false
   },
   {
-    "description": "8700K",
+    "description": "Google DNS",
     "id": 2,
-    "ip": "192.168.12.228",
+    "ip": "8.8.8.8",
     "mac": "30:9C:23:FF:FF:FF",
-    "name": "Desktop",
+    "name": "Google",
     "status": false
   },
   {