Merge pull request #177 from enbohm/fix_build_props

Updating build prop and fixing classes

pom.xml

@@ -43,10 +43,6 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-container-image-docker</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>

src/main/java/se/enbohms/halo/HaloScheduler.java

@@ -6,6 +6,8 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import se.enbohms.halo.service.HaloService;
+import se.enbohms.halo.service.TimeService;
 
 @ApplicationScoped
 public class HaloScheduler {

src/main/java/se/enbohms/halo/restclients/HaloLoginPayload.java → src/main/java/se/enbohms/halo/restclient/HaloLoginPayload.java

@@ -1,4 +1,4 @@
-package se.enbohms.halo.restclients;
+package se.enbohms.halo.restclient;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import se.enbohms.halo.PrivateVisibilityStrategy;

src/main/java/se/enbohms/halo/restclients/HaloRestClient.java → src/main/java/se/enbohms/halo/restclient/HaloRestClient.java

@@ -1,4 +1,4 @@
-package se.enbohms.halo.restclients;
+package se.enbohms.halo.restclient;
 
 import jakarta.ws.rs.HeaderParam;
 import jakarta.ws.rs.POST;

src/main/java/se/enbohms/halo/restclients/HaloSettingsPayload.java → src/main/java/se/enbohms/halo/restclient/HaloSettingsPayload.java

@@ -1,4 +1,4 @@
-package se.enbohms.halo.restclients;
+package se.enbohms.halo.restclient;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import se.enbohms.halo.PrivateVisibilityStrategy;

src/main/java/se/enbohms/halo/restclients/SunsetTimeClient.java → src/main/java/se/enbohms/halo/restclient/SunsetTimeClient.java

@@ -1,4 +1,4 @@
-package se.enbohms.halo.restclients;
+package se.enbohms.halo.restclient;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;

src/main/java/se/enbohms/halo/HaloService.java → src/main/java/se/enbohms/halo/service/HaloService.java

@@ -1,15 +1,14 @@
-package se.enbohms.halo;
+package se.enbohms.halo.service;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.jboss.logging.Logger;
-import se.enbohms.halo.restclients.HaloLoginPayload;
-import se.enbohms.halo.restclients.HaloRestClient;
-import se.enbohms.halo.restclients.HaloSettingsPayload;
+import se.enbohms.halo.restclient.HaloLoginPayload;
+import se.enbohms.halo.restclient.HaloRestClient;
+import se.enbohms.halo.restclient.HaloSettingsPayload;
 
 @ApplicationScoped
 public class HaloService {
@@ -36,25 +35,25 @@ public void init() {
 
   public void turnLightOn() {
     var payload = new HaloSettingsPayload(wallboxId, "Medium", "false");
-    sendPutRequest(getAuthToken(), payload);
+    sendPutRequest(getToken(), payload);
     LOG.info("TURNING ON LED");
   }
 
   public void turnLightOff() {
     var payload = new HaloSettingsPayload(wallboxId, "OFF", "false");
-    sendPutRequest(getAuthToken(), payload);
+    sendPutRequest(getToken(), payload);
     LOG.info("TURNING OFF LED");
   }
 
-  private void sendPutRequest(HaloAuthResponse authResponse, HaloSettingsPayload payload) {
+  private void sendPutRequest(HaloTokenResponse tokenResponse, HaloSettingsPayload payload) {
     var putResponse = haloRestClient
-        .changeSettings("Bearer " + authResponse.token(), wallboxId, payload);
+        .changeSettings("Bearer " + tokenResponse.token(), wallboxId, payload);
     LOG.info("PUT status code " + putResponse.getStatus());
     LOG.info("PUT response body " + putResponse.readEntity(String.class));
   }
 
-  private HaloAuthResponse getAuthToken() {
+  private HaloTokenResponse getToken() {
     var response = haloRestClient.getAuthToken(apiKey, new HaloLoginPayload(userName, pwd));
-    return response.readEntity(HaloAuthResponse.class);
+    return response.readEntity(HaloTokenResponse.class);
   }
 }

src/main/java/se/enbohms/halo/HaloAuthResponse.java → src/main/java/se/enbohms/halo/service/HaloTokenResponse.java

@@ -1,15 +1,16 @@
-package se.enbohms.halo;
+package se.enbohms.halo.service;
 
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import jakarta.json.bind.annotation.JsonbCreator;
 import jakarta.json.bind.annotation.JsonbVisibility;
+import se.enbohms.halo.PrivateVisibilityStrategy;
 
 @RegisterForReflection
 @JsonbVisibility(value = PrivateVisibilityStrategy.class)
-public record HaloAuthResponse(String token) {
+public record HaloTokenResponse(String token) {
     @JsonbCreator
-    public HaloAuthResponse {
+    public HaloTokenResponse {
     }
 }

src/main/java/se/enbohms/halo/TimeService.java → src/main/java/se/enbohms/halo/service/TimeService.java

@@ -1,6 +1,5 @@
-package se.enbohms.halo;
+package se.enbohms.halo.service;
 
-import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneId;
@@ -13,7 +12,7 @@
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.jboss.logging.Logger;
-import se.enbohms.halo.restclients.SunsetTimeClient;
+import se.enbohms.halo.restclient.SunsetTimeClient;
 
 @ApplicationScoped
 public class TimeService {

src/main/resources/application.properties

@@ -1,12 +1,3 @@
-quarkus.package.type=uber-jar
-quarkus.http.port=8081
-quarkus.native.native-image-xmx=6G
-
-quarkus.container-image.group=enbohm
-quarkus.container-image.name=halo-wallbox-scheduler
-quarkus.container-image.tag=latest
-quarkus.native.additional-build-args=--report-unsupported-elements-at-runtime
-
 halo.apikey=ADD_A_KEY
 halo.username=andreas@enbohms.se
 halo.pwd=ADD_A_PWD

src/test/java/se/enbohms/halo/TimeServiceTest.java

@@ -9,6 +9,7 @@
 import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
+import se.enbohms.halo.service.TimeService;
 
 @QuarkusTest
 @QuarkusTestResource(WiremockTimeServiceEndpoint.class)