Rename to SQL Templates

Author: vietj

pom.xml

@@ -104,13 +104,11 @@
 
   <modules>
     <module>vertx-sql-client</module>
-    <module>vertx-sql-client-template</module>
     <module>vertx-pg-client</module>
     <module>vertx-mysql-client</module>
     <module>vertx-mssql-client</module>
     <module>vertx-db2-client</module>
+    <module>vertx-sql-templates</module>
   </modules>
 
-
-
 </project>

vertx-sql-client-template/src/test/resources/META-INF/services/io.vertx.codegen.GeneratorLoader

@@ -25,11 +25,11 @@
     <version>4.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>vertx-sql-client-template</artifactId>
+  <artifactId>vertx-sql-templates</artifactId>
 
-  <name>Vertx SQL Client template</name>
+  <name>Vertx SQL Templates</name>
   <url>https://github.com/eclipse-vertx/vertx-sql-client</url>
-  <description>The Reactive SQL Client template</description>
+  <description>Vert.x SQL Templates</description>
 
   <properties>
     <docs.dir>${project.basedir}/src/main/docs</docs.dir>

vertx-sql-client-template/src/test/resources/META-INF/vertx/json-mappers.properties

@@ -1,11 +1,11 @@
-= Client SQL templates
+= SQL Templates
 :toc:
 
-SQL client templates is a small library designed to facilitate the execution of SQL queries.
+SQL Templates is a small library designed to facilitate the execution of SQL queries.
 
 == Usage
 
-To use client SQL templates add the following dependency to the _dependencies_ section of your build descriptor:
+To use SQL Templates add the following dependency to the _dependencies_ section of your build descriptor:
 
 * Maven (in your `pom.xml`):
 
@@ -30,17 +30,17 @@ dependencies {
 
 Here is the simplest way to use an SQL template.
 
-SQL template consumes _named_ parameters and thus takes (by default) a map as parameters sources instead of a tuple.
+A SQL template consumes _named_ parameters and thus takes (by default) a map as parameters sources instead of a tuple.
 
-SQL template produces (by default) a `RowSet<Row>` like a client `PreparedQuery`. In fact the template is a thin
+A SQL template produces (by default) a `RowSet<Row>` like a client `PreparedQuery`. In fact the template is a thin
 wrapper for a `PreparedQuery`.
 
 [source,$lang]
 ----
 {@link examples.TemplateExamples#queryExample}
 ----
 
-When you need to perform an insert or update operation and you do not care of the result, you can use {@link io.vertx.sqlclient.template.SqlTemplate#forUpdate} instead:
+When you need to perform an insert or update operation and you do not care of the result, you can use {@link io.vertx.sqltemplates.SqlTemplate#forUpdate} instead:
 
 [source,$lang]
 ----
@@ -188,7 +188,7 @@ public class LocalDateTimePojo {
 
 == Mapping with Vert.x data objects
 
-The SQL template component can generate mapping function for Vert.x data objects.
+The SQL Templates component can generate mapping function for Vert.x data objects.
 
 A Vert.x data object is a simple Java bean class annotated with the `@DataObject` annotation.
 
@@ -199,7 +199,7 @@ A Vert.x data object is a simple Java bean class annotated with the `@DataObject
 
 === Code generation
 
-Any data object annotated by {@link io.vertx.sqlclient.template.annotations.RowMapped} or {@link io.vertx.sqlclient.template.annotations.ParametersMapped}
+Any data object annotated by {@link io.vertx.sqltemplates.annotations.RowMapped} or {@link io.vertx.sqltemplates.annotations.ParametersMapped}
 will trigger  the generation of a corresponding mapper class.
 
 The _codegen_ annotation processor generates these classes at compilation time. It is a feature of the Java
@@ -255,7 +255,7 @@ explicitly, for instance in Maven:
 
 === Row mapping
 
-You can generate a row mapper by annotating your data object by {@link io.vertx.sqlclient.template.annotations.RowMapped}.
+You can generate a row mapper by annotating your data object by {@link io.vertx.sqltemplates.annotations.RowMapped}.
 
 [source,$lang]
 ----
@@ -265,7 +265,7 @@ You can generate a row mapper by annotating your data object by {@link io.vertx.
 By default each column name is bound after the data object properties, e.g the `userName` property binds to
 the `userName` column.
 
-You can use custom names thanks to the {@link io.vertx.sqlclient.template.annotations.Column}
+You can use custom names thanks to the {@link io.vertx.sqltemplates.annotations.Column}
 annotation.
 
 [source,$lang]
@@ -284,7 +284,7 @@ The generated mapper can be used to perform row mapping like explained in <<row_
 
 === Parameters mapping
 
-You can generate a parameters mapper by annotating your data object by {@link io.vertx.sqlclient.template.annotations.ParametersMapped}.
+You can generate a parameters mapper by annotating your data object by {@link io.vertx.sqltemplates.annotations.ParametersMapped}.
 
 [source,$lang]
 ----
@@ -294,7 +294,7 @@ You can generate a parameters mapper by annotating your data object by {@link io
 By default each parameter is bound after the data object properties, e.g the `userName` property binds to
 the `userName` parameter.
 
-You can use custom names thanks to the {@link io.vertx.sqlclient.template.annotations.TemplateParameter}
+You can use custom names thanks to the {@link io.vertx.sqltemplates.annotations.TemplateParameter}
 annotation.
 
 [source,$lang]

vertx-sql-client-template/pom.xml renamed to vertx-sql-templates/pom.xml

@@ -6,11 +6,11 @@
 import io.vertx.docgen.Source;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.SqlClient;
-import io.vertx.sqlclient.template.SqlTemplate;
-import io.vertx.sqlclient.template.annotations.Column;
-import io.vertx.sqlclient.template.annotations.ParametersMapped;
-import io.vertx.sqlclient.template.annotations.RowMapped;
-import io.vertx.sqlclient.template.annotations.TemplateParameter;
+import io.vertx.sqltemplates.SqlTemplate;
+import io.vertx.sqltemplates.annotations.Column;
+import io.vertx.sqltemplates.annotations.ParametersMapped;
+import io.vertx.sqltemplates.annotations.RowMapped;
+import io.vertx.sqltemplates.annotations.TemplateParameter;
 
 import java.util.Collections;
 import java.util.HashMap;

vertx-sql-client-template/src/main/asciidoc/index.adoc renamed to vertx-sql-templates/src/main/asciidoc/index.adoc

@@ -1,4 +1,4 @@
-package io.vertx.sqlclient.template;
+package io.vertx.sqltemplates;
 
 import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.VertxGen;
@@ -10,7 +10,7 @@
 import io.vertx.sqlclient.SqlClient;
 import io.vertx.sqlclient.SqlResult;
 import io.vertx.sqlclient.impl.SqlClientInternal;
-import io.vertx.sqlclient.template.impl.SqlTemplateImpl;
+import io.vertx.sqltemplates.impl.SqlTemplateImpl;
 
 import java.util.List;
 import java.util.Map;
@@ -40,7 +40,7 @@ public interface SqlTemplate<I, R> {
    * @return the template
    */
   static SqlTemplate<Map<String, Object>, RowSet<Row>> forQuery(SqlClient client, String template) {
-    io.vertx.sqlclient.template.impl.SqlTemplate sqlTemplate = io.vertx.sqlclient.template.impl.SqlTemplate.create((SqlClientInternal) client, template);
+    io.vertx.sqltemplates.impl.SqlTemplate sqlTemplate = io.vertx.sqltemplates.impl.SqlTemplate.create((SqlClientInternal) client, template);
     return new SqlTemplateImpl<>(client, sqlTemplate, Function.identity(), Function.identity());
   }
 
@@ -52,7 +52,7 @@ static SqlTemplate<Map<String, Object>, RowSet<Row>> forQuery(SqlClient client,
    * @return the template
    */
   static SqlTemplate<Map<String, Object>, SqlResult<Void>> forUpdate(SqlClient client, String template) {
-    io.vertx.sqlclient.template.impl.SqlTemplate sqlTemplate = io.vertx.sqlclient.template.impl.SqlTemplate.create((SqlClientInternal) client, template);
+    io.vertx.sqltemplates.impl.SqlTemplate sqlTemplate = io.vertx.sqltemplates.impl.SqlTemplate.create((SqlClientInternal) client, template);
     return new SqlTemplateImpl<>(client, sqlTemplate, query -> query.collecting(SqlTemplateImpl.NULL_COLLECTOR), Function.identity());
   }
 

vertx-sql-client-template/src/main/java/examples/TemplateExamples.java renamed to vertx-sql-templates/src/main/java/examples/TemplateExamples.java

@@ -1,4 +1,4 @@
-package io.vertx.sqlclient.template.annotations;
+package io.vertx.sqltemplates.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

vertx-sql-client-template/src/main/java/io/vertx/sqlclient/template/SqlTemplate.java renamed to vertx-sql-templates/src/main/java/io/vertx/sqltemplates/SqlTemplate.java

@@ -1,4 +1,4 @@
-package io.vertx.sqlclient.template.annotations;
+package io.vertx.sqltemplates.annotations;
 
 import io.vertx.codegen.Case;
 import io.vertx.codegen.LowerCamelCase;

vertx-sql-client-template/src/main/java/io/vertx/sqlclient/template/annotations/Column.java renamed to vertx-sql-templates/src/main/java/io/vertx/sqltemplates/annotations/Column.java

@@ -1,4 +1,4 @@
-package io.vertx.sqlclient.template.annotations;
+package io.vertx.sqltemplates.annotations;
 
 import io.vertx.codegen.Case;
 import io.vertx.codegen.LowerCamelCase;