checkstyle

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledConfigMapContextToSourceDataProviderTests.java

@@ -376,12 +376,10 @@ void searchWithLabelsOneConfigMapFound() {
 	}
 
 	/**
-<<<<<<< HEAD
-=======
-	 * two configmaps are deployed: "color-configmap" with label: "{color:blue}" and
-	 * "color-configmap-k8s" with label: "{color:red}". We search by "{color:blue}" and
-	 * find one configmap. Since profiles are enabled, we will also be reading
-	 * "color-configmap-k8s", even if its labels do not match provided ones.
+	 * <<<<<<< HEAD ======= two configmaps are deployed: "color-configmap" with label:
+	 * "{color:blue}" and "color-configmap-k8s" with label: "{color:red}". We search by
+	 * "{color:blue}" and find one configmap. Since profiles are enabled, we will also be
+	 * reading "color-configmap-k8s", even if its labels do not match provided ones.
 	 */
 	@Test
 	void searchWithLabelsOneConfigMapFoundAndOneFromProfileFound() {
@@ -419,8 +417,7 @@ void searchWithLabelsOneConfigMapFoundAndOneFromProfileFound() {
 	}
 
 	/**
->>>>>>> main
-	 * <pre>
+	 * >>>>>>> main <pre>
 	 *     - configmap "color-configmap" with label "{color:blue}"
 	 *     - configmap "shape-configmap" with labels "{color:blue, shape:round}"
 	 *     - configmap "no-fit" with labels "{tag:no-fit}"

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java

@@ -376,12 +376,10 @@ void searchWithLabelsOneSecretFound() {
 	}
 
 	/**
-<<<<<<< HEAD
-=======
-	 * two secrets are deployed: secret "color-secret" with label: "{color:blue}" and
-	 * "color-secret-k8s" with label: "{color:red}". We search by "{color:blue}" and find
-	 * one secret. Since profiles are enabled, we will also be reading "color-secret-k8s",
-	 * even if its labels do not match provided ones.
+	 * <<<<<<< HEAD ======= two secrets are deployed: secret "color-secret" with label:
+	 * "{color:blue}" and "color-secret-k8s" with label: "{color:red}". We search by
+	 * "{color:blue}" and find one secret. Since profiles are enabled, we will also be
+	 * reading "color-secret-k8s", even if its labels do not match provided ones.
 	 */
 	@Test
 	void searchWithLabelsOneSecretFoundAndOneFromProfileFound() {
@@ -419,8 +417,7 @@ void searchWithLabelsOneSecretFoundAndOneFromProfileFound() {
 	}
 
 	/**
->>>>>>> main
-	 * <pre>
+	 * >>>>>>> main <pre>
 	 *     - secret "color-secret" with label "{color:blue}"
 	 *     - secret "shape-secret" with labels "{color:blue, shape:round}"
 	 *     - secret "no-fit" with labels "{tag:no-fit}"

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_profile/LabeledConfigMapWithProfile.java

@@ -151,15 +151,11 @@ void testBlue() {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * <pre>
+	 * <<<<<<< HEAD <pre>
 	 *   this one is taken from : "green-configmap.green-configmap-k8s.green-configmap-prod.green-purple-configmap.green-purple-configmap-k8s".
 	 *   We find "green-configmap", "green-configmap-k8s", "green-configmap-prod"  by labels.
 	 *   Also "green-purple-configmap" and "green-purple-configmap-k8s" are found.
-	 * </pre>
-=======
-	 * found by labels.
->>>>>>> main
+	 * </pre> ======= found by labels. >>>>>>> main
 	 */
 	@Test
 	void testGreen() {

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_profile/LabeledSecretWithProfile.java

@@ -75,12 +75,12 @@ abstract class LabeledSecretWithProfile {
 	 *     - secret with name "color-secret-k8s", with labels : "{color: not-blue}"
 	 *     - secret with name "green-secret-k8s", with labels : "{color: green-k8s}"
 	 *     - secret with name "green-secret-prod", with labels : "{color: green-prod}"
-<<<<<<< HEAD
-=======
+	<<<<<<< HEAD
+	=======
 	 *
 	 *     	a test that proves order: first read non-profile based secrets, thus profile based
 	 *     	secrets override non-profile ones.
->>>>>>> main
+	>>>>>>> main
 	 *     - secret with name "green-purple-secret", labels "{color: green, shape: round}", data: "{eight: 8}"
 	 *     - secret with name "green-purple-secret-k8s", labels "{color: black}", data: "{eight: eight-ish}"
 	 * </pre>
@@ -168,13 +168,13 @@ void testBlue() {
 
 	/**
 	 * <pre>
-<<<<<<< HEAD
+	<<<<<<< HEAD
 	 *   this one is taken from : "green-purple-secret.green-purple-secret-k8s.green-secret.green-secret-k8s.green-secret-prod".
 	 *   We find "green-secret", "green-secrets-k8s" and "green-secrets-prod" by labels.
 	 *   Also "green-purple-secret" and "green-purple-secret-k8s" are found.
-=======
+	=======
 	 *   We find "green-secret" by labels.
->>>>>>> main
+	>>>>>>> main
 	 * </pre>
 	 */
 	@Test