Skip to content

Commit f601694

Browse files
dizzzzdizzzz
committed
Code quality: make final
1 parent 394e4aa commit f601694

21 files changed

+427
-427
lines changed

‎extensions/indexes/range/src/main/java/org/exist/indexing/range/ComplexRangeIndexConfigElement.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ComplexRangeIndexConfigElement extends RangeIndexConfigElement {
4646

4747
private static final Logger LOG = LogManager.getLogger(ComplexRangeIndexConfigElement.class);
4848

49-
private Map<String, RangeIndexConfigField> fields = new HashMap<>();
49+
private final Map<String, RangeIndexConfigField> fields = new HashMap<>();
5050

5151

5252
protected ArrayList<RangeIndexConfigCondition> conditions = new ArrayList<>();
@@ -61,10 +61,10 @@ public ComplexRangeIndexConfigElement(final Element node, final NodeList childre
6161
super(node, namespaces);
6262

6363
for (int i = 0; i < children.getLength(); i++) {
64-
Node child = children.item(i);
64+
final Node child = children.item(i);
6565
if (child.getNodeType() == Node.ELEMENT_NODE) {
6666
if (FIELD_ELEMENT.equals(child.getLocalName())) {
67-
RangeIndexConfigField field = new RangeIndexConfigField(path, (Element) child, namespaces);
67+
final RangeIndexConfigField field = new RangeIndexConfigField(path, (Element) child, namespaces);
6868
fields.put(field.getName(), field);
6969
} else if (CONDITION_ELEMENT.equals(child.getLocalName())){
7070
conditions.add(new RangeIndexConfigAttributeCondition((Element) child, path));
@@ -83,8 +83,8 @@ public boolean isComplex() {
8383
}
8484

8585
@Override
86-
public boolean isCaseSensitive(String fieldName) {
87-
for (RangeIndexConfigField field: fields.values()) {
86+
public boolean isCaseSensitive(final String fieldName) {
87+
for (final RangeIndexConfigField field: fields.values()) {
8888
if(fieldName != null && fieldName.equals(field.getName())) {
8989
return field.isCaseSensitive();
9090
}
@@ -93,7 +93,7 @@ public boolean isCaseSensitive(String fieldName) {
9393
}
9494

9595
@Override
96-
public boolean match(NodePath other) {
96+
public boolean match(final NodePath other) {
9797
if (isQNameIndex) {
9898
final QName qn1 = path.getLastComponent();
9999
final QName qn2 = other.getLastComponent();
@@ -103,68 +103,68 @@ public boolean match(NodePath other) {
103103
}
104104

105105
@Override
106-
public boolean find(NodePath other) {
106+
public boolean find(final NodePath other) {
107107
return (getField(other) != null);
108108
}
109109

110110
@Override
111-
public TextCollector getCollector(NodePath path) {
111+
public TextCollector getCollector(final NodePath path) {
112112
return new ComplexTextCollector(this, path);
113113
}
114114

115115
@Override
116-
public Analyzer getAnalyzer(String fieldName) {
116+
public Analyzer getAnalyzer(final String fieldName) {
117117
if (fields.containsKey(fieldName)) {
118118
return analyzer;
119119
}
120120
return null;
121121
}
122122

123-
public RangeIndexConfigField getField(NodePath path) {
124-
for (RangeIndexConfigField field: fields.values()) {
123+
public RangeIndexConfigField getField(final NodePath path) {
124+
for (final RangeIndexConfigField field: fields.values()) {
125125
if (field.match(path))
126126
return field;
127127
}
128128
return null;
129129
}
130130

131-
public RangeIndexConfigField getField(NodePath parentPath, NodePath path) {
132-
for (RangeIndexConfigField field: fields.values()) {
131+
public RangeIndexConfigField getField(final NodePath parentPath, final NodePath path) {
132+
for (final RangeIndexConfigField field: fields.values()) {
133133
if (field.match(parentPath, path))
134134
return field;
135135
}
136136
return null;
137137
}
138138

139139
@Override
140-
public int getType(String fieldName) {
141-
RangeIndexConfigField field = fields.get(fieldName);
140+
public int getType(final String fieldName) {
141+
final RangeIndexConfigField field = fields.get(fieldName);
142142
if (field != null) {
143143
return field.getType();
144144
}
145145
return Type.ITEM;
146146
}
147147

148148
@Override
149-
public org.exist.indexing.range.conversion.TypeConverter getTypeConverter(String fieldName) {
150-
RangeIndexConfigField field = fields.get(fieldName);
149+
public org.exist.indexing.range.conversion.TypeConverter getTypeConverter(final String fieldName) {
150+
final RangeIndexConfigField field = fields.get(fieldName);
151151
if (field != null) {
152152
return field.getTypeConverter();
153153
}
154154
return null;
155155
}
156156

157-
public boolean matchConditions(Node node) {
158-
for (RangeIndexConfigCondition condition : conditions) {
157+
public boolean matchConditions(final Node node) {
158+
for (final RangeIndexConfigCondition condition : conditions) {
159159
if (!condition.matches(node))
160160
return false;
161161
}
162162

163163
return true;
164164
}
165165

166-
public boolean findCondition(Predicate predicate) {
167-
for (RangeIndexConfigCondition condition : conditions) {
166+
public boolean findCondition(final Predicate predicate) {
167+
for (final RangeIndexConfigCondition condition : conditions) {
168168
if (condition.find(predicate))
169169
return true;
170170
}

‎extensions/indexes/range/src/main/java/org/exist/indexing/range/ComplexTextCollector.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,49 @@
3030

3131
public class ComplexTextCollector implements TextCollector {
3232

33-
private NodePath parentPath;
34-
private ComplexRangeIndexConfigElement config;
35-
private List<Field> fields = new LinkedList<>();
33+
private final NodePath parentPath;
34+
private final ComplexRangeIndexConfigElement config;
35+
private final List<Field> fields = new LinkedList<>();
3636
private RangeIndexConfigField currentField = null;
3737
private int length = 0;
3838

39-
public ComplexTextCollector(ComplexRangeIndexConfigElement configuration, NodePath parentPath) {
39+
public ComplexTextCollector(final ComplexRangeIndexConfigElement configuration, final NodePath parentPath) {
4040
this.config = configuration;
4141
this.parentPath = new NodePath(parentPath, false);
4242
}
4343

4444
@Override
45-
public void startElement(QName qname, NodePath path) {
46-
RangeIndexConfigField fieldConf = config.getField(parentPath, path);
45+
public void startElement(final QName qname, final NodePath path) {
46+
final RangeIndexConfigField fieldConf = config.getField(parentPath, path);
4747
if (fieldConf != null) {
4848
currentField = fieldConf;
49-
Field field = new Field(currentField.getName(), false, fieldConf.whitespaceTreatment(), fieldConf.isCaseSensitive());
49+
final Field field = new Field(currentField.getName(), false, fieldConf.whitespaceTreatment(), fieldConf.isCaseSensitive());
5050
fields.add(field);
5151
}
5252

5353
}
5454

5555
@Override
56-
public void endElement(QName qname, NodePath path) {
56+
public void endElement(final QName qname, final NodePath path) {
5757
if (currentField != null && currentField.match(path)) {
5858
currentField = null;
5959
}
6060
}
6161

6262
@Override
63-
public void attribute(AttrImpl attribute, NodePath path) {
64-
RangeIndexConfigField fieldConf = config.getField(parentPath, path);
63+
public void attribute(final AttrImpl attribute, final NodePath path) {
64+
final RangeIndexConfigField fieldConf = config.getField(parentPath, path);
6565
if (fieldConf != null) {
66-
Field field = new Field(fieldConf.getName(), true, fieldConf.whitespaceTreatment(), fieldConf.isCaseSensitive());
66+
final Field field = new Field(fieldConf.getName(), true, fieldConf.whitespaceTreatment(), fieldConf.isCaseSensitive());
6767
field.append(attribute.getValue());
6868
fields.add(0, field);
6969
}
7070
}
7171

7272
@Override
73-
public void characters(AbstractCharacterData text, NodePath path) {
73+
public void characters(final AbstractCharacterData text, final NodePath path) {
7474
if (currentField != null) {
75-
Field field = fields.get(fields.size() - 1);
75+
final Field field = fields.get(fields.size() - 1);
7676
if (!field.isAttribute() && (currentField.includeNested() || currentField.match(path))) {
7777
field.append(text.getXMLString());
7878
length += text.getXMLString().length();

‎extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndex.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ public enum Operator {
6565

6666
static {
6767
LOOKUP_MAP = new HashMap<>();
68-
for (Operator operator : Operator.values()) {
68+
for (final Operator operator : Operator.values()) {
6969
LOOKUP_MAP.put(operator.name, operator);
7070
}
7171
}
7272

73-
Operator(String name, boolean supportsCollation) {
73+
Operator(final String name, final boolean supportsCollation) {
7474
this.name = name;
7575
this.supportsCollation = supportsCollation;
7676
}
@@ -84,20 +84,20 @@ public boolean supportsCollation() {
8484
return supportsCollation;
8585
}
8686

87-
public static Operator getByName(String name) { return LOOKUP_MAP.get(name); }
87+
public static Operator getByName(final String name) { return LOOKUP_MAP.get(name); }
8888
}
8989

9090
private static final String DIR_NAME = "range";
9191

92-
private Analyzer defaultAnalyzer = new KeywordAnalyzer();
92+
private final Analyzer defaultAnalyzer = new KeywordAnalyzer();
9393

9494
@Override
9595
public String getDirName() {
9696
return DIR_NAME;
9797
}
9898

9999
@Override
100-
public IndexWorker getWorker(DBBroker broker) {
100+
public IndexWorker getWorker(final DBBroker broker) {
101101
return new RangeIndexWorker(this, broker);
102102
}
103103

‎extensions/indexes/range/src/main/java/org/exist/indexing/range/RangeIndexAnalyzer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
public class RangeIndexAnalyzer extends Analyzer {
5353

5454
private static class FilterConfig {
55-
private Function<TokenStream, TokenStream> constructor;
55+
private final Function<TokenStream, TokenStream> constructor;
5656

5757
FilterConfig(final Element config) throws DatabaseConfigurationException {
5858
final String className = config.getAttribute("class");
@@ -84,20 +84,20 @@ private static class FilterConfig {
8484
}
8585
}
8686

87-
private List<FilterConfig> filterConfigs = new ArrayList<>();
87+
private final List<FilterConfig> filterConfigs = new ArrayList<>();
8888
private Collator collator = null;
8989

9090
public RangeIndexAnalyzer() {
9191
}
9292

93-
public void addFilter(Element filter) throws DatabaseConfigurationException {
93+
public void addFilter(final Element filter) throws DatabaseConfigurationException {
9494
filterConfigs.add(new FilterConfig(filter));
9595
}
9696

97-
public void addCollation(String uri) throws DatabaseConfigurationException {
97+
public void addCollation(final String uri) throws DatabaseConfigurationException {
9898
try {
9999
collator = Collations.getCollationFromURI(uri, null);
100-
} catch (XPathException e) {
100+
} catch (final XPathException e) {
101101
throw new DatabaseConfigurationException(e.getMessage(), e);
102102
}
103103
}

0 commit comments

Comments
 (0)