Skip to content

Commit bb9e621

Browse files
dizzzzdizzzz
authored
Merge pull request #38 from dizzzz/feature/rework_extension
Feature/rework extension
2 parents 17f30b4 + 7537c12 commit bb9e621

15 files changed

+26
-44
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/ConversionTools.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,11 @@ public static Object parseSequence(Sequence seq) throws XPathException {
132132
switch (seq.getItemType()) {
133133
case Type.MAP:
134134
MapType map = (MapType) seq;
135-
BasicDBObject value = parseMap(map);
136-
retVal = value;
135+
retVal = parseMap(map);
137136
break;
138137
case Type.ARRAY:
139138
ArrayType array = (ArrayType) seq;
140-
ArrayList values = parseArray(array);
141-
retVal = values;
139+
retVal = parseArray(array);
142140
break;
143141
default:
144142
retVal = ConversionTools.convertParameters(seq)[0];

‎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

+5-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.bson.types.ObjectId;
3737
import org.exist.Namespaces;
3838
import org.exist.dom.QName;
39-
import org.exist.dom.memtree.DocumentImpl;
4039
import org.exist.dom.memtree.SAXAdapter;
4140
import org.exist.mongodb.shared.Constants;
4241
import static org.exist.mongodb.shared.Constants.EXIST_COMPRESSION;
@@ -129,9 +128,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
129128
throw new XPathException(this, GridfsModule.GRFS0004, String.format("Document '%s' could not be found.", documentId));
130129
}
131130

132-
Sequence retVal = get(gfsFile, forceBinary);
133-
134-
return retVal;
131+
return get(gfsFile, forceBinary);
135132

136133
} catch (XPathException ex) {
137134
LOG.error(ex.getMessage(), ex);
@@ -178,10 +175,11 @@ Sequence get(GridFSDBFile gfsFile, boolean forceBinary) throws IOException, XPat
178175
}
179176

180177
/**
181-
* Parse an byte-array containing (compressed) XML data into an eXist-db
178+
* Parse an byte-stream containing (compressed) XML data into an eXist-db
182179
* document.
183180
*
184-
* @param data Byte array containing the XML data.
181+
* @param xqueryContext Xquery context
182+
* @param is Byte stream containing the XML data.
185183
* @return Sequence containing the XML as DocumentImpl
186184
*
187185
* @throws XPathException Something bad happened.
@@ -208,7 +206,7 @@ private Sequence processXML(XQueryContext xqueryContext, InputStream is) throws
208206
IOUtils.closeQuietly(is);
209207

210208
if (validationReport.isValid()) {
211-
content = (DocumentImpl) adapter.getDocument();
209+
content = adapter.getDocument();
212210
} else {
213211
String txt = String.format("Received document is not valid: %s", validationReport.toString());
214212
LOG.debug(txt);

‎java/src/org/exist/mongodb/xquery/gridfs/Stream.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,8 @@ private ResponseWrapper getResponseWrapper(XQueryContext context) throws XPathEx
275275
throw new XPathException(this, signatures[1].toString()
276276
+ " can only be used within the EXistServlet or XQueryServlet");
277277
}
278-
ResponseWrapper response = (ResponseWrapper) respValue.getObject();
279278

280-
return response;
279+
return (ResponseWrapper) respValue.getObject();
281280
}
282281

283282
/**
@@ -301,9 +300,8 @@ private RequestWrapper getRequestWrapper(XQueryContext context) throws XPathExce
301300
throw new XPathException(this, signatures[1].toString()
302301
+ " can only be used within the EXistServlet or XQueryServlet");
303302
}
304-
RequestWrapper request = (RequestWrapper) respValue.getObject();
305303

306-
return request;
304+
return (RequestWrapper) respValue.getObject();
307305
}
308306

309307
/**

‎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/collection/FindAndModify.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,10 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
150150

151151

152152
// Execute query
153-
Sequence retVal = (result==null)
154-
? Sequence.EMPTY_SEQUENCE
155-
: new StringValue(result.toString());
156153

157-
return retVal;
154+
return (result==null)
155+
? Sequence.EMPTY_SEQUENCE
156+
: new StringValue(result.toString());
158157

159158
} catch (Throwable t) {
160159
return GenericExceptionHandler.handleException(this, t);

‎java/src/org/exist/mongodb/xquery/mongodb/collection/FindAndRemove.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,10 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
9494
DBObject result = dbcol.findAndRemove(query);
9595

9696
// Parse results
97-
Sequence retVal = (result==null)
98-
? Sequence.EMPTY_SEQUENCE
99-
: new StringValue(result.toString());
10097

101-
return retVal;
98+
return (result==null)
99+
? Sequence.EMPTY_SEQUENCE
100+
: new StringValue(result.toString());
102101

103102
} catch (Throwable t) {
104103
return GenericExceptionHandler.handleException(this, t);

‎java/src/org/exist/mongodb/xquery/mongodb/collection/FindOne.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,11 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
129129
}
130130

131131
// Execute query
132-
Sequence retVal = (result == null)
132+
133+
return (result == null)
133134
? Sequence.EMPTY_SEQUENCE
134135
: new StringValue(result.toString());
135136

136-
return retVal;
137-
138137
} catch (Throwable t) {
139138
return GenericExceptionHandler.handleException(this, t);
140139
}

‎java/src/org/exist/mongodb/xquery/mongodb/collection/Group.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,8 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
139139
DBObject result = dbcol.group(command);
140140

141141
// Execute query
142-
Sequence retVal = new StringValue(result.toString());
143142

144-
return retVal;
143+
return new StringValue(result.toString());
145144

146145
} catch (Throwable t) {
147146
return GenericExceptionHandler.handleException(this, t);

‎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)