Skip to content

Commit b7e4f9f

Browse files
dizzzzdizzzz
committed
Smaller code improvements
1 parent 719e9dc commit b7e4f9f

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎src/main/java/org/exist/console/xquery/ConsoleModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,27 @@ public class ConsoleModule extends AbstractInternalModule {
4646

4747
private static ConsoleAdapter adapter = null;
4848

49-
public static void log(String channel, String message) {
49+
public static void log(final String channel, final String message) {
5050
log(channel, false, message);
5151
}
5252

53-
public static void log(String channel, boolean json, String message) {
53+
public static void log(final String channel, final boolean json, final String message) {
5454
if (adapter != null) {
5555
adapter.log(channel, json, message);
5656
}
5757
}
5858

59-
public static void log(String channel, String source, int line, int column, String message) {
59+
public static void log(final String channel, final String source, final int line, final int column, final String message) {
6060
log(channel, source, line, column, false, message);
6161
}
6262

63-
public static void log(String channel, String source, int line, int column, boolean json, String message) {
63+
public static void log(final String channel, final String source, final int line, final int column, final boolean json, final String message) {
6464
if (adapter != null) {
6565
adapter.log(channel, source, line, column, json, message);
6666
}
6767
}
6868

69-
public static void send(String channel, String json) {
69+
public static void send(final String channel, final String json) {
7070
if (adapter != null) {
7171
adapter.send(channel, json);
7272
}
@@ -80,7 +80,7 @@ public static void setAdapter(final ConsoleAdapter consoleAdapter) {
8080
adapter = consoleAdapter;
8181
}
8282

83-
public ConsoleModule(Map<String, List<? extends Object>> parameters) {
83+
public ConsoleModule(final Map<String, List<?>> parameters) {
8484
super(functions, parameters, false);
8585
}
8686

‎src/main/java/org/exist/console/xquery/JMXToken.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public class JMXToken extends BasicFunction {
4545
new FunctionReturnSequenceType(Type.STRING, Cardinality.ZERO_OR_ONE, "The authentication token")
4646
);
4747

48-
public JMXToken(XQueryContext context) {
48+
public JMXToken(final XQueryContext context) {
4949
super(context, signature);
5050
}
5151

5252
@Override
53-
public Sequence eval(Sequence[] sequences, Sequence sequence) throws XPathException {
53+
public Sequence eval(final Sequence[] sequences, final Sequence sequence) throws XPathException {
5454
if (!context.getEffectiveUser().hasDbaRole()) {
5555
throw new XPathException(this, "Only a dba user is allowed to retrieve the JMX access token.");
5656
}
@@ -74,7 +74,7 @@ public Sequence eval(Sequence[] sequences, Sequence sequence) throws XPathExcept
7474
if (key != null) {
7575
return new StringValue(key);
7676
}
77-
} catch (IOException ex) {
77+
} catch (final IOException ex) {
7878
throw new XPathException(this, "Exception while reading token file: " + ex.getMessage(), ex);
7979
}
8080
}

‎src/main/java/org/exist/console/xquery/Log.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
public class Log extends BasicFunction {
4242

43-
public final static FunctionSignature signatures[] = {
43+
public final static FunctionSignature[] signatures = {
4444
new FunctionSignature(
4545
new QName("log", ConsoleModule.NAMESPACE_URI, ConsoleModule.PREFIX),
4646
"Logs a message to the logger using the template given in the first parameter and " +
@@ -119,40 +119,40 @@ public class Log extends BasicFunction {
119119

120120
private Expression parent = null;
121121

122-
public Log(XQueryContext context, FunctionSignature signature) {
122+
public Log(final XQueryContext context, final FunctionSignature signature) {
123123
super(context, signature);
124124
}
125125

126126
@Override
127-
public void analyze(AnalyzeContextInfo contextInfo) throws XPathException {
127+
public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException {
128128
super.analyze(contextInfo);
129129
parent = contextInfo.getParent();
130130
}
131131

132132
@Override
133-
public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException {
133+
public Sequence eval(final Sequence[] args, final Sequence contextSequence) throws XPathException {
134134
final Properties outputProperties = new Properties(SERIALIZATION_PROPERTIES);
135135
if (isCalledAs("dump")) {
136136
final String channel = getArgumentCount() == 0 ? "default" : args[0].getStringValue();
137137
Set<String> varsToPrint = null;
138138
if (getArgumentCount() == 2) {
139-
varsToPrint = new HashSet<String>();
140-
for (SequenceIterator i = args[1].iterate(); i.hasNext(); ) {
139+
varsToPrint = new HashSet<>();
140+
for (final SequenceIterator i = args[1].iterate(); i.hasNext(); ) {
141141
varsToPrint.add(i.nextItem().getStringValue());
142142
}
143143
}
144-
StringWriter writer = new StringWriter();
145-
JSONWriter jsonWriter = new JSONWriter(writer);
144+
final StringWriter writer = new StringWriter();
145+
final JSONWriter jsonWriter = new JSONWriter(writer);
146146
try {
147147
jsonWriter.startDocument();
148148
jsonWriter.startElement("", "result", "result");
149149

150-
Map<QName, Variable> vars = context.getLocalVariables();
151-
for (Map.Entry<QName, Variable> var: vars.entrySet()) {
152-
String name = var.getKey().toString();
150+
final Map<QName, Variable> vars = context.getLocalVariables();
151+
for (final Map.Entry<QName, Variable> var: vars.entrySet()) {
152+
final String name = var.getKey().toString();
153153
if (varsToPrint == null || varsToPrint.contains(name)) {
154154
jsonWriter.startElement("", name, name);
155-
StringBuilder value = new StringBuilder();
155+
final StringBuilder value = new StringBuilder();
156156
printItems(value, outputProperties, false, var.getValue().getValue());
157157
jsonWriter.characters(value);
158158
jsonWriter.endElement("", name, name);
@@ -167,7 +167,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
167167
} else {
168168
ConsoleModule.log(channel, parent.getSource().pathOrContentOrShortIdentifier(), parent.getLine(), parent.getColumn(), true, msg);
169169
}
170-
} catch (TransformerException e) {
170+
} catch (final TransformerException e) {
171171
e.printStackTrace();
172172
}
173173

@@ -194,25 +194,25 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
194194
return Sequence.EMPTY_SEQUENCE;
195195
}
196196

197-
private void printItems(StringBuilder out, Properties outputProperties, boolean jsonFormat, Sequence sequence) throws XPathException {
198-
for (SequenceIterator i = sequence.iterate(); i.hasNext(); ) {
197+
private void printItems(final StringBuilder out, final Properties outputProperties, final boolean jsonFormat, final Sequence sequence) throws XPathException {
198+
for (final SequenceIterator i = sequence.iterate(); i.hasNext(); ) {
199199
final Item item = i.nextItem();
200200
if (Type.subTypeOf(item.getType(), Type.NODE)) {
201201
final Serializer serializer = context.getBroker().getSerializer();
202202
serializer.reset();
203203
try {
204204
serializer.setProperties(outputProperties);
205205
out.append(serializer.serialize((NodeValue) item));
206-
} catch (SAXException e) {
206+
} catch (final SAXException e) {
207207
out.append(e.getMessage());
208208
}
209209
} else if (item.getType() == Type.MAP_ITEM || item.getType() == Type.ARRAY_ITEM) {
210210
final StringWriter writer = new StringWriter();
211211
final XQuerySerializer xqSerializer = new XQuerySerializer(context.getBroker(), JSON_SERIALIZATION_PROPERTIES, writer);
212212
try {
213213
xqSerializer.serialize(item.toSequence());
214-
out.append(writer.toString());
215-
} catch (SAXException e) {
214+
out.append(writer);
215+
} catch (final SAXException e) {
216216
throw new XPathException(this, e.getMessage());
217217
}
218218
} else if (jsonFormat) {

‎src/main/java/org/exist/remoteconsole/RemoteConsoleAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void log(final String channel, final boolean json, final String message)
5454
}
5555

5656
@Override
57-
public void log(String channel, String source, int line, int column, String message) {
57+
public void log(final String channel, final String source, final int line, final int column, final String message) {
5858
log(channel, source, line, column, false, message);
5959
}
6060

@@ -80,7 +80,7 @@ public void send(final String channel, final String jsonString) {
8080
private String getTimestamp() {
8181
try {
8282
return new DateTimeValue().getStringValue();
83-
} catch (XPathException e) {
83+
} catch (final XPathException e) {
8484
return null;
8585
}
8686
}

0 commit comments

Comments
 (0)