Author: rohini
Date: Fri Aug 2 00:48:31 2013
New Revision: 1509505
URL: http://svn.apache.org/r1509505
Log:
OOZIE-1482 4.0 client does not work with 3.x server for coord jobs (rohini)
Modified:
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
oozie/branches/branch-4.0/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java?rev=1509505&r1=1509504&r2=1509505&view=diff
==============================================================================
---
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
(original)
+++
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
Fri Aug 2 00:48:31 2013
@@ -237,7 +237,7 @@ public class JsonToBean {
@SuppressWarnings("unchecked")
private Object parseType(Class type, Object obj) {
if (type == String.class) {
- return obj;
+ return obj == null ? obj : obj.toString();
}
else if (type == Integer.TYPE) {
return (obj != null) ? new Integer(((Long) obj).intValue()) :
new Integer(0);
Modified:
oozie/branches/branch-4.0/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java?rev=1509505&r1=1509504&r2=1509505&view=diff
==============================================================================
---
oozie/branches/branch-4.0/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
(original)
+++
oozie/branches/branch-4.0/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
Fri Aug 2 00:48:31 2013
@@ -307,6 +307,13 @@ public class TestJsonToBean extends Test
assertEquals(2, job.getActions().size());
assertEquals("ca1", job.getActions().get(0).getId());
assertEquals("ca2", job.getActions().get(1).getId());
+
+ // Test backward compatibility with 3.x. 3.x will not be forward
compatible with 4.x though.
+ // i.e 4.1 client can be used with 3.x server. But 3.x client cannot
be used with 4.x server.
+ // Frequency was a int in 3.x but was changed to String in 4.x for
cron support
+ json.put(JsonTags.COORDINATOR_JOB_FREQUENCY, 1L);
+ CoordinatorJob oozie3xjob = JsonToBean.createCoordinatorJob(json);
+ assertEquals("1", oozie3xjob.getFrequency());
}
@SuppressWarnings("unchecked")
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1509505&r1=1509504&r2=1509505&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Fri Aug 2 00:48:31 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 release
+OOZIE-1482 4.0 client does not work with 3.x server for coord jobs (rohini)
OOZIE-1479 Duplicate end_miss events introduced by OOZIE-1472 (rohini)
OOZIE-1472 Confirm against database before generating start and duration miss
events (rohini)
OOZIE-1473 getKey() not overridden in some commands causing duplicates in
queue (virag)
