fix: rework Service and Listener Manager to not be static in HetznerCloud

Author: CubitsDev

.gitignore

@@ -38,4 +38,5 @@ bin/
 ### Mac OS ###
 .DS_Store
 
-.idea
+.idea
+/src/test/java/dev/tomr/hcloud/component/TestApp.java

src/main/java/dev/tomr/hcloud/HetznerCloud.java

@@ -15,13 +15,14 @@
 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 final ObjectMapper objectMapper = new ObjectMapper();
     private static final String HETZNER_CLOUD_HOST = "https://api.hetzner.cloud/v1/";
 
     private static HetznerCloud instance;
 
+    private final ListenerManager listenerManager = ListenerManager.getInstance();
+    private final ServiceManager serviceManager = ServiceManager.getInstance();
+
     private String apiKey;
     private final String host;
 
@@ -78,15 +79,15 @@ public static ObjectMapper getObjectMapper() {
      * Get the internal {@code ListenerManager}. End users do not need to interact with the {@code ListenerManager}
      * @return The {@code ListenerManager} Instance
      */
-    public static ListenerManager getListenerManager() {
+    public ListenerManager getListenerManager() {
         return listenerManager;
     }
 
     /**
      * Get the internal {@code ServiceManager}. End users do not need to interact with the {@code ServiceManager}
      * @return The {@code ServiceManager} Instance
      */
-    public static ServiceManager getServiceManager() {
+    public ServiceManager getServiceManager() {
         return serviceManager;
     }
 

src/main/java/dev/tomr/hcloud/listener/ServerChangeListener.java

@@ -21,6 +21,6 @@ public void propertyChange(PropertyChangeEvent evt) {
         Server server = (Server) evt.getSource();
         logger.info("Server changed: " + evt.getPropertyName());
         logger.info("Server: " + evt.getOldValue() + " -> " + evt.getNewValue());
-        HetznerCloud.getServiceManager().getServerService().serverNameOrLabelUpdate(evt.getPropertyName(), evt.getNewValue(), server);
+        HetznerCloud.getInstance().getServiceManager().getServerService().serverNameOrLabelUpdate(evt.getPropertyName(), evt.getNewValue(), server);
     }
 }

src/main/java/dev/tomr/hcloud/resources/server/Server.java

@@ -94,7 +94,7 @@ public Server(Integer id, String backupWindow, String created, Datacenter datace
     }
 
     private void setupPropertyChangeListener() {
-        propertyChangeSupport.addPropertyChangeListener(HetznerCloud.getListenerManager().getServerChangeListener());
+        propertyChangeSupport.addPropertyChangeListener(HetznerCloud.getInstance().getListenerManager().getServerChangeListener());
     }
 
 

src/main/java/dev/tomr/hcloud/service/server/ServerService.java

@@ -42,7 +42,7 @@ public class ServerService {
      * Creates a new {@code ServerService} instance
      */
     public ServerService() {
-        this.serviceManager = HetznerCloud.getServiceManager();
+        this.serviceManager = HetznerCloud.getInstance().getServiceManager();
     }
 
     public ServerService(ServiceManager serviceManager) {
@@ -113,7 +113,7 @@ private void updateAllRemoteServers() {
             newServerMap.put(Date.from(Instant.now()), ServerConverterUtil.transformServerDTOToServer(serverDTO));
         });
         remoteServers = newServerMap;
-        lastFullRefresh = new Date();
+        lastFullRefresh = Date.from(Instant.now());
     }
 
     public Server getServer(Integer id) {

src/test/java/dev/tomr/hcloud/HetznerCloudTest.java

@@ -64,14 +64,14 @@ void callingSetApiKeyUpdatesTheAPIKey() throws IllegalAccessException, NoSuchFie
     @DisplayName("Calling getListenerManager returns the listener manager")
     void callingGetListenerManagerReturnsTheListenerManager() {
         ListenerManager listenerManager = ListenerManager.getInstance();
-        assertEquals(listenerManager, HetznerCloud.getListenerManager());
+        assertEquals(listenerManager, HetznerCloud.getInstance().getListenerManager());
     }
 
     @Test
     @DisplayName("Calling getServiceManager returns the service manager")
     void callingGetServiceManagerReturnsTheServiceManager() {
         ServiceManager serviceManager = ServiceManager.getInstance();
-        assertEquals(serviceManager, HetznerCloud.getServiceManager());
+        assertEquals(serviceManager, HetznerCloud.getInstance().getServiceManager());
     }
 
     @Test

src/test/java/dev/tomr/hcloud/listener/ServerChangeListenerTest.java

@@ -21,17 +21,19 @@ public class ServerChangeListenerTest {
     @Test
     void verifyServerChangeListenerCalledWhenSetterIsSet() {
         try (MockedStatic<HetznerCloud> hetznerCloud = mockStatic(HetznerCloud.class)) {
+            HetznerCloud hetznerCloudMock = mock(HetznerCloud.class);
             ServerChangeListener scl = new ServerChangeListener();
             ServerChangeListener serverChangeListener = spy(scl);
             ListenerManager listenerManager = mock(ListenerManager.class);
             ServiceManager serviceManager = mock(ServiceManager.class);
             ServerService serverService = mock(ServerService.class);
             ArgumentCaptor<PropertyChangeEvent> captor = ArgumentCaptor.forClass(PropertyChangeEvent.class);
 
-            hetznerCloud.when(HetznerCloud::getServiceManager).thenReturn(serviceManager);
-            hetznerCloud.when(HetznerCloud::getListenerManager).thenReturn(listenerManager);
+            hetznerCloud.when(HetznerCloud::getInstance).thenReturn(hetznerCloudMock);
             when(listenerManager.getServerChangeListener()).thenReturn(serverChangeListener);
             when(serviceManager.getServerService()).thenReturn(serverService);
+            when(hetznerCloudMock.getListenerManager()).thenReturn(listenerManager);
+            when(hetznerCloudMock.getServiceManager()).thenReturn(serviceManager);
 
             Server server = new Server();
             server.setName("test");

src/test/java/dev/tomr/hcloud/resources/server/ServerTest.java

@@ -114,8 +114,10 @@ void serverCanBeInstantiatedAndValuesSetCorrectly() {
     void callingSetLabelsUpdatesLabels() {
         try (MockedStatic<HetznerCloud> hetznerCloudMockedStatic = mockStatic(HetznerCloud.class);
             MockedStatic<ListenerManager> listenerManagerMockedStatic = mockStatic(ListenerManager.class)) {
+            HetznerCloud hetznerCloud = mock(HetznerCloud.class);
             ListenerManager listenerManager = mock(ListenerManager.class);
-            hetznerCloudMockedStatic.when(HetznerCloud::getListenerManager).thenReturn(listenerManager);
+            hetznerCloudMockedStatic.when(HetznerCloud::getInstance).thenReturn(hetznerCloud);
+            when(hetznerCloud.getListenerManager()).thenReturn(listenerManager);
 
             Server server = new Server();
             server.setLabels(Map.of("label", "value"));
@@ -130,13 +132,15 @@ void callingSetLabelsSendsAnEventToTheServerChangeListener() {
         try (MockedStatic<HetznerCloud> hetznerCloud = mockStatic(HetznerCloud.class)) {
             ServerChangeListener scl = new ServerChangeListener();
             ServerChangeListener serverChangeListener = spy(scl);
+            HetznerCloud hetznerCloudMock = mock(HetznerCloud.class);
             ListenerManager listenerManager = mock(ListenerManager.class);
             ServiceManager serviceManager = mock(ServiceManager.class);
             ServerService serverService = mock(ServerService.class);
             ArgumentCaptor<PropertyChangeEvent> captor = ArgumentCaptor.forClass(PropertyChangeEvent.class);
 
-            hetznerCloud.when(HetznerCloud::getServiceManager).thenReturn(serviceManager);
-            hetznerCloud.when(HetznerCloud::getListenerManager).thenReturn(listenerManager);
+            hetznerCloud.when(HetznerCloud::getInstance).thenReturn(hetznerCloudMock);
+            when(hetznerCloudMock.getListenerManager()).thenReturn(listenerManager);
+            when(hetznerCloudMock.getServiceManager()).thenReturn(serviceManager);
             when(listenerManager.getServerChangeListener()).thenReturn(serverChangeListener);
             when(serviceManager.getServerService()).thenReturn(serverService);
 
@@ -153,10 +157,11 @@ void callingSetLabelsSendsAnEventToTheServerChangeListener() {
     @Test
     @DisplayName("calling setName updates the name")
     void callingSetNameUpdatesTheName() {
-        try (MockedStatic<HetznerCloud> hetznerCloudMockedStatic = mockStatic(HetznerCloud.class);
-             MockedStatic<ListenerManager> listenerManagerMockedStatic = mockStatic(ListenerManager.class)) {
+        try (MockedStatic<HetznerCloud> hetznerCloudMockedStatic = mockStatic(HetznerCloud.class)) {
+            HetznerCloud hetznerCloud = mock(HetznerCloud.class);
             ListenerManager listenerManager = mock(ListenerManager.class);
-            hetznerCloudMockedStatic.when(HetznerCloud::getListenerManager).thenReturn(listenerManager);
+            hetznerCloudMockedStatic.when(HetznerCloud::getInstance).thenReturn(hetznerCloud);
+            when(hetznerCloud.getListenerManager()).thenReturn(listenerManager);
             Server server = new Server();
             server.setName("name");
             assertEquals("name", server.getName());
@@ -167,15 +172,17 @@ void callingSetNameUpdatesTheName() {
     @DisplayName("calling setName sends an event to the ServerChangeListener")
     void callingSetNameSendsAnEventToTheServerChangeListener() {
         try (MockedStatic<HetznerCloud> hetznerCloud = mockStatic(HetznerCloud.class)) {
+            HetznerCloud hetznerCloudMock = mock(HetznerCloud.class);
             ServerChangeListener scl = new ServerChangeListener();
             ServerChangeListener serverChangeListener = spy(scl);
             ListenerManager listenerManager = mock(ListenerManager.class);
             ServiceManager serviceManager = mock(ServiceManager.class);
             ServerService serverService = mock(ServerService.class);
             ArgumentCaptor<PropertyChangeEvent> captor = ArgumentCaptor.forClass(PropertyChangeEvent.class);
 
-            hetznerCloud.when(HetznerCloud::getServiceManager).thenReturn(serviceManager);
-            hetznerCloud.when(HetznerCloud::getListenerManager).thenReturn(listenerManager);
+            hetznerCloud.when(HetznerCloud::getInstance).thenReturn(hetznerCloudMock);
+            when(hetznerCloudMock.getListenerManager()).thenReturn(listenerManager);
+            when(hetznerCloudMock.getServiceManager()).thenReturn(serviceManager);
             when(listenerManager.getServerChangeListener()).thenReturn(serverChangeListener);
             when(serviceManager.getServerService()).thenReturn(serverService);