Polish contribution

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerInstanceWebClientConfiguration.java

@@ -139,8 +139,14 @@ protected static class HttpHeadersProviderConfiguration {
 		@ConditionalOnMissingBean
 		public BasicAuthHttpHeaderProvider basicAuthHttpHeadersProvider(AdminServerProperties adminServerProperties) {
 			AdminServerProperties.InstanceAuthProperties instanceAuth = adminServerProperties.getInstanceAuth();
-			return BasicAuthHttpHeaderProvider.of(instanceAuth.isEnabled(), instanceAuth.getDefaultUserName(),
-					instanceAuth.getDefaultPassword(), instanceAuth.getServiceMap());
+
+			if (instanceAuth.isEnabled()) {
+				return new BasicAuthHttpHeaderProvider(instanceAuth.getDefaultUserName(),
+						instanceAuth.getDefaultPassword(), instanceAuth.getServiceMap());
+			}
+			else {
+				return new BasicAuthHttpHeaderProvider();
+			}
 		}
 
 	}

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/client/BasicAuthHttpHeaderProvider.java

@@ -17,6 +17,7 @@
 package de.codecentric.boot.admin.server.web.client;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Map;
 
 import javax.annotation.Nullable;
@@ -35,36 +36,46 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
-@lombok.AllArgsConstructor(staticName = "of")
-@lombok.NoArgsConstructor
 public class BasicAuthHttpHeaderProvider implements HttpHeadersProvider {
 
 	private static final String[] USERNAME_KEYS = { "user.name", "user-name", "username" };
 
 	private static final String[] PASSWORD_KEYS = { "user.password", "user-password", "userpassword" };
 
-	private Boolean instanceAuthEnabled = Boolean.FALSE;
+	@Nullable
+	private final String defaultUserName;
 
-	private String defaultUserName;
+	@Nullable
+	private final String defaultPassword;
 
-	private String defaultPassword;
+	private final Map<String, InstanceCredentials> serviceMap;
 
-	private Map<String, InstanceCredentials> serviceMap;
+	public BasicAuthHttpHeaderProvider(@Nullable String defaultUserName, @Nullable String defaultPassword,
+			Map<String, InstanceCredentials> serviceMap) {
+		this.defaultUserName = defaultUserName;
+		this.defaultPassword = defaultPassword;
+		this.serviceMap = serviceMap;
+	}
+
+	public BasicAuthHttpHeaderProvider() {
+		this(null, null, Collections.emptyMap());
+	}
 
 	@Override
 	public HttpHeaders getHeaders(Instance instance) {
 		String username = getMetadataValue(instance, USERNAME_KEYS);
 		String password = getMetadataValue(instance, PASSWORD_KEYS);
 
-		if (this.instanceAuthEnabled && !(StringUtils.hasText(username) && StringUtils.hasText(password))) {
+		if (!(StringUtils.hasText(username) && StringUtils.hasText(password))) {
 			String registeredName = instance.getRegistration().getName();
-			username = this.defaultUserName;
-			password = this.defaultPassword;
-			if (serviceMap.containsKey(registeredName)) {
-				InstanceCredentials creds = serviceMap.get(registeredName);
-				username = creds.getUserName();
-				password = creds.getUserPassword();
+			InstanceCredentials credentials = this.serviceMap.get(registeredName);
+			if (credentials != null) {
+				username = credentials.getUserName();
+				password = credentials.getUserPassword();
+			}
+			else {
+				username = this.defaultUserName;
+				password = this.defaultPassword;
 			}
 		}
 

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/client/BasicAuthHttpHeaderProviderTest.java

@@ -32,7 +32,7 @@ public class BasicAuthHttpHeaderProviderTest {
 
 	private final BasicAuthHttpHeaderProvider headersProvider = new BasicAuthHttpHeaderProvider();
 
-	private final BasicAuthHttpHeaderProvider headersProviderEnableInstanceAuth = BasicAuthHttpHeaderProvider.of(true,
+	private final BasicAuthHttpHeaderProvider headersProviderEnableInstanceAuth = new BasicAuthHttpHeaderProvider(
 			"client", "client", Collections.singletonMap("sb-admin-server", InstanceCredentials.of("admin", "admin")));
 
 	@Test