Changeset 3700

Timestamp:

13/03/08 14:12:58 (4 years ago)

Author:

michael

Message:

Fix support for "null" values and add convience methods for next/previous URLs in lists.

Files:

• trunk/src/main/java/org/sarugo/restlet/jpa/converter/Converter.java (modified) (1 diff)
• trunk/src/main/java/org/sarugo/restlet/jpa/converter/FormConverter.java (modified) (1 diff)
• trunk/src/main/java/org/sarugo/restlet/jpa/resource/EntityList.java (modified) (2 diffs)

trunk/src/main/java/org/sarugo/restlet/jpa/converter/Converter.java

@@ -21 +21 @@
-    protected <T extends Object> T convertToTypeOrEntity(Class<T> type,
-            String value) {
-
+ = null
-        try {
-            result = type.cast(getApplication().getEntity(value));
-        } catch (Exception e) {
+            // leave as null
+        }
+        if (result == null) {
-            result = convertToType(type, value);
-        }

trunk/src/main/java/org/sarugo/restlet/jpa/converter/FormConverter.java

@@ -41 +41 @@
-                if (value != null && p.getWriteMethod() != null) {
-                    Object v = convertToTypeOrEntity(p.getPropertyType(), value);
-
+ || value.equals("null")
-                        p.getWriteMethod().invoke(entity, v);
-                    } else if (p.getPropertyType().isAssignableFrom(Date.class)) {

trunk/src/main/java/org/sarugo/restlet/jpa/resource/EntityList.java

@@ -11 +11 @@
-import org.restlet.data.Form;
-import org.restlet.data.Parameter;
+import org.restlet.data.Reference;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
@@ -155 +156 @@
-    }
-
+    public String getPrevUrl() {
+        return getRequest().getResourceRef().toString(false, false) + "?q="
+                + Reference.encode(getSearchString()) + "&query="
+                + Reference.encode(getQueryName()) + "&start=" + getPrevStart()
+                + "&max=" + getMaxResults();
+    }
+
+    public String getNextUrl() {
+        return getRequest().getResourceRef().toString(false, false) + "?q="
+                + Reference.encode(getSearchString()) + "&query="
+                + Reference.encode(getQueryName()) + "&start=" + getNextStart()
+                + "&max=" + getMaxResults();
+    }
+
-    @Override
-    public boolean allowPost() {