Author: mfranklin
Date: Tue Jun 5 17:32:31 2012
New Revision: 1346484
URL: http://svn.apache.org/viewvc?rev=1346484&view=rev
Log:
Refactored PortalPreference RAVE-659
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
- copied, changed from r1346467,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
- copied, changed from r1346467,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
(from r1346467,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java&r1=1346467&r2=1346484&rev=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
Tue Jun 5 17:32:31 2012
@@ -35,11 +35,11 @@ import java.util.List;
@Access(AccessType.FIELD)
@Table(name = "portal_preference")
@NamedQueries({
- @NamedQuery(name = PortalPreference.GET_ALL, query = "SELECT pp FROM
PortalPreference pp"),
- @NamedQuery(name = PortalPreference.GET_BY_KEY,
- query = "SELECT pp FROM PortalPreference pp WHERE pp.key = :"
+ PortalPreference.PARAM_KEY)
+ @NamedQuery(name = JpaPortalPreference.GET_ALL, query = "SELECT pp
FROM JpaPortalPreference pp"),
+ @NamedQuery(name = JpaPortalPreference.GET_BY_KEY,
+ query = "SELECT pp FROM JpaPortalPreference pp WHERE pp.key =
:" + JpaPortalPreference.PARAM_KEY)
})
-public class PortalPreference implements BasicEntity, Serializable {
+public class JpaPortalPreference implements BasicEntity, Serializable,
PortalPreference {
private static final long serialVersionUID = 1L;
@@ -61,17 +61,17 @@ public class PortalPreference implements
@ElementCollection(fetch = FetchType.EAGER)
private List<String> values = new LinkedList<String>();
- public PortalPreference() {
+ public JpaPortalPreference() {
super();
}
- public PortalPreference(String key, String value) {
+ public JpaPortalPreference(String key, String value) {
super();
this.key = key;
this.values.add(value);
}
- public PortalPreference(String key, List<String> values) {
+ public JpaPortalPreference(String key, List<String> values) {
super();
this.key = key;
this.values = values;
@@ -87,40 +87,27 @@ public class PortalPreference implements
this.entityId = entityId;
}
- /**
- * Gets the key of the preference, e.g. "availableFruit"
- *
- * @return name of the preference key
- */
+ @Override
public String getKey() {
return key;
}
+ @Override
public void setKey(String key) {
this.key = key;
}
- /**
- * Gets a String array of the preference values, e.g. {"apple", "pear",
"orange"}
- *
- * @return String array of the preference values
- */
+ @Override
public List<String> getValues() {
return values;
}
+ @Override
public void setValues(List<String> values) {
this.values = values;
}
- /**
- * Helper method for the view layer to get a single value for a preference.
- * If there is no value, it returns {@literal null}.
- * If there is 1 value, it returns that value.
- *
- * @return the single value of the preference or {@literal null} if not set
- * @throws NotSupportedException if the preference has multiple values
- */
+ @Override
public String getValue() {
if (values.isEmpty()) {
return null;
@@ -130,11 +117,7 @@ public class PortalPreference implements
throw new NotSupportedException("Cannot return single value for a List
of size " + values.size());
}
- /**
- * Sets a single value for a preference. Will overwrite any exisiting
value(s)
- *
- * @param value String value of the preference
- */
+ @Override
public void setValue(String value) {
List<String> values = new ArrayList<String>();
values.add(value);
@@ -150,7 +133,7 @@ public class PortalPreference implements
if (getClass() != obj.getClass()) {
return false;
}
- final PortalPreference other = (PortalPreference) obj;
+ final JpaPortalPreference other = (JpaPortalPreference) obj;
if (this.entityId != other.entityId && (this.entityId == null ||
!this.entityId.equals(other.entityId))) {
return false;
}
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java?rev=1346484&view=auto
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
(added)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
Tue Jun 5 17:32:31 2012
@@ -0,0 +1,40 @@
+package org.apache.rave.portal.model;
+
+import java.util.List;
+
+public interface PortalPreference {
+ /**
+ * Gets the key of the preference, e.g. "availableFruit"
+ *
+ * @return name of the preference key
+ */
+ String getKey();
+
+ void setKey(String key);
+
+ /**
+ * Gets a String array of the preference values, e.g. {"apple", "pear",
"orange"}
+ *
+ * @return String array of the preference values
+ */
+ List<String> getValues();
+
+ void setValues(List<String> values);
+
+ /**
+ * Helper method for the view layer to get a single value for a preference.
+ * If there is no value, it returns {@literal null}.
+ * If there is 1 value, it returns that value.
+ *
+ * @return the single value of the preference or {@literal null} if not set
+ * @throws org.apache.rave.exception.NotSupportedException if the
preference has multiple values
+ */
+ String getValue();
+
+ /**
+ * Sets a single value for a preference. Will overwrite any exisiting
value(s)
+ *
+ * @param value String value of the preference
+ */
+ void setValue(String value);
+}
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
(from r1346467,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java&r1=1346467&r2=1346484&rev=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
Tue Jun 5 17:32:31 2012
@@ -1,8 +1,8 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.Address;
-import org.apache.rave.portal.model.JpaAddress;
+import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
@@ -12,51 +12,40 @@ import javax.persistence.TypedQuery;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
/**
- * Converts an Address to a JpaAddress
+ * Converts an PortalPreference JpaPortalPreference
*/
@Component
-public class JpaAddressConverter implements ModelConverter<Address,
JpaAddress> {
+public class JpaPortalPreferenceConverter implements
ModelConverter<PortalPreference, JpaPortalPreference> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<Address> getSourceType() {
- return Address.class;
+ public Class<PortalPreference> getSourceType() {
+ return PortalPreference.class;
}
@Override
- public JpaAddress convert(Address source) {
- return source instanceof JpaAddress ? (JpaAddress) source :
createEntity(source);
+ public JpaPortalPreference convert(PortalPreference source) {
+ return source instanceof JpaPortalPreference ? (JpaPortalPreference)
source : createEntity(source);
}
- private JpaAddress createEntity(Address source) {
- JpaAddress converted = null;
+ private JpaPortalPreference createEntity(PortalPreference source) {
+ JpaPortalPreference converted = null;
if (source != null) {
- TypedQuery<JpaAddress> query =
manager.createNamedQuery(JpaAddress.FIND_BY_STREET_CITY_COUNTRY,
JpaAddress.class);
- query.setParameter(JpaAddress.STREET_PARAM,
source.getStreetAddress());
- query.setParameter(JpaAddress.CITY_PARAM, source.getLocality());
- query.setParameter(JpaAddress.COUNTRY_PARAM, source.getCountry());
+ TypedQuery<JpaPortalPreference> query =
manager.createNamedQuery(JpaPortalPreference.GET_BY_KEY,
JpaPortalPreference.class);
+ query.setParameter(JpaPortalPreference.PARAM_KEY, source.getKey());
converted = getSingleResult(query.getResultList());
if (converted == null) {
- converted = new JpaAddress();
+ converted = new JpaPortalPreference();
}
updateProperties(source, converted);
}
return converted;
}
- private void updateProperties(Address source, JpaAddress converted) {
- converted.setCountry(source.getCountry());
- converted.setLatitude(source.getLatitude());
- converted.setLongitude(source.getLongitude());
- converted.setLocality(source.getLocality());
- converted.setPostalCode(source.getPostalCode());
- converted.setRegion(source.getRegion());
- converted.setStreetAddress(source.getStreetAddress());
- converted.setQualifier(source.getQualifier());
- converted.setFormatted(source.getFormatted());
- converted.setPrimary(source.getPrimary());
+ private void updateProperties(PortalPreference source, JpaPortalPreference
converted) {
+
}
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
Tue Jun 5 17:32:31 2012
@@ -25,7 +25,7 @@ import org.apache.rave.portal.model.Port
import java.util.List;
/**
- * Provides persistence operations for the {@link PortalPreference}
+ * Provides persistence operations for the {@link
org.apache.rave.portal.model.JpaPortalPreference}
*/
public interface PortalPreferenceRepository extends
Repository<PortalPreference> {
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
Tue Jun 5 17:32:31 2012
@@ -19,38 +19,68 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.conversion.JpaPortalPreferenceConverter;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
+import org.apache.rave.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import java.util.List;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
/**
* JPA implementation for {@link PortalPreferenceRepository}
*/
@Repository
-public class JpaPortalPreferenceRepository extends
AbstractJpaRepository<PortalPreference> implements PortalPreferenceRepository {
+public class JpaPortalPreferenceRepository implements
PortalPreferenceRepository {
+
+ @PersistenceContext
+ private EntityManager manager;
+
+ @Autowired
+ private JpaPortalPreferenceConverter converter;
- public JpaPortalPreferenceRepository() {
- super(PortalPreference.class);
- }
@Override
public List<PortalPreference> getAll() {
- final TypedQuery<PortalPreference> query =
- manager.createNamedQuery(PortalPreference.GET_ALL,
PortalPreference.class);
- return query.getResultList();
+ final TypedQuery<JpaPortalPreference> query =
+ manager.createNamedQuery(JpaPortalPreference.GET_ALL,
JpaPortalPreference.class);
+ return
CollectionUtils.<PortalPreference>toBaseTypedList(query.getResultList());
}
@Override
public PortalPreference getByKey(String key) {
- final TypedQuery<PortalPreference> query =
- manager.createNamedQuery(PortalPreference.GET_BY_KEY,
PortalPreference.class);
- query.setParameter(PortalPreference.PARAM_KEY, key);
+ final TypedQuery<JpaPortalPreference> query =
+ manager.createNamedQuery(JpaPortalPreference.GET_BY_KEY,
JpaPortalPreference.class);
+ query.setParameter(JpaPortalPreference.PARAM_KEY, key);
return getSingleResult(query.getResultList());
}
+
+ @Override
+ public Class<? extends PortalPreference> getType() {
+ return JpaPortalPreference.class;
+ }
+
+ @Override
+ public PortalPreference get(long id) {
+ return manager.find(JpaPortalPreference.class, id);
+ }
+
+ @Override
+ public PortalPreference save(PortalPreference item) {
+ JpaPortalPreference pref = converter.convert(item);
+ return saveOrUpdate(pref.getEntityId(), manager, pref);
+ }
+
+ @Override
+ public void delete(PortalPreference item) {
+ manager.remove(converter.convert(item));
+ }
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
Tue Jun 5 17:32:31 2012
@@ -30,14 +30,14 @@ import java.util.Map;
public interface PortalPreferenceService {
/**
- * Creates a Map of all {@link PortalPreference}'s using the preference
key as key for the Map.Entry
+ * Creates a Map of all {@link
org.apache.rave.portal.model.JpaPortalPreference}'s using the preference key as
key for the Map.Entry
*
* @return Map of PortalPreference's
*/
Map<String, PortalPreference> getPreferencesAsMap();
/**
- * Gets a {@link PortalPreference} by its key
+ * Gets a {@link org.apache.rave.portal.model.JpaPortalPreference} by its
key
*
* @param key unique name of the preference
* @return PortalPreference if it exists, otherwise {@literal null}
@@ -45,7 +45,7 @@ public interface PortalPreferenceService
PortalPreference getPreference(String key);
/**
- * Saves a {@link PortalPreference} with a single value.
+ * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference} with a
single value.
* If a PortalPreference already exists with this key, its value(s) will
be overwritten.
*
* @param key of the preference, e.g. {@literal title}
@@ -54,7 +54,7 @@ public interface PortalPreferenceService
void savePreference(String key, String value);
/**
- * Saves a {@link PortalPreference} with a List of values.
+ * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference} with a
List of values.
* If a PortalPreference already exists with this key, its value(s) will
be overwritten.
*
* @param key of the preference, e.g. {@literal colors}
@@ -63,7 +63,7 @@ public interface PortalPreferenceService
void savePreference(String key, List<String> values);
/**
- * Saves a {@link PortalPreference}
+ * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference}
*
* @param preference PortalPreference to save
*/
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.service.impl;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -70,7 +71,7 @@ public class DefaultPortalPreferenceServ
public void savePreference(String key, List<String> values) {
PortalPreference preference = getPreference(key);
if (preference == null) {
- preference = new PortalPreference(key, values);
+ preference = new JpaPortalPreference(key, values);
} else {
preference.setValues(values);
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
Tue Jun 5 17:32:31 2012
@@ -24,9 +24,9 @@
<persistence-unit name="ravePersistenceUnit"
transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.rave.portal.model.Page</class>
- <class>org.apache.rave.portal.model.Region</class>
+ <class>org.apache.rave.portal.model.JpaRegion</class>
<class>org.apache.rave.portal.model.User</class>
- <class>org.apache.rave.portal.model.RegionWidget</class>
+ <class>org.apache.rave.portal.model.JpaRegionWidget</class>
<class>org.apache.rave.portal.model.RegionWidgetPreference</class>
<class>org.apache.rave.portal.model.JpaWidget</class>
<class>org.apache.rave.portal.model.JpaWidgetComment</class>
@@ -35,7 +35,7 @@
<class>org.apache.rave.portal.model.Authority</class>
<class>org.apache.rave.portal.model.Tag</class>
<class>org.apache.rave.portal.model.WidgetTag</class>
- <class>org.apache.rave.portal.model.PortalPreference</class>
+ <class>org.apache.rave.portal.model.JpaPortalPreference</class>
<class>org.apache.rave.portal.model.JpaPageTemplate</class>
<class>org.apache.rave.portal.model.JpaPageTemplateRegion</class>
<class>org.apache.rave.portal.model.JpaPageTemplateWidget</class>
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
Tue Jun 5 17:32:31 2012
@@ -30,7 +30,7 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.assertNull;
/**
- * Test for {@link PortalPreference}
+ * Test for {@link JpaPortalPreference}
*/
public class PortalPreferenceTest {
private static final String KEY = "foo";
@@ -39,7 +39,7 @@ public class PortalPreferenceTest {
@Test
public void testGettersSetters() throws Exception {
Long entityId = 1L;
- PortalPreference preference = new PortalPreference();
+ JpaPortalPreference preference = new JpaPortalPreference();
assertNull(preference.getValue());
@@ -54,21 +54,21 @@ public class PortalPreferenceTest {
@Test
public void singleValuePreference() throws Exception {
- PortalPreference preference = new PortalPreference(KEY, "bar");
+ PortalPreference preference = new JpaPortalPreference(KEY, "bar");
assertEquals(KEY, preference.getKey());
assertEquals("bar", preference.getValue());
}
@Test
public void testGetValues() throws Exception {
- PortalPreference preference = new PortalPreference(KEY, VALUES);
+ PortalPreference preference = new JpaPortalPreference(KEY, VALUES);
assertEquals(KEY, preference.getKey());
assertEquals(VALUES, preference.getValues());
}
@Test
public void testSetValues() throws Exception {
- PortalPreference preference = new PortalPreference(KEY, VALUES);
+ PortalPreference preference = new JpaPortalPreference(KEY, VALUES);
assertEquals(KEY, preference.getKey());
assertEquals(VALUES, preference.getValues());
preference.setValue("tree");
@@ -79,7 +79,7 @@ public class PortalPreferenceTest {
@Test(expected = NotSupportedException.class)
public void getValueFailsForMultiValue() {
- PortalPreference preference = new PortalPreference(KEY, VALUES);
+ PortalPreference preference = new JpaPortalPreference(KEY, VALUES);
preference.getValue();
assertFalse("Expected exception", true);
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.service.impl;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -108,8 +109,8 @@ public class DefaultPortalPreferenceServ
public void testSaveKeyValue_new() {
final String key = "foo";
final String value = "bar";
- PortalPreference fooBar = new PortalPreference(key, value);
- PortalPreference fooBarSaved = new PortalPreference(key, value);
+ PortalPreference fooBar = new JpaPortalPreference(key, value);
+ JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, value);
fooBarSaved.setEntityId(123L);
expect(repository.getByKey(key)).andReturn(null).once();
@@ -124,9 +125,9 @@ public class DefaultPortalPreferenceServ
final String key = "foo";
final String value = "bar";
final String newValue = "baz";
- PortalPreference fooBar = new PortalPreference(key, value);
+ JpaPortalPreference fooBar = new JpaPortalPreference(key, value);
fooBar.setEntityId(123L);
- PortalPreference fooBarSaved = new PortalPreference(key, newValue);
+ JpaPortalPreference fooBarSaved = new JpaPortalPreference(key,
newValue);
fooBarSaved.setEntityId(123L);
expect(repository.getByKey(key)).andReturn(fooBar).once();
@@ -142,8 +143,8 @@ public class DefaultPortalPreferenceServ
List<String> values = new ArrayList<String>();
values.add("bar");
values.add("baz");
- PortalPreference fooBar = new PortalPreference(key, values);
- PortalPreference fooBarSaved = new PortalPreference(key, values);
+ PortalPreference fooBar = new JpaPortalPreference(key, values);
+ JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, values);
fooBarSaved.setEntityId(123L);
expect(repository.getByKey(key)).andReturn(null).once();
@@ -162,9 +163,9 @@ public class DefaultPortalPreferenceServ
List<String> newValues = new ArrayList<String>();
values.add("bar2");
values.add("baz2");
- PortalPreference fooBar = new PortalPreference(key, values);
+ JpaPortalPreference fooBar = new JpaPortalPreference(key, values);
fooBar.setEntityId(123L);
- PortalPreference fooBarSaved = new PortalPreference(key, newValues);
+ JpaPortalPreference fooBarSaved = new JpaPortalPreference(key,
newValues);
fooBarSaved.setEntityId(123L);
expect(repository.getByKey(key)).andReturn(fooBar).once();
@@ -177,7 +178,7 @@ public class DefaultPortalPreferenceServ
@Test
public void testSavePreference() {
PortalPreference title = titlePreference();
- PortalPreference savedTitle = new PortalPreference("title", "Rave");
+ JpaPortalPreference savedTitle = new JpaPortalPreference("title",
"Rave");
savedTitle.setEntityId(123L);
expect(repository.save(title)).andReturn(savedTitle).once();
@@ -194,7 +195,7 @@ public class DefaultPortalPreferenceServ
colors.add("red");
colors.add("yellow");
colors.add("blue");
- PortalPreference colorPref = new PortalPreference("colors", colors);
+ PortalPreference colorPref = new JpaPortalPreference("colors", colors);
List<PortalPreference> preferences = new ArrayList<PortalPreference>();
preferences.add(title);
@@ -204,6 +205,6 @@ public class DefaultPortalPreferenceServ
}
private static PortalPreference titlePreference() {
- return new PortalPreference("title", "Rave");
+ return new JpaPortalPreference("title", "Rave");
}
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql
Tue Jun 5 17:32:31 2012
@@ -999,18 +999,18 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'color');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'red');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'yellow');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'blue');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'title');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
-- end portal preferences
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.model;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import java.util.Map;
@@ -45,13 +46,13 @@ public class PortalPreferenceForm {
private void populateMissingPreferences() {
if (getPageSize() == null) {
- preferenceMap.put(PAGE_SIZE, new PortalPreference(PAGE_SIZE,
DEFAULT_PAGE_SIZE));
+ preferenceMap.put(PAGE_SIZE, new JpaPortalPreference(PAGE_SIZE,
DEFAULT_PAGE_SIZE));
}
if (getTitleSuffix() == null) {
- preferenceMap.put(TITLE_SUFFIX, new PortalPreference(TITLE_SUFFIX,
DEFAULT_TITLE_SUFFIX));
+ preferenceMap.put(TITLE_SUFFIX, new
JpaPortalPreference(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
}
if (getJavaScriptDebugMode() == null) {
- preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new
PortalPreference(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new
JpaPortalPreference(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
}
}
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
Tue Jun 5 17:32:31 2012
@@ -20,7 +20,7 @@
package org.apache.rave.portal.web.util;
/**
- * Utility class for {@link org.apache.rave.portal.model.PortalPreference} keys
+ * Utility class for {@link org.apache.rave.portal.model.JpaPortalPreference}
keys
*/
public final class PortalPreferenceKeys {
private PortalPreferenceKeys() { }
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.controller.admin;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.model.PortalPreferenceForm;
@@ -168,7 +169,7 @@ public class PortalPreferenceControllerT
public void testUpdatePreferences_invalidPageSizeValue() {
ModelMap model = new ExtendedModelMap();
HashMap<String, PortalPreference> preferenceMap = new HashMap<String,
PortalPreference>();
- PortalPreference pageSizePref = new
PortalPreference(PortalPreferenceKeys.PAGE_SIZE, "invalid");
+ PortalPreference pageSizePref = new
JpaPortalPreference(PortalPreferenceKeys.PAGE_SIZE, "invalid");
preferenceMap.put(PortalPreferenceKeys.PAGE_SIZE, pageSizePref);
PortalPreferenceForm form = new PortalPreferenceForm(preferenceMap);
final BindingResult errors = new BeanPropertyBindingResult(form,
"form");
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.model;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.junit.Before;
import org.junit.Test;
@@ -37,11 +38,11 @@ public class PortalPreferenceFormTest {
@Before
public void setUp() throws Exception {
- PortalPreference titlePref = new PortalPreference(TITLE_SUFFIX, "Test
portal");
+ PortalPreference titlePref = new JpaPortalPreference(TITLE_SUFFIX,
"Test portal");
preferenceMap.put(TITLE_SUFFIX, titlePref);
- PortalPreference pageSizePref = new PortalPreference(PAGE_SIZE, "20");
+ PortalPreference pageSizePref = new JpaPortalPreference(PAGE_SIZE,
"20");
preferenceMap.put(PAGE_SIZE, pageSizePref);
- PortalPreference javaScriptDebugMode = new
PortalPreference(JAVASCRIPT_DEBUG_MODE, "0");
+ PortalPreference javaScriptDebugMode = new
JpaPortalPreference(JAVASCRIPT_DEBUG_MODE, "0");
preferenceMap.put(JAVASCRIPT_DEBUG_MODE, javaScriptDebugMode);
}
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
Tue Jun 5 17:32:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.validator;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.web.model.PortalPreferenceForm;
import org.junit.Before;
@@ -55,8 +56,8 @@ public class PortalPreferenceFormValidat
@Test
public void testValidate_Valid() throws Exception {
Map<String, PortalPreference> preferenceMap = new HashMap<String,
PortalPreference>();
- preferenceMap.put(TITLE_SUFFIX, new PortalPreference(TITLE_SUFFIX, "-
Rave unit test"));
- preferenceMap.put(PAGE_SIZE, new PortalPreference(PAGE_SIZE, "10"));
+ preferenceMap.put(TITLE_SUFFIX, new JpaPortalPreference(TITLE_SUFFIX,
"- Rave unit test"));
+ preferenceMap.put(PAGE_SIZE, new JpaPortalPreference(PAGE_SIZE, "10"));
PortalPreferenceForm form = new PortalPreferenceForm(preferenceMap);
Errors errors = new BindException(form, "form");
validator.validate(form, errors);
@@ -80,7 +81,7 @@ public class PortalPreferenceFormValidat
@Test
public void testValidate_InvalidPageSize() throws Exception {
Map<String, PortalPreference> preferenceMap = new HashMap<String,
PortalPreference>();
- preferenceMap.put(PAGE_SIZE, new PortalPreference(PAGE_SIZE, "10.5"));
+ preferenceMap.put(PAGE_SIZE, new JpaPortalPreference(PAGE_SIZE,
"10.5"));
PortalPreferenceForm form = new PortalPreferenceForm(preferenceMap);
Errors errors = new BindException(form, "form");
validator.validate(form, errors);
Modified:
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Tue Jun 5 17:32:31 2012
@@ -1054,21 +1054,21 @@ values (@user_id_13, @user_authority_id)
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'titleSuffix');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, ' - Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'pageSize');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, '10');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'javaScriptDebugMode');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, '1');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
-- end portal preferences
Modified:
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1346484&r1=1346483&r2=1346484&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
(original)
+++
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
Tue Jun 5 17:32:31 2012
@@ -39,7 +39,7 @@
<h2><fmt:message key="admin.preferences.shorttitle"/></h2>
<spring:url value="/app/admin/preferencedetail/edit"
var="detaillink"/>
- <%--@elvariable id="preferenceMap"
type="java.util.Map<java.lang.String,
org.apache.rave.portal.model.PortalPreference>"--%>
+ <%--@elvariable id="preferenceMap"
type="java.util.Map<java.lang.String,
org.apache.rave.portal.model.JpaPortalPreference>"--%>
<c:choose>
<c:when test="${fn:length(preferenceMap) eq 0}">
<a class="btn btn-primary" href="<c:out
value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
