Author: mfranklin
Date: Fri Jan 18 18:34:54 2013
New Revision: 1435297
URL: http://svn.apache.org/viewvc?rev=1435297&view=rev
Log:
Updated edge case handling for converters RAVE-875
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
Fri Jan 18 18:34:54 2013
@@ -49,6 +49,9 @@ public class JpaApplicationDataConverter
JpaApplicationData converted = null;
if (source != null) {
converted = source.getId() == null ? new JpaApplicationData() :
manager.find(JpaApplicationData.class, Long.parseLong(source.getId()));
+ if(converted == null) {
+ converted = new JpaApplicationData();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
Fri Jan 18 18:34:54 2013
@@ -49,6 +49,9 @@ public class JpaCategoryConverter implem
JpaCategory converted = null;
if (source != null) {
converted = source.getId() == null ? new JpaCategory() :
manager.find(JpaCategory.class, Long.parseLong(source.getId()));
+ if(converted == null) {
+ converted = new JpaCategory();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
Fri Jan 18 18:34:54 2013
@@ -49,6 +49,9 @@ public class JpaOAuthConsumerStoreConver
JpaOAuthConsumerStore converted = null;
if (source != null) {
converted = source.getId() == null ? new JpaOAuthConsumerStore() :
manager.find(JpaOAuthConsumerStore.class, Long.parseLong(source.getId()));
+ if(converted == null) {
+ converted = new JpaOAuthConsumerStore();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
Fri Jan 18 18:34:54 2013
@@ -48,7 +48,9 @@ public class JpaOAuthTokenInfoConverter
private JpaOAuthTokenInfo createEntity(OAuthTokenInfo source) {
JpaOAuthTokenInfo converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaOAuthTokenInfo() :
manager.find(JpaOAuthTokenInfo.class, Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaOAuthTokenInfo() :
manager.find(JpaOAuthTokenInfo.class, Long.parseLong(source.getId()));
if(converted == null) {
+ converted = new JpaOAuthTokenInfo();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
Fri Jan 18 18:34:54 2013
@@ -49,7 +49,9 @@ public class JpaPageConverter implements
private JpaPage createEntity(Page source) {
JpaPage converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaPage() :
manager.find(JpaPage.class, source.getId());
+ converted = source.getId() == null ? new JpaPage() :
manager.find(JpaPage.class, source.getId()); if(converted == null) {
+ converted = new JpaPage();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
Fri Jan 18 18:34:54 2013
@@ -44,7 +44,9 @@ public class JpaPageTemplateConverter im
private JpaPageTemplate createEntity(PageTemplate source) {
JpaPageTemplate converted = null;
if(source != null) {
- converted = source.getId() == null ? new JpaPageTemplate() :
manager.find(JpaPageTemplate.class, Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaPageTemplate() :
manager.find(JpaPageTemplate.class, Long.parseLong(source.getId()));
if(converted == null) {
+ converted = new JpaPageTemplate();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
Fri Jan 18 18:34:54 2013
@@ -45,7 +45,9 @@ public class JpaPageTemplateRegionConver
JpaPageTemplateRegion converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaPageTemplateRegion() :
manager.find(JpaPageTemplateRegion.class, Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaPageTemplateRegion() :
manager.find(JpaPageTemplateRegion.class, Long.parseLong(source.getId()));
if(converted == null) {
+ converted = new JpaPageTemplateRegion();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
Fri Jan 18 18:34:54 2013
@@ -44,7 +44,9 @@ public class JpaPageTemplateWidgetConver
private JpaPageTemplateWidget createEntity(PageTemplateWidget source) {
JpaPageTemplateWidget converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaPageTemplateWidget() :
manager.find(JpaPageTemplateWidget.class, Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaPageTemplateWidget() :
manager.find(JpaPageTemplateWidget.class, Long.parseLong(source.getId()));
if(converted == null) {
+ converted = new JpaPageTemplateWidget();
+ }
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java?rev=1435297&r1=1435296&r2=1435297&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
Fri Jan 18 18:34:54 2013
@@ -48,7 +48,9 @@ public class JpaPageUserConverter implem
private JpaPageUser createEntity(PageUser source) {
JpaPageUser converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaPageUser() :
manager.find(JpaPageUser.class, Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaPageUser() :
manager.find(JpaPageUser.class, Long.parseLong(source.getId())); if(converted
== null) {
+ converted = new JpaPageUser();
+ }
updateProperties(source, converted);
}
return converted;
