Update to Spring Framework 6.1.0-M2
Closes gh-792
This commit is contained in:
@@ -782,7 +782,8 @@ public final class LdapUtils {
|
||||
|
||||
@Override
|
||||
public void handleAttributeValue(String attributeName, Object attributeValue, int index) {
|
||||
Assert.isTrue(attributeName == null || this.clazz.isAssignableFrom(attributeValue.getClass()));
|
||||
Assert.isTrue(attributeName == null || this.clazz.isAssignableFrom(attributeValue.getClass()),
|
||||
() -> "either attributeName must be null or the attribute value must be of type " + this.clazz);
|
||||
this.collection.add(this.clazz.cast(attributeValue));
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ public final class LdapTransactionUtils {
|
||||
* name.
|
||||
*/
|
||||
public static Name getFirstArgumentAsName(Object[] args) {
|
||||
Assert.notEmpty(args);
|
||||
Assert.notEmpty(args, "args cannot be empty");
|
||||
|
||||
Object firstArg = args[0];
|
||||
return getArgumentAsName(firstArg);
|
||||
|
||||
@@ -55,7 +55,7 @@ public class ModifyAttributesOperationRecorder implements CompensatingTransactio
|
||||
* CompensatingTransactionOperationRecorder#recordOperation(java.lang.Object[])
|
||||
*/
|
||||
public CompensatingTransactionOperationExecutor recordOperation(Object[] args) {
|
||||
Assert.notNull(args);
|
||||
Assert.notNull(args, "args cannot be empty");
|
||||
Name dn = LdapTransactionUtils.getFirstArgumentAsName(args);
|
||||
if (args.length != 2 || !(args[1] instanceof ModificationItem[])) {
|
||||
throw new IllegalArgumentException("Unexpected arguments to ModifyAttributes operation");
|
||||
|
||||
@@ -54,7 +54,7 @@ public class RenameOperationRecorder implements CompensatingTransactionOperation
|
||||
*/
|
||||
public CompensatingTransactionOperationExecutor recordOperation(Object[] args) {
|
||||
log.debug("Storing rollback information for rename operation");
|
||||
Assert.notEmpty(args);
|
||||
Assert.notEmpty(args, "args cannot be empty");
|
||||
if (args.length != 2) {
|
||||
// This really shouldn't happen.
|
||||
throw new IllegalArgumentException("Illegal argument length");
|
||||
|
||||
Reference in New Issue
Block a user