LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Publish for PageModels 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4460 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-12-03 10:49:26 +00:00
parent 0367ef4f70
commit 80d3a02996
5 changed files with 285 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java
View File

@ -55,6 +55,10 @@ public class ComponentModel implements Serializable {
@NotNull
private String uuid;
@Column(name = "MODEL_UUID", length = 255, nullable = false)
@NotNull
private String modelUuid;
@ManyToOne
@JoinColumn(name = "PAGE_MODEL_ID")
private PageModel pageModel;
@ -83,10 +87,18 @@ public class ComponentModel implements Serializable {
return uuid;
}
protected void setUUid(final String uuid) {
protected void setUuid(final String uuid) {
this.uuid = uuid;
}
public String getModelUuid() {
return modelUuid;
}
protected void setModelUuid(final String modelUuid) {
this.modelUuid = modelUuid;
}
public PageModel getPageModel() {
return pageModel;
}

8
ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java
View File

@ -43,7 +43,13 @@ public class ComponentModelRepository extends AbstractEntityRepository<Long, Com
@Override
public void initNewEntity(final ComponentModel componentModel) {
componentModel.setUUid(UUID.randomUUID().toString());
final String uuid = UUID.randomUUID().toString();
componentModel.setUuid(uuid);
if (componentModel.getModelUuid() == null
|| componentModel.getModelUuid().isEmpty()) {
componentModel.setModelUuid(uuid);
}
}
}

45
ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java
View File

@ -54,6 +54,26 @@ import javax.validation.constraints.NotNull;
@Entity
@Table(name = "PAGE_MODELS", schema = CoreConstants.DB_SCHEMA)
@NamedQueries({
@NamedQuery(
name = "PageModel.findDraftVersion",
query = "SELECT p FROM PageModel p "
+ "WHERE p.modelUuid = :uuid "
+ "AND p.version = org.libreccm.pagemodel.PageModelVersion.DRAFT")
,
@NamedQuery(
name = "PageModel.hasLiveVersion",
query = "SELECT (CASE WHEN COUNT(p) > 0 THEN true ELSE False END) "
+ "FROM PageModel p "
+ "WHERE p.modelUuid = :uuid "
+ "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE"
)
,
@NamedQuery(
name = "PageModel.findLiveVersion",
query = "SELECT p FROM PageModel p "
+ "WHERE p.modelUuid = :uuid "
+ "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE")
,
@NamedQuery(
name = "PageModel.findByApplication",
query = "SELECT p FROM PageModel p WHERE p.application = :application")
@ -67,7 +87,8 @@ import javax.validation.constraints.NotNull;
name = "PageModel.findByApplicationAndName",
query = "SELECT p FROM PageModel p "
+ "WHERE p.name = :name AND p.application = :application"
),
)
,
@NamedQuery(
name = "PageModel.countByApplicationAndName",
query = "SELECT COUNT(p) FROM PageModel p "
@ -87,6 +108,10 @@ public class PageModel implements Serializable {
@NotNull
private String uuid;
@Column(name = "MODEL_UUID", length = 255, nullable = false)
@NotNull
private String modelUuid;
@Column(name = "NAME", length = 255)
private String name;
@ -146,6 +171,14 @@ public class PageModel implements Serializable {
this.uuid = uuid;
}
public String getModelUuid() {
return modelUuid;
}
protected void setModelUuid(final String modelUuid) {
this.modelUuid = modelUuid;
}
public String getName() {
return name;
}
@ -158,7 +191,7 @@ public class PageModel implements Serializable {
return version;
}
protected void setPageModelVersion(final PageModelVersion version) {
protected void setVersion(final PageModelVersion version) {
this.version = version;
}
@ -202,14 +235,18 @@ public class PageModel implements Serializable {
this.components = components;
}
public void addComponent(final ComponentModel component) {
protected void addComponent(final ComponentModel component) {
components.add(component);
}
public void removeComponent(final ComponentModel component) {
protected void removeComponent(final ComponentModel component) {
components.remove(component);
}
protected void clearComponents() {
components.clear();
}
@Override
public int hashCode() {
int hash = 7;

216
ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java
View File

@ -18,6 +18,8 @@
*/
package org.libreccm.pagemodel;
import com.arsdigita.util.UncheckedWrapperException;
import org.libreccm.core.CoreConstants;
import org.libreccm.modules.CcmModule;
import org.libreccm.modules.Module;
@ -25,16 +27,28 @@ import org.libreccm.security.AuthorizationRequired;
import org.libreccm.security.RequiresPrivilege;
import org.libreccm.web.CcmApplication;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.transaction.Transactional;
/**
@ -44,6 +58,9 @@ import javax.transaction.Transactional;
@RequestScoped
public class PageModelManager {
@Inject
private EntityManager entityManager;
@Inject
private PageModelRepository pageModelRepo;
@ -79,6 +96,7 @@ public class PageModelManager {
* application.
* @param application The application for which the {@link PageModel} is
* created.
* @param type Type of the page model (view technology).
*
* @return The new {@link PageModel}.
*/
@ -115,10 +133,208 @@ public class PageModelManager {
pageModel.setName(name);
pageModel.setApplication(application);
pageModel.setType(type);
pageModel.setVersion(PageModelVersion.DRAFT);
return pageModel;
}
@AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED)
public PageModel getDraftVersion(
@RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
final PageModel pageModel) {
if (pageModel == null) {
throw new IllegalArgumentException(
"Can't get draft version for page model null.");
}
final TypedQuery<PageModel> query = entityManager.createNamedQuery(
"PageModel.findDraftVersion", PageModel.class);
query.setParameter("uuid", pageModel.getModelUuid());
return query.getSingleResult();
}
@Transactional(Transactional.TxType.REQUIRED)
public boolean isLive(final PageModel pageModel) {
final TypedQuery<Boolean> query = entityManager.createNamedQuery(
"PageModel.hasLiveVersion", Boolean.class);
query.setParameter("uuid", pageModel.getModelUuid());
return query.getSingleResult();
}
@AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED)
public Optional<PageModel> getLiveVersion(
@RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) PageModel pageModel) {
if (isLive(pageModel)) {
final TypedQuery<PageModel> query = entityManager.createNamedQuery(
"PageModel.findLiveVersion",
PageModel.class);
query.setParameter("uuid", pageModel.getModelUuid());
return Optional.of(query.getSingleResult());
} else {
return Optional.empty();
}
}
public PageModel publish(final PageModel pageModel) {
final PageModel draftModel = getDraftVersion(pageModel);
final PageModel liveModel;
if (isLive(pageModel)) {
liveModel = getLiveVersion(pageModel).get();
} else {
liveModel = new PageModel();
}
liveModel.setVersion(PageModelVersion.LIVE);
liveModel.setModelUuid(draftModel.getModelUuid());
for (Map.Entry<Locale, String> entry : draftModel.getTitle().getValues()
.entrySet()) {
liveModel.getTitle().addValue(entry.getKey(), entry.getValue());
}
for (Map.Entry<Locale, String> entry : liveModel.getDescription()
.getValues().entrySet()) {
liveModel.getDescription().addValue(entry.getKey(),
entry.getValue());
}
liveModel.setApplication(draftModel.getApplication());
liveModel.setType(draftModel.getType());
liveModel.clearComponents();
for(final ComponentModel draft : draftModel.getComponents()) {
final ComponentModel live = publishComponentModel(draft);
addComponentModel(liveModel, live);
}
return liveModel;
}
@SuppressWarnings("unchecked")
private ComponentModel publishComponentModel(final ComponentModel draftModel) {
final Class<? extends ComponentModel> clazz = draftModel.getClass();
final ComponentModel liveModel;
try {
liveModel = clazz.newInstance();
} catch (InstantiationException | IllegalAccessException ex) {
throw new UncheckedWrapperException(ex);
}
liveModel.setModelUuid(draftModel.getModelUuid());
final BeanInfo beanInfo;
try {
beanInfo = Introspector.getBeanInfo(clazz);
} catch(IntrospectionException ex) {
throw new UncheckedWrapperException(ex);
}
for(final PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors()) {
final Class<?> propType = propertyDescriptor.getPropertyType();
final Method readMethod = propertyDescriptor.getReadMethod();
final Method writeMethod = propertyDescriptor.getWriteMethod();
if (propertyIsExcluded(propertyDescriptor.getName())) {
continue;
}
if (writeMethod == null) {
continue;
}
if (propType != null
&& propType.isAssignableFrom(List.class)) {
final List<Object> source;
final List<Object> target;
try {
source = (List<Object>) readMethod.invoke(draftModel);
target = (List<Object>) readMethod.invoke(liveModel);
} catch(IllegalAccessException
| IllegalArgumentException
| InvocationTargetException ex) {
throw new UncheckedWrapperException(ex);
}
target.addAll(source);
} else if(propType != null
&& propType.isAssignableFrom(Map.class)) {
final Map<Object, Object> source;
final Map<Object, Object> target;
try {
source = (Map<Object, Object>) readMethod.invoke(draftModel);
target = (Map<Object, Object>) readMethod.invoke(liveModel);
} catch(IllegalAccessException
| IllegalArgumentException
| InvocationTargetException ex) {
throw new UncheckedWrapperException(ex);
}
source.forEach((key, value) -> target.put(key, value));
} else if(propType != null
&& propType.isAssignableFrom(Set.class)) {
final Set<Object> source;
final Set<Object> target;
try {
source = (Set<Object>) readMethod.invoke(draftModel);
target = (Set<Object>) readMethod.invoke(liveModel);
}catch(IllegalAccessException
| IllegalArgumentException
| InvocationTargetException ex) {
throw new UncheckedWrapperException(ex);
}
target.addAll(source);
} else {
final Object value;
try {
value = readMethod.invoke(draftModel);
writeMethod.invoke(liveModel, value);
} catch(IllegalAccessException
| IllegalArgumentException
| InvocationTargetException ex) {
throw new UncheckedWrapperException(ex);
}
}
}
componentModelRepo.save(liveModel);
return liveModel;
}
private boolean propertyIsExcluded(final String name) {
final String[] excluded = new String[]{
"uuid",
"modelUuid"
};
boolean result = false;
for(final String current : excluded) {
if (current.equals(name)) {
result = true;
break;
}
}
return result;
}
public List<PageModelComponentModel> findAvailableComponents() {
final List<PageModelComponentModel> list = new ArrayList<>(components
.values());

10
ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java
View File

@ -55,7 +55,13 @@ public class PageModelRepository extends AbstractEntityRepository<Long, PageMode
throw new IllegalArgumentException("PageModel can't be null.");
}
pageModel.setUuid(UUID.randomUUID().toString());
final String uuid = UUID.randomUUID().toString();
pageModel.setUuid(uuid);
if (pageModel.getModelUuid() == null
|| pageModel.getModelUuid().isEmpty()) {
pageModel.setModelUuid(uuid);
}
}
public List<PageModel> findByApplication(final CcmApplication application) {
@ -113,7 +119,7 @@ public class PageModelRepository extends AbstractEntityRepository<Long, PageMode
public long countByApplicationAndName(final CcmApplication application,
final String name) {
if (application == null) {
throw new IllegalArgumentException(
"Can't count page models for application null");