diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index d5efd9fdf..9cd23aabd 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -814,8 +814,8 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 		 */
 		static class PropertyMatch {
 
-            private final @Nullable Pattern namePatternRegex;
-            private final @Nullable String typeName;
+			private final @Nullable Pattern namePatternRegex;
+			private final @Nullable String typeName;
 
 			/**
 			 * Creates a new {@link PropertyMatch} for the given name pattern and type name. At least one of the parameters
@@ -826,10 +826,10 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			 */
 			public PropertyMatch(@Nullable String namePattern, @Nullable String typeName) {
 
-				Assert.isTrue(!((namePattern == null) && (typeName == null)), "Either name pattern or type name must be given");
+				Assert.isTrue(namePattern != null || typeName != null, "Either name pattern or type name must be given");
 
-                this.namePatternRegex = namePattern == null ? null : Pattern.compile(namePattern);
-                this.typeName = typeName;
+				this.namePatternRegex = namePattern == null ? null : Pattern.compile(namePattern);
+				this.typeName = typeName;
 			}
 
 			/**
@@ -864,11 +864,11 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 				Assert.notNull(name, "Name must not be null");
 				Assert.notNull(type, "Type must not be null");
 
-                if (namePatternRegex != null && !namePatternRegex.matcher(name).matches()) {
-                    return false;
-                }
+				if (namePatternRegex != null && !namePatternRegex.matcher(name).matches()) {
+					return false;
+				}
 
-				if ((typeName != null) && !type.getName().equals(typeName)) {
+				if (typeName != null && !type.getName().equals(typeName)) {
 					return false;
 				}
 
@@ -909,7 +909,9 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 
 				return super.matches(property);
 			}
+
 		}
+
 	}
 
 }