Sprint22 master (#31)

* Issue 29 add config parameter (#30)

* add configurationProperties

* Improving mssql stored procedures (#28)

* Adding RESULT_VALUE parameter processing.

* Improving MSSQL stored procedures processing

* Fixing exceptions processing.

* Add log properties

* Update README.md

Author: Olha Virolainen

.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2
+jobs:
+  test:
+    docker:
+      - image: circleci/openjdk:8
+    steps:
+      - checkout
+      - restore_cache:
+          key: gradle-{{ checksum "build.gradle" }}
+
+      - run: ./gradlew downloadDependencies --daemon
+      - save_cache:
+          key: gradle-{{ checksum "build.gradle" }}
+          paths:
+            - ~/.gradle/caches
+            - ~/.gradle/wrapper
+
+      - run:
+          name: Run Unit Tests
+          command: ./gradlew test --daemon
+      - run:
+          name: Run Integration Tests
+          command: ./gradlew integrationTest --daemon
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - test

.gitignore

@@ -7,4 +7,5 @@
 out/
 tests.log
 tests.properties
-tests.script
+tests.script
+.env

CHANGELOG.md

@@ -0,0 +1,8 @@
+ ## 2.2.0 (August 28, 2019)
+ 
+ * Add support `Configuration properties` for DB connection
+ * Enable circleci
+ 
+ ## 2.1.0 (July 30, 2019)
+ 
+ * Initial release which includes a bunch of previous unversioned releases

README.md

@@ -1,4 +1,5 @@
 # JDBC-component
+
 ## Description
 This is an open source component for working with object-relational database management systems on [elastic.io platform](http://www.elastic.io "elastic.io platform").
 
@@ -27,8 +28,9 @@ Following actions are inside:
 
 ### Requirements
 Before you can deploy any code into elastic.io **you must be a registered elastic.io platform user**. Please see our home page at [http://www.elastic.io](http://www.elastic.io) to learn how. 
+
 #### Environment variables
-For unit-testing is needed to specify following environment variables:
+For integration-testing is needed to specify following environment variables:
 1. Connection to MSSQL:
  - ``CONN_USER_MSSQL`` - user login
  - ``CONN_PASSWORD_MSSQL`` - user password
@@ -55,29 +57,31 @@ For unit-testing is needed to specify following environment variables:
  - ``CONN_PORT_POSTGRESQL`` - DataBase port
 #### Others
 ## Credentials
-You may use following properties to configure a connection:
-![image](https://user-images.githubusercontent.com/40201204/43577550-ce99efe6-9654-11e8-87ed-f3e0839d618a.png)
-You can add the authorisation methods during the integration flow design or by going to your Settings > Security credentials > REST client and adding there.
+You need to use following properties to configure credentials:
+
 ### DB Engine
-You are able to choose one of existing database types:
+Choose one of existing database types:
 ![image](https://user-images.githubusercontent.com/40201204/43577772-6f85bdea-9655-11e8-96e1-368493a36c9d.png)
 
 ### Connection URI
-In the Connection URI field please provide hostname of the server, e.g. ``acme.com``
+Provide hostname of the server, e.g. ``acme.com``
 ### Connection port
-In the Connection port field please provide port of the server instance, as by default:
+Optional field. Provide port of the server instance, as by default:
 - ``3306`` - MySQL
 - ``5432`` - PostgreSQL
 - ``1521`` - Oracle
 - ``1433`` - MSSQL
 ### Database Name
-In the Database Name field please provide name of database at the instance that you want to interact with.
+Provide name of database at the instance that you want to interact with.
 ### User
-In the User field please provide a username that has permissions to interact with the Database.
+Provide a username that has permissions to interact with the Database.
 ### Password
-In the Password field please provide a password of the user that has permissions to interact with the Database.
+Provide a password of the user that has permissions to interact with the Database.
+### Configuration properties
+Optional field. Provide a configuration properties for connections to the Database, e.g. ``useUnicode=true&serverTimezone=UTC``
+
+**Limitation:** `Configuration properties` value may not be checked during Credentials Verifacation, so in case of using this field make sure that it contains correct input. 
 
-Validation will start right after click on a Save button. You will be able to continue working with component after validation if all provided credentials will be valid.
 ## Triggers
 ### Select trigger
 You are able to provide SELECT query with last execution timestamp as WHERE clause criteria.
@@ -113,7 +117,6 @@ The format of ``Start Polling From (optional)`` field should be like ``yyyy-mm-d
 ### SELECT trigger (Deprecated)
 This action exists in JDBC component only for backward compatibility. New [**Select trigger**](#select-trigger) is recommended to use.
 
-
 ## Actions
 ### Select action
 ![image](https://user-images.githubusercontent.com/40201204/43592439-39ec5738-967e-11e8-8632-3655b08982d3.png)
@@ -248,7 +251,8 @@ Component generates next metadata:
 
 
 ### Create or update record action (Deprecated)
-This action exists in JDBC component only for backward compatibility. [**Upsert row by primary key**](#upsert-row-by-primary-key-action) Action is recommended to use.
+This action exists in JDBC component only for backward compatibility. 
+Please use [**Upsert row by primary key**](#upsert-row-by-primary-key-action) instead.
 
 ## Current limitations
 1. Only tables with one [PRIMARY KEY](https://en.wikipedia.org/wiki/Primary_key "PRIMARY KEY") is supported. You will see the message ``Table has not Primary Key. Should be one Primary Key

build.gradle

@@ -1,10 +1,48 @@
 group = 'io.elastic'
-version = '2.1.0'
+version = '2.2.0'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 apply plugin: 'groovy'
 
+sourceSets {
+    integrationTest {
+        java.outputDir = file('build/classes/integrationtest')
+        java { srcDir file('src/integration-test/java') }
+        resources { srcDir file('src/integration-test/resources') }
+    }
+    main {
+        java.outputDir = file('build/classes/main')
+    }
+    test {
+        java.outputDir = file('build/classes/test')
+    }
+}
+
+test {
+    exclude 'io/elastic/jdbc/integration/**'
+    testLogging {
+        showStandardStreams = true
+    }
+    maxParallelForks 4
+}
+
+task integrationTest(type: Test) {
+    testLogging {
+        showStandardStreams = true
+    }
+    filter() {
+        includeTestsMatching "io.elastic.jdbc.integration.*"
+    }
+}
+
+task downloadDependencies() {
+    description 'Download all dependencies to the Gradle cache'
+    doLast {
+        configurations.findAll { it.canBeResolved }.files
+    }
+}
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -28,10 +66,12 @@ dependencies {
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.3'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.7.3'
 
+    testCompile group: 'io.github.cdimascio', name: 'java-dotenv', version: '5.1.0'
     testCompile "org.spockframework:spock-core:1.1-groovy-2.4"
     testCompile 'org.hsqldb:hsqldb:2.0.0'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.9'
+
+wrapper {
+    gradleVersion = '5.4.1'
 }

circle.yml

@@ -45,6 +45,12 @@
         "label": "Password",
         "required": true,
         "placeholder": "Password"
+      },
+      "configurationProperties": {
+        "viewClass": "TextFieldView",
+        "label": "Configuration properties",
+        "required": false,
+        "placeholder": "useUnicode=true&serverTimezone=UTC"
       }
     }
   },

component.json

@@ -1,6 +1,6 @@
-#Mon Aug 10 13:36:19 EEST 2015
+#Tue Aug 13 13:58:37 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -80,4 +80,9 @@ public int getType() {
   public int getOrder() {
     return order;
   }
+
+  public ProcedureParameter setOrder(int order) {
+    this.order = order;
+    return this;
+  }
 }

src/main/java/io/elastic/jdbc/ProcedureParameter.java

@@ -7,6 +7,7 @@
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Map;
@@ -16,9 +17,13 @@
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MSSQL extends Query {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(MSSQL.class);
+
   public ArrayList executePolling(Connection connection) throws SQLException {
     validateQuery();
     String sql = "WITH Results_CTE AS" +
@@ -119,6 +124,7 @@ public void executeUpdate(Connection connection, String tableName, String idColu
   protected CallableStatement prepareCallableStatement(Connection connection, String procedureName,
       Map<String, ProcedureParameter> procedureParams, JsonObject messageBody)
       throws SQLException {
+
     CallableStatement stmt = connection.prepareCall(
         String.format("{call %s%s}", procedureName,
             generateStatementWildcardMask(procedureParams)));
@@ -128,14 +134,16 @@ protected CallableStatement prepareCallableStatement(Connection connection, Stri
       ProcedureParameter parameter = procedureParams.values()
           .stream()
           .filter(p -> p.getOrder() == order)
-          .findFirst().orElseThrow(() -> new IllegalStateException("Can't find parameter by order"));
+          .findFirst()
+          .orElseThrow(() -> new IllegalStateException("Can't find parameter by order"));
 
       if (parameter.getDirection() == Direction.IN || parameter.getDirection() == Direction.INOUT) {
         if (parameter.getDirection() == Direction.INOUT) {
           stmt.registerOutParameter(inc, parameter.getType());
         }
 
         String type = Utils.cleanJsonType(Utils.detectColumnType(parameter.getType(), ""));
+        LOGGER.info("Processing: " + parameter.getName());
         switch (type) {
           case ("number"):
             stmt.setObject(inc,
@@ -168,10 +176,21 @@ public JsonObject callProcedure(Connection connection, JsonObject body, JsonObje
     CallableStatement stmt = prepareCallableStatement(connection,
         configuration.getString("procedureName"), procedureParams, body);
 
-    stmt.execute();
+    ResultSet functionResultSet = null;
+    try {
+      functionResultSet = stmt.executeQuery();
+    } catch (SQLException e) {
+      if (e.getErrorCode() != 0) { // Ensuring that procedure was executed, but functionResultSet is empty
+        throw e;
+      }
+    }
 
     JsonObjectBuilder resultBuilder = Json.createObjectBuilder();
 
+    if (functionResultSet != null) {
+      addResultSetToJson(resultBuilder, functionResultSet, "@RETURN_VALUE");
+    }
+
     procedureParams.values().stream()
         .filter(param -> param.getDirection() == Direction.OUT
             || param.getDirection() == Direction.INOUT)