Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make NameAwareAttribute Iterable

Browse Source 
Allow faster iteration over NameAwareAttribute's values

Fixes gh-429
This commit is contained in:
Patryk Petrowski
2016-11-23 14:02:14 +01:00
committed by Rob Winch
parent e7c64527b4
commit 37f8833826
4 changed files with 78 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
View File

@@ -458,8 +458,8 @@ public class DirContextAdapter implements DirContextOperations {
*/
private boolean isChanged(String name, Object[] values, boolean orderMatters) {
Attribute orig = originalAttrs.get(name);
Attribute prev = updatedAttrs.get(name);
NameAwareAttribute orig = originalAttrs.get(name);
NameAwareAttribute prev = updatedAttrs.get(name);
// values == null and values.length == 0 is treated the same way
boolean emptyNewValue = (values == null || values.length == 0);
@@ -494,67 +494,43 @@ public class DirContextAdapter implements DirContextOperations {
// Check contents of arrays
// Order DOES matter, e.g. first names
try {
for (int i = 0; i < orig.size(); i++) {
Object obj = orig.get(i);
// TRUE if one value is not equal
if (!(obj instanceof String)) {
return true;
}
if (orderMatters) {
// check only the string with same index
if (!values[i].equals(obj)) {
return true;
}
}
else {
// check all strings
if (!ObjectUtils.containsElement(values, obj)) {
return true;
}
}
}
}
catch (NamingException e) {
// TRUE if we can't access the value
if (isAttributeUpdated(values, orderMatters, orig))
return true;
}
if (prev != null) {
// Also check against updatedAttrs, since there might have been
// a previous update
try {
for (int i = 0; i < prev.size(); i++) {
Object obj = prev.get(i);
// TRUE if one value is not equal
if (!(obj instanceof String)) {
return true;
}
if (orderMatters) {
// check only the string with same index
if (!values[i].equals(obj)) {
return true;
}
}
else {
// check all strings
if (!ObjectUtils.containsElement(values, obj)) {
return true;
}
}
}
}
catch (NamingException e) {
// TRUE if we can't access the value
if (isAttributeUpdated(values, orderMatters, prev))
return true;
}
}
// FALSE since we have compared all values
return false;
}
private boolean isAttributeUpdated(Object[] values, boolean orderMatters, NameAwareAttribute orig) {
int i = 0;
for (Object obj : orig) {
// TRUE if one value is not equal
if (!(obj instanceof String)) {
return true;
}
if (orderMatters) {
// check only the string with same index
if (!values[i].equals(obj)) {
return true;
}
}
else {
// check all strings
if (!ObjectUtils.containsElement(values, obj)) {
return true;
}
}
i++;
}
return false;
}
/**
* Checks if an entry has a specific attribute.
*
@@ -1413,7 +1389,7 @@ public class DirContextAdapter implements DirContextOperations {
builder.append(" {");
try {
for (NamingEnumeration<? extends Attribute> i = originalAttrs.getAll(); i.hasMore();) {
for (NamingEnumeration<NameAwareAttribute> i = originalAttrs.getAll(); i.hasMore();) {
Attribute attribute = i.next();
if (attribute.size() == 1) {
builder.append(attribute.getID());
@@ -1421,15 +1397,10 @@ public class DirContextAdapter implements DirContextOperations {
builder.append(attribute.get());
}
else {
for (int j = 0; j < attribute.size(); j++) {
if (j > 0) {
builder.append(", ");
}
builder.append(attribute.getID());
builder.append('[');
builder.append(j);
builder.append("]=");
builder.append(attribute.get(j));
int j = 0;
for (Object value : (Iterable) attribute) {
appendAttributeValue(builder, attribute.getID(), value, j);
j++;
}
}
@@ -1446,7 +1417,18 @@ public class DirContextAdapter implements DirContextOperations {
return builder.toString();
}
/**
private void appendAttributeValue(StringBuilder builder, String attributeID, Object value, int index) throws NamingException {
if (index > 0) {
builder.append(", ");
}
builder.append(attributeID);
builder.append('[');
builder.append(index);
builder.append("]=");
builder.append(value);
}
/**
* {@inheritDoc}
*/
@Override

15
core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java
View File

@@ -40,7 +40,7 @@ import java.util.Set;
* @author Mattias Hellborg Arthursson
* @since 2.0
*/
public final class NameAwareAttribute implements Attribute {
public final class NameAwareAttribute implements Attribute, Iterable<Object> {
private final String id;
private final boolean orderMatters;
@@ -219,6 +219,13 @@ public final class NameAwareAttribute implements Attribute {
return orderMatters;
}
/**
* <p>
* Due to performance reasons it is not advised to iterate over the attribute's values using this method.
* Please use the {@link #iterator()} instead.
* </p>
* {@inheritDoc}
*/
@Override
public Object get(int ix) throws NamingException {
Iterator<Object> iterator = values.iterator();
@@ -348,4 +355,10 @@ public final class NameAwareAttribute implements Attribute {
return String.format("NameAwareAttribute; id: %s; hasValuesAsNames: %s; orderMatters: %s; values: %s",
id, hasValuesAsNames(), orderMatters, values);
}
@Override
public Iterator<Object> iterator() {
return values.iterator();
}
}

2
core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java
View File

@@ -69,7 +69,7 @@ public final class NameAwareAttributes implements Attributes {
}
@Override
public NamingEnumeration<? extends Attribute> getAll() {
public NamingEnumeration<NameAwareAttribute> getAll() {
return new IterableNamingEnumeration<NameAwareAttribute>(attributes.values());
}

24
core/src/main/java/org/springframework/ldap/support/LdapUtils.java
View File

@@ -299,17 +299,29 @@ public final class LdapUtils {
Assert.notNull(attribute, "Attribute must not be null");
Assert.notNull(callbackHandler, "callbackHandler must not be null");
for (int i = 0; i < attribute.size(); i++) {
try {
callbackHandler.handleAttributeValue(attribute.getID(), attribute.get(i), i);
if (attribute instanceof Iterable) {
int i = 0;
for (Object obj : (Iterable) attribute) {
handleAttributeValue(attribute.getID(), obj, i, callbackHandler);
i++;
}
catch (javax.naming.NamingException e) {
throw convertLdapException(e);
}
else {
for (int i = 0; i < attribute.size(); i++) {
try {
handleAttributeValue(attribute.getID(), attribute.get(i), i, callbackHandler);
} catch (javax.naming.NamingException e) {
throw convertLdapException(e);
}
}
}
}
/**
private static void handleAttributeValue(String attributeID, Object value, int i, AttributeValueCallbackHandler callbackHandler) {
callbackHandler.handleAttributeValue(attributeID, value, i);
}
/**
* An {@link AttributeValueCallbackHandler} to collect values in a supplied
* collection.
*