Remove JTemplate examples.

gk-brown · gk-brown · commit 47cdd5afb2ef · 2019-01-16T16:57:57.000-05:00
diff --git a/httprpc-test/.classpath b/httprpc-test/.classpath
@@ -20,12 +20,6 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry sourcepath="/Users/greg/.gradle/caches/modules-2/files-2.1/org.jtemplate/jtemplate/2.2/92db4e885fbe5e08df53bab47e8cc9b34d8d7681/jtemplate-2.2-sources.jar" kind="lib" path="/Users/greg/.gradle/caches/modules-2/files-2.1/org.jtemplate/jtemplate/2.2/69b3c9ed1f8a792f84b717412a79a7310a6f218e/jtemplate-2.2.jar">
-		<attributes>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
 	<classpathentry sourcepath="/Users/greg/.gradle/caches/modules-2/files-2.1/org.mongodb/mongo-java-driver/3.0.4/8496e137420c22756c97f58a55e8816867de5aff/mongo-java-driver-3.0.4-sources.jar" kind="lib" path="/Users/greg/.gradle/caches/modules-2/files-2.1/org.mongodb/mongo-java-driver/3.0.4/f9caed188f03990204f3381d01d44f70fc93acec/mongo-java-driver-3.0.4.jar">
 		<attributes>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
diff --git a/httprpc-test/.settings/org.eclipse.jdt.core.prefs b/httprpc-test/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Sat Oct 13 14:44:59 EDT 2018
+#Wed Jan 16 16:28:15 EST 2019
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/httprpc-test/build.gradle b/httprpc-test/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     compile project(':httprpc')
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.1'
-    implementation 'org.jtemplate:jtemplate:2.2+'
     implementation 'org.mongodb:mongo-java-driver:3.0+'
     implementation 'mysql:mysql-connector-java:5.1+'
 }
diff --git a/httprpc-test/src/main/java/org/httprpc/test/mongodb/RestaurantService.java b/httprpc-test/src/main/java/org/httprpc/test/mongodb/RestaurantService.java
@@ -27,7 +27,6 @@
 import org.httprpc.io.JSONEncoder;
 import org.httprpc.RequestMethod;
 import org.httprpc.Response;
-import org.jtemplate.TemplateEncoder;
 
 import com.mongodb.MongoClient;
 import com.mongodb.client.FindIterable;
@@ -86,13 +85,6 @@ public Iterator<Document> iterator() {
                 CSVEncoder csvEncoder = new CSVEncoder(Arrays.asList("name", "address.building", "address.street", "borough", "cuisine"));
 
                 csvEncoder.writeValues(cursorAdapter, getResponse().getOutputStream());
-            } else if (format.equals("html")){
-                getResponse().setContentType("text/html;charset=UTF-8");
-
-                TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource("restaurants.html"));
-
-                templateEncoder.setBaseName(getClass().getPackage().getName() + ".restaurants");
-                templateEncoder.writeValue(cursorAdapter, getResponse().getOutputStream(), getRequest().getLocale());
             } else {
                 throw new UnsupportedOperationException();
             }
diff --git a/httprpc-test/src/main/java/org/httprpc/test/mysql/PetService.java b/httprpc-test/src/main/java/org/httprpc/test/mysql/PetService.java
@@ -38,7 +38,6 @@
 import org.httprpc.Response;
 import org.httprpc.sql.Parameters;
 import org.httprpc.sql.ResultSetAdapter;
-import org.jtemplate.TemplateEncoder;
 
 /**
  * Pet service.
@@ -105,13 +104,6 @@ public void getPets(String owner, String format) throws SQLException, IOExceptio
                     CSVEncoder csvEncoder = new CSVEncoder(Arrays.asList("name", "species", "sex", "birth"));
 
                     csvEncoder.writeValues(resultSetAdapter, getResponse().getOutputStream());
-                } else if (format.equals("html")) {
-                    getResponse().setContentType("text/html;charset=UTF-8");
-
-                    TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource("pets.html"));
-
-                    templateEncoder.setBaseName(getClass().getPackage().getName() + ".pets");
-                    templateEncoder.writeValue(resultSetAdapter, getResponse().getOutputStream(), getRequest().getLocale());
                 } else {
                     throw new UnsupportedOperationException();
                 }
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.html b/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.html
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.properties b/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.properties
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.html b/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.html
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.properties b/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.properties
diff --git a/httprpc-test/src/main/webapp/index.jsp b/httprpc-test/src/main/webapp/index.jsp
@@ -185,17 +185,15 @@
 
 <a href="${pageContext.request.contextPath}/restaurants?api">Restaurants (API)</a><br/>
 <br/>
-<a href="${pageContext.request.contextPath}/restaurants?zipCode=10462">Restaurants</a><br/>
+<a href="${pageContext.request.contextPath}/restaurants?zipCode=10462">Restaurants (JSON)</a><br/>
 <a href="${pageContext.request.contextPath}/restaurants?zipCode=10462&format=csv">Restaurants (CSV)</a><br/>
-<a href="${pageContext.request.contextPath}/restaurants?zipCode=10462&format=html">Restaurants (HTML)</a><br/>
 
 <h2>MySQL</h2>
 
 <a href="${pageContext.request.contextPath}/pets?api">Pets (API)</a><br/>
 <br/>
-<a href="${pageContext.request.contextPath}/pets?owner=Gwen">Pets</a><br/>
+<a href="${pageContext.request.contextPath}/pets?owner=Gwen">Pets (JSON)</a><br/>
 <a href="${pageContext.request.contextPath}/pets?owner=Gwen&format=csv">Pets (CSV)</a><br/>
-<a href="${pageContext.request.contextPath}/pets?owner=Gwen&format=html">Pets (HTML)</a><br/>
 <br/>
 <a href="${pageContext.request.contextPath}/pets/average-age">Average Age</a><br/>
 
diff --git a/httprpc/.classpath b/httprpc/.classpath
@@ -31,7 +31,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry sourcepath="/Users/greg/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar" kind="lib" path="/Users/greg/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar">
+	<classpathentry sourcepath="/Users/greg/.gradle/caches/modules-2/files-2.1/junit/junit/4.13-beta-1/9dce6ee8700922293d5fe52ac9435cc2707bd2ba/junit-4.13-beta-1-sources.jar" kind="lib" path="/Users/greg/.gradle/caches/modules-2/files-2.1/junit/junit/4.13-beta-1/1bc4a3b4a2d01a08c3a2cc8143666565b846ed17/junit-4.13-beta-1.jar">
 		<attributes>
 			<attribute name="gradle_used_by_scope" value="test"/>
 		</attributes>
diff --git a/httprpc/.settings/org.eclipse.jdt.core.prefs b/httprpc/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Sat Oct 13 14:44:58 EDT 2018
+#Wed Jan 16 16:28:15 EST 2019
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-#Sat Oct 13 14:44:59 EDT 2018`
	`2`	`+#Wed Jan 16 16:28:15 EST 2019`
`3`	`3`	`org.eclipse.jdt.core.compiler.debug.localVariable=generate`
`4`	`4`	`org.eclipse.jdt.core.compiler.compliance=1.8`
`5`	`5`	`org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ dependencies {`
`25`	`25`	`compile project(':httprpc')`
`26`	`26`	`providedCompile 'javax.servlet:javax.servlet-api:3.1.0'`
`27`	`27`	`providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.1'`
`28`		`- implementation 'org.jtemplate:jtemplate:2.2+'`
`29`	`28`	`implementation 'org.mongodb:mongo-java-driver:3.0+'`
`30`	`29`	`implementation 'mysql:mysql-connector-java:5.1+'`
`31`	`30`	`}`