Replace hashing id with named instance id

Author: VancySavoki

moss-core/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java

@@ -21,15 +21,7 @@
 import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
 import de.codecentric.boot.admin.server.eventstore.InMemoryEventStore;
 import de.codecentric.boot.admin.server.eventstore.InstanceEventStore;
-import de.codecentric.boot.admin.server.services.EndpointDetectionTrigger;
-import de.codecentric.boot.admin.server.services.EndpointDetector;
-import de.codecentric.boot.admin.server.services.HashingInstanceUrlIdGenerator;
-import de.codecentric.boot.admin.server.services.InfoUpdateTrigger;
-import de.codecentric.boot.admin.server.services.InfoUpdater;
-import de.codecentric.boot.admin.server.services.InstanceIdGenerator;
-import de.codecentric.boot.admin.server.services.InstanceRegistry;
-import de.codecentric.boot.admin.server.services.StatusUpdateTrigger;
-import de.codecentric.boot.admin.server.services.StatusUpdater;
+import de.codecentric.boot.admin.server.services.*;
 import de.codecentric.boot.admin.server.services.endpoints.ChainingStrategy;
 import de.codecentric.boot.admin.server.services.endpoints.ProbeEndpointsStrategy;
 import de.codecentric.boot.admin.server.services.endpoints.QueryIndexEndpointStrategy;
@@ -74,7 +66,7 @@ public InstanceRegistry instanceRegistry(InstanceRepository instanceRepository,
     @Bean
     @ConditionalOnMissingBean
     public InstanceIdGenerator instanceIdGenerator() {
-        return new HashingInstanceUrlIdGenerator();
+        return new HostPortPidInstanceIdGenerator();
     }
 
     @Bean

moss-core/src/main/java/de/codecentric/boot/admin/server/services/HostPortPidInstanceIdGenerator.java

@@ -0,0 +1,44 @@
+package de.codecentric.boot.admin.server.services;
+
+import de.codecentric.boot.admin.server.domain.values.InstanceId;
+import de.codecentric.boot.admin.server.domain.values.Registration;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+@Slf4j
+public class HostPortPidInstanceIdGenerator implements InstanceIdGenerator {
+    private static final char _ = '_';
+    private static final char point = '.';
+    private HashingInstanceUrlIdGenerator hashingInstanceUrlIdGenerator
+            = new HashingInstanceUrlIdGenerator();
+    @Override
+    public InstanceId generateId(Registration registration) {
+        URL serviceUrl;
+        try {
+            serviceUrl = new URL(registration.getServiceUrl());
+        } catch (MalformedURLException e) {
+            log.error("Malformed service url {}, fallback to hashing", registration.getServiceUrl());
+            return hashingInstanceUrlIdGenerator.generateId(registration);
+        }
+        StringBuilder stringBuilder =
+                new StringBuilder(registration.getName())
+                .append(_).append(serviceUrl.getProtocol())
+                .append(_).append(serviceUrl.getHost().replace(point, _))
+                .append(_).append(serviceUrl.getPort())
+
+                ;
+        String encode;
+        String id = stringBuilder.toString();
+        try {
+            encode = URLEncoder.encode(id, "utf-8");
+            return InstanceId.of(encode);
+        } catch (UnsupportedEncodingException e) {
+            log.error("Failed to encode id of {}, fallback to hashing", id);
+            return hashingInstanceUrlIdGenerator.generateId(registration);
+        }
+
+    }
+}