Skip to content
Permalink
Browse files

style: remove extra empty lines (#1452)

  • Loading branch information...
kazachka authored and davecramer committed Apr 1, 2019
1 parent ed5f750 commit 5e48c4d0714fd656fb1997f29c1fa2d4fee60708
Showing with 0 additions and 44 deletions.
  1. +0 −1 pgjdbc/src/main/java/org/postgresql/core/PGStream.java
  2. +0 −1 pgjdbc/src/main/java/org/postgresql/core/v3/BatchedQuery.java
  3. +0 −3 pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
  4. +0 −1 pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java
  5. +0 −1 pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
  6. +0 −1 pgjdbc/src/main/java/org/postgresql/hostchooser/CandidateHost.java
  7. +0 −2 pgjdbc/src/main/java/org/postgresql/jdbc/AbstractBlobClob.java
  8. +0 −3 pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions.java
  9. +0 −1 pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions2.java
  10. +0 −1 pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
  11. +0 −1 pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
  12. +0 −2 pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
  13. +0 −2 pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
  14. +0 −1 pgjdbc/src/main/java/org/postgresql/largeobject/BlobInputStream.java
  15. +0 −1 pgjdbc/src/main/java/org/postgresql/largeobject/BlobOutputStream.java
  16. +0 −1 pgjdbc/src/main/java/org/postgresql/sspi/SSPIClient.java
  17. +0 −17 pgjdbc/src/main/java/org/postgresql/util/Base64.java
  18. +0 −1 pgjdbc/src/main/java/org/postgresql/util/PGtokenizer.java
  19. +0 −1 pgjdbc/src/test/java/org/postgresql/test/TestUtil.java
  20. +0 −1 pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3BlobTest.java
  21. +0 −1 pgjdbc/src/test/java/org/postgresql/test/jdbc42/Jdbc42CallableStatementTest.java
@@ -489,7 +489,6 @@ public void skip(int size) throws IOException {
}
}


/**
* Copy data from an input stream to the connection.
*
@@ -8,7 +8,6 @@
import org.postgresql.core.NativeQuery;
import org.postgresql.core.ParameterList;


/**
* Purpose of this object is to support batched query re write behaviour. Responsibility for
* tracking the batch size and implement the clean up of the query fragments after the batch execute
@@ -1731,8 +1731,6 @@ private void sendCloseStatement(String statementName) throws IOException {
pgStream.sendChar(0); // statement name terminator
}



// sendOneQuery sends a single statement via the extended query protocol.
// Per the FE/BE docs this is essentially the same as how a simple query runs
// (except that it generates some extra acknowledgement messages, and we
@@ -2746,7 +2744,6 @@ public boolean getIntegerDateTimes() {
private final boolean allowEncodingChanges;
private final boolean cleanupSavePoints;


/**
* <p>The estimated server response size since we last consumed the input stream from the server, in
* bytes.</p>
@@ -24,7 +24,6 @@
import java.sql.SQLException;
import java.util.Arrays;


/**
* Parameter list for a single-statement V3 query.
*
@@ -481,7 +481,6 @@ public int getCancelSignalTimeout() {
return PGProperty.CANCEL_SIGNAL_TIMEOUT.getIntNoCheck(properties);
}


/**
* @param enabled if SSL is enabled
* @see PGProperty#SSL
@@ -7,7 +7,6 @@

import org.postgresql.util.HostSpec;


/**
* Candidate host to be connected.
*/
@@ -31,7 +31,6 @@
private boolean currentLoIsWriteable;
private boolean support64bit;


/**
* We create separate LargeObjects for methods that use streams so they won't interfere with each
* other.
@@ -192,7 +191,6 @@ private byte next() {
}
}


/**
* This is simply passing the byte value of the pattern Blob.
*
@@ -107,13 +107,11 @@
public static final String SQL_TSI_WEEK = "WEEK";
public static final String SQL_TSI_YEAR = "YEAR";


// system functions
public static final String DATABASE = "database";
public static final String IFNULL = "ifnull";
public static final String USER = "user";


/**
* storage for functions implementations.
*/
@@ -625,7 +623,6 @@ private static String constantToInterval(String type, String value) throws SQLEx
}
}


/**
* time stamp diff.
*
@@ -557,7 +557,6 @@ private static boolean isTsi(String interval) {
return interval.regionMatches(true, 0, SQL_TSI_ROOT, 0, SQL_TSI_ROOT.length());
}


/**
* time stamp diff
*
@@ -2431,7 +2431,6 @@ public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQ
return true;
}


/* lots of unsupported stuff... */
public boolean ownUpdatesAreVisible(int type) throws SQLException {
return true;
@@ -1389,7 +1389,6 @@ public ParameterMetaData createParameterMetaData(BaseConnection conn, int[] oids
return new PgParameterMetaData(conn, oids);
}


//#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
public void setObject(int parameterIndex, Object x, java.sql.SQLType targetSqlType,
int scaleOrLength) throws SQLException {
@@ -667,7 +667,6 @@ public Object getObjectImpl(String columnName, Map<String, Class<?>> map) throws
return getObjectImpl(findColumn(columnName), map);
}


/*
* This checks against map for the type of column i, and if found returns an object based on that
* mapping. The class must implement the SQLData interface.
@@ -710,7 +709,6 @@ public int getRow() throws SQLException {
return rowOffset + currentRow + 1;
}


// This one needs some thought, as not all ResultSets come from a statement
public Statement getStatement() throws SQLException {
checkClosed();
@@ -37,7 +37,6 @@
import java.util.SimpleTimeZone;
import java.util.TimeZone;


/**
* Misc utils for handling time and date values.
*/
@@ -1003,7 +1002,6 @@ public Time toTimeBin(TimeZone tz, byte[] bytes) throws PSQLException {
return convertToTime(millis, tz); // Ensure date part is 1970-01-01
}


//#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
/**
* Returns the SQL Time object matching the given bytes with {@link Oid#TIME}.
@@ -111,7 +111,6 @@ public int read() throws java.io.IOException {
}
}


/**
* <p>Closes this input stream and releases any system resources associated with the stream.</p>
*
@@ -86,7 +86,6 @@ public void write(byte[] buf, int off, int len) throws java.io.IOException {
}
}


/**
* Flushes this output stream and forces any buffered output bytes to be written out. The general
* contract of <code>flush</code> is that calling it is an indication that, if any bytes
@@ -46,7 +46,6 @@
private WindowsSecurityContextImpl sspiContext;
private String targetName;


/**
* <p>Instantiate an SSPIClient for authentication of a connection.</p>
*
@@ -58,7 +58,6 @@

/* ******** P U B L I C F I E L D S ******** */


/**
* No options specified. Value is zero.
*/
@@ -69,13 +68,11 @@
*/
public static final int ENCODE = 1;


/**
* Specify decoding.
*/
public static final int DECODE = 0;


/**
* Don't break lines when encoding (violates strict Base64 specification).
*/
@@ -84,31 +81,26 @@

/* ******** P R I V A T E F I E L D S ******** */


/**
* Maximum line length (76) of Base64 output.
*/
private static final int MAX_LINE_LENGTH = 76;


/**
* The equals sign (=) as a byte.
*/
private static final byte EQUALS_SIGN = (byte) '=';


/**
* The new line character (\n) as a byte.
*/
private static final byte NEW_LINE = (byte) '\n';


/**
* Preferred encoding.
*/
private static final String PREFERRED_ENCODING = "UTF-8";


/**
* The 64 valid Base64 values.
*/
@@ -138,7 +130,6 @@
ALPHABET = bytes;
}


/**
* Translates a Base64 value to either its 6-bit reconstruction value or a negative number
* indicating some other meaning.
@@ -183,7 +174,6 @@
private static final byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
private static final byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding


/**
* Defeats instantiation.
*/
@@ -193,7 +183,6 @@ private Base64() {

/* ******** E N C O D I N G M E T H O D S ******** */


/**
* Encodes up to three bytes of the array <var>source</var> and writes the resulting four Base64
* bytes to <var>destination</var>. The source and destination arrays can be manipulated anywhere
@@ -265,7 +254,6 @@ public static String encodeBytes(byte[] source) {
return encodeBytes(source, 0, source.length, NO_OPTIONS);
} // end encodeBytes


/**
* <p>Encodes a byte array into Base64 notation.</p>
*
@@ -292,7 +280,6 @@ public static String encodeBytes(byte[] source, int options) {
return encodeBytes(source, 0, source.length, options);
} // end encodeBytes


/**
* Encodes a byte array into Base64 notation. Does not GZip-compress data.
*
@@ -306,7 +293,6 @@ public static String encodeBytes(byte[] source, int off, int len) {
return encodeBytes(source, off, len, NO_OPTIONS);
} // end encodeBytes


/**
* <p>Encodes a byte array into Base64 notation.</p>
*
@@ -379,7 +365,6 @@ public static String encodeBytes(byte[] source, int off, int len, int options) {

/* ******** D E C O D I N G M E T H O D S ******** */


/**
* Decodes four bytes from array <var>source</var> and writes the resulting bytes (up to three of
* them) to <var>destination</var>. The source and destination arrays can be manipulated anywhere
@@ -449,7 +434,6 @@ private static int decode4to3(byte[] source, int srcOffset, byte[] destination,
}
} // end decodeToBytes


/**
* Very low-level access to decoding ASCII characters in the form of a byte array. Does not
* support automatically gunzipping or any other "fancy" features.
@@ -501,7 +485,6 @@ private static int decode4to3(byte[] source, int srcOffset, byte[] destination,
return out;
} // end decode


/**
* Decodes data from Base64 notation, automatically detecting gzip-compressed data and
* decompressing it.
@@ -9,7 +9,6 @@
import java.util.ArrayList;
import java.util.List;


/**
* This class is used to tokenize the text output of org.postgres. It's mainly used by the geometric
* classes, but is useful in parsing any output from custom data types output from org.postgresql.
@@ -397,7 +397,6 @@ public static void dropSchema(Connection con, String schema) throws SQLException
}
}


/*
* Helper - creates a test table for use by a test
*/
@@ -239,7 +239,6 @@ public void readWriteStream(byte[] data) throws SQLException, IOException {
readWriteStream(1, data);
}


/**
* Reads then writes data to the blob via a stream.
*/
@@ -22,7 +22,6 @@
import java.util.Collections;
import java.util.List;


/**
* Tests for JDBC 4.2 features in {@link org.postgresql.jdbc.PgCallableStatement}.
*/

0 comments on commit 5e48c4d

Please sign in to comment.
You can’t perform that action at this time.