Skip to content

Commit

Permalink
UpdateModificationConverter: final fields + two typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
virgo47 committed Jun 9, 2020
1 parent e16d813 commit e7f9406
Showing 1 changed file with 11 additions and 8 deletions.
Expand Up @@ -23,9 +23,9 @@
*/
public class UpdateModificationConverter extends AbstractModificationConverter {

private Set<Attribute> attributesToAdd = new HashSet<>();
private Set<Attribute> attributesToUpdate = new HashSet<>();
private Set<Attribute> attributesToRemove = new HashSet<>();
private final Set<Attribute> attributesToAdd = new HashSet<>();
private final Set<Attribute> attributesToUpdate = new HashSet<>();
private final Set<Attribute> attributesToRemove = new HashSet<>();

public Set<Attribute> getAttributesToAdd() {
return attributesToAdd;
Expand All @@ -40,7 +40,10 @@ public Set<Attribute> getAttributesToRemove() {
}

@Override
protected <T> void collect(String connIdAttrName, PropertyDelta<T> delta, PlusMinusZero isInModifiedAuxilaryClass, CollectorValuesConverter<T> valuesConverter) throws SchemaException {
protected <T> void collect(String connIdAttrName, PropertyDelta<T> delta,
PlusMinusZero isInModifiedAuxiliaryClass, CollectorValuesConverter<T> valuesConverter)
throws SchemaException {

if (delta.isAdd()) {
List<Object> connIdAttributeValues = valuesConverter.covertAttributeValuesToConnId(delta.getValuesToAdd(), delta.getElementName());
if (delta.getDefinition().isMultiValue()) {
Expand All @@ -53,7 +56,7 @@ protected <T> void collect(String connIdAttrName, PropertyDelta<T> delta, PlusMi
}
}
if (delta.isDelete()) {
if (delta.getDefinition().isMultiValue() || isInModifiedAuxilaryClass == PlusMinusZero.MINUS) {
if (delta.getDefinition().isMultiValue() || isInModifiedAuxiliaryClass == PlusMinusZero.MINUS) {
List<Object> connIdAttributeValues = valuesConverter.covertAttributeValuesToConnId(delta.getValuesToDelete(), delta.getElementName());
attributesToRemove.add(AttributeBuilder.build(connIdAttrName, connIdAttributeValues));
} else {
Expand All @@ -62,13 +65,13 @@ protected <T> void collect(String connIdAttrName, PropertyDelta<T> delta, PlusMi
// Update attribute to no values. This will efficiently clean up the attribute.
// It should also make no substantial difference in such case.
// But it is working around some connector bugs.
// update with EMTPY value. The connIdAttributeValues is NOT used in this branch
// update with EMPTY value. The connIdAttributeValues is NOT used in this branch
attributesToUpdate.add(AttributeBuilder.build(connIdAttrName));
}
}
if (delta.isReplace()) {
List<Object> connIdAttributeValues = valuesConverter.covertAttributeValuesToConnId(delta.getValuesToReplace(), delta.getElementName());
if (isInModifiedAuxilaryClass == PlusMinusZero.PLUS) {
if (isInModifiedAuxiliaryClass == PlusMinusZero.PLUS) {
attributesToAdd.add(AttributeBuilder.build(connIdAttrName, connIdAttributeValues));
} else {
attributesToUpdate.add(AttributeBuilder.build(connIdAttrName, connIdAttributeValues));
Expand All @@ -77,7 +80,7 @@ protected <T> void collect(String connIdAttrName, PropertyDelta<T> delta, PlusMi
}

@Override
protected <T> void collectReplace(String connIdAttrName, T connIdAttrValue) throws SchemaException {
protected <T> void collectReplace(String connIdAttrName, T connIdAttrValue) {
if (connIdAttrValue == null) {
attributesToUpdate.add(AttributeBuilder.build(connIdAttrName));
} else {
Expand Down

0 comments on commit e7f9406

Please sign in to comment.