Mechanical code improvements 2

Author: dizzzz

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

@@ -132,13 +132,11 @@ public static Object parseSequence(Sequence seq) throws XPathException {
         switch (seq.getItemType()) {
             case Type.MAP:
                 MapType map = (MapType) seq;
-                BasicDBObject value = parseMap(map);
-                retVal = value;
+                retVal = parseMap(map);
                 break;
             case Type.ARRAY:
                 ArrayType array = (ArrayType) seq;
-                ArrayList values = parseArray(array);
-                retVal = values;
+                retVal = parseArray(array);
                 break;
             default:
                 retVal = ConversionTools.convertParameters(seq)[0];

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

@@ -36,7 +36,6 @@
 import org.bson.types.ObjectId;
 import org.exist.Namespaces;
 import org.exist.dom.QName;
-import org.exist.dom.memtree.DocumentImpl;
 import org.exist.dom.memtree.SAXAdapter;
 import org.exist.mongodb.shared.Constants;
 import static org.exist.mongodb.shared.Constants.EXIST_COMPRESSION;
@@ -129,9 +128,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                 throw new XPathException(this, GridfsModule.GRFS0004, String.format("Document '%s' could not be found.", documentId));
             }
 
-            Sequence retVal = get(gfsFile, forceBinary);
-
-            return retVal;
+            return get(gfsFile, forceBinary);
 
         } catch (XPathException ex) {
             LOG.error(ex.getMessage(), ex);

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

@@ -275,9 +275,8 @@ private ResponseWrapper getResponseWrapper(XQueryContext context) throws XPathEx
             throw new XPathException(this, signatures[1].toString()
                     + " can only be used within the EXistServlet or XQueryServlet");
         }
-        ResponseWrapper response = (ResponseWrapper) respValue.getObject();
 
-        return response;
+        return (ResponseWrapper) respValue.getObject();
     }
 
     /**
@@ -301,9 +300,8 @@ private RequestWrapper getRequestWrapper(XQueryContext context) throws XPathExce
             throw new XPathException(this, signatures[1].toString()
                     + " can only be used within the EXistServlet or XQueryServlet");
         }
-        RequestWrapper request = (RequestWrapper) respValue.getObject();
 
-        return request;
+        return (RequestWrapper) respValue.getObject();
     }
 
     /**

java/src/org/exist/mongodb/xquery/mongodb/collection/FindAndModify.java

@@ -150,11 +150,10 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
 
 
             // Execute query
-            Sequence retVal = (result==null) 
-                    ? Sequence.EMPTY_SEQUENCE 
-                    : new StringValue(result.toString());
 
-            return retVal;
+            return (result==null)
+                    ? Sequence.EMPTY_SEQUENCE
+                    : new StringValue(result.toString());
 
         } catch (Throwable t) {
             return GenericExceptionHandler.handleException(this, t);

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

@@ -94,11 +94,10 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
             DBObject result = dbcol.findAndRemove(query);
 
             // Parse results
-            Sequence retVal = (result==null) 
-                    ? Sequence.EMPTY_SEQUENCE 
-                    : new StringValue(result.toString());
 
-            return retVal;
+            return (result==null)
+                    ? Sequence.EMPTY_SEQUENCE
+                    : new StringValue(result.toString());
 
         } catch (Throwable t) {
             return GenericExceptionHandler.handleException(this, t);

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

@@ -129,12 +129,11 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
             }
 
             // Execute query
-            Sequence retVal = (result == null)
+
+            return (result == null)
                     ? Sequence.EMPTY_SEQUENCE
                     : new StringValue(result.toString());
 
-            return retVal;
-
         } catch (Throwable t) {
             return GenericExceptionHandler.handleException(this, t);
         } 

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

@@ -139,9 +139,8 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
             DBObject result = dbcol.group(command);
 
             // Execute query
-            Sequence retVal = new StringValue(result.toString());
 
-            return retVal;
+            return new StringValue(result.toString());
 
         } catch (Throwable t) {
             return GenericExceptionHandler.handleException(this, t);