Dave Ward d437d5105d Merged V4.0-BUG-FIX to HEAD
36311: BDE-69: filter long tests if minimal.testing property is defined
   36314: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36247: ALF-11027: temporarily remove import of maven.xml, since it makes ant calls fail from enterpriseprojects
   36331: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36333: Revert ALF-12447.
   36334: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36318: ALF-12447: Fix case on META-INF folder for SDK
      36332: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36337: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36332: ALF-12447: Yet more meta-inf case changes needed.
   36342: ALF-14120: fix only completed tasks returned
   36343: ALF-13898: starting workflow from IMAP now using workflowDefs with engine name included, fallback to appending $jbpm when not present, to preserve backwards compatibility.
   36345: Fix for ALF-12730 - Email Space Users fails if template is used
   36346: Fix for ALF-9466 - We can search contents sorted by categories in Advanced search in Share, but saved search will not be shown in UI.
   36364: Switch version to 4.0.3
   36375: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
      36366: Tweak to implementation to ensure that on-authentication-failed, the status is updated within a r/w transaction.
      36374: Provide more specific exceptions from the Remote Connector Service for client and server errors
   36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"
   36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS typed query and ordering tests
   36432: ALF-14133: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
      << 4.0.x specific change: Changed transformer.complex.OOXML.Image into transformer.complex.Any.Image >>
      << allowing any transformer to be selected for the conversion to JPEG >>
      36427: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Added a base spring bean for all complex transformers
      36362: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
   36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS test data change broke AFTS ID ordering
   36503: Removed thousands of compiler warnings (CMIS query test code)
   36518: Fix for ALF-13778 - Links on Share Repository search page show incorrect link name; do not work when root-node is defined.
   Fix now means that Share search correctly handles overridden Repository root node setting. Original work by Vasily Olhin.
   36520: BDE-69: filter all repo tests if minimal.testing property is defined
   36534: ALF-14116: Latest Surf libs (r1075) - ensure that i18n extensions can process browser sent short locales
   36563: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36336: ALF-12447: Yet more meta-inf case changes needed.
      36347: Fix for ALF-13920 - Error occurred when try to edit/delete category
      36352: Fix for ALF-13123 - Invalid JSON format from Get Node Tags Webscript - strings not double-quoted. Also fixed POST webscript with same issue.
      36399: ALL LANG: translation updates based on EN r36392
      36421: Fix for Mac Lion versioning issue. ALF-12792 (Part 1 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      Added support for filesystems that do not implement the NTFS streams interface in the CIFS transact rename processing, for the Alfresco repo filesystem.
      36422: Fix for Mac Lion versioning issue. ALF-12792 (Part 2 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      36423: Add support for file size tracking in the file state. ALF-13616 (Part 1 of 2)
      36424: Fix for Mac MS Word file save issue. ALF-13616 (Part 2 of 2)
      Added live file size tracking to file writing/folder searches so the correct file size is returned before the file is closed.
      36444: Merged DEV to V3.4-BUG-FIX
         36419: ALF-12666 Search against simple-search-additional-attributes doesn't work properly
            SearchContext.buildQuery(int) method was changed.
      36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
       - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
       - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
       - Optimized favorite document query to remove need for a PATH
       - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
       - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
       - Added some addition doclist.get.js query scriptlogger debugging output
      36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
      36475: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Change base spring bean on example config file
      36480: 36453: ALF-3881 : ldap sync deletion behaviour not flexible enough
         - synchronization.allowDeletions parameter introduced
         - default value is true (existing behaviour)
         - when false, no missing users or groups are deleted from the repository
         - instead they are cleared of their zones and missing groups are cleared of all their members
         - colliding users and groups from different zones are also 'moved' rather than recreated
         - unit test added
      36491: Added CIFS transact2 NT passthru levels for set end of file/set allocation size. ALF-13616.
      Also updated FileInfoLevel with the latest list of NT passthru information levels.
      36497: Fixed ALF-14163: JavaScript Behaviour broken: Node properties cannot be cast to java.io.Serializable
       - Fallout from ALF-12855
       - Made class Serializable (like HashMap would have been)
       - Fixed line endings, too
      36531: ALF-13769: Merged BELARUS/V3.4-BUG-FIX-2012_04_05 to V3.4-BUG-FIX (3.4.10)
         35150: ALF-2645 : 3.2+ ldap sync debug information is too scarce 
            - Improved LDAP logging.
      36532: ALF-13769: BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (3.4.10)
         36461: ALF-237: WCM: File conflicts cause file order not to be consistent
            - It is reasonable set values for checkboxes using the indexes from the list, which are not changed. So when we submit the window, the getSelectedNodes method is invoked and 
              it takes selected nodes by checkbox values from "paths" list. 
      36535: Merged DEV to V3.4-BUG-FIX
         36479: ALF-8918 : Cannot "edit offline" a web quick start publication
            A check in TaggableAspect.onUpdatePropertiesOnCommit() was extended to skip the update, if no tags were changed.
      36555: Merged V3.4 to V3.4-BUG-FIX
         36294: ALF-14039: Merged HEAD to V3.4
            31732: ALF-10934: Prevent potential start/stop ping-pong of subsystems across a cluster
               - When a cluster boots up or receives a reinit message it shouldn't be sending out any start messages
   36566: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      36172: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         36169: ALF-8755: After renaming content / space by Contributor via WebDAV new items are created
   36572: Merged V4.0 to V4.0-BUG-FIX
      36388: ALF-14025: Updated Surf libs (1071). Fixes to checksum-disabled dependency handling
      36392: ALF-14129 Failed to do upgrade from 3.4.8 to 4.0.2
         << Committed change for Frederik Heremans >>
         - Moved actual activiti-tables creation to before the upgrade
      36409: Fix for ALF-14124 Solr is not working - Errors occur during the startup
      36466: Fix for ALF-12770 - Infinite loop popup alert in TinyMCE after XSS injection in Alfresco Explorer online edit.
      36501: Merged DEV to V4.0
         36496: ALF-14063 : CLONE - Internet Explorer hangs when using the object picker with a larger number of documents
            YUI 2.9.0 library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8.
      36502: ALF-14105: Share Advanced search issue with the form values
      - Fix by David We
      36538: ALF-13986: Updated web.xml and index.jsp redirect to ensure that SSO works with proper surf site-configuration customization
      36539: Fix for ALF-14167 Filtering by Tags/Categories doen't findes any content in Repository/DocumentLibrary
      - fix default namespace back to "" -> "" and fix the specific SOLR tests that require otherwise.
      36541: ALF-14082: Input stream leaks in thumbnail rendering webscripts
      36560: Correctly size content length header after HTML stripping process (ALF-9365)
   36574: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36316: Merged V4.0-BUG-FIX to V4.0 (4.0.2)
      36391: Merged V4.0-BUG-FIX to V4.0
         36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-18 17:00:53 +00:00

444 lines
13 KiB
Java

/*
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.util;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* A map that protects keys and values from accidental modification.
* <p/>
* Use this map when keys or values need to be protected against client modification.
* For example, when a component pulls a map from a common resource it can wrap
* the map with this class to prevent any accidental modification of the shared
* resource.
* <p/>
* Upon first write to this map , the underlying map will be copied (selectively cloned),
* the original map handle will be discarded and the copied map will be used. Note that
* the map copy process will also occur if any mutable value is in danger of being
* exposed to client modification. Therefore, methods that iterate and retrieve values
* will also trigger the copy if any values are mutable.
*
* @param <K> the map key type (must extend {@link Serializable})
* @param <V> the map value type (must extend {@link Serializable})
*
* @author Derek Hulley
* @since 3.4.9
* @since 4.0.1
*/
public class ValueProtectingMap<K extends Serializable, V extends Serializable> implements Map<K, V>, Serializable
{
private static final long serialVersionUID = -9073485393875357605L;
/**
* Default immutable classes:
* <li>String</li>
* <li>BigDecimal</li>
* <li>BigInteger</li>
* <li>Byte</li>
* <li>Double</li>
* <li>Float</li>
* <li>Integer</li>
* <li>Long</li>
* <li>Short</li>
* <li>Boolean</li>
* <li>Date</li>
* <li>Locale</li>
*/
public static final Set<Class<?>> DEFAULT_IMMUTABLE_CLASSES;
static
{
DEFAULT_IMMUTABLE_CLASSES = new HashSet<Class<?>>(13);
DEFAULT_IMMUTABLE_CLASSES.add(String.class);
DEFAULT_IMMUTABLE_CLASSES.add(BigDecimal.class);
DEFAULT_IMMUTABLE_CLASSES.add(BigInteger.class);
DEFAULT_IMMUTABLE_CLASSES.add(Byte.class);
DEFAULT_IMMUTABLE_CLASSES.add(Double.class);
DEFAULT_IMMUTABLE_CLASSES.add(Float.class);
DEFAULT_IMMUTABLE_CLASSES.add(Integer.class);
DEFAULT_IMMUTABLE_CLASSES.add(Long.class);
DEFAULT_IMMUTABLE_CLASSES.add(Short.class);
DEFAULT_IMMUTABLE_CLASSES.add(Boolean.class);
DEFAULT_IMMUTABLE_CLASSES.add(Date.class);
DEFAULT_IMMUTABLE_CLASSES.add(Locale.class);
}
/**
* Protect a specific value if it is considered mutable
*
* @param <S> the type of the value, which must be {@link Serializable}
* @param value the value to protect if it is mutable (may be <tt>null</tt>)
* @param immutableClasses a set of classes that can be considered immutable
* over and above the {@link #DEFAULT_IMMUTABLE_CLASSES default set}
* @return a cloned instance (via serialization) or the instance itself, if immutable
*/
@SuppressWarnings("unchecked")
public static <S extends Serializable> S protectValue(S value, Set<Class<?>> immutableClasses)
{
if (!mustProtectValue(value, immutableClasses))
{
return value;
}
// We have to clone it
// No worries about the return type; it has to be the same as we put into the serializer
return (S) SerializationUtils.deserialize(SerializationUtils.serialize(value));
}
/**
* Utility method to check if values need to be cloned or not
*
* @param <S> the type of the value, which must be {@link Serializable}
* @param value the value to check
* @param immutableClasses a set of classes that can be considered immutable
* over and above the {@link #DEFAULT_IMMUTABLE_CLASSES default set}
* @return <tt>true</tt> if the value must <b>NOT</b> be given
* to the calling clients
*/
public static <S extends Serializable> boolean mustProtectValue(S value, Set<Class<?>> immutableClasses)
{
if (value == null)
{
return false;
}
Class<?> clazz = value.getClass();
return (
DEFAULT_IMMUTABLE_CLASSES.contains(clazz) == false &&
immutableClasses.contains(clazz) == false);
}
/**
* Utility method to clone a map, preserving immutable instances
*
* @param <K> the map key type, which must be {@link Serializable}
* @param <V> the map value type, which must be {@link Serializable}
* @param map the map to copy
* @param immutableClasses a set of classes that can be considered immutable
* over and above the {@link #DEFAULT_IMMUTABLE_CLASSES default set}
*/
public static <K extends Serializable, V extends Serializable> Map<K, V> cloneMap(Map<K, V> map, Set<Class<?>> immutableClasses)
{
Map<K, V> copy = new HashMap<K, V>((int)(map.size() * 1.3));
for (Map.Entry<K, V> element : map.entrySet())
{
K key = element.getKey();
V value = element.getValue();
// Clone as necessary
key = ValueProtectingMap.protectValue(key, immutableClasses);
value = ValueProtectingMap.protectValue(value, immutableClasses);
copy.put(key, value);
}
return copy;
}
private ReentrantReadWriteLock.ReadLock readLock;
private ReentrantReadWriteLock.WriteLock writeLock;
private boolean cloned = false;
private Map<K, V> map;
private Set<Class<?>> immutableClasses;
/**
* Construct providing a protected map and using only the
* {@link #DEFAULT_IMMUTABLE_CLASSES default immutable classes}
*
* @param protectedMap the map to safeguard
*/
public ValueProtectingMap(Map<K, V> protectedMap)
{
this (protectedMap, null);
}
/**
* Construct providing a protected map, complementing the set of
* {@link #DEFAULT_IMMUTABLE_CLASSES default immutable classes}
*
* @param protectedMap the map to safeguard
* @param immutableClasses additional immutable classes
* over and above the {@link #DEFAULT_IMMUTABLE_CLASSES default set}
* (may be <tt>null</tt>
*/
public ValueProtectingMap(Map<K, V> protectedMap, Set<Class<?>> immutableClasses)
{
// Unwrap any internal maps if given a value protecting map
if (protectedMap instanceof ValueProtectingMap)
{
ValueProtectingMap<K, V> mapTemp = (ValueProtectingMap<K, V>) protectedMap;
this.map = mapTemp.map;
}
else
{
this.map = protectedMap;
}
this.cloned = false;
if (immutableClasses == null)
{
this.immutableClasses = Collections.emptySet();
}
else
{
this.immutableClasses = new HashSet<Class<?>>(immutableClasses);
}
// Construct locks
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
this.readLock = lock.readLock();
this.writeLock = lock.writeLock();
}
/**
* An unsafe method to use for anything except tests.
*
* @return the map that this instance is protecting
*/
/* protected */ Map<K, V> getProtectedMap()
{
return map;
}
/**
* Called by methods that need to force the map into a safe state.
* <p/>
* This method can be called without any locks being active.
*/
private void cloneMap()
{
readLock.lock();
try
{
// Check that it hasn't been copied already
if (cloned)
{
return;
}
}
finally
{
readLock.unlock();
}
/*
* Note: This space here is a window during which some code could have made
* a copy. Therefore we will do a cautious double-check.
*/
// Put in a write lock before cloning the map
writeLock.lock();
try
{
// Check that it hasn't been copied already
if (cloned)
{
return;
}
Map<K, V> copy = ValueProtectingMap.cloneMap(map, immutableClasses);
// Discard the original
this.map = copy;
this.cloned = true;
}
finally
{
writeLock.unlock();
}
}
/*
* READ-ONLY METHODS
*/
@Override
public int size()
{
readLock.lock();
try
{
return map.size();
}
finally
{
readLock.unlock();
}
}
@Override
public boolean isEmpty()
{
readLock.lock();
try
{
return map.isEmpty();
}
finally
{
readLock.unlock();
}
}
@Override
public boolean containsKey(Object key)
{
readLock.lock();
try
{
return map.containsKey(key);
}
finally
{
readLock.unlock();
}
}
@Override
public boolean containsValue(Object value)
{
readLock.lock();
try
{
return map.containsValue(value);
}
finally
{
readLock.unlock();
}
}
@Override
public int hashCode()
{
readLock.lock();
try
{
return map.hashCode();
}
finally
{
readLock.unlock();
}
}
@Override
public boolean equals(Object obj)
{
readLock.lock();
try
{
return map.equals(obj);
}
finally
{
readLock.unlock();
}
}
@Override
public String toString()
{
readLock.lock();
try
{
return map.toString();
}
finally
{
readLock.unlock();
}
}
/*
* METHODS THAT *MIGHT* REQUIRE COPY
*/
@Override
public V get(Object key)
{
readLock.lock();
try
{
V value = map.get(key);
return ValueProtectingMap.protectValue(value, immutableClasses);
}
finally
{
readLock.unlock();
}
}
/*
* METHODS THAT REQUIRE COPY
*/
@Override
public V put(K key, V value)
{
cloneMap();
return map.put(key, value);
}
@Override
public V remove(Object key)
{
cloneMap();
return map.remove(key);
}
@Override
public void putAll(Map<? extends K, ? extends V> m)
{
cloneMap();
map.putAll(m);
}
@Override
public void clear()
{
cloneMap();
map.clear();
}
@Override
public Set<K> keySet()
{
cloneMap();
return map.keySet();
}
@Override
public Collection<V> values()
{
cloneMap();
return map.values();
}
@Override
public Set<Entry<K, V>> entrySet()
{
cloneMap();
return map.entrySet();
}
}