monetdb-java: src/main/java/org/monetdb/jdbc/MonetConnection.java comparison

comparison src/main/java/org/monetdb/jdbc/MonetConnection.java @ 620:5ab170ddc66a

Some small improvements

author	Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date	Wed, 19 Jan 2022 21:30:10 +0100 (2022-01-19)
parents	15eb17b911a5
children	1c3cdf0667d7

comparison

equal deleted inserted replaced

-:ffc2fc8e82ec
+:5ab170ddc66a
 							tmpLine = in.readLine();
 							linetype = in.getLineType();
 							break;
 						case FILETRANSFER:
 							// Consume the command
-							String transferCommand = in.readLine();
+							final String transferCommand = in.readLine();
 							// Consume the fake prompt inserted by MapiSocket.
-							String dummy = in.readLine();
+							in.readLine();
 							// Handle the request
 							if (transferCommand != null)
 								error = handleTransfer(transferCommand);
 							else
 								error = "Protocol violation, expected transfer command, got nothing";
 		} else if (transferCommand.startsWith("rb ")) {
 			return handleUpload(transferCommand.substring(3), false, 0);
 		} else if (transferCommand.startsWith("w ")) {
 			return handleDownload(transferCommand.substring(2), true);
 		} else if (transferCommand.startsWith("wb ")) {
-			return handleDownload(transferCommand.substring(2), false);
+			return handleDownload(transferCommand.substring(3), false);
 		}
 		return "JDBC does not support this file transfer yet: " + transferCommand;
 	}
 	private String handleUpload(final String path, final boolean textMode, final long offset) throws IOException {
 		try {
 			uploadHandler.handleUpload(handle, path, textMode, linesToSkip);
 			if (!handle.hasBeenUsed()) {
 				throw new IOException("Call to " + uploadHandler.getClass().getCanonicalName() + ".handleUpload for path '" + path + "' sent neither data nor an error message");
 			}
+		} finally {
 			handle.close();
-		} finally {
 			server.setInsertFakePrompts(wasFaking);
 		}
 		return handle.getError();
 	}
-	private String handleDownload(final String path, boolean textMode) throws IOException {
+	private String handleDownload(final String path, final boolean textMode) throws IOException {
 		if (downloadHandler == null) {
 			return "No file download handler has been registered with the JDBC driver";
 		}
 		final Download handle = new Download(server, textMode);
 	public interface UploadHandler {
 		/**
 		 * Called if the server sends a request to read file data.
 		 *
 		 * Use the given handle to receive data or send errors to the server.
-		 *  @param handle Handle to communicate with the server
+		 *
+		 * @param handle Handle to communicate with the server
 		 * @param name Name of the file the server would like to read. Make sure
 		 *             to validate this before reading from the file system
 		 * @param textMode Whether to open the file as text or binary data.
 		 * @param linesToSkip In text mode, number of initial lines to skip.
 		 *                    0 means upload everything, 1 means skip the first line, etc.
 		 * Called if the server sends a request to write a file.
 		 *
 		 * Use the given handle to send data or errors to the server.
 		 *
 		 * @param handle Handle to communicate with the server
-		 * @param name Name of the file the server would like to write. Make sure to validate this before writing to
+		 * @param name Name of the file the server would like to write. Make sure
-		 *             the file system
+		 *             to validate this before writing to the file system
 		 * @param textMode Whether this is text or binary data.
 		 */
 		void handleDownload(Download handle, String name, boolean textMode) throws IOException;
 	}
 		/**
 		 * Read data from the given buffered reader and send it to the server
 		 * @param reader reader to read from
 		 * @param linesToSkip start uploading at line {@code offset}. Value 0 and 1
-		 * both mean upload the whole file, value 2 means skip the first line, etc.q
+		 *        both mean upload the whole file, value 2 means skip the first line, etc.
 		 */
 		public void uploadFrom(final BufferedReader reader, final long linesToSkip) throws IOException {
 			for (int i = 0; i < linesToSkip; i++) {
 				String line = reader.readLine();
 				if (line == null) {
 		 * {@link IOException} but this will terminate the connection.
 		 *
 		 * Note: as of MonetDB version Jul2021 the server always terminates the connection
 		 * when this error is used.  This will probably change in the future.
 		 */
-		public void sendError(String errorMessage) throws IOException {
+		public void sendError(final String errorMessage) throws IOException {
 			if (error != null) {
 				throw new IOException("another error has already been sent: " + error);
 			}
 			error = errorMessage;
 		}
 			final InputStream s = getStream();
 			final InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8);
 			final char[] buffer = new char[65536];
 			while (true) {
 				final int nread = r.read(buffer);
-				if (nread < 0)
+				if (nread < 0) {
 					break;
+				}
 				writer.write(buffer, 0, nread);
 			}
 		}
 		/**
 		 * @return  true if data has been received or an error has been sent.
 		 */
 		public boolean hasBeenUsed() {
-			return error != null || stream != null;
+			return stream != null || error != null;
 		}
 		/**
 		 * @return the error that was sent, if any
 		 */
 		/**
 		 * Set the line endings used in the stream returned by {@link Download#getStream()}
 		 * @param sep separator to use
 		 * @throws IllegalArgumentException if sep is neither "\n" nor "\r\n"
 		 */
-		public void setLineSeparator(String sep) {
+		public void setLineSeparator(final String sep) {
 			if ("\n".equals(sep)) {
 				prependCr = false;
 			} else if ("\r\n".equals(sep)) {
 				prependCr = true;
 			} else {
-				throw new IllegalArgumentException("sep must be \n or \r\n");
+				throw new IllegalArgumentException("sep must be \\n or \\r\\n");
 			}
 		}
 	}
 	public static class StripCrLfStream extends FilterOutputStream {
 		public boolean pending() {
 			return this.crPending;
 		}
 		@Override
-		public void write(int b) throws IOException {
+		public void write(final int b) throws IOException {
 			if (crPending && b != '\n') {
-					out.write('\r');
+				out.write('\r');
 			}
 			if (b != '\r') {
 				out.write(b);
 				crPending = false;
 			} else {
 				crPending = true;
 			}
 		}
 		@Override
-		public void write(byte[] b) throws IOException {
+		public void write(final byte[] b) throws IOException {
 			this.write(b, 0, b.length);
 		}
 		@Override
-		public void write(byte[] b, int off, int len) throws IOException {
+		public void write(final byte[] b, int off, int len) throws IOException {
 			if (len == 0) {
 				return;
 			}
 			if (crPending && b[0] != '\n') {
 				out.write('\r');

Mercurial > hg > monetdb-java

comparison src/main/java/org/monetdb/jdbc/MonetConnection.java @ 620:5ab170ddc66a