From 183f33182d9a03b2690e4f47bfa1fd248c80c430 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Wed, 7 Apr 2021 16:12:55 -0400
Subject: [PATCH] Resolving merge conflicts

---
 .../KubernetesClientEventBasedConfigMapChangeDetector.java       | 1 +
 .../reload/KubernetesClientEventBasedSecretsChangeDetector.java  | 1 +
 .../fabric8/config/reload/EventBasedConfigMapChangeDetector.java | 1 +
 .../fabric8/config/reload/EventBasedSecretsChangeDetector.java   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java
index 30d1283d..c4b0e9e8 100644
--- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java
+++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java
@@ -125,6 +125,7 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura
 	}
 
 	private void onEvent(V1ConfigMap configMap) {
+		this.log.debug(String.format("onEvent configMap: %s", configMap.toString()));
 		boolean changed = changed(locateMapPropertySources(this.propertySourceLocator, this.environment),
 				findPropertySources(KubernetesClientConfigMapPropertySource.class));
 		if (changed) {
diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java
index 7b7ed7fe..f42b89d2 100644
--- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java
+++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java
@@ -119,6 +119,7 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati
 	}
 
 	private void onEvent(V1Secret secret) {
+		this.log.debug(String.format("onEvent configMap: %s", secret.toString()));
 		boolean changed = changed(locateMapPropertySources(this.propertySourceLocator, this.environment),
 				findPropertySources(KubernetesClientSecretsPropertySource.class));
 		if (changed) {
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java
index e19d5c13..256d28cd 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java
@@ -119,6 +119,7 @@ public class EventBasedConfigMapChangeDetector extends ConfigurationChangeDetect
 	}
 
 	protected void onEvent(ConfigMap configMap) {
+		this.log.debug(String.format("onEvent configMap: %s", configMap.toString()));
 		boolean changed = changed(
 				locateMapPropertySources(this.fabric8ConfigMapPropertySourceLocator, this.environment),
 				findPropertySources(Fabric8ConfigMapPropertySource.class));
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java
index 4e626668..e710c814 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java
@@ -119,6 +119,7 @@ public class EventBasedSecretsChangeDetector extends ConfigurationChangeDetector
 	}
 
 	protected void onEvent(Secret secret) {
+		this.log.debug(String.format("onEvent configMap: %s", secret.toString()));
 		boolean changed = changed(locateMapPropertySources(this.fabric8SecretsPropertySourceLocator, this.environment),
 				findPropertySources(Fabric8SecretsPropertySource.class));
 		if (changed) {