Author: chris.laprun(a)jboss.com Date: 2011-10-12 08:18:10 -0400 (Wed, 12 Oct 2011) New Revision: 7731 Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/spi/RegistrationSPI.java Log: - Harmonized handling of persistent key on Registration with what is done in Consumer and ConsumerGroup for better coherence and maintainability. Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-12 12:14:42 UTC (rev 7730) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-12 12:18:10 UTC (rev 7731) @@ -42,6 +42,7 @@ import org.gatein.wsrp.registration.mapping.RegistrationPropertiesMapping; import javax.jcr.RepositoryException; +import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -114,16 +115,16 @@ } @Override - protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties) throws RegistrationException + protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException { + RegistrationSPI registration = super.internalCreateRegistration(consumer, registrationProperties); ChromatticSession session = persister.getSession(); - RegistrationSPI registration; try { ConsumerMapping cm = session.findById(ConsumerMapping.class, consumer.getPersistentKey()); RegistrationMapping rm = cm.createAndAddRegistrationMappingFrom(null); - registration = newRegistrationSPI(consumer, registrationProperties, rm.getPersistentKey()); rm.initFrom(registration); + registration.setPersistentKey(rm.getPersistentKey()); persister.closeSession(true); } catch (Exception e) Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-12 12:14:42 UTC (rev 7730) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-12 12:18:10 UTC (rev 7731) @@ -145,9 +145,10 @@ props = rpm.toPropMap(); } - RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props, getPersistentKey()); + RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props); reg.setStatus(getStatus()); reg.setRegistrationHandle(getRegistrationHandle()); + reg.setPersistentKey(getPersistentKey()); Collection<PortletContextMapping> pcms = getPortletContexts(); for (PortletContextMapping pcm : pcms) Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java 2011-10-12 12:14:42 UTC (rev 7730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java 2011-10-12 12:18:10 UTC (rev 7731) @@ -47,7 +47,7 @@ public class RegistrationImpl implements RegistrationSPI { - private final String key; + private String key; private ConsumerSPI consumer; private RegistrationStatus status; private Map<QName, Object> properties; @@ -56,9 +56,8 @@ private transient RegistrationPersistenceManager manager; - RegistrationImpl(String key, ConsumerSPI consumer, RegistrationStatus status, Map<QName, Object> properties, RegistrationPersistenceManager manager) + RegistrationImpl(ConsumerSPI consumer, RegistrationStatus status, Map<QName, Object> properties, RegistrationPersistenceManager manager) { - this.key = key; this.consumer = consumer; this.status = status; this.properties = new HashMap<QName, Object>(properties); @@ -71,6 +70,11 @@ return key; } + public void setPersistentKey(String key) + { + this.key = key; + } + public void setRegistrationHandle(String handle) { this.registrationHandle = handle; Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-10-12 12:14:42 UTC (rev 7730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-10-12 12:18:10 UTC (rev 7731) @@ -102,12 +102,14 @@ @Override protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException { - return newRegistrationSPI(consumer, registrationProperties, "" + lastRegistrationId++); + RegistrationSPI registrationSPI = newRegistrationSPI(consumer, registrationProperties); + registrationSPI.setPersistentKey("" + lastRegistrationId++); + return registrationSPI; } - public RegistrationSPI newRegistrationSPI(ConsumerSPI consumer, Map<QName, Object> registrationProperties, String registrationKey) + public RegistrationSPI newRegistrationSPI(ConsumerSPI consumer, Map<QName, Object> registrationProperties) { - return new RegistrationImpl(registrationKey, consumer, RegistrationStatus.PENDING, registrationProperties, this); + return new RegistrationImpl(consumer, RegistrationStatus.PENDING, registrationProperties, this); } @Override Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/spi/RegistrationSPI.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/spi/RegistrationSPI.java 2011-10-12 12:14:42 UTC (rev 7730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/spi/RegistrationSPI.java 2011-10-12 12:18:10 UTC (rev 7731) @@ -26,7 +26,6 @@ import org.gatein.pc.api.PortletContext; import org.gatein.registration.Registration; import org.gatein.registration.RegistrationException; -import org.gatein.registration.RegistrationManager; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -43,4 +42,6 @@ void removePortletContext(PortletContext portletContext) throws RegistrationException; void removePortletContext(PortletContext portletContext, boolean needsSaving) throws RegistrationException; + + void setPersistentKey(String key); }