Update README.md; rename template documents.

gk-brown · gk-brown · commit 1ce95bce4db5 · 2018-08-28T17:48:51.000-04:00
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ HTTP-RPC provides the following classes for creating and consuming REST services
     * `WebServiceProxy` - class for invoking remote web services
     * `WebServiceException` - exception thrown when a service operation returns an error
 * `org.httprpc.beans`
-    * `BeanAdapter` - class that presents the properties of a Java Bean object as a map and vice versa
-    * `Key` - annotation that associates a custom key with a Bean property
+    * `BeanAdapter` - class that presents the properties of a Java bean object as a map and vice versa
+    * `Key` - annotation that associates a custom key with a bean property
 * `org.httprpc.sql`
     * `ResultSetAdapter` - class that presents the contents of a JDBC result set as an iterable sequence of maps or typed row values
     * `Parameters` - class for applying named parameters values to prepared statements 
@@ -411,7 +411,7 @@ March has 31 days
 ```
 
 ## BeanAdapter
-The `BeanAdapter` class implements the `Map` interface and exposes any properties defined by the Bean as entries in the map, allowing custom data types to be serialized as JSON objects or CSV records. 
+The `BeanAdapter` class implements the `Map` interface and exposes any properties defined by a bean as entries in the map, allowing custom data types to be serialized as JSON objects or CSV records. 
 
 If a property value is `null` or an instance of one of the following types, it is returned as is:
 
@@ -424,7 +424,7 @@ If a property value is `null` or an instance of one of the following types, it i
 * `java.util.time.LocalTime`
 * `java.util.time.LocalDateTime`
 
-If a property returns an instance of `List` or `Map`, the value will be wrapped in an adapter of the same type that automatically adapts its sub-elements. Otherwise, the value is assumed to be a Bean and is wrapped in a `BeanAdapter`.
+If a property returns an instance of `List` or `Map`, the value will be wrapped in an adapter of the same type that automatically adapts its sub-elements. Otherwise, the value is assumed to be a bean and is wrapped in a `BeanAdapter`.
 
 For example, the following class might be used to represent a node in a hierarchical object graph:
 
@@ -531,7 +531,7 @@ If the value is already an instance of the requested type, it is returned as is.
 * If the target type is `java.util.time.LocalDate`, `java.util.time.LocalTime`, or `java.util.time.LocalDateTime`, the value is parsed using the appropriate `parse()` method.
 * If the target type is `java.util.List` or `java.util.Map`, the value is wrapped in an adapter of the same type that automatically adapts its sub-elements.
 
-Otherwise, the target is assumed to be a Bean, and the value is assumed to be a map. If the target type is a concrete class, an instance of the type is dynamically created and populated using the entries in the map. Property values are adapted as described above. If a property provides multiple setters, the first applicable setter will be applied.
+Otherwise, the target is assumed to be a bean, and the value is assumed to be a map. If the target type is a concrete class, an instance of the type is dynamically created and populated using the entries in the map. Property values are adapted as described above. If a property provides multiple setters, the first applicable setter will be applied.
 
 If the target type is an interface, the return value is an implementation of the interface that maps accessor methods to entries in the map. For example, given the following interface definition:
 
@@ -553,7 +553,7 @@ root.getChildren().get(0).getChildren().get(0).getName(); // "January"
 ```
 
 ### Custom Property Keys
-The `Key` annotation can be used to associate a custom key with a Bean property. For example, the following property would appear as "first_name" in the resulting map instead of "firstName":
+The `Key` annotation can be used to associate a custom key with a bean property. For example, the following property would appear as "first_name" in the resulting map instead of "firstName":
 
 ```java
 @Key("first_name")
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
@@ -81,11 +81,11 @@ public Iterator<Document> iterator() {
 
                 csvEncoder.writeValues(cursorAdapter, getResponse().getOutputStream());
             } else {
-                String name = String.format("%s~%s", getRequest().getServletPath().substring(1), format);
+                String name = String.format("%s.%s", getRequest().getServletPath().substring(1), format);
 
                 getResponse().setContentType(String.format("%s;charset=UTF-8", getServletContext().getMimeType(name)));
 
-                TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource(String.format("%s.txt", name)));
+                TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource(name));
 
                 templateEncoder.setBaseName(getClass().getName());
                 templateEncoder.writeValue(cursorAdapter, getResponse().getOutputStream(), getRequest().getLocale());
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
@@ -91,11 +91,11 @@ public void getPets(String owner, String format) throws SQLException, IOExceptio
 
                         csvEncoder.writeValues(resultSetAdapter, getResponse().getOutputStream());
                     } else {
-                        String name = String.format("%s~%s", getRequest().getServletPath().substring(1), format);
+                        String name = String.format("%s.%s", getRequest().getServletPath().substring(1), format);
 
                         getResponse().setContentType(String.format("%s;charset=UTF-8", getServletContext().getMimeType(name)));
 
-                        TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource(String.format("%s.txt", name)));
+                        TemplateEncoder templateEncoder = new TemplateEncoder(getClass().getResource(name));
 
                         templateEncoder.setBaseName(getClass().getName());
                         templateEncoder.writeValue(resultSetAdapter, getResponse().getOutputStream(), getRequest().getLocale());
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
@@ -5,7 +5,7 @@
 <body>
 {{#.}}
 <p>
-<strong>{{name:^html}}</strong></em><br/>
+<strong>{{name:^html}}</strong><br/>
 {{address.building:^html}} {{address.street:^html}}, {{borough:^html}}<br/>
 </p>
 <p>{{@cuisine:^html}}: <em>{{cuisine:^html}}</em></p>
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.xml b/httprpc-test/src/main/resources/org/httprpc/test/mongodb/restaurants.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <restaurants>
-  {{#.}}<restaurant>
+  {{#.}}
+  <restaurant>
     <name>{{name:^xml}}</name>
     <address>
         <building>{{address.building:^xml}}</building>
@@ -12,5 +13,6 @@
     <grades>
         {{#grades}}<grade date="{{date:format=shortDate:^xml}}" score="{{score:^xml}}">{{grade:^xml}}</grade>{{/grades}}
     </grades>
-  </restaurant>{{/.}}
+  </restaurant>
+  {{/.}}
 </restaurants>
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
@@ -8,7 +8,8 @@
 {{@name:^html}}: {{name:^html}}<br/>
 {{@species:^html}}: {{species:^html}}<br/>
 {{@sex:^html}}: {{sex:^html}}<br/>
-{{@birth:^html}}: {{birth:format=mediumDate:^html}}</p>
+{{@birth:^html}}: {{birth:format=mediumDate:^html}}<br/>
+</p>
 {{/.}}
 </body>
 </html>
diff --git a/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.xml b/httprpc-test/src/main/resources/org/httprpc/test/mysql/pets.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pets>
-  {{#.}}<pet>
+  {{#.}}
+  <pet>
     <name>{{name:^xml}}</name>
     <species>{{species:^xml}}</species>
     <sex>{{sex:^xml}}</sex>
     <birth>{{birth:format=shortDate:^xml}}</birth>
-  </pet>{{/.}}
+  </pet>
+  {{/.}}
 </pets>
diff --git a/httprpc/src/main/java/org/httprpc/beans/BeanAdapter.java b/httprpc/src/main/java/org/httprpc/beans/BeanAdapter.java
@@ -36,7 +36,7 @@
 import java.util.Set;
 
 /**
- * Class that presents the properties of a Java Bean object as a map. Property
+ * Class that presents the properties of a Java bean object as a map. Property
  * values are adapted as described for {@link #adapt(Object)}.
  */
 public class BeanAdapter extends AbstractMap<String, Object> {
@@ -149,10 +149,10 @@ public Object setValue(Object value) {
     private static final String SET_PREFIX = "set";
 
     /**
-     * Constructs a new Bean adapter.
+     * Constructs a new bean adapter.
      *
      * @param bean
-     * The source Bean.
+     * The source bean.
      */
     public BeanAdapter(Object bean) {
         this(bean, new HashMap<>());
@@ -312,7 +312,7 @@ public Entry<String, Object> next() {
      * If the value is a {@link List}, it is wrapped in an adapter that will
      * adapt the list's elements. If the value is a {@link Map}, it is wrapped
      * in an adapter that will adapt the map's values. Otherwise, the value is
-     * assumed to be a Bean and is wrapped in a {@link BeanAdapter}.
+     * assumed to be a bean and is wrapped in a {@link BeanAdapter}.
      *
      * @param <T>
      * The target type.
@@ -373,7 +373,7 @@ private static Object adapt(Object value, HashMap<Class<?>, HashMap<String, Meth
      * that will adapt the list's elements. If the target type is a {@link Map},
      * the value is wrapped in an adapter that will adapt the map's values.
      *
-     * Otherwise, the target is assumed to be a Bean, and the value is assumed
+     * Otherwise, the target is assumed to be a bean, and the value is assumed
      * to be a map. If the target type is not an interface, an instance is
      * dynamically created and populated using the entries in the map. Property
      * values are adapted as described above. If a property provides multiple
