Merge pull request #1445 from lat-lon/cleanupMssqlDialect-1322

Refactored deegree-dialect-mssql module and upgraded JDBC driver for SQL Server
deegree · Feb 8, 2023 · 6c002b8 · 6c002b8
2 parents 3762c65 + 3eaae54
commit 6c002b8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/deegree-core/deegree-core-geometry/pom.xml b/deegree-core/deegree-core-geometry/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>postgis-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-geometry</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
           <groupId>com.microsoft.sqlserver</groupId>
           <artifactId>mssql-jdbc</artifactId>
-          <version>7.2.2.jre8</version>
+          <version>10.2.2.jre11</version>
         </dependency>
       </dependencies>
     </profile>
@@ -46,6 +46,10 @@
       <artifactId>deegree-core-db</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/...ect/deegree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialect.java b/...ect/deegree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialect.java
@@ -61,14 +61,12 @@
 import org.deegree.sqldialect.filter.AbstractWhereBuilder;
 import org.deegree.sqldialect.filter.PropertyNameMapper;
 import org.deegree.sqldialect.filter.UnmappableException;
-import org.deegree.sqldialect.filter.mssql.MSSQLGeometryConverter;
-import org.deegree.sqldialect.filter.mssql.MSSQLWhereBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.deegree.sqldialect.AbstractSQLDialect;
 
 /**
- * {@link SQLDialect} for Microsoft SQL databases.
+ * {@link SQLDialect} for Microsoft SQL Server databases.
  * 
  * @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
  * @author <a href="mailto:schneider@lat-lon.de">Markus Schneider</a>

diff --git a/...ree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialectProvider.java b/...ree-sqldialect-mssql/src/main/java/org/deegree/sqldialect/mssql/MSSQLDialectProvider.java
@@ -44,7 +44,7 @@
 import org.slf4j.Logger;
 
 /**
- * {@link SqlDialectProvider} for Microsoft SQL databases.
+ * {@link SqlDialectProvider} for Microsoft SQL Server databases.
  * 
  * @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
  * @author last edited by: $Author: schneider $

diff --git a/.../filter/mssql/MSSQLGeometryConverter.java → ...dialect/mssql/MSSQLGeometryConverter.java b/.../filter/mssql/MSSQLGeometryConverter.java → ...dialect/mssql/MSSQLGeometryConverter.java
@@ -33,7 +33,7 @@
 
  e-mail: info@deegree.org
  ----------------------------------------------------------------------------*/
-package org.deegree.sqldialect.filter.mssql;
+package org.deegree.sqldialect.mssql;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -52,7 +52,7 @@
 import org.slf4j.Logger;
 
 /**
- * {@link GeometryParticleConverter} for PostGIS databases.
+ * {@link GeometryParticleConverter} for Microsoft SQL Server databases.
  * 
  * @author <a href="mailto:schneider@lat-lon.de">Markus Schneider</a>
  * @author last edited by: $Author: mschneider $

diff --git a/...alect/filter/mssql/MSSQLWhereBuilder.java → ...e/sqldialect/mssql/MSSQLWhereBuilder.java b/...alect/filter/mssql/MSSQLWhereBuilder.java → ...e/sqldialect/mssql/MSSQLWhereBuilder.java
@@ -33,7 +33,7 @@
 
  e-mail: info@deegree.org
  ----------------------------------------------------------------------------*/
-package org.deegree.sqldialect.filter.mssql;
+package org.deegree.sqldialect.mssql;
 
 import static java.sql.Types.BOOLEAN;
 import static org.deegree.commons.tom.primitive.BaseType.DECIMAL;

diff --git a/...t/filter/mssql/MSSQLWhereBuilderTest.java → ...ldialect/mssql/MSSQLWhereBuilderTest.java b/...t/filter/mssql/MSSQLWhereBuilderTest.java → ...ldialect/mssql/MSSQLWhereBuilderTest.java
@@ -33,7 +33,7 @@
 
  e-mail: info@deegree.org
  ----------------------------------------------------------------------------*/
-package org.deegree.sqldialect.filter.mssql;
+package org.deegree.sqldialect.mssql;
 
 import org.deegree.commons.tom.primitive.PrimitiveValue;
 import org.deegree.commons.xml.CommonNamespaces;

diff --git a/pom.xml b/pom.xml
@@ -809,6 +809,11 @@
         <artifactId>postgis-jdbc</artifactId>
         <version>2.5.1</version>
       </dependency>
+      <dependency>
+        <groupId>net.postgis</groupId>
+        <artifactId>postgis-geometry</artifactId>
+        <version>2.5.1</version>
+      </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>