NotNull

DataGrip · Jul 13, 2020 · 5e999b7 · 5e999b7
1 parent b794e3c
commit 5e999b7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/driver/src/main/java/com/intellij/CouchbaseMetaData.java b/driver/src/main/java/com/intellij/CouchbaseMetaData.java
@@ -1,6 +1,7 @@
 package com.intellij;
 
 import com.couchbase.client.java.json.JsonObject;
+import org.jetbrains.annotations.NotNull;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -19,7 +20,7 @@ public class CouchbaseMetaData implements DatabaseMetaData {
     private final CouchbaseConnection connection;
     private final CouchbaseJdbcDriver driver;
 
-    CouchbaseMetaData(CouchbaseConnection connection, CouchbaseJdbcDriver driver) {
+    CouchbaseMetaData(@NotNull CouchbaseConnection connection, @NotNull CouchbaseJdbcDriver driver) {
         this.connection = connection;
         this.driver = driver;
     }

diff --git a/driver/src/main/java/com/intellij/CouchbasePreparedStatement.java b/driver/src/main/java/com/intellij/CouchbasePreparedStatement.java
@@ -3,6 +3,7 @@
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.json.JsonArray;
 import com.couchbase.client.java.query.QueryOptions;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -36,7 +37,7 @@ public class CouchbasePreparedStatement extends CouchbaseBaseStatement implement
     private final String sql;
     private Object[] params;
 
-    CouchbasePreparedStatement(Cluster cluster, String sql, boolean returnNullStrings) {
+    CouchbasePreparedStatement(@NotNull Cluster cluster, @NotNull String sql, boolean returnNullStrings) {
         super(cluster);
         this.returnNullStrings = returnNullStrings;
         this.sql = sql;

diff --git a/driver/src/main/java/com/intellij/CouchbaseResultSet.java b/driver/src/main/java/com/intellij/CouchbaseResultSet.java
@@ -2,6 +2,7 @@
 
 import com.couchbase.client.java.json.JsonObject;
 import com.couchbase.client.java.query.ReactiveQueryResult;
+import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
 
 import java.io.InputStream;
@@ -45,18 +46,17 @@ public class CouchbaseResultSet implements ResultSet {
     private CouchbaseResultSetMetaData meta;
     private boolean isClosed = false;
 
-    CouchbaseResultSet(Statement statement, Mono<ReactiveQueryResult> queryResult, boolean returnNullStrings) {
+    CouchbaseResultSet(@NotNull Statement statement, @NotNull Mono<ReactiveQueryResult> queryResult,
+                       boolean returnNullStrings) {
         this.statement = statement;
         this.stream = queryResult.flux()
                 .flatMap(ReactiveQueryResult::rowsAsObject)
-                .doOnRequest(x -> System.err.println("Requested next: " + x))
-                .doOnCancel(() -> System.err.println("Cancel this flux"))
                 .toStream();
         this.iterator = stream.iterator();
         this.returnNullStrings = returnNullStrings;
     }
 
-    CouchbaseResultSet(Statement statement, Mono<ReactiveQueryResult> queryResult) {
+    CouchbaseResultSet(@NotNull Statement statement, @NotNull Mono<ReactiveQueryResult> queryResult) {
         this(statement, queryResult, true);
     }
 
@@ -85,7 +85,6 @@ public boolean next() throws SQLException {
 
     @Override
     public void close() {
-        System.out.println("Close called");
         if (stream != null) {
             stream.close();
             iterator = Collections.emptyIterator();
@@ -297,7 +296,6 @@ public SQLWarning getWarnings() throws SQLException {
 
     @Override
     public void clearWarnings() {
-        // todo
     }
 
     @Override
@@ -425,7 +423,6 @@ public int getFetchDirection() {
 
     @Override
     public void setFetchSize(int rows) {
-        // todo
     }
 
     @Override

diff --git a/driver/src/main/java/com/intellij/CouchbaseResultSetMetaData.java b/driver/src/main/java/com/intellij/CouchbaseResultSetMetaData.java
@@ -1,5 +1,7 @@
 package com.intellij;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -18,7 +20,7 @@ public class CouchbaseResultSetMetaData implements ResultSetMetaData {
 
     private final List<ColumnMetaData> columnMetaData;
 
-    CouchbaseResultSetMetaData(List<ColumnMetaData> columnMetaData) {
+    CouchbaseResultSetMetaData(@NotNull List<ColumnMetaData> columnMetaData) {
         this.columnMetaData = columnMetaData;
     }
 

diff --git a/driver/src/main/java/com/intellij/CouchbaseStatement.java b/driver/src/main/java/com/intellij/CouchbaseStatement.java
@@ -1,13 +1,14 @@
 package com.intellij;
 
 import com.couchbase.client.java.Cluster;
+import org.jetbrains.annotations.NotNull;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 
 public class CouchbaseStatement extends CouchbaseBaseStatement {
-    CouchbaseStatement(Cluster cluster) {
+    CouchbaseStatement(@NotNull Cluster cluster) {
         super(cluster);
     }
 
@@ -25,6 +26,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
 
     @Override
     public int executeUpdate(String sql) throws SQLException {
+        //todo: learn to handle update queries
         checkClosed();
         try {
             result = new CouchbaseResultSet(this, cluster.reactive().query(sql));