Merge pull request #11 from bytefish/2.0-api

Author: bytefish

JSqlServerBulkInsert/jsqlserverbulkinsert.iml

@@ -7,7 +7,7 @@
 
     <groupId>de.bytefish</groupId>
     <artifactId>jsqlserverbulkinsert</artifactId>
-    <version>1.5</version>
+    <version>2.0</version>
     <name>jsqlserverbulkinsert</name>
     <description>JSqlServerBulkInsert is a Java library for Bulk Inserts to the SQL Server.</description>
     <url>http://www.github.com/bytefish/JSqlServerBulkInsert</url>
@@ -54,6 +54,11 @@
                 </configuration>
             </plugin>
         </plugins>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
     </build>
 
     <properties>
@@ -155,7 +160,7 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>6.4.0.jre8</version>
+            <version>7.2.2.jre8</version>
         </dependency>
 
         <dependency>

JSqlServerBulkInsert/pom.xml

@@ -1,4 +1,4 @@
-// Copyright (c) Philipp Wagner. All rights reserved.
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package de.bytefish.jsqlserverbulkinsert;

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/ISqlServerBulkInsert.java

@@ -1,4 +1,4 @@
-// Copyright (c) Philipp Wagner. All rights reserved.
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package de.bytefish.jsqlserverbulkinsert;
@@ -12,6 +12,7 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Collection;
 import java.util.stream.Stream;
 
 public class SqlServerBulkInsert<TEntity> implements ISqlServerBulkInsert<TEntity> {
@@ -44,4 +45,12 @@ public void saveAll(Connection connection, SQLServerBulkCopyOptions options, Str
             throw new RuntimeException(e);
         }
     }
+
+    public void saveAll(Connection connection, Collection<TEntity> entities) throws SQLException {
+        if(entities == null) {
+            throw new IllegalArgumentException("entities");
+        }
+
+        saveAll(connection, entities.stream());
+    }
 }

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/SqlServerBulkInsert.java

@@ -0,0 +1,17 @@
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+public abstract class BaseConverter<TSourceType> implements IConverter<TSourceType> {
+
+    public Object convert(TSourceType value) {
+        if(value == null) {
+            return null;
+        }
+
+        return internalConvert(value);
+    }
+
+    public abstract Object internalConvert(TSourceType value);
+}

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/BaseConverter.java

@@ -0,0 +1,23 @@
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+public class BigDecimalConverter extends BaseConverter<BigDecimal> {
+
+    private final int scale;
+    private final RoundingMode roundingMode;
+
+    public BigDecimalConverter(int scale, RoundingMode roundingMode) {
+        this.roundingMode = roundingMode;
+        this.scale = scale;
+    }
+
+    @Override
+    public Object internalConvert(BigDecimal value) {
+        return value.setScale(scale, BigDecimal.ROUND_HALF_UP);
+    }
+}

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/BigDecimalConverter.java

@@ -0,0 +1,13 @@
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+import java.math.BigInteger;
+
+public class BigIntegerConverter extends BaseConverter<BigInteger> {
+    @Override
+    public Object internalConvert(BigInteger value) {
+        return value.longValueExact();
+    }
+}

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/BigIntegerConverter.java

@@ -0,0 +1,9 @@
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+public interface IConverter<TSourceType> {
+
+    Object convert(TSourceType value);
+}

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/IConverter.java

@@ -0,0 +1,8 @@
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+public class IdentityConverter<TPropertyType> extends BaseConverter<TPropertyType> {
+    @Override
+    public Object internalConvert(TPropertyType value) {
+        return value;
+    }
+}

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/IdentityConverter.java

@@ -0,0 +1,21 @@
+// Copyright (c) Philipp Wagner and Victor Lee. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+
+public class InstantConverter extends BaseConverter<Instant> {
+
+    @Override
+    public Object internalConvert(Instant value) {
+        Timestamp castedResult = new Timestamp(value.toEpochMilli());
+
+        // Round to the nearest 100 nanoseconds, the precision that SQL server can handle:
+        castedResult.setNanos((value.getNano()/100)*100);
+
+        return castedResult;
+    };
+
+}