#1: Make 'jpx.jdbc' module compile.

Author: jenetics

gradle/libs.versions.toml

@@ -1,13 +1,19 @@
 [plugins]
 
 jmh = { id = "me.champeau.jmh", version = "0.7.2" }
+lombok = { id = "io.freefair.lombok", version = "8.4" }
 
 [libraries]
 
 assertj = "org.assertj:assertj-core:3.24.2"
 commons-math = "org.apache.commons:commons-math3:3.6.1"
 equalsverifier = "nl.jqno.equalsverifier:equalsverifier:3.15.3"
+facilejdbc = "io.jenetics:facilejdbc:2.0.0"
 guava = "com.google.guava:guava:32.1.3-jre"
+h2 = "com.h2database:h2:2.1.214"
+mariadb-java-client = "org.mariadb.jdbc:mariadb-java-client:3.3.0"
+mysql-connector-java = "mysql:mysql-connector-java:8.0.33"
+postgres = "org.postgresql:postgresql:42.6.0"
 prngine = "io.jenetics:prngine:2.0.0"
 rxjava = "io.reactivex.rxjava2:rxjava:2.2.21"
 testng = "org.testng:testng:7.8.0"

jpx.jdbc/build.gradle.kts

@@ -24,102 +24,25 @@
  * @version 1.0
  */
 
-import io.franzbecker.gradle.lombok.task.DelombokTask
-
 plugins {
-	id "io.franzbecker.gradle-lombok" version "3.2.0"
+	`java-library`
+	idea
+	`maven-publish`
+	alias(libs.plugins.lombok)
 }
 
-apply plugin: 'java-library'
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-compileTestJava.dependsOn tasks.getByPath(':jpx:compileTestJava')
+description = "JPX - Java GPX (GPS) Library"
 
-description = 'JPX - Java GPX Library'
-
-repositories {
-	mavenCentral()
-	jcenter()
-}
+extra["moduleName"] = "io.jenetics.jpx.jdbc"
 
 dependencies {
-	api project(':jpx')
-	implementation 'io.jenetics:facilejdbc:0.3.0'
-
-	testImplementation project(':jpx').sourceSets.test.output
-	testImplementation 'org.testng:testng:6.9.10'
-	testImplementation 'com.h2database:h2:1.4.193'
-	testImplementation 'mysql:mysql-connector-java:6.0.5'
-	testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.4.3'
-	testImplementation 'org.postgresql:postgresql:42.2.7'
-}
-
-task delombok(type: DelombokTask, dependsOn: compileJava) {
-	ext.outputDir = file("$buildDir/delombok")
-	outputs.dir(outputDir)
-	sourceSets.main.java.srcDirs.each {
-		inputs.dir(it)
-		args(it, "-d", outputDir)
-	}
-	doFirst {
-		outputDir.deleteDir()
-	}
+	api(project(":jpx"))
+	api(libs.facilejdbc)
+
+	testImplementation(libs.assertj)
+	testImplementation(libs.equalsverifier)
+	testImplementation(libs.prngine)
+	testImplementation(libs.testng)
+	testImplementation(libs.h2)
 }
 
-javadoc {
-	dependsOn delombok
-
-	project.configure(options) {
-		memberLevel = 'PROTECTED'
-		version = true
-		author = true
-		docEncoding = 'UTF-8'
-		charSet = 'UTF-8'
-		linkSource = true
-		links = [
-			'https://docs.oracle.com/javase/8/docs/api',
-			'https://jenetics.github.io/jpx/javadoc/jpx'
-		]
-		windowTitle = "JPX ${project.version}"
-		docTitle = "<h1>JPX ${project.version}</h1>"
-		bottom = "&copy; ${copyrightYear} Franz Wilhelmst&ouml;tter  &nbsp;<i>(${dateformat.format(now)})</i>"
-		options.tags = ["apiNote:a:API Note:",
-						"implSpec:a:Implementation Requirements:",
-						"implNote:a:Implementation Note:"]
-		//exclude '**/internal/**'
-	}
-
-	// Copy the doc-files.
-	doLast {
-		project.copy {
-			from('src/main/java') {
-				include 'org/**/doc-files/*.*'
-			}
-			includeEmptyDirs = false
-			into destinationDir.path
-		}
-	}
-}
-
-test {
-	testLogging.showStandardStreams = true
-	useTestNG {
-		preserveOrder true
-		parallel = 'tests' // 'methods'
-	}
-}
-
-jar {
-	manifest {
-		attributes(
-			'Implementation-Title': 'JPX - Java GPX library',
-			'Implementation-Version': "${project.name}-${project.version}",
-			'Implementation-URL': 'https://jenetics.github.io/jpx',
-			'Implementation-Vendor': 'jenetics',
-			'ProjectName': project.name,
-			'Version': project.version,
-			'Maintainer': 'Franz Wilhelmstötter'
-		)
-	}
-}

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/BoundsAccess.java

@@ -25,12 +25,12 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import io.jenetics.jpx.Bounds;
-
 import io.jenetics.facilejdbc.Dctor;
 import io.jenetics.facilejdbc.Query;
 import io.jenetics.facilejdbc.RowParser;
 
+import io.jenetics.jpx.Bounds;
+
 /**
  * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
  * @version !__version__!
@@ -39,15 +39,17 @@
 public final class BoundsAccess {
 	private BoundsAccess() {}
 
-	private static final Query SELECT = Query.of(
-		"SELECT minlat, minlon, maxlat, maxlon " +
-		"FROM bounds " +
-		"WHERE id = :id"
+	private static final Query SELECT = Query.of("""
+		SELECT minlat, minlon, maxlat, maxlon
+		FROM bounds
+		WHERE id = :id
+		"""
 	);
 
-	private static final Query INSERT = Query.of(
-		"INSERT INTO bounds(minlat, minlon, maxlat, maxlon) " +
-		"VALUES(:minlat, :minlon, :maxlat, :maxlon)"
+	private static final Query INSERT = Query.of("""
+		INSERT INTO bounds(minlat, minlon, maxlat, maxlon)
+		VALUES(:minlat, :minlon, :maxlat, :maxlon)
+		"""
 	);
 
 	private static final RowParser<Bounds> PARSER = (row, conn) -> Bounds.of(

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/CopyrightAccess.java

@@ -27,12 +27,12 @@
 import java.sql.SQLException;
 import java.time.Year;
 
-import io.jenetics.jpx.Copyright;
-
 import io.jenetics.facilejdbc.Dctor;
 import io.jenetics.facilejdbc.Query;
 import io.jenetics.facilejdbc.RowParser;
 
+import io.jenetics.jpx.Copyright;
+
 /**
  * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
  * @version !__version__!
@@ -41,15 +41,17 @@
 public final class CopyrightAccess {
 	private CopyrightAccess() {}
 
-	private static final Query SELECT = Query.of(
-		"SELECT id, author, year, license " +
-		"FROM copyright " +
-		"WHERE id = :id"
+	private static final Query SELECT = Query.of("""
+		SELECT id, author, year, license
+		FROM copyright
+		WHERE id = :id
+		"""
 	);
 
-	private static final Query INSERT = Query.of(
-		"INSERT INTO copyright(author, year, license) " +
-		"VALUES(:author, :year, :license)"
+	private static final Query INSERT = Query.of("""
+		INSERT INTO copyright(author, year, license)
+		VALUES(:author, :year, :license)
+		"""
 	);
 
 	private static final RowParser<Copyright> PARSER = (row, conn) -> Copyright.of(

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/GPXAccess.java

@@ -25,15 +25,15 @@
 import java.sql.SQLException;
 import java.util.List;
 
+import io.jenetics.facilejdbc.Batch;
+import io.jenetics.facilejdbc.Dctor;
+import io.jenetics.facilejdbc.Query;
+
 import io.jenetics.jpx.GPX;
 import io.jenetics.jpx.Route;
 import io.jenetics.jpx.Track;
 import io.jenetics.jpx.WayPoint;
 
-import io.jenetics.facilejdbc.Batch;
-import io.jenetics.facilejdbc.Dctor;
-import io.jenetics.facilejdbc.Query;
-
 /**
  * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
  * @version !__version__!
@@ -42,17 +42,18 @@
 public final class GPXAccess {
 	private GPXAccess() {}
 
-	private static final Query INSERT_QUERY = Query.of(
-		"INSERT INTO gpx(version, creator, metadata_id) " +
-		"VALUES(:version, :creator, :metadata_id);"
+	private static final Query INSERT_QUERY = Query.of("""
+		INSERT INTO gpx(version, creator, metadata_id)
+		VALUES(:version, :creator, :metadata_id)
+		"""
 	);
 
 	private static final Dctor<GPX> DCTOR = Dctor.of(
 		field("version", GPX::getVersion),
 		field("creator", GPX::getCreator),
 		field(
 			"metadata_id",
-			(g, c) -> MetadataAccess.insert(g.getMetadata().orElse(null), c)
+			(gpx, conn) -> MetadataAccess.insert(gpx.getMetadata().orElse(null), conn)
 		)
 	);
 
@@ -73,9 +74,10 @@ public static Long insert(final GPX gpx, final Connection conn)
 		return id;
 	}
 
-	private static final Query WAY_POINT_INSERT_QUERY = Query.of(
-		"INSERT INTO gpx_way_point(gpx_id, way_point_id) " +
-		"VALUES(:gpx_id, :way_point_id);"
+	private static final Query WAY_POINT_INSERT_QUERY = Query.of("""
+		INSERT INTO gpx_way_point(gpx_id, way_point_id)
+		VALUES(:gpx_id, :way_point_id)
+		"""
 	);
 
 	private static void insertWayPoints(
@@ -96,9 +98,10 @@ private static void insertWayPoints(
 		WAY_POINT_INSERT_QUERY.executeUpdate(batch, conn);
 	}
 
-	private static final Query ROUTE_INSERT_QUERY = Query.of(
-		"INSERT INTO gpx_route(gpx_id, route_id) " +
-		"VALUES(:gpx_id, :route_id);"
+	private static final Query ROUTE_INSERT_QUERY = Query.of("""
+		INSERT INTO gpx_route(gpx_id, route_id)
+		VALUES(:gpx_id, :route_id)
+		"""
 	);
 
 	private static void insertRoutes(
@@ -119,9 +122,10 @@ private static void insertRoutes(
 		ROUTE_INSERT_QUERY.executeUpdate(batch, conn);
 	}
 
-	private static final Query TRACK_INSERT_QUERY = Query.of(
-		"INSERT INTO gpx_track(gpx_id, track_id) " +
-		"VALUES(:gpx_id, :track_id);"
+	private static final Query TRACK_INSERT_QUERY = Query.of("""
+		INSERT INTO gpx_track(gpx_id, track_id)
+		VALUES(:gpx_id, :track_id)
+		"""
 	);
 
 	private static void insertTracks(

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/GpxTypeMapper.java

@@ -24,6 +24,8 @@
 import java.time.Duration;
 import java.time.ZonedDateTime;
 
+import io.jenetics.facilejdbc.spi.SqlTypeMapper;
+
 import io.jenetics.jpx.DGPSStation;
 import io.jenetics.jpx.Degrees;
 import io.jenetics.jpx.Fix;
@@ -33,8 +35,6 @@
 import io.jenetics.jpx.Speed;
 import io.jenetics.jpx.UInt;
 
-import io.jenetics.facilejdbc.spi.SqlTypeMapper;
-
 /**
  * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
  * @version !__version__!

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/LinkAccess.java

@@ -26,12 +26,12 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import io.jenetics.jpx.Link;
-
 import io.jenetics.facilejdbc.Dctor;
 import io.jenetics.facilejdbc.Query;
 import io.jenetics.facilejdbc.RowParser;
 
+import io.jenetics.jpx.Link;
+
 /**
  * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
  * @version !__version__!
@@ -40,15 +40,17 @@
 public final class LinkAccess {
 	private LinkAccess() {}
 
-	private static final Query SELECT = Query.of(
-		"SELECT id, href, text, type " +
-		"FROM link " +
-		"WHERE id = :id;"
+	private static final Query SELECT = Query.of("""
+		SELECT id, href, text, type
+		FROM link
+		WHERE id = :id
+		"""
 	);
 
-	private static final Query INSERT = Query.of(
-		"INSERT INTO link(href, text, type) " +
-		"VALUES(:href, :text, :type);"
+	private static final Query INSERT = Query.of("""
+		INSERT INTO link(href, text, type)
+		VALUES(:href, :text, :type)
+		"""
 	);
 
 	private static final RowParser<Link> PARSER = (row, conn) -> Link.of(