|
|
|
@ -826,7 +826,7 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<? |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public PropertyMatch(@Nullable String namePattern, @Nullable String typeName) { |
|
|
|
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.namePatternRegex = namePattern == null ? null : Pattern.compile(namePattern); |
|
|
|
this.typeName = typeName; |
|
|
|
this.typeName = typeName; |
|
|
|
@ -868,7 +868,7 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<? |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ((typeName != null) && !type.getName().equals(typeName)) { |
|
|
|
if (typeName != null && !type.getName().equals(typeName)) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -909,7 +909,9 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<? |
|
|
|
|
|
|
|
|
|
|
|
return super.matches(property); |
|
|
|
return super.matches(property); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|