Skip to content

Commit e98234f

Browse files
dcrissmandcrissman
committed
rename LazyLdapFieldNameTranslator to TrivialLdapFieldNameTranslator
1 parent 8c7927b commit e98234f

File tree

8 files changed

+52
-53
lines changed

8 files changed

+52
-53
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
*/
4848
public class EntryBuilder extends TranslatorFromJson<Entry>{
4949

50-
private final LdapFieldNameTranslator fieldNameTranslator
51-
;
50+
private final LdapFieldNameTranslator fieldNameTranslator;
5251

5352
public EntryBuilder(EntityMetadata md, LdapFieldNameTranslator fieldNameTranslator){
5453
super(md);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import com.redhat.lightblue.crud.CRUDUpdateResponse;
4545
import com.redhat.lightblue.crud.CrudConstants;
4646
import com.redhat.lightblue.crud.DocCtx;
47-
import com.redhat.lightblue.crud.ldap.model.LazyLdapFieldNameTranslator;
47+
import com.redhat.lightblue.crud.ldap.model.TrivialLdapFieldNameTranslator;
4848
import com.redhat.lightblue.crud.ldap.translator.FilterTranslator;
4949
import com.redhat.lightblue.crud.ldap.translator.ResultTranslator;
5050
import com.redhat.lightblue.crud.ldap.translator.SortTranslator;
@@ -335,7 +335,7 @@ private LdapFieldNameTranslator getLdapFieldNameTranslator(EntityMetadata md){
335335
Object o = md.getEntityInfo().getProperties().get(LdapConstant.BACKEND);
336336

337337
if(o == null){
338-
return new LazyLdapFieldNameTranslator();
338+
return new TrivialLdapFieldNameTranslator();
339339
}
340340

341341
if(!(o instanceof LdapFieldNameTranslator)){

‎lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/model/LazyLdapFieldNameTranslator.java‎ renamed to ‎lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* @author dcrissman
2828
*/
29-
public class LazyLdapFieldNameTranslator implements LdapFieldNameTranslator{
29+
public class TrivialLdapFieldNameTranslator implements LdapFieldNameTranslator{
3030

3131
@Override
3232
public String translateFieldName(String fieldName) {

‎lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/EntryBuilderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.redhat.lightblue.common.ldap.LightblueUtil;
4444
import com.redhat.lightblue.crud.ldap.EntryBuilderTest.ParameterizedTests;
4545
import com.redhat.lightblue.crud.ldap.EntryBuilderTest.SpecializedTests;
46-
import com.redhat.lightblue.crud.ldap.model.LazyLdapFieldNameTranslator;
46+
import com.redhat.lightblue.crud.ldap.model.TrivialLdapFieldNameTranslator;
4747
import com.redhat.lightblue.metadata.EntityMetadata;
4848
import com.redhat.lightblue.metadata.types.DateType;
4949
import com.redhat.lightblue.test.MetadataUtil;
@@ -64,7 +64,7 @@ protected static Entry buildEntry(String fieldName, String metadataType, String
6464
.replaceFirst("#value", crudValue);
6565

6666
EntityMetadata md = MetadataUtil.createEntityMetadata(LdapConstant.BACKEND, json(metadata), null, null);
67-
EntryBuilder builder = new EntryBuilder(md, new LazyLdapFieldNameTranslator());
67+
EntryBuilder builder = new EntryBuilder(md, new TrivialLdapFieldNameTranslator());
6868

6969
return builder.build("uid=someuid,dc=example,dc=com",
7070
new JsonDoc(json(crud).get("data")));

‎lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/model/LazyLdapFieldNameTranslatorTest.java‎ renamed to ‎lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslatorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222

2323
import org.junit.Test;
2424

25-
public class LazyLdapFieldNameTranslatorTest {
25+
public class TrivialLdapFieldNameTranslatorTest {
2626

2727
@Test
2828
public void testTranslateFieldName(){
2929
String fieldName = "fakeFieldName";
30-
assertEquals(fieldName, new LazyLdapFieldNameTranslator().translateFieldName(fieldName));
30+
assertEquals(fieldName, new TrivialLdapFieldNameTranslator().translateFieldName(fieldName));
3131
}
3232

3333
@Test
3434
public void testTranslateAttributeName(){
3535
String attributeName = "fakeAttributeName";
36-
assertEquals(attributeName, new LazyLdapFieldNameTranslator().translateAttributeName(attributeName));
36+
assertEquals(attributeName, new TrivialLdapFieldNameTranslator().translateAttributeName(attributeName));
3737
}
3838

3939
}

‎lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/translator/FilterTranslatorTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.Test;
2727

2828
import com.fasterxml.jackson.databind.JsonNode;
29-
import com.redhat.lightblue.crud.ldap.model.LazyLdapFieldNameTranslator;
29+
import com.redhat.lightblue.crud.ldap.model.TrivialLdapFieldNameTranslator;
3030
import com.redhat.lightblue.query.ArrayContainsExpression;
3131
import com.redhat.lightblue.query.ArrayMatchExpression;
3232
import com.redhat.lightblue.query.BinaryComparisonOperator;
@@ -50,7 +50,7 @@ public class FilterTranslatorTest {
5050
@SuppressWarnings("serial")
5151
@Test(expected = UnsupportedOperationException.class)
5252
public void testTranslate_UnsupportedFilterType(){
53-
new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(new QueryExpression(){
53+
new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(new QueryExpression(){
5454

5555
@Override
5656
public JsonNode toJson() {
@@ -65,7 +65,7 @@ public void testTranslate_ValueComparisonExpression_Equals(){
6565
QueryExpression query = new ValueComparisonExpression(
6666
new Path("somekey"), BinaryComparisonOperator._eq, new Value("somevalue"));
6767

68-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
68+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
6969
assertEquals("(somekey=somevalue)", filter.toString());
7070
}
7171

@@ -74,7 +74,7 @@ public void testTranslate_ValueComparisonExpression_NotEquals(){
7474
QueryExpression query = new ValueComparisonExpression(
7575
new Path("somekey"), BinaryComparisonOperator._neq, new Value("somevalue"));
7676

77-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
77+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
7878
assertEquals("(!(somekey=somevalue))", filter.toString());
7979
}
8080

@@ -83,7 +83,7 @@ public void testTranslate_ValueComparisonExpression_GTE(){
8383
QueryExpression query = new ValueComparisonExpression(
8484
new Path("somekey"), BinaryComparisonOperator._gte, new Value("somevalue"));
8585

86-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
86+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
8787
assertEquals("(somekey>=somevalue)", filter.toString());
8888
}
8989

@@ -92,7 +92,7 @@ public void testTranslate_ValueComparisonExpression_GT(){
9292
QueryExpression query = new ValueComparisonExpression(
9393
new Path("somekey"), BinaryComparisonOperator._gt, new Value("somevalue"));
9494

95-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
95+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
9696
assertEquals("(!(somekey<=somevalue))", filter.toString());
9797
}
9898

@@ -101,7 +101,7 @@ public void testTranslate_ValueComparisonExpression_LTE(){
101101
QueryExpression query = new ValueComparisonExpression(
102102
new Path("somekey"), BinaryComparisonOperator._lte, new Value("somevalue"));
103103

104-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
104+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
105105
assertEquals("(somekey<=somevalue)", filter.toString());
106106
}
107107

@@ -110,7 +110,7 @@ public void testTranslate_ValueComparisonExpression_LT(){
110110
QueryExpression query = new ValueComparisonExpression(
111111
new Path("somekey"), BinaryComparisonOperator._lt, new Value("somevalue"));
112112

113-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
113+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
114114
assertEquals("(!(somekey>=somevalue))", filter.toString());
115115
}
116116

@@ -120,7 +120,7 @@ public void testTranslate_UnaryLogicalExpression_NOT(){
120120
UnaryLogicalOperator._not,
121121
new ValueComparisonExpression(new Path("somekey"), BinaryComparisonOperator._eq, new Value("somevalue")));
122122

123-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
123+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
124124
assertEquals("(!(somekey=somevalue))", filter.toString());
125125
}
126126

@@ -131,7 +131,7 @@ public void testTranslate_NaryRelationalExpression_IN(){
131131
NaryRelationalOperator._in,
132132
Arrays.asList(new Value("somevalue"), new Value("someothervalue")));
133133

134-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
134+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
135135
assertEquals("(|(somekey=somevalue)(somekey=someothervalue))", filter.toString());
136136
}
137137

@@ -142,7 +142,7 @@ public void testTranslate_NaryRelationalExpression_NOT_IN(){
142142
NaryRelationalOperator._not_in,
143143
Arrays.asList(new Value("somevalue"), new Value("someothervalue")));
144144

145-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
145+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
146146
assertEquals("(!(|(somekey=somevalue)(somekey=someothervalue)))", filter.toString());
147147
}
148148

@@ -153,7 +153,7 @@ public void testTranslate_NaryLogicalExpression_AND(){
153153
new ValueComparisonExpression(new Path("somekey"), BinaryComparisonOperator._eq, new Value("somevalue")),
154154
new ValueComparisonExpression(new Path("someotherkey"), BinaryComparisonOperator._eq, new Value("someothervalue")))));
155155

156-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
156+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
157157
assertEquals("(&(somekey=somevalue)(someotherkey=someothervalue))", filter.toString());
158158
}
159159

@@ -164,7 +164,7 @@ public void testTranslate_NaryLogicalExpression_OR(){
164164
new ValueComparisonExpression(new Path("somekey"), BinaryComparisonOperator._eq, new Value("somevalue")),
165165
new ValueComparisonExpression(new Path("someotherkey"), BinaryComparisonOperator._eq, new Value("someothervalue")))));
166166

167-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
167+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
168168
assertEquals("(|(somekey=somevalue)(someotherkey=someothervalue))", filter.toString());
169169
}
170170

@@ -175,7 +175,7 @@ public void testTranslate_ArrayContainsExpression_ANY(){
175175
ContainsOperator._any,
176176
Arrays.asList(new Value("somevalue"), new Value("someothervalue")));
177177

178-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
178+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
179179
assertEquals("(|(somekey=somevalue)(somekey=someothervalue))", filter.toString());
180180
}
181181

@@ -186,7 +186,7 @@ public void testTranslate_ArrayContainsExpression_ALL(){
186186
ContainsOperator._all,
187187
Arrays.asList(new Value("somevalue"), new Value("someothervalue")));
188188

189-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
189+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
190190
assertEquals("(&(somekey=somevalue)(somekey=someothervalue))", filter.toString());
191191
}
192192

@@ -197,29 +197,29 @@ public void testTranslate_ArrayContainsExpression_NONE(){
197197
ContainsOperator._none,
198198
Arrays.asList(new Value("somevalue"), new Value("someothervalue")));
199199

200-
Filter filter = new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
200+
Filter filter = new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
201201
assertEquals("(!(&(somekey=somevalue)(somekey=someothervalue)))", filter.toString());
202202
}
203203

204204
@Test(expected = UnsupportedOperationException.class)
205205
public void testTranslate_ArrayMatchExpression(){
206206
QueryExpression query = new ArrayMatchExpression(null, null);
207207

208-
new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
208+
new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
209209
}
210210

211211
@Test(expected = UnsupportedOperationException.class)
212212
public void testTranslate_FieldComparisonExpression(){
213213
QueryExpression query = new FieldComparisonExpression(null, null, null);
214214

215-
new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
215+
new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
216216
}
217217

218218
@Test(expected = UnsupportedOperationException.class)
219219
public void testTranslate_RegexMatchExpression(){
220220
QueryExpression query = new RegexMatchExpression(null, null, false, false, false, false);
221221

222-
new FilterTranslator(new LazyLdapFieldNameTranslator()).translate(query);
222+
new FilterTranslator(new TrivialLdapFieldNameTranslator()).translate(query);
223223
}
224224

225225
}

0 commit comments

Comments
 (0)