You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/19 21:20:51 UTC
svn commit: r1351805 - in
/rave/branches/model_interfaces/rave-components/rave-jpa/src:
main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
Author: mfranklin
Date: Tue Jun 19 19:20:51 2012
New Revision: 1351805
URL: http://svn.apache.org/viewvc?rev=1351805&view=rev
Log:
Updated WidgetRating conversion RAVE-652
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java?rev=1351805&r1=1351804&r2=1351805&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java Tue Jun 19 19:20:51 2012
@@ -5,18 +5,12 @@ import org.apache.rave.portal.model.JpaW
import org.apache.rave.portal.model.WidgetRating;
import org.springframework.stereotype.Component;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
/**
* Converts a WidgetRating to a JpaWidgetRating
*/
@Component
public class JpaWidgetRatingConverter implements ModelConverter<WidgetRating, JpaWidgetRating> {
- @PersistenceContext
- private EntityManager manager;
-
@Override
public Class<WidgetRating> getSourceType() {
return WidgetRating.class;
@@ -29,18 +23,15 @@ public class JpaWidgetRatingConverter im
private JpaWidgetRating createEntity(WidgetRating source) {
JpaWidgetRating converted = null;
- if (source != null) {
- converted = manager.find(JpaWidgetRating.class, source.getId());
-
- if (converted == null) {
- converted = new JpaWidgetRating();
- }
+ if(source != null) {
+ converted = new JpaWidgetRating();
updateProperties(source, converted);
}
return converted;
}
private void updateProperties(WidgetRating source, JpaWidgetRating converted) {
+ converted.setId(source.getId());
converted.setScore(source.getScore());
converted.setUserId(source.getUserId());
converted.setWidgetId(source.getWidgetId());
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java?rev=1351805&r1=1351804&r2=1351805&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java Tue Jun 19 19:20:51 2012
@@ -41,12 +41,17 @@ public class JpaWidgetRatingConverterTes
@Test
public void convertValid() {
WidgetRating template = new WidgetRatingImpl();
-
+ template.setScore(1);
+ template.setUserId(42L);
+ template.setWidgetId(24L);
+
JpaWidgetRating jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaWidgetRating.class)));
- //TODO: Add coverage for all methods
+ assertThat(jpaTemplate.getScore(), is(equalTo(template.getScore())));
+ assertThat(jpaTemplate.getUserId(), is(equalTo(template.getUserId())));
+ assertThat(jpaTemplate.getWidgetId(), is(equalTo(template.getWidgetId())));
}
}