Skip to content

Commit 327c30a

Browse files
dcrissmandcrissman
committed
correct variable names
1 parent d663b0b commit 327c30a

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/EntryBuilder.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ else if(type instanceof BinaryType){
7575

7676
@Override
7777
protected void translate(SimpleField field, Path path, JsonNode node, Entry target) {
78-
String fieldName = property.translateFieldName(field.getName());
78+
String attributeName = property.translateFieldName(field.getName());
7979

80-
if(LdapConstant.ATTRIBUTE_DN.equalsIgnoreCase(fieldName)){
80+
if(LdapConstant.ATTRIBUTE_DN.equalsIgnoreCase(attributeName)){
8181
throw new IllegalArgumentException(
8282
"'dn' should not be included as it's value will be derived from the metadata.basedn and" +
8383
" the metadata.uniqueattr. Including the 'dn' as an insert attribute is confusing.");
8484
}
85-
else if(LightblueUtil.isFieldObjectType(fieldName)
86-
|| LightblueUtil.isFieldAnArrayCount(fieldName, getEntityMetadata().getFields())){
85+
else if(LightblueUtil.isFieldObjectType(attributeName)
86+
|| LightblueUtil.isFieldAnArrayCount(attributeName, getEntityMetadata().getFields())){
8787
/*
8888
* Indicates the field is auto-generated for lightblue purposes. These fields
8989
* should not be inserted into LDAP.
@@ -94,10 +94,10 @@ else if(LightblueUtil.isFieldObjectType(fieldName)
9494
Type type = field.getType();
9595
Object o = fromJson(type, node);
9696
if(type instanceof BinaryType) {
97-
target.addAttribute(fieldName, (byte[])o);
97+
target.addAttribute(attributeName, (byte[])o);
9898
}
9999
else{
100-
target.addAttribute(fieldName, o.toString());
100+
target.addAttribute(attributeName, o.toString());
101101
}
102102
}
103103

@@ -110,21 +110,21 @@ protected void translate(ObjectField field, Path path, JsonNode node, Entry targ
110110
protected void translateSimpleArray(ArrayField field, Path path, List<Object> items, Entry target) {
111111
ArrayElement arrayElement = field.getElement();
112112
Type arrayElementType = arrayElement.getType();
113-
String fieldName = property.translateFieldName(field.getName());
113+
String attributeName = property.translateFieldName(field.getName());
114114

115115
if(arrayElementType instanceof BinaryType){
116116
List<byte[]> bytes = new ArrayList<byte[]>();
117117
for(Object item : items){
118118
bytes.add((byte[])item);
119119
}
120-
target.addAttribute(fieldName, bytes.toArray(new byte[0][]));
120+
target.addAttribute(attributeName, bytes.toArray(new byte[0][]));
121121
}
122122
else{
123123
List<String> values = new ArrayList<String>();
124124
for(Object item : items){
125125
values.add(item.toString());
126126
}
127-
target.addAttribute(fieldName, values);
127+
target.addAttribute(attributeName, values);
128128
}
129129
}
130130

‎lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ public CRUDInsertionResponse insert(CRUDOperationContext ctx,
127127

128128
JsonNode rootNode = document.getRoot();
129129

130-
String uniqueAttributeName = property.translateAttributeName(store.getUniqueAttribute());
131-
JsonNode uniqueNode = rootNode.get(uniqueAttributeName);
130+
String uniqueFieldName = property.translateAttributeName(store.getUniqueAttribute());
131+
JsonNode uniqueNode = rootNode.get(uniqueFieldName);
132132
if(uniqueNode == null){
133-
throw new IllegalArgumentException(uniqueAttributeName + " is a required field");
133+
throw new IllegalArgumentException(uniqueFieldName + " is a required field");
134134
}
135135

136136
String dn = createDN(store, uniqueNode.asText());
@@ -424,7 +424,7 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
424424
JsonNodeFactory factory = ctx.getFactory().getNodeFactory();
425425
LdapMetadataProperty property = getLdapMetadataProperty(md);
426426

427-
Set<String> requiredAttributes = translateFieldNames(property, gatherRequiredFields(md, projection, null, null));
427+
Set<String> requiredAttributeNames = translateFieldNames(property, gatherRequiredFields(md, projection, null, null));
428428
Projector projector = Projector.getInstance(
429429
Projection.add(
430430
projection,
@@ -442,7 +442,7 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
442442
DocCtx projectionResponseJson = null;
443443

444444
// If only dn is in the projection, then no need to query LDAP.
445-
if((requiredAttributes.size() == 1) && requiredAttributes.contains(LdapConstant.ATTRIBUTE_DN)){
445+
if((requiredAttributeNames.size() == 1) && requiredAttributeNames.contains(LdapConstant.ATTRIBUTE_DN)){
446446
ObjectNode node = factory.objectNode();
447447
node.set(dnFieldName, StringType.TYPE.toJson(factory, dn));
448448
projectionResponseJson = new DocCtx(new JsonDoc(node));

‎lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/translator/FilterTranslator.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ else if (query instanceof ValueComparisonExpression){
8686
}
8787

8888
private Filter translate(ArrayContainsExpression query){
89-
String fieldName = property.translateFieldName(query.getArray().toString());
89+
String attributeName = property.translateFieldName(query.getArray().toString());
9090

9191
List<Filter> filters = new ArrayList<Filter>();
9292
for(Value value : query.getValues()){
93-
filters.add(Filter.createEqualityFilter(fieldName, value.getValue().toString()));
93+
filters.add(Filter.createEqualityFilter(attributeName, value.getValue().toString()));
9494
}
9595

9696
switch(query.getOp()){
@@ -131,10 +131,10 @@ private Filter translate(NaryLogicalExpression query){
131131
}
132132

133133
private Filter translate(NaryRelationalExpression query){
134-
String fieldName = property.translateFieldName(query.getField().toString());
134+
String attributeName = property.translateFieldName(query.getField().toString());
135135
List<Filter> filters = new ArrayList<Filter>();
136136
for(Value value : query.getValues()){
137-
filters.add(Filter.createEqualityFilter(fieldName, value.getValue().toString()));
137+
filters.add(Filter.createEqualityFilter(attributeName, value.getValue().toString()));
138138
}
139139

140140
switch (query.getOp()){
@@ -162,22 +162,22 @@ private Filter translate(UnaryLogicalExpression query){
162162
}
163163

164164
private Filter translate(ValueComparisonExpression query){
165-
String fieldName = property.translateFieldName(query.getField().toString());
165+
String attributeName = property.translateFieldName(query.getField().toString());
166166
String rValue = query.getRvalue().getValue().toString();
167167

168168
switch(query.getOp()){
169169
case _eq:
170-
return Filter.createEqualityFilter(fieldName, rValue);
170+
return Filter.createEqualityFilter(attributeName, rValue);
171171
case _neq:
172-
return Filter.createNOTFilter(Filter.createEqualityFilter(fieldName, rValue));
172+
return Filter.createNOTFilter(Filter.createEqualityFilter(attributeName, rValue));
173173
case _gte:
174-
return Filter.createGreaterOrEqualFilter(fieldName, rValue);
174+
return Filter.createGreaterOrEqualFilter(attributeName, rValue);
175175
case _lte:
176-
return Filter.createLessOrEqualFilter(fieldName, rValue);
176+
return Filter.createLessOrEqualFilter(attributeName, rValue);
177177
case _gt: //aka. !lte
178-
return Filter.createNOTFilter(Filter.createLessOrEqualFilter(fieldName, rValue));
178+
return Filter.createNOTFilter(Filter.createLessOrEqualFilter(attributeName, rValue));
179179
case _lt: //aka. !gte
180-
return Filter.createNOTFilter(Filter.createGreaterOrEqualFilter(fieldName, rValue));
180+
return Filter.createNOTFilter(Filter.createGreaterOrEqualFilter(attributeName, rValue));
181181
default:
182182
throw new UnsupportedOperationException("Unsupported operation: " + query.getOp());
183183
}

0 commit comments

Comments
 (0)