[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERRest/Sources/er/rest ERXRestRequestHandler.java, 1.14, 1.15 ERXDefaultRestDelegate.java, 1.10, 1.11

[Mike S. <ms...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERRest/Sources/er/rest
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12580/Sources/er/rest

Modified Files:
	ERXRestRequestHandler.java ERXDefaultRestDelegate.java 
Log Message:
support for disabling the guessing of entity delegate class names

Index: ERXRestRequestHandler.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERRest/Sources/er/rest/ERXRestRequestHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ERXRestRequestHandler.java	30 Apr 2008 19:10:09 -0000	1.14
--- ERXRestRequestHandler.java	30 Apr 2008 21:44:45 -0000	1.15
***************
*** 514,518 ****
  			defaultEntityDelegate = new ERXUnsafeRestEntityDelegate();
  		}
! 		ERXDefaultRestDelegate restDelegate = new ERXDefaultRestDelegate(defaultEntityDelegate);
  		IERXRestAuthenticationDelegate authenticationDelegate = new ERXUnsafeRestAuthenticationDelegate();
  		// IERXRestResponseWriter responseWriter = new ERXJSONRestResponseWriter(true, displayToMany); // DON'T COMMIT
--- 514,518 ----
  			defaultEntityDelegate = new ERXUnsafeRestEntityDelegate();
  		}
! 		ERXDefaultRestDelegate restDelegate = new ERXDefaultRestDelegate(defaultEntityDelegate, true);
  		IERXRestAuthenticationDelegate authenticationDelegate = new ERXUnsafeRestAuthenticationDelegate();
  		// IERXRestResponseWriter responseWriter = new ERXJSONRestResponseWriter(true, displayToMany); // DON'T COMMIT

Index: ERXDefaultRestDelegate.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERRest/Sources/er/rest/ERXDefaultRestDelegate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ERXDefaultRestDelegate.java	29 Apr 2008 20:21:40 -0000	1.10
--- ERXDefaultRestDelegate.java	30 Apr 2008 21:44:45 -0000	1.11
***************
*** 23,26 ****
--- 23,27 ----
  	private NSMutableDictionary _entityDelegates;
  	private IERXRestEntityDelegate _defaultDelegate;
+ 	private boolean _guessDelegateNames;
  
  	/**
***************
*** 28,32 ****
  	 */
  	public ERXDefaultRestDelegate() {
! 		this(new ERXDenyRestEntityDelegate());
  	}
  
--- 29,44 ----
  	 */
  	public ERXDefaultRestDelegate() {
! 		this(new ERXDenyRestEntityDelegate(), true);
! 	}
! 
! 	/**
! 	 * Constructs an ERXDefaultRestDelegate with an ERXDenyRestEntityDelegate as the default entity delegate.
! 	 * 
! 	 * @param guessDelegateNames
! 	 *            if true, delegates names will be guessed "<EntityName>RestEntityDelegate" before falling back to the
! 	 *            default
! 	 */
! 	public ERXDefaultRestDelegate(boolean guessDelegateNames) {
! 		this(new ERXDenyRestEntityDelegate(), guessDelegateNames);
  	}
  
***************
*** 37,45 ****
  	 * @param defaultDelegate
  	 *            the default entity delegate to use
  	 */
! 	public ERXDefaultRestDelegate(IERXRestEntityDelegate defaultDelegate) {
  		_entityAliases = new NSMutableDictionary();
  		_entityDelegates = new NSMutableDictionary();
  		_defaultDelegate = defaultDelegate;
  	}
  
--- 49,61 ----
  	 * @param defaultDelegate
  	 *            the default entity delegate to use
+ 	 * @param guessDelegateNames
+ 	 *            if true, delegates names will be guessed "<EntityName>RestEntityDelegate" before falling back to the
+ 	 *            default
  	 */
! 	public ERXDefaultRestDelegate(IERXRestEntityDelegate defaultDelegate, boolean guessDelegateNames) {
  		_entityAliases = new NSMutableDictionary();
  		_entityDelegates = new NSMutableDictionary();
  		_defaultDelegate = defaultDelegate;
+ 		_guessDelegateNames = guessDelegateNames;
  	}
  
***************
*** 69,73 ****
  			throw new IllegalArgumentException("Unable to process " + lastKey);
  		}
! 		
  		return restResult;
  	}
--- 85,89 ----
  			throw new IllegalArgumentException("Unable to process " + lastKey);
  		}
! 
  		return restResult;
  	}
***************
*** 218,222 ****
  			String entityDelegateClassName = ERXProperties.stringForKey("ERXRest." + entity.name() + ".delegate");
  			Class<IERXRestEntityDelegate> entityDelegateClass;
! 			if (entityDelegateClassName == null) {
  				entityDelegateClassName = entity.name() + "RestEntityDelegate";
  				entityDelegateClass = _NSUtilities.classWithName(entityDelegateClassName);
--- 234,238 ----
  			String entityDelegateClassName = ERXProperties.stringForKey("ERXRest." + entity.name() + ".delegate");
  			Class<IERXRestEntityDelegate> entityDelegateClass;
! 			if (entityDelegateClassName == null && _guessDelegateNames) {
  				entityDelegateClassName = entity.name() + "RestEntityDelegate";
  				entityDelegateClass = _NSUtilities.classWithName(entityDelegateClassName);