Skip to content

Commit d51723e

Browse files
author
Andrii Andriichuk
committed
refactor according to Intellij and sonar inspections
1 parent 1fbf630 commit d51723e

35 files changed

+165
-136
lines changed

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/AbstractFieldCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ protected void appendQuery(final StringBuilder sb)
3232
{
3333
sb.append(SPACE);
3434
}
35-
sb.append(field.toString());
35+
sb.append(field);
3636
}
3737
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/AbstractFlexibleSearchQueryChainElement.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.util.Map;
66

7+
78
/**
89
* An abstract element of the flexible search query.
910
*/

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/AbstractJoinElement.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@
1010
*/
1111
public abstract class AbstractJoinElement extends AbstractTableFromClauseElement
1212
{
13+
private final String joinStatement;
1314

14-
AbstractJoinElement(final AbstractFlexibleSearchQueryChainElement parent, final Class<? extends ItemModel> clazz)
15+
AbstractJoinElement(final AbstractFlexibleSearchQueryChainElement parent, final Class<? extends ItemModel> clazz,
16+
final String joinStatement)
1517
{
1618
super(parent, clazz);
19+
this.joinStatement = joinStatement;
1720
}
1821

19-
AbstractJoinElement(final AbstractFlexibleSearchQueryChainElement parent, final String typeCode)
22+
AbstractJoinElement(final AbstractFlexibleSearchQueryChainElement parent, final String typeCode, final String joinStatement)
2023
{
2124
super(parent, typeCode);
25+
this.joinStatement = joinStatement;
2226
}
2327

2428
/**
@@ -38,8 +42,6 @@ protected void appendQuery(final StringBuilder sb)
3842
{
3943
super.appendQuery(sb);
4044

41-
sb.append(SPACE).append(getJoinStatement()).append(SPACE).append(getTypecode());
45+
sb.append(SPACE).append(joinStatement).append(SPACE).append(getTypecode());
4246
}
43-
44-
protected abstract String getJoinStatement();
4547
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/AbstractTableFromClauseElement.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ protected String getTypecode()
2929
return typeCode;
3030
}
3131

32-
private String fetchTypeCode(final Class<? extends ItemModel> clazz)
32+
private static String fetchTypeCode(final Class<? extends ItemModel> clazz)
3333
{
3434
try
3535
{
3636
return clazz.getField("_TYPECODE").get(Optional.empty()).toString();
3737
}
3838
catch (final IllegalAccessException | NoSuchFieldException e)
3939
{
40-
throw new IllegalStateException("Failed to get _TYPECODE field from class " + clazz.getName()
41-
+ " during building flexible search query.", e);
40+
throw new IllegalStateException(
41+
"Failed to get _TYPECODE field from class " + clazz.getName() + " during building flexible search query.", e);
4242
}
4343
}
4444
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/CombineConditionElement.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ public AbstractFieldCondition condition(final String fieldName, final RegularPar
4242
* field name (from model item, e.g. ProductModel.NAME)
4343
* @param conditionType
4444
* type of condition
45-
* @param firstConditionParameter
45+
* @param firstParameter
4646
* first parameter
47-
* @param secondConditionParameter
47+
* @param secondParameter
4848
* second parameter
4949
* @return new field condition
5050
*/
5151
public AbstractFieldCondition condition(final String fieldName, final TwoParameterConditionType conditionType,
52-
final Object firstConditionParameter, final Object secondConditionParameter)
52+
final Object firstParameter, final Object secondParameter)
5353
{
54-
return new TwoParameterFieldCondition(this, new SimpleField(fieldName), conditionType, firstConditionParameter,
55-
secondConditionParameter);
54+
return new TwoParameterFieldCondition(this, new SimpleField(fieldName), conditionType, firstParameter, secondParameter);
5655
}
5756

5857
/**
@@ -113,16 +112,16 @@ public AbstractFieldCondition condition(final AliasedField aliasedField, final R
113112
* field with alias
114113
* @param conditionType
115114
* type of condition
116-
* @param firstConditionParameter
115+
* @param firstParameter
117116
* first parameter
118-
* @param secondConditionParameter
117+
* @param secondParameter
119118
* second parameter
120119
* @return new field condition
121120
*/
122121
public AbstractFieldCondition condition(final AliasedField aliasedField, final TwoParameterConditionType conditionType,
123-
final Object firstConditionParameter, final Object secondConditionParameter)
122+
final Object firstParameter, final Object secondParameter)
124123
{
125-
return new TwoParameterFieldCondition(this, aliasedField, conditionType, firstConditionParameter, secondConditionParameter);
124+
return new TwoParameterFieldCondition(this, aliasedField, conditionType, firstParameter, secondParameter);
126125
}
127126

128127
/**
@@ -259,7 +258,7 @@ protected void appendQuery(final StringBuilder sb)
259258
{
260259
super.appendQuery(sb);
261260

262-
sb.append(SPACE).append(combineOperator.getValue());
261+
sb.append(SPACE).append(combineOperator);
263262
}
264263

265264
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/CombineConditionType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ public enum CombineConditionType
1111
this.operator = operator;
1212
}
1313

14-
public String getValue()
14+
@Override
15+
public String toString()
1516
{
1617
return operator;
1718
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/ConditionType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder;
22

3+
@FunctionalInterface
34
public interface ConditionType
45
{
56
String getOperator();

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/Conditions.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
import java.util.Collection;
44

55

6-
public class Conditions
6+
public final class Conditions
77
{
8+
private Conditions()
9+
{
10+
}
11+
812
/**
913
* Creates field condition with a given parameter.
10-
*
14+
*
1115
* @param fieldName
1216
* field name (from model item, e.g. ProductModel.NAME)
1317
* @param conditionType
@@ -29,17 +33,16 @@ public static AbstractFieldCondition condition(final String fieldName, final Reg
2933
* field name (from model item, e.g. ProductModel.NAME)
3034
* @param conditionType
3135
* type of condition
32-
* @param firstConditionParameter
36+
* @param firstParameter
3337
* first parameter
34-
* @param secondConditionParameter
38+
* @param secondParameter
3539
* second parameter
3640
* @return new field condition
3741
*/
3842
public static AbstractFieldCondition condition(final String fieldName, final TwoParameterConditionType conditionType,
39-
final Object firstConditionParameter, final Object secondConditionParameter)
43+
final Object firstParameter, final Object secondParameter)
4044
{
41-
return new TwoParameterFieldCondition(new SimpleField(fieldName), conditionType, firstConditionParameter,
42-
secondConditionParameter);
45+
return new TwoParameterFieldCondition(new SimpleField(fieldName), conditionType, firstParameter, secondParameter);
4346
}
4447

4548
/**
@@ -78,7 +81,7 @@ public static AbstractFieldCondition condition(final String fieldName, final Col
7881

7982
/**
8083
* Creates field condition with a given parameter.
81-
*
84+
*
8285
* @param aliasedField
8386
* field with alias
8487
* @param conditionType
@@ -100,21 +103,21 @@ public static AbstractFieldCondition condition(final AliasedField aliasedField,
100103
* field with alias
101104
* @param conditionType
102105
* type of condition
103-
* @param firstConditionParameter
106+
* @param firstParameter
104107
* first parameter
105-
* @param secondConditionParameter
108+
* @param secondParameter
106109
* second parameter
107110
* @return new field condition
108111
*/
109112
public static AbstractFieldCondition condition(final AliasedField aliasedField, final TwoParameterConditionType conditionType,
110-
final Object firstConditionParameter, final Object secondConditionParameter)
113+
final Object firstParameter, final Object secondParameter)
111114
{
112-
return new TwoParameterFieldCondition(aliasedField, conditionType, firstConditionParameter, secondConditionParameter);
115+
return new TwoParameterFieldCondition(aliasedField, conditionType, firstParameter, secondParameter);
113116
}
114117

115118
/**
116119
* Creates field condition with a given collection parameter.
117-
*
120+
*
118121
* @param aliasedField
119122
* field with alias
120123
* @param conditionType
@@ -148,7 +151,7 @@ public static AbstractFieldCondition condition(final AliasedField aliasedField,
148151

149152
/**
150153
* Creates field condition with a given condition.
151-
*
154+
*
152155
* @param fieldName
153156
* field name (from model item, e.g. ProductModel.NAME)
154157
* @param conditionType
@@ -162,7 +165,7 @@ public static AbstractFieldCondition condition(final String fieldName, final Par
162165

163166
/**
164167
* Creates field condition with a given condition.
165-
*
168+
*
166169
* @param aliasedField
167170
* field with alias
168171
* @param conditionType
@@ -176,7 +179,7 @@ public static AbstractFieldCondition condition(final AliasedField aliasedField,
176179

177180
/**
178181
* Puts given condition (with chained conditions if any) into braces.
179-
*
182+
*
180183
* @param condition
181184
* condition to wrap
182185
* @return braced condition chain
@@ -188,7 +191,7 @@ public static BraceConditionWrapper braces(final AbstractCondition condition)
188191

189192
/**
190193
* Builds inner query condition.
191-
*
194+
*
192195
* @param queryConditionType
193196
* condition type
194197
* @param innerQuery
@@ -203,7 +206,7 @@ public static AbstractCondition condition(final UnaryQueryConditionType queryCon
203206

204207
/**
205208
* Creates custom condition of given string. Given string is trimmed to remove redundant spaces if any.
206-
*
209+
*
207210
* @param customCondition
208211
* custom condition string, e.g. "UPPER({name})=?name"
209212
* @return new custom condition element
@@ -212,8 +215,4 @@ public static AbstractCondition customCondition(final String customCondition)
212215
{
213216
return new CustomCondition(customCondition.trim());
214217
}
215-
216-
private Conditions()
217-
{
218-
}
219218
}

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/Field.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder;
22

3+
@FunctionalInterface
34
public interface Field
45
{
56
/**
67
* Returns this field's name
8+
*
79
* @return field name
810
*/
911
String getFieldName();

‎src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/FieldToFieldCondition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class FieldToFieldCondition extends AbstractFieldCondition
1717
}
1818

1919
FieldToFieldCondition(final AbstractFlexibleSearchQueryChainElement parent, final Field field,
20-
final RegularParameterConditionType conditionType, final Field secondField)
20+
final RegularParameterConditionType conditionType, final Field secondField)
2121
{
2222
super(parent, field);
2323
this.conditionType = conditionType;
@@ -29,7 +29,7 @@ protected void appendQuery(final StringBuilder sb)
2929
{
3030
super.appendQuery(sb);
3131

32-
sb.append(conditionType.getOperator()).append(secondField.toString());
32+
sb.append(conditionType.getOperator()).append(secondField);
3333
}
3434

3535
}

0 commit comments

Comments
 (0)