Merge pull request #141 from GServlet/develop

merging branch develop into master

README.md

@@ -67,7 +67,7 @@ More information can be found on the project [homepage](https://gservlet.org) wh
 
 ## Getting Started
 
-If you are just getting started with GServlet, you may want to begin by creating your first project. This section shows you how to get up and running quickly. It is highly recommended to consume the GServlet API through a dependency management tool and the artifact can be found in Maven's central repository. it is named **gservlet-api** and you just need to name a dependency on it in your project.
+If you are just getting started with GServlet, you may want to begin by creating your first project. This section shows you how to get up and running quickly. It is highly recommended to consume the GServlet API through a dependency management tool and the artifact can be found in Maven's central repository. It is named **gservlet-api** and you just need to name a dependency on it in your project.
 
 ### From Maven
 
@@ -160,7 +160,7 @@ class ServletRequestListener {
 }
 ```
 
-For a deep insight, please read the complete [documentation](https://gservlet.org/documentation).
+For a deep insight of how to write your Groovy artifacts, please read the complete [documentation](https://gservlet.org/documentation).
 
 ## Building from source
 
@@ -170,7 +170,7 @@ For a deep insight, please read the complete [documentation](https://gservlet.or
 
 ### Documentation
 
-The developer guide generated with Maven is based on [Asciidoctor](http://asciidoctor.org/). By default only the HTML output is enabled.
+The developer guide generated with Maven is based on [Asciidoctor](http://asciidoctor.org/). Only the HTML output is enabled.
 
     > mvn clean install -Pdocumentation
 
@@ -190,7 +190,7 @@ We version GServlet by following [Semantic Versioning](https://semver.org), whic
 
 ## Status
 
-The current version of GServlet is 1.0.0
+The current version of GServlet is 1.0.0.
 
 ## Contributing
 

src/main/java/dsld/servlet.dsld

@@ -31,7 +31,7 @@ contribute(currentType(annos: annotatedBy(Servlet))) {
 	property name : 'response', type : javax.servlet.http.HttpServletResponse, provider : 'org.gservlet.AbstractServlet', doc : 'the HttpServletResponse object'
 	property name : 'session', type : javax.servlet.http.HttpSession, provider : 'org.gservlet.AbstractServlet', doc : 'the HttpSession object'
 	property name : 'context', type : javax.servlet.ServletContext, provider : 'org.gservlet.AbstractServlet', doc : 'the ServletContext object'
-	property name : 'connection', type : groovy.sql.Sql, provider : 'org.gservlet.AbstractServlet', doc : 'the Sql object'
+	property name : 'sql', type : groovy.sql.Sql, provider : 'org.gservlet.AbstractServlet', doc : 'the Sql object'
 	property name : 'out', type : java.io.PrintWriter, provider : 'org.gservlet.AbstractServlet', doc : 'the PrintWriter object'
 	property name : 'html', type : groovy.xml.MarkupBuilder, provider : 'org.gservlet.AbstractServlet', doc : 'the MarkupBuilder object'
 }
@@ -59,7 +59,7 @@ contribute(currentType(annos: annotatedBy(Filter))) {
 	property name : 'chain', type : javax.servlet.FilterChain, provider : 'org.gservlet.AbstractFilter', doc : 'the FilterChain object'
 	property name : 'session', type : javax.servlet.http.HttpSession, provider : 'org.gservlet.AbstractFilter', doc : 'the HttpSession object'
 	property name : 'context', type : javax.servlet.ServletContext, provider : 'org.gservlet.AbstractFilter', doc : 'the ServletContext object'
-	property name : 'connection', type : groovy.sql.Sql, provider : 'org.gservlet.AbstractFilter', doc : 'the Sql object'
+	property name : 'sql', type : groovy.sql.Sql, provider : 'org.gservlet.AbstractFilter', doc : 'the Sql object'
 	property name : 'out', type : java.io.PrintWriter, provider : 'org.gservlet.AbstractFilter', doc : 'the PrintWriter object'
 	property name : 'html', type : groovy.xml.MarkupBuilder, provider : 'org.gservlet.AbstractFilter', doc : 'the MarkupBuilder object'
 }

src/main/java/org/gservlet/AbstractFilter.java

@@ -267,7 +267,7 @@ public HttpServletResponse getResponse() {
 	 * 
 	 */
 	public Sql getConnection() {
-		return requestContext.get().getConnection();
+		return requestContext.get().getSql();
 	}
 
 	/**

src/main/java/org/gservlet/AbstractServlet.java

@@ -298,8 +298,8 @@ public HttpServletResponse getResponse() {
 	 * @return the Sql object
 	 * 
 	 */
-	public Sql getConnection() {
-		return requestContext.get().getConnection();
+	public Sql getSql() {
+		return requestContext.get().getSql();
 	}
 
 	/**

src/main/java/org/gservlet/RequestContext.java

@@ -153,7 +153,7 @@ public MarkupBuilder getHtml() throws IOException {
 	* @return the Sql object
 	* 
 	*/
-	public Sql getConnection() {
+	public Sql getSql() {
 		return (Sql) request.getAttribute(Constants.CONNECTION);
 	}
 

src/test/java/org/gservlet/HttpServletTest.java

@@ -73,7 +73,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 		assertEquals(SessionWrapper.class, servlet.getSession().getClass());
 		assertEquals(ContextWrapper.class, servlet.getContext().getClass());
 		assertNull(servlet.getConfig());
-		assertNotNull(servlet.getConnection());
+		assertNotNull(servlet.getSql());
 	}
 
 	@SuppressWarnings("rawtypes")