Skip to content

Commit 6cbbce9

Browse files
committed
Mechanical code improvements
1 parent 17f30b4 commit 6cbbce9

File tree

9 files changed

+12
-19
lines changed

9 files changed

+12
-19
lines changed

java/src/org/exist/mongodb/shared/ContentSerializer.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ static int addGridFSFileEntry(final MemTreeBuilder builder, final GridFSFile gfs
224224

225225
List<String> aliases = gfsFile.getAliases();
226226
if (aliases != null) {
227-
gfsFile.getAliases().stream().forEach((alias) -> {
228-
addElementValue(builder, "alias", alias);
229-
});
227+
gfsFile.getAliases().stream().forEach((alias) -> addElementValue(builder, "alias", alias));
230228
}
231229

232230
// mimetype

java/src/org/exist/mongodb/shared/MongodbClientStore.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public MongoClient validate(String mongodbClientId) throws XPathException {
8181
if (mongodbClientId == null || !isValid(mongodbClientId)) {
8282
try {
8383
// introduce a delay
84-
Thread.sleep(1000l);
84+
Thread.sleep(1000L);
8585

8686
} catch (InterruptedException ex) {
8787
LOG.error(ex);

java/src/org/exist/mongodb/xquery/BSonModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class BSonModule extends AbstractInternalModule {
3636
public final static QName EXCEPTION_MESSAGE_QNAME
3737
= new QName("exception-message", BSonModule.NAMESPACE_URI, BSonModule.PREFIX);
3838

39-
public BSonModule(Map<String, List<? extends Object>> parameters) throws XPathException {
39+
public BSonModule(Map<String, List<?>> parameters) throws XPathException {
4040
super(functions, parameters);
4141
}
4242

java/src/org/exist/mongodb/xquery/GridfsModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class GridfsModule extends AbstractInternalModule {
5151
public final static QName EXCEPTION_MESSAGE_QNAME
5252
= new QName("exception-message", GridfsModule.NAMESPACE_URI, GridfsModule.PREFIX);
5353

54-
public GridfsModule(Map<String, List<? extends Object>> parameters) throws XPathException {
54+
public GridfsModule(Map<String, List<?>> parameters) throws XPathException {
5555
super(functions, parameters);
5656
}
5757

java/src/org/exist/mongodb/xquery/MongodbModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public class MongodbModule extends AbstractInternalModule {
124124
public final static QName EXCEPTION_MESSAGE_QNAME
125125
= new QName("exception-message", MongodbModule.NAMESPACE_URI, MongodbModule.PREFIX);
126126

127-
public MongodbModule(Map<String, List<? extends Object>> parameters) throws XPathException {
127+
public MongodbModule(Map<String, List<?>> parameters) throws XPathException {
128128
super(functions, parameters);
129129
}
130130

java/src/org/exist/mongodb/xquery/gridfs/Get.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,11 @@ Sequence get(GridFSDBFile gfsFile, boolean forceBinary) throws IOException, XPat
178178
}
179179

180180
/**
181-
* Parse an byte-array containing (compressed) XML data into an eXist-db
181+
* Parse an byte-stream containing (compressed) XML data into an eXist-db
182182
* document.
183183
*
184-
* @param data Byte array containing the XML data.
184+
* @param xqueryContext Xquery context
185+
* @param is Byte stream containing the XML data.
185186
* @return Sequence containing the XML as DocumentImpl
186187
*
187188
* @throws XPathException Something bad happened.
@@ -208,7 +209,7 @@ private Sequence processXML(XQueryContext xqueryContext, InputStream is) throws
208209
IOUtils.closeQuietly(is);
209210

210211
if (validationReport.isValid()) {
211-
content = (DocumentImpl) adapter.getDocument();
212+
content = adapter.getDocument();
212213
} else {
213214
String txt = String.format("Received document is not valid: %s", validationReport.toString());
214215
LOG.debug(txt);

java/src/org/exist/mongodb/xquery/mongodb/client/ListDatabases.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
7575
MongoClient client = MongodbClientStore.getInstance().get(mongodbClientId);
7676

7777
ValueSequence seq = new ValueSequence();
78-
client.getDatabaseNames().stream().forEach((name) -> {
79-
seq.add(new StringValue(name));
80-
});
78+
client.getDatabaseNames().stream().forEach((name) -> seq.add(new StringValue(name)));
8179
return seq;
8280

8381
} catch (Throwable t) {

java/src/org/exist/mongodb/xquery/mongodb/client/ListMongdbClientIds.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
7676

7777
ValueSequence valueSequence = new ValueSequence();
7878

79-
clientIds.stream().forEach((mongodbClientId) -> {
80-
valueSequence.add(new StringValue(mongodbClientId));
81-
});
79+
clientIds.stream().forEach((mongodbClientId) -> valueSequence.add(new StringValue(mongodbClientId)));
8280

8381
return valueSequence;
8482

java/src/org/exist/mongodb/xquery/mongodb/db/ListCollections.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
8484
ValueSequence valueSequence = new ValueSequence();
8585

8686
// Iterate over collection names
87-
collectionNames.stream().forEach((collName) -> {
88-
valueSequence.add(new StringValue(collName));
89-
});
87+
collectionNames.stream().forEach((collName) -> valueSequence.add(new StringValue(collName)));
9088

9189
return valueSequence;
9290

0 commit comments

Comments
 (0)