diff --git a/.project b/.project
index 51e84ac..a90c195 100644
--- a/.project
+++ b/.project
@@ -39,4 +39,15 @@
edu.umd.cs.findbugs.plugin.eclipse.findbugsNature
org.eclipse.wst.common.project.facet.core.nature
+
+
+ 1714375844981
+
+ 30
+
+ org.eclipse.core.resources.regexFilterMatcher
+ node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 9e5201e..af7d083 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -4,7 +4,7 @@ org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
@@ -78,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=21
org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
diff --git a/src/test/java/io/github/sebasbaumh/postgis/DatatypesTest.java b/src/test/java/io/github/sebasbaumh/postgis/DatatypesTest.java
index eb601ce..ed36cb7 100644
--- a/src/test/java/io/github/sebasbaumh/postgis/DatatypesTest.java
+++ b/src/test/java/io/github/sebasbaumh/postgis/DatatypesTest.java
@@ -32,21 +32,21 @@
public class DatatypesTest extends DatabaseTestBase
{
- private static final String cr_str = "CIRCULARSTRING(-9 2,-8 3,-7 2)";
+ private static final String CR_STR = "CIRCULARSTRING(-9 2,-8 3,-7 2)";
- private static final String cr_str2 = "CIRCULARSTRING(0 -1,-1 0,0 1,1 0,0 -1)";
+ private static final String CR_STR2 = "CIRCULARSTRING(0 -1,-1 0,0 1,1 0,0 -1)";
- private static final String lng_str = "LINESTRING (10 10 20,20 20 20, 50 50 50, 34 34 34)";
+ private static final String LNG_STR = "LINESTRING (10 10 20,20 20 20, 50 50 50, 34 34 34)";
private static final Logger logger = LoggerFactory.getLogger(DatatypesTest.class);
- private static final String mlng_str = "MULTILINESTRING ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+ private static final String MLNG_STR = "MULTILINESTRING ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
- private static final String mplg_str = "MULTIPOLYGON (((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))";
+ private static final String MPLG_STR = "MULTIPOLYGON (((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))";
- private static final String plg_str = "POLYGON ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+ private static final String PLG_STR = "POLYGON ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
- private static final String ptg_str = "POINT(10 10 20)";
+ private static final String PTG_STR = "POINT(10 10 20)";
@SuppressWarnings("unchecked")
private T assertGeometry(Class clazz, String wkt) throws SQLException
@@ -68,8 +68,8 @@ public void testCircularString() throws SQLException
return;
}
logger.trace("void testCircularString()");
- logger.debug(cr_str);
- CircularString lng = assertGeometry(CircularString.class, cr_str);
+ logger.debug(CR_STR);
+ CircularString lng = assertGeometry(CircularString.class, CR_STR);
logger.debug(lng.toString());
}
@@ -81,8 +81,8 @@ public void testCircularString2() throws SQLException
return;
}
logger.trace("void testCircularString2()");
- logger.debug(cr_str2);
- CircularString lng = assertGeometry(CircularString.class, cr_str2);
+ logger.debug(CR_STR2);
+ CircularString lng = assertGeometry(CircularString.class, CR_STR2);
logger.debug(lng.toString());
}
@@ -94,8 +94,8 @@ public void testLineString() throws SQLException
return;
}
logger.trace("void testLineString()");
- logger.debug(lng_str);
- LineString lng = assertGeometry(LineString.class, lng_str);
+ logger.debug(LNG_STR);
+ LineString lng = assertGeometry(LineString.class, LNG_STR);
logger.debug(lng.toString());
}
@@ -107,8 +107,8 @@ public void testMultiLineString() throws SQLException
return;
}
logger.trace("void testMultiLineString()");
- logger.debug(mlng_str);
- MultiLineString mlng = assertGeometry(MultiLineString.class, mlng_str);
+ logger.debug(MLNG_STR);
+ MultiLineString mlng = assertGeometry(MultiLineString.class, MLNG_STR);
logger.debug(mlng.toString());
}
@@ -120,8 +120,8 @@ public void testMultiPolygon() throws SQLException
return;
}
logger.trace("void testMultiPolygon()");
- logger.debug(mplg_str);
- MultiPolygon mplg = assertGeometry(MultiPolygon.class, mplg_str);
+ logger.debug(MPLG_STR);
+ MultiPolygon mplg = assertGeometry(MultiPolygon.class, MPLG_STR);
logger.debug(mplg.toString());
}
@@ -133,8 +133,8 @@ public void testPGgeometry() throws SQLException
return;
}
logger.trace("void testPGgeometry()");
- logger.debug(mlng_str);
- PGgeometry pgf = new PGgeometry(getWKBFromWKT(mlng_str));
+ logger.debug(MLNG_STR);
+ PGgeometry pgf = new PGgeometry(getWKBFromWKT(MLNG_STR));
logger.debug(pgf.toString());
}
@@ -146,8 +146,8 @@ public void testPoint() throws SQLException
return;
}
logger.trace("void testPoint()");
- logger.debug(ptg_str);
- Point ptg = assertGeometry(Point.class, ptg_str);
+ logger.debug(PTG_STR);
+ Point ptg = assertGeometry(Point.class, PTG_STR);
logger.debug(ptg.toString());
}
@@ -159,8 +159,8 @@ public void testPolygon() throws SQLException
return;
}
logger.trace("void testPolygon()");
- logger.debug(plg_str);
- Polygon plg = assertGeometry(Polygon.class, plg_str);
+ logger.debug(PLG_STR);
+ Polygon plg = assertGeometry(Polygon.class, PLG_STR);
logger.debug(plg.toString());
}
diff --git a/src/test/java/io/github/sebasbaumh/postgis/GeographyTest.java b/src/test/java/io/github/sebasbaumh/postgis/GeographyTest.java
index a71cd81..1760880 100644
--- a/src/test/java/io/github/sebasbaumh/postgis/GeographyTest.java
+++ b/src/test/java/io/github/sebasbaumh/postgis/GeographyTest.java
@@ -33,15 +33,15 @@
@SuppressWarnings("javadoc")
public class GeographyTest extends PostgisDatabaseTest
{
- private static final String lng_str = "LINESTRING (10 10 20,20 20 20, 50 50 50, 34 34 34)";
+ private static final String LNG_STR = "LINESTRING (10 10 20,20 20 20, 50 50 50, 34 34 34)";
- private static final String mlng_str = "MULTILINESTRING ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+ private static final String MLNG_STR = "MULTILINESTRING ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
- private static final String mplg_str = "MULTIPOLYGON (((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))";
+ private static final String MPLG_STR = "MULTIPOLYGON (((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))";
- private static final String plg_str = "POLYGON ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+ private static final String PLG_STR = "POLYGON ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
- private static final String ptg_str = "POINT(10 10 20)";
+ private static final String PTG_STR = "POINT(10 10 20)";
@SuppressWarnings("unchecked")
private T assertGeometry(Class clazz, String wkt) throws SQLException
@@ -62,7 +62,7 @@ public void testLineString() throws SQLException
{
return;
}
- assertGeometry(LineString.class, lng_str);
+ assertGeometry(LineString.class, LNG_STR);
}
@Test
@@ -72,7 +72,7 @@ public void testMultiLineString() throws SQLException
{
return;
}
- assertGeometry(MultiLineString.class, mlng_str);
+ assertGeometry(MultiLineString.class, MLNG_STR);
}
@Test
@@ -82,7 +82,7 @@ public void testMultiPolygon() throws SQLException
{
return;
}
- assertGeometry(MultiPolygon.class, mplg_str);
+ assertGeometry(MultiPolygon.class, MPLG_STR);
}
@SuppressWarnings("unused")
@@ -94,7 +94,7 @@ public void testPGgeometry() throws SQLException
{
return;
}
- new PGgeometry(getWKBFromWKT(mlng_str));
+ new PGgeometry(getWKBFromWKT(MLNG_STR));
}
@Test
@@ -104,7 +104,7 @@ public void testPoint() throws SQLException
{
return;
}
- assertGeometry(Point.class, ptg_str);
+ assertGeometry(Point.class, PTG_STR);
}
@Test
@@ -114,7 +114,7 @@ public void testPolygon() throws SQLException
{
return;
}
- assertGeometry(Polygon.class, plg_str);
+ assertGeometry(Polygon.class, PLG_STR);
}
}
diff --git a/src/test/java/io/github/sebasbaumh/postgis/VersionPrinterTest.java b/src/test/java/io/github/sebasbaumh/postgis/VersionPrinterTest.java
index 4ed353e..1044136 100644
--- a/src/test/java/io/github/sebasbaumh/postgis/VersionPrinterTest.java
+++ b/src/test/java/io/github/sebasbaumh/postgis/VersionPrinterTest.java
@@ -43,7 +43,7 @@ public class VersionPrinterTest extends DatabaseTestBase
private static final Logger logger = LoggerFactory.getLogger(VersionPrinterTest.class);
- private static String[] POSTGIS_FUNCTIONS = { "postgis_version", "postgis_proj_version",
+ private static final String[] POSTGIS_FUNCTIONS = { "postgis_version", "postgis_proj_version",
"postgis_scripts_installed", "postgis_lib_version", "postgis_scripts_released", "postgis_uses_stats",
"postgis_geos_version", "postgis_scripts_build_date", "postgis_lib_build_date", "postgis_full_version",
"postgis_gdal_version", "postgis_libjson_version", "postgis_libxml_version", "postgis_raster_lib_version",