feat: start work on auto caching and accessing servers

CubitsDev · CubitsDev · commit 4124d9009a6e · 2024-11-17T16:03:23.000Z
diff --git a/src/main/java/dev/tomr/hcloud/HetznerCloud.java b/src/main/java/dev/tomr/hcloud/HetznerCloud.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.tomr.hcloud.listener.ListenerManager;
+import dev.tomr.hcloud.resources.server.Server;
 import dev.tomr.hcloud.service.ServiceManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -14,10 +15,10 @@
 public class HetznerCloud {
     protected static final Logger logger = LogManager.getLogger();
 
-    private static final ListenerManager listenerManager = ListenerManager.getInstance();
-    private static final ServiceManager serviceManager = ServiceManager.getInstance();
+    private static ListenerManager listenerManager = ListenerManager.getInstance();
+    private static ServiceManager serviceManager = ServiceManager.getInstance();
     private static final ObjectMapper objectMapper = new ObjectMapper();
-    private static String HETZNER_CLOUD_HOST = "https://api.hetzner.cloud/v1/";
+    private static final String HETZNER_CLOUD_HOST = "https://api.hetzner.cloud/v1/";
 
     private static HetznerCloud instance;
 
@@ -32,6 +33,7 @@ public HetznerCloud(String apiKey) {
         this.apiKey = apiKey;
         this.host = HETZNER_CLOUD_HOST;
         instance = this;
+        ServiceManager.getInstance().getServerService().forceRefreshServersCache();
     }
 
     /**
@@ -43,6 +45,7 @@ public HetznerCloud(String apiKey, String host) {
         this.apiKey = apiKey;
         this.host = host;
         instance = this;
+        ServiceManager.getInstance().getServerService().forceRefreshServersCache();
     }
 
     /**
@@ -96,4 +99,21 @@ public static ServiceManager getServiceManager() {
     public List<String> getHttpDetails() {
         return List.of(host, apiKey);
     }
+
+    /**
+     * Whether we have an API Key supplied
+     * @return true if one is present, false if not
+     */
+    public boolean hasApiKey() {
+        return apiKey != null && !apiKey.isEmpty();
+    }
+
+    /**
+     * Get a Hetzner Server Instance from the local cache
+     * @param id ID of the server
+     * @return A server object from the local cache
+     */
+    public Server getServer(Integer id) {
+        return serviceManager.getServerService().getServer(id);
+    }
 }
diff --git a/src/main/java/dev/tomr/hcloud/http/model/ServerDTOList.java b/src/main/java/dev/tomr/hcloud/http/model/ServerDTOList.java
@@ -0,0 +1,37 @@
+package dev.tomr.hcloud.http.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import dev.tomr.hcloud.http.HetznerJsonObject;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ServerDTOList extends HetznerJsonObject {
+    private Object meta;
+    private List<ServerDTO> servers;
+
+    public ServerDTOList() {}
+
+    public ServerDTOList(Object meta, List<ServerDTO> servers) {
+        this.meta = meta;
+        this.servers = servers;
+    }
+
+    public Object getMeta() {
+        return meta;
+    }
+
+    public List<ServerDTO> getServers() {
+        return servers;
+    }
+
+    public void setMeta(Object meta) {
+        this.meta = meta;
+    }
+
+    public void setServers(List<ServerDTO> servers) {
+        this.servers = servers;
+    }
+}
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/CreatedFrom.java b/src/main/java/dev/tomr/hcloud/resources/common/CreatedFrom.java
@@ -9,13 +9,15 @@ public CreatedFrom(int id, String name) {
         this.name = name;
     }
 
+    public CreatedFrom() {
+    }
+
     public int getId() {
         return id;
     }
 
-    public CreatedFrom setId(int id) {
+    public void setId(int id) {
         this.id = id;
-        return this;
     }
 
     public String getName() {
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Datacenter.java b/src/main/java/dev/tomr/hcloud/resources/common/Datacenter.java
@@ -18,6 +18,9 @@ public Datacenter(String description, Integer id, Location location, String name
         this.serverTypes = serverTypes;
     }
 
+    public Datacenter() {
+    }
+
     public String getDescription() {
         return description;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Deprecation.java b/src/main/java/dev/tomr/hcloud/resources/common/Deprecation.java
@@ -14,6 +14,9 @@ public Deprecation(Date announced, Date unavailableAfter) {
         this.unavailableAfter = unavailableAfter;
     }
 
+    public Deprecation() {
+    }
+
     public Date getAnnounced() {
         return announced;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Image.java b/src/main/java/dev/tomr/hcloud/resources/common/Image.java
@@ -53,6 +53,9 @@ public Image(String architecture, Object boundTo, Date created, CreatedFrom crea
         this.type = type;
     }
 
+    public Image() {
+    }
+
     public String getArchitecture() {
         return architecture;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Iso.java b/src/main/java/dev/tomr/hcloud/resources/common/Iso.java
@@ -20,6 +20,9 @@ public Iso(String architecture, Map<String, Date> deprecation, String descriptio
         this.type = type;
     }
 
+    public Iso() {
+    }
+
     public String getArchitecture() {
         return architecture;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Location.java b/src/main/java/dev/tomr/hcloud/resources/common/Location.java
@@ -24,6 +24,9 @@ public Location(String city, String country, String description, Integer id, dou
         this.networkZone = networkZone;
     }
 
+    public Location() {
+    }
+
     public String getCity() {
         return city;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/PlacementGroup.java b/src/main/java/dev/tomr/hcloud/resources/common/PlacementGroup.java
@@ -21,6 +21,9 @@ public PlacementGroup(Date created, int id, Map<String, String> labels, String n
         this.type = type;
     }
 
+    public PlacementGroup() {
+    }
+
     public Date getCreated() {
         return created;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Price.java b/src/main/java/dev/tomr/hcloud/resources/common/Price.java
@@ -4,7 +4,7 @@
 
 public class Price{
     @JsonProperty("included_traffic")
-    private Integer includedTraffic;
+    private Long includedTraffic;
     private String location;
     @JsonProperty("price_hourly")
     private PriceDetails priceHourly;
@@ -13,19 +13,21 @@ public class Price{
     @JsonProperty("price_per_tb_traffic")
     private PriceDetails pricePerTbTraffic;
 
-    public Price(Integer includedTraffic, String location, PriceDetails priceHourly, PriceDetails priceMonthly, PriceDetails pricePerTbTraffic) {
+    public Price(Long includedTraffic, String location, PriceDetails priceHourly, PriceDetails priceMonthly, PriceDetails pricePerTbTraffic) {
         this.includedTraffic = includedTraffic;
         this.location = location;
         this.priceHourly = priceHourly;
         this.priceMonthly = priceMonthly;
         this.pricePerTbTraffic = pricePerTbTraffic;
     }
 
-    public Integer getIncludedTraffic() {
+    public Price() {}
+
+    public Long getIncludedTraffic() {
         return includedTraffic;
     }
 
-    public void setIncludedTraffic(Integer includedTraffic) {
+    public void setIncludedTraffic(Long includedTraffic) {
         this.includedTraffic = includedTraffic;
     }
 
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/PriceDetails.java b/src/main/java/dev/tomr/hcloud/resources/common/PriceDetails.java
@@ -9,6 +9,8 @@ public PriceDetails(String gross, String net) {
         this.net = net;
     }
 
+    public PriceDetails() {}
+
     public String getGross() {
         return gross;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/Protection.java b/src/main/java/dev/tomr/hcloud/resources/common/Protection.java
@@ -12,6 +12,8 @@ public Protection(boolean delete, boolean rebuild) {
         this.rebuild = rebuild;
     }
 
+    public Protection() {}
+
     public boolean isDelete() {
         return delete;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/ServerType.java b/src/main/java/dev/tomr/hcloud/resources/common/ServerType.java
@@ -38,6 +38,8 @@ public ServerType(String architecture, Integer cores, String cpuType, boolean de
         this.storageType = storageType;
     }
 
+    public ServerType() {}
+
     public String getArchitecture() {
         return architecture;
     }
diff --git a/src/main/java/dev/tomr/hcloud/resources/common/ServerTypes.java b/src/main/java/dev/tomr/hcloud/resources/common/ServerTypes.java
@@ -16,6 +16,8 @@ public ServerTypes(List<Integer> available, List<Integer> availableForMigration,
         this.supported = supported;
     }
 
+    public ServerTypes() {}
+
     public List<Integer> getAvailable() {
         return available;
     }
diff --git a/src/main/java/dev/tomr/hcloud/service/ServiceManager.java b/src/main/java/dev/tomr/hcloud/service/ServiceManager.java
@@ -13,8 +13,8 @@ public class ServiceManager {
     private ExecutorService executor;
 
     private ServiceManager() {
-        this.serverService = new ServerService();
         instance = this;
+        this.serverService = new ServerService(this);
     }
 
     /**
diff --git a/src/main/java/dev/tomr/hcloud/service/server/ServerService.java b/src/main/java/dev/tomr/hcloud/service/server/ServerService.java
@@ -4,36 +4,55 @@
 import dev.tomr.hcloud.http.HetznerCloudHttpClient;
 import dev.tomr.hcloud.http.converter.ServerConverterUtil;
 import dev.tomr.hcloud.http.model.ServerDTO;
+import dev.tomr.hcloud.http.model.ServerDTOList;
 import dev.tomr.hcloud.resources.server.Server;
 import dev.tomr.hcloud.service.ServiceManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
+import java.time.Instant;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static dev.tomr.hcloud.http.RequestVerb.GET;
 import static dev.tomr.hcloud.http.RequestVerb.PUT;
 
 public class ServerService {
     protected static final Logger logger = LogManager.getLogger();
 
-    private final HetznerCloudHttpClient client;
+    private final HetznerCloudHttpClient client = HetznerCloudHttpClient.getInstance();
     private final ServiceManager serviceManager;
 
     private final ConcurrentHashMap<String, Object> updatedFields = new ConcurrentHashMap<>();
     private Server updatedServer;
     private CompletableFuture<Void> updatedServerFuture;
 
+    private Map<Date, Server> remoteServers = new HashMap<>();
+
     /**
      * Creates a new {@code ServerService} instance
      */
     public ServerService() {
-        client = HetznerCloudHttpClient.getInstance();
-        serviceManager = HetznerCloud.getServiceManager();
+        this.serviceManager = HetznerCloud.getServiceManager();
+    }
+
+    public ServerService(ServiceManager serviceManager) {
+        this.serviceManager = serviceManager;
+    }
+
+    public void forceRefreshServersCache() {
+        if (HetznerCloud.getInstance().hasApiKey()) {
+            updateAllRemoteServers();
+        } else {
+            logger.warn("No API Key supplied, not refreshing servers. Consider refreshing again, when you have a key!");
+        }
     }
 
     /**
@@ -77,6 +96,34 @@ public void cancelServerNameOrLabelUpdate() {
         updatedFields.clear();
     }
 
+    private void updateAllRemoteServers() {
+        Map<Date, Server> newServerMap = new HashMap<>();
+        List<String> hostAndKey = HetznerCloud.getInstance().getHttpDetails();
+        String httpUrl = String.format("%sservers", hostAndKey.get(0));
+        ServerDTOList serverDTOList = null;
+        try {
+            serverDTOList = client.sendHttpRequest(ServerDTOList.class, httpUrl, GET, hostAndKey.get(1));
+        } catch (IOException | InterruptedException | IllegalAccessException e) {
+            logger.error("Failed to refresh all remote servers!");
+            throw new RuntimeException(e);
+        }
+        serverDTOList.getServers().forEach(serverDTO -> {
+            newServerMap.put(Date.from(Instant.now()), ServerConverterUtil.transformServerDTOToServer(serverDTO));
+            logger.info(serverDTO.getId());
+        });
+        remoteServers = newServerMap;
+    }
+
+    public Server getServer(Integer id) {
+        for (var entry : remoteServers.entrySet()) {
+            if (entry.getValue().getId().equals(id)) {
+                return entry.getValue();
+            }
+        }
+        logger.warn("Server with id {} not found", id);
+        return null;
+    }
+
     private CompletableFuture<Void> scheduleHttpRequest(String host, String apiKey) {
         return CompletableFuture.runAsync(() -> {
             try {
@@ -94,7 +141,7 @@ private CompletableFuture<Void> scheduleHttpRequest(String host, String apiKey)
                     removeUnchangedFields(serverDTO);
                     info = ref.get();
                     logger.info(info);
-                    String endpoint = host + "server/" + updatedServer.getId();
+                    String endpoint = host + "servers/" + updatedServer.getId();
                     client.sendHttpRequest(ServerDTO.class, endpoint, PUT, apiKey, HetznerCloud.getObjectMapper().writeValueAsString(serverDTO));
                 } else {
                     throw new RuntimeException("No updated values??");
diff --git a/src/test/java/dev/tomr/hcloud/http/converter/ServerConverterUtilTest.java b/src/test/java/dev/tomr/hcloud/http/converter/ServerConverterUtilTest.java
@@ -27,7 +27,7 @@ public class ServerConverterUtilTest {
             null,
             2048,
             "",
-            List.of(new Price(0, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
+            List.of(new Price(0L, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
             ""
     );
     private Iso ISO = new Iso("", Map.of(), "", 1, "", "");
diff --git a/src/test/java/dev/tomr/hcloud/http/model/ServerDTOBuilderTest.java b/src/test/java/dev/tomr/hcloud/http/model/ServerDTOBuilderTest.java
@@ -28,7 +28,7 @@ void serverDTOBuilderCreatesAServerDTOCorrectly() {
                 null,
                 2048,
                 "",
-                List.of(new Price(0, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
+                List.of(new Price(0L, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
                 ""
         );
         Iso ISO = new Iso("", Map.of(), "", 1, "", "");
diff --git a/src/test/java/dev/tomr/hcloud/http/model/ServerDTOTest.java b/src/test/java/dev/tomr/hcloud/http/model/ServerDTOTest.java
@@ -174,7 +174,7 @@ void setServerType() {
                 null,
                 2048,
                 "",
-                List.of(new Price(0, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
+                List.of(new Price(0L, "london", new PriceDetails("", ""), new PriceDetails("", ""), new PriceDetails("", ""))),
                 ""
         );
         serverDTO.setServerType(serverType);
diff --git a/src/test/java/dev/tomr/hcloud/resources/common/PriceTest.java b/src/test/java/dev/tomr/hcloud/resources/common/PriceTest.java
diff --git a/src/test/java/dev/tomr/hcloud/resources/common/ServerTypeTest.java b/src/test/java/dev/tomr/hcloud/resources/common/ServerTypeTest.java
diff --git a/src/test/java/dev/tomr/hcloud/resources/server/ServerTest.java b/src/test/java/dev/tomr/hcloud/resources/server/ServerTest.java
diff --git a/src/test/java/dev/tomr/hcloud/service/server/ServerServiceTest.java b/src/test/java/dev/tomr/hcloud/service/server/ServerServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,15 @@ public CreatedFrom(int id, String name) {`
`9`	`9`	`this.name = name;`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ public CreatedFrom() {`
	`13`	`+ }`
	`14`	`+`
`12`	`15`	`public int getId() {`
`13`	`16`	`return id;`
`14`	`17`	`}`
`15`	`18`
`16`		`- public CreatedFrom setId(int id) {`
	`19`	`+ public void setId(int id) {`
`17`	`20`	`this.id = id;`
`18`		`- return this;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public String getName() {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ public Datacenter(String description, Integer id, Location location, String name`
`18`	`18`	`this.serverTypes = serverTypes;`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ public Datacenter() {`
	`22`	`+ }`
	`23`	`+`
`21`	`24`	`public String getDescription() {`
`22`	`25`	`return description;`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ public Deprecation(Date announced, Date unavailableAfter) {`
`14`	`14`	`this.unavailableAfter = unavailableAfter;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public Deprecation() {`
	`18`	`+ }`
	`19`	`+`
`17`	`20`	`public Date getAnnounced() {`
`18`	`21`	`return announced;`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ public Image(String architecture, Object boundTo, Date created, CreatedFrom crea`
`53`	`53`	`this.type = type;`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ public Image() {`
	`57`	`+ }`
	`58`	`+`
`56`	`59`	`public String getArchitecture() {`
`57`	`60`	`return architecture;`
`58`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ public Iso(String architecture, Map<String, Date> deprecation, String descriptio`
`20`	`20`	`this.type = type;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ public Iso() {`
	`24`	`+ }`
	`25`	`+`
`23`	`26`	`public String getArchitecture() {`
`24`	`27`	`return architecture;`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ public Location(String city, String country, String description, Integer id, dou`
`24`	`24`	`this.networkZone = networkZone;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public Location() {`
	`28`	`+ }`
	`29`	`+`
`27`	`30`	`public String getCity() {`
`28`	`31`	`return city;`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ public PlacementGroup(Date created, int id, Map<String, String> labels, String n`
`21`	`21`	`this.type = type;`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ public PlacementGroup() {`
	`25`	`+ }`
	`26`	`+`
`24`	`27`	`public Date getCreated() {`
`25`	`28`	`return created;`
`26`	`29`	`}`