From eaa43716411e4bd6c0b63ad9672e5c65f3433746 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 26 Jan 2022 17:02:59 +0100
Subject: [PATCH] Minor fixes

---
 .../java/io/ebean/config/dbplatform/db2/DB2Platform.java  | 8 ++++----
 .../expression/platform/DbExpressionHandlerFactory.java   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
index 622ff102e..2d2673b46 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
@@ -1,7 +1,10 @@
 package io.ebean.config.dbplatform.db2;
 
+import java.sql.Types;
+
+import javax.sql.DataSource;
+
 import io.ebean.BackgroundExecutor;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
@@ -9,9 +12,6 @@ import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
-import javax.sql.DataSource;
-import java.sql.Types;
-
 /**
  * DB2 specific platform.
  */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
index 110719ddd..bc80213c0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -24,8 +24,6 @@ public final class DbExpressionHandlerFactory {
         return new OracleDbExpression();
       case DB2:
         return new Db2DbExpression();
-      case SQLSERVER16:
-      case SQLSERVER17:
       case SQLSERVER:
         return new SqlServerDbExpression();
       case HANA: