MOB-29: Content Storage Lifecycle Management

- Some collapsing of common code in Constraint hierarchy.
 - Added aspect 'cm:storeSelector' with property 'cm:storeName'.
 - Defined a new, unused content store 'storeSelectorContentStore' (see content-services-context.xml).
   If this store is used, then setting the 'cm:storeName' property will force content to be stored in one
   of the named stores.  A LIST constraint is indirectly enforced for the 'cm:storeName' property.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-05-15 04:36:20 +00:00
parent d1d35999de
commit e1ada58fef
27 changed files with 982 additions and 166 deletions

View File

@@ -25,6 +25,8 @@
package org.alfresco.repo.dictionary.constraint;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.service.cmr.dictionary.Constraint;
import org.alfresco.service.cmr.dictionary.ConstraintException;
@@ -44,20 +46,31 @@ public abstract class AbstractConstraint implements Constraint
/** The constraint name. May be useful in error messages */
private String shortName;
private ConstraintRegistry registry;
/**
* Sets the constraint name. Automatically called after construction. Please excuse the strange method name as we
* want the property name to begin with an underscore to avoid property name clashes.
*
* @param shortName
* @deprecated
*/
public void set_shortName(String shortName)
{
this.shortName = shortName;
setShortName(shortName);
}
/**
* Gets the constraint name. May be useful in error messages.
* Sets the constraint name
* @param name
*/
public void setShortName(String name)
{
this.shortName = name;
}
/**
* Gets the constraint name.
*
* @return the constraint name.
*/
@@ -66,14 +79,41 @@ public abstract class AbstractConstraint implements Constraint
return this.shortName;
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getType()
/**
* Optionally specify the registry that will be used to register the constraint.
* This is used when instantiating constraints outside the dictionary.
*
* @param registry the constraint registry
*/
public void setRegistry(ConstraintRegistry registry)
{
this.registry = registry;
}
public String getType()
{
return this.getClass().getName();
}
public Map<String, Object> getParameters()
{
return new HashMap<String, Object>(3);
}
/**
* {@inheritDoc}
* <p>
* Registers the constraint with the registry, if present. Call this method if
* you want the constraint to be auto-registered.
*/
public void initialize()
{
if (registry != null)
{
registry.register(shortName, this);
}
}
/**
* Check that the given value is not <tt>null</tt>.
*
@@ -86,7 +126,7 @@ public abstract class AbstractConstraint implements Constraint
{
if (value == null)
{
throw new DictionaryException(AbstractConstraint.ERR_PROP_NOT_SET, value);
throw new DictionaryException(AbstractConstraint.ERR_PROP_NOT_SET, name, getShortName());
}
}

View File

@@ -24,8 +24,6 @@
*/
package org.alfresco.repo.dictionary.constraint;
import java.util.Map;
import org.alfresco.service.cmr.dictionary.ConstraintException;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
@@ -33,7 +31,6 @@ import org.alfresco.service.cmr.security.AuthorityType;
public class AuthorityNameConstraint extends AbstractConstraint
{
private static final String ERR_INVALID_AUTHORITY_NAME = "d_dictionary.constraint.authority_name.invalid_authority_name";
private static final String ERR_NON_STRING = "d_dictionary.constraint.authority_name.non_string";
@@ -57,20 +54,4 @@ public class AuthorityNameConstraint extends AbstractConstraint
throw new ConstraintException(ERR_INVALID_AUTHORITY_NAME, value, type);
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#initialize()
*/
public void initialize()
{
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
return null;
}
}

View File

@@ -0,0 +1,93 @@
/*
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.dictionary.constraint;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.service.cmr.dictionary.Constraint;
/**
* A registry of constraints.
*
* @author Derek Hulley
* @since 3.2
*/
public class ConstraintRegistry
{
private static ConstraintRegistry instance = new ConstraintRegistry();
private Map<String, Constraint> constraints;
/**
* @return Returns the singleton
*/
public static ConstraintRegistry getInstance()
{
return instance;
}
/**
* Private constructor
* @see #getInstance()
*/
private ConstraintRegistry()
{
constraints = new HashMap<String, Constraint>(13);
}
/**
* Register the constraint by name
*/
public void register(String name, Constraint constraint)
{
if (this == instance)
{
constraints.put(name, constraint);
}
else
{
instance.register(name, constraint);
}
}
/**
* Get the constraint by name
*
* @param name the name by which the constraint was registered
* @return Returns the constraint or <tt>null</tt> if it does not exist.
*/
public Constraint getConstraint(String name)
{
if (this == instance)
{
return constraints.get(name);
}
else
{
return instance.getConstraint(name);
}
}
}

View File

@@ -319,9 +319,7 @@ public class ConstraintsTest extends TestCase
{
private List<Object> tested;
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#initialize()
*/
@Override
public void initialize()
{
tested = new ArrayList<Object>(4);
@@ -348,13 +346,5 @@ public class ConstraintsTest extends TestCase
throw new ConstraintException("Non-String value");
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
return null;
}
}
}

View File

@@ -59,8 +59,8 @@ public class ListOfValuesConstraint extends AbstractConstraint
caseSensitive = true;
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getType()
/**
* {@inheritDoc}
*/
@Override
public String getType()
@@ -135,10 +135,23 @@ public class ListOfValuesConstraint extends AbstractConstraint
this.caseSensitive = caseSensitive;
}
@Override
public void initialize()
{
super.initialize();
checkPropertyNotNull("allowedValues", allowedValues);
}
@Override
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("caseSensitive", this.caseSensitive);
params.put("allowedValues", this.allowedValues);
return params;
}
protected void evaluateSingleValue(Object value)
{
@@ -168,17 +181,4 @@ public class ListOfValuesConstraint extends AbstractConstraint
}
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("caseSensitive", this.caseSensitive);
params.put("allowedValues", this.allowedValues);
return params;
}
}

View File

@@ -53,9 +53,6 @@ public class NumericRangeConstraint extends AbstractConstraint
private double minValue = Double.MIN_VALUE;
private double maxValue = Double.MAX_VALUE;
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getType()
*/
@Override
public String getType()
{
@@ -118,17 +115,18 @@ public class NumericRangeConstraint extends AbstractConstraint
}
this.maxValue = maxValue;
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#initialize()
*/
public void initialize()
{
}
/*
* @see org.alfresco.repo.dictionary.constraint.AbstractConstraint#evaluateSingleValue(java.lang.Object)
*/
@Override
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("minValue", this.minValue);
params.put("maxValue", this.maxValue);
return params;
}
protected void evaluateSingleValue(Object value)
{
// ensure that the value can be converted to a double
@@ -154,17 +152,4 @@ public class NumericRangeConstraint extends AbstractConstraint
throw new ConstraintException(ERR_OUT_OF_RANGE, checkValue, minValue, maxValue);
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("minValue", this.minValue);
params.put("maxValue", this.maxValue);
return params;
}
}

View File

@@ -57,9 +57,9 @@ public class RegexConstraint extends AbstractConstraint
private String expression;
private Pattern patternMatcher;
private boolean requiresMatch = true;
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getType()
/**
* {@inheritDoc}
*/
public String getType()
{
@@ -113,7 +113,19 @@ public class RegexConstraint extends AbstractConstraint
{
this.requiresMatch = requiresMatch;
}
@Override
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("expression", this.expression);
params.put("requiresMatch", this.requiresMatch);
return params;
}
@Override
public void initialize()
{
checkPropertyNotNull("expression", expression);
@@ -146,14 +158,4 @@ public class RegexConstraint extends AbstractConstraint
}
}
}
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("expression", this.expression);
params.put("requiresMatch", this.requiresMatch);
return params;
}
}

View File

@@ -0,0 +1,127 @@
/*
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.dictionary.constraint;
import java.util.List;
import java.util.Map;
import org.alfresco.service.cmr.dictionary.Constraint;
import org.alfresco.service.cmr.dictionary.DictionaryException;
/**
* Constraint implementation that defers to constraints registered with the
* static instance of the {@link ConstraintRegistry}.
*
* @see #setAllowedValues(List)
* @see #setCaseSensitive(boolean)
*
* @author Derek Hulley
*/
public final class RegisteredConstraint implements Constraint
{
private static final String ERR_NAME_NOT_REGISTERED = "d_dictionary.constraint.registered.not_registered";
private String shortName;
private String registeredName;
public RegisteredConstraint()
{
}
@Override
public String toString()
{
StringBuilder sb = new StringBuilder(80);
sb.append("RegisteredConstraint")
.append("[ registeredName=").append(registeredName)
.append(", constraint=").append(ConstraintRegistry.getInstance().getConstraint(registeredName))
.append("]");
return sb.toString();
}
public String getShortName()
{
return shortName;
}
public void setShortName(String shortName)
{
this.shortName = shortName;
}
/**
* Set the name of the constraint that will be used to look up the constraint
* that will be delegated to.
*/
public void setRegisteredName(String registeredName)
{
this.registeredName = registeredName;
}
public void initialize()
{
if (registeredName == null)
{
throw new DictionaryException(AbstractConstraint.ERR_PROP_NOT_SET, "registeredName");
}
}
/**
* @return the constraint that matches the registered name
*/
private Constraint getConstraint()
{
Constraint constraint = ConstraintRegistry.getInstance().getConstraint(registeredName);
if (constraint == null)
{
throw new DictionaryException(ERR_NAME_NOT_REGISTERED, registeredName);
}
return constraint;
}
/**
* Defers to the registered constraint
*/
public String getType()
{
return getConstraint().getType();
}
/**
* Defers to the registered constraint
*/
public Map<String, Object> getParameters()
{
return getConstraint().getParameters();
}
/**
* Defers to the registered constraint
*/
public void evaluate(Object value)
{
getConstraint().evaluate(value);
}
}

View File

@@ -50,8 +50,8 @@ public class StringLengthConstraint extends AbstractConstraint
private int minLength = 0;
private int maxLength = Integer.MAX_VALUE;
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getType()
/**
* {@inheritDoc}
*/
@Override
public String getType()
@@ -116,8 +116,15 @@ public class StringLengthConstraint extends AbstractConstraint
this.maxLength = maxLength;
}
public void initialize()
@Override
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("minLength", this.minLength);
params.put("maxLength", this.maxLength);
return params;
}
protected void evaluateSingleValue(Object value)
@@ -144,17 +151,4 @@ public class StringLengthConstraint extends AbstractConstraint
throw new ConstraintException(ERR_INVALID_LENGTH, checkValue, minLength, maxLength);
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
Map<String, Object> params = new HashMap<String, Object>(2);
params.put("minLength", this.minLength);
params.put("maxLength", this.maxLength);
return params;
}
}

View File

@@ -24,8 +24,6 @@
*/
package org.alfresco.repo.dictionary.constraint;
import java.util.Map;
import org.alfresco.service.cmr.dictionary.ConstraintException;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
@@ -62,20 +60,4 @@ public class UserNameConstraint extends AbstractConstraint
throw new ConstraintException(ERR_INVALID_USERNAME, value, type);
}
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#initialize()
*/
public void initialize()
{
}
/*
* @see org.alfresco.service.cmr.dictionary.Constraint#getParameters()
*/
public Map<String, Object> getParameters()
{
return null;
}
}