May 2009 - hibernate-commits - Jboss List Archives

Hibernate SVN: r16612 - in core/branches/envers-hibernate-3.3: src/main/java/org/hibernate/envers/ant and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: adamw Date: 2009-05-22 02:45:23 -0400 (Fri, 22 May 2009) New Revision: 16612 Modified: core/branches/envers-hibernate-3.3/pom.xml core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java core/branches/envers-hibernate-3.3/src/main/java/org/jboss/envers/VersionsReaderFactory.java Log: svn merge -r 16502:16611 https://svn.jboss.org/repos/hibernate/core/trunk/envers . Modified: core/branches/envers-hibernate-3.3/pom.xml =================================================================== --- core/branches/envers-hibernate-3.3/pom.xml 2009-05-21 16:00:20 UTC (rev 16611) +++ core/branches/envers-hibernate-3.3/pom.xml 2009-05-22 06:45:23 UTC (rev 16612) @@ -70,8 +70,8 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> + <groupId>org.hibernate.java-persistence</groupId> + <artifactId>jpa-api</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -149,9 +149,9 @@ <version>3.2.0.ga</version> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> + <groupId>org.hibernate.java-persistence</groupId> + <artifactId>jpa-api</artifactId> + <version>2.0.Beta2</version> </dependency> <dependency> <groupId>ant</groupId> Modified: core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java =================================================================== --- core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2009-05-21 16:00:20 UTC (rev 16611) +++ core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2009-05-22 06:45:23 UTC (rev 16612) @@ -33,8 +33,8 @@ */ public class AnnotationConfigurationTaskWithEnvers extends AnnotationConfigurationTask { protected void doConfiguration(Configuration configuration) { - AuditConfiguration.getFor(configuration); - - super.doConfiguration(configuration); + super.doConfiguration(configuration); + configuration.buildMappings(); + AuditConfiguration.getFor(configuration); } } Modified: core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java =================================================================== --- core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2009-05-21 16:00:20 UTC (rev 16611) +++ core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2009-05-22 06:45:23 UTC (rev 16612) @@ -161,6 +161,11 @@ EntityConfiguration referencedEntityConfiguration = mainGenerator.getEntitiesConfigurations() .get(referencedEntityName); + if (referencedEntityConfiguration == null) { + throwRelationNotAudited(referencedEntityName); + // Impossible to get here. + throw new AssertionError(); + } IdMappingData referencedIdMapping = referencedEntityConfiguration.getIdMappingData(); IdMappingData referencingIdMapping = referencingEntityConfiguration.getIdMappingData(); @@ -378,8 +383,14 @@ String prefixRelated = prefix + "_"; String referencedEntityName = getReferencedEntityName(value); - IdMappingData referencedIdMapping = mainGenerator.getEntitiesConfigurations() - .get(referencedEntityName).getIdMappingData(); + EntityConfiguration referencedEntityConfiguration = mainGenerator.getEntitiesConfigurations() + .get(referencedEntityName); + if (referencedEntityConfiguration == null) { + throwRelationNotAudited(referencedEntityName); + // Impossible to get here. + throw new AssertionError(); + } + IdMappingData referencedIdMapping = referencedEntityConfiguration.getIdMappingData(); // Adding related-entity (in this case: the referenced entities id) id mapping to the xml only if the // relation isn't inverse (so when <code>xmlMapping</code> is not null). @@ -520,4 +531,9 @@ throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in " + referencingEntityName + "!"); } + + private void throwRelationNotAudited(String referencedEntityName) { + throw new MappingException("An audited relation from " + referencingEntityName + + " to a non-audited entity: " + referencedEntityName); + } } Property changes on: core/branches/envers-hibernate-3.3/src/main/java/org/jboss/envers/VersionsReaderFactory.java ___________________________________________________________________ Name: svn:mergeinfo -

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16611 - in core/branches/Branch_3_3/core/src/main/java/org/hibernate: exception and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-05-21 12:00:20 -0400 (Thu, 21 May 2009) New Revision: 16611 Removed: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/ExceptionUtils.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/Nestable.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableDelegate.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableException.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/AssertionFailure.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/HibernateException.java Log: HHH-3918 - Use standard JDK exception nesting Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/AssertionFailure.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/AssertionFailure.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/AssertionFailure.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -24,8 +24,6 @@ */ package org.hibernate; -import org.hibernate.exception.NestableRuntimeException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +32,7 @@ * * @author Gavin King */ -public class AssertionFailure extends NestableRuntimeException { +public class AssertionFailure extends RuntimeException { private static final Logger log = LoggerFactory.getLogger( AssertionFailure.class ); Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/HibernateException.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/HibernateException.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/HibernateException.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -24,19 +24,18 @@ */ package org.hibernate; -import org.hibernate.exception.NestableRuntimeException; - /** - * Any exception that occurs inside the persistence layer - * or JDBC driver. <tt>SQLException</tt>s are always wrapped - * by instances of <tt>JDBCException</tt>. - * + * The base {@link Throwable} type for Hibernate. + * + * Note that all {@link java.sql.SQLException SQLExceptions} will be wrapped in some form of + * {@link JDBCException}. + * * @see JDBCException + * * @author Gavin King */ +public class HibernateException extends RuntimeException { -public class HibernateException extends NestableRuntimeException { - public HibernateException(Throwable root) { super(root); } Deleted: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/ExceptionUtils.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/ExceptionUtils.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/ExceptionUtils.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -1,705 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import org.hibernate.util.ArrayHelper; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.StringTokenizer; - -/** - * Provides utilities for manipulating and examining - * <code>Throwable</code> objects. - * - * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a> - * @author Dmitri Plotnikov - * @author Stephen Colebourne - * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a> - * @author Pete Gieser - * @version $Id: ExceptionUtils.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public final class ExceptionUtils { - - private static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); - - /** - * Used when printing stack frames to denote the start of a - * wrapped exception. - * - * Package private for accessibility by test suite. - */ - static final String WRAPPED_MARKER = " [wrapped] "; - - /** - * The names of methods commonly used to access a wrapped exception. - */ - private static final String[] CAUSE_METHOD_NAMES = { - "getCause", - "getNextException", - "getTargetException", - "getException", - "getSourceException", - "getRootCause", - "getCausedByException", - "getNested" - }; - - /** - * The Method object for JDK1.4 getCause. - */ - private static final Method THROWABLE_CAUSE_METHOD; - - static { - Method getCauseMethod; - try { - getCauseMethod = Throwable.class.getMethod( "getCause", null ); - } - catch ( Exception e ) { - getCauseMethod = null; - } - THROWABLE_CAUSE_METHOD = getCauseMethod; - } - - private ExceptionUtils() { - } - - //----------------------------------------------------------------------- - /** - * Adds to the list of method names used in the search for <code>Throwable</code> - * objects. - * - * @param methodName the methodName to add to the list, <code>null</code> - * and empty strings are ignored - * @since 2.0 - */ - /*public static void addCauseMethodName(String methodName) { - if ( StringHelper.isNotEmpty(methodName) ) { - List list = new ArrayList( Arrays.asList(CAUSE_METHOD_NAMES ); - list.add(methodName); - CAUSE_METHOD_NAMES = (String[]) list.toArray(new String[list.size()]); - } - }*/ - - /** - * Introspects the <code>Throwable</code> to obtain the cause. - * - * The method searches for methods with specific names that return a - * <code>Throwable</code> object. This will pick up most wrapping exceptions, - * including those from JDK 1.4, and - * {@link org.apache.commons.lang.exception.NestableException NestableException}. - * The method names can be added to using {@link #addCauseMethodName(String)}. - * - * The default list searched for are: - * <ul> - * <li><code>getCause()</code></li> - * <li><code>getNextException()</code></li> - * <li><code>getTargetException()</code></li> - * <li><code>getException()</code></li> - * <li><code>getSourceException()</code></li> - * <li><code>getRootCause()</code></li> - * <li><code>getCausedByException()</code></li> - * <li><code>getNested()</code></li> - * </ul> - * - * In the absence of any such method, the object is inspected for a - * <code>detail</code> field assignable to a <code>Throwable</code>. - * - * If none of the above is found, returns <code>null</code>. - * - * @param throwable the throwable to introspect for a cause, may be null - * @return the cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getCause(Throwable throwable) { - return getCause( throwable, CAUSE_METHOD_NAMES ); - } - - /** - * Introspects the <code>Throwable</code> to obtain the cause. - * - * <ol> - * <li>Try known exception types.</li> - * <li>Try the supplied array of method names.</li> - * <li>Try the field 'detail'.</li> - * </ol> - * - * A <code>null</code> set of method names means use the default set. - * A <code>null</code> in the set of method names will be ignored. - * - * @param throwable the throwable to introspect for a cause, may be null - * @param methodNames the method names, null treated as default set - * @return the cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getCause(Throwable throwable, String[] methodNames) { - if ( throwable == null ) { - return null; - } - Throwable cause = getCauseUsingWellKnownTypes( throwable ); - if ( cause == null ) { - if ( methodNames == null ) { - methodNames = CAUSE_METHOD_NAMES; - } - for ( int i = 0; i < methodNames.length; i++ ) { - String methodName = methodNames[i]; - if ( methodName != null ) { - cause = getCauseUsingMethodName( throwable, methodName ); - if ( cause != null ) { - break; - } - } - } - - if ( cause == null ) { - cause = getCauseUsingFieldName( throwable, "detail" ); - } - } - return cause; - } - - /** - * Introspects the <code>Throwable</code> to obtain the root cause. - * - * This method walks through the exception chain to the last element, - * "root" of the tree, using {@link #getCause(Throwable)}, and - * returns that exception. - * - * @param throwable the throwable to get the root cause for, may be null - * @return the root cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getRootCause(Throwable throwable) { - Throwable cause = getCause( throwable ); - if ( cause != null ) { - throwable = cause; - while ( ( throwable = getCause( throwable ) ) != null ) { - cause = throwable; - } - } - return cause; - } - - /** - * Finds a <code>Throwable</code> for known types. - * - * Uses <code>instanceof</code> checks to examine the exception, - * looking for well known types which could contain chained or - * wrapped exceptions. - * - * @param throwable the exception to examine - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingWellKnownTypes(Throwable throwable) { - if ( throwable instanceof Nestable ) { - return ( ( Nestable ) throwable ).getCause(); - } - else if ( throwable instanceof SQLException ) { - return ( ( SQLException ) throwable ).getNextException(); - } - else if ( throwable instanceof InvocationTargetException ) { - return ( ( InvocationTargetException ) throwable ).getTargetException(); - } - else { - return null; - } - } - - /** - * Finds a <code>Throwable</code> by method name. - * - * @param throwable the exception to examine - * @param methodName the name of the method to find and invoke - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingMethodName(Throwable throwable, String methodName) { - Method method = null; - try { - method = throwable.getClass().getMethod( methodName, null ); - } - catch ( NoSuchMethodException ignored ) { - } - catch ( SecurityException ignored ) { - } - - if ( method != null && Throwable.class.isAssignableFrom( method.getReturnType() ) ) { - try { - return ( Throwable ) method.invoke( throwable, ArrayHelper.EMPTY_OBJECT_ARRAY ); - } - catch ( IllegalAccessException ignored ) { - } - catch ( IllegalArgumentException ignored ) { - } - catch ( InvocationTargetException ignored ) { - } - } - return null; - } - - /** - * Finds a <code>Throwable</code> by field name. - * - * @param throwable the exception to examine - * @param fieldName the name of the attribute to examine - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingFieldName(Throwable throwable, String fieldName) { - Field field = null; - try { - field = throwable.getClass().getField( fieldName ); - } - catch ( NoSuchFieldException ignored ) { - } - catch ( SecurityException ignored ) { - } - - if ( field != null && Throwable.class.isAssignableFrom( field.getType() ) ) { - try { - return ( Throwable ) field.get( throwable ); - } - catch ( IllegalAccessException ignored ) { - } - catch ( IllegalArgumentException ignored ) { - } - } - return null; - } - - //----------------------------------------------------------------------- - /** - * Checks if the Throwable class has a <code>getCause</code> method. - * - * This is true for JDK 1.4 and above. - * - * @return true if Throwable is nestable - * @since 2.0 - */ - public static boolean isThrowableNested() { - return ( THROWABLE_CAUSE_METHOD != null ); - } - - /** - * Checks whether this <code>Throwable</code> class can store a cause. - * - * This method does not check whether it actually does store a cause. - * - * @param throwable the <code>Throwable</code> to examine, may be null - * @return boolean <code>true</code> if nested otherwise <code>false</code> - * @since 2.0 - */ - public static boolean isNestedThrowable(Throwable throwable) { - if ( throwable == null ) { - return false; - } - - if ( throwable instanceof Nestable ) { - return true; - } - else if ( throwable instanceof SQLException ) { - return true; - } - else if ( throwable instanceof InvocationTargetException ) { - return true; - } - else if ( isThrowableNested() ) { - return true; - } - - Class cls = throwable.getClass(); - for ( int i = 0, isize = CAUSE_METHOD_NAMES.length; i < isize; i++ ) { - try { - Method method = cls.getMethod( CAUSE_METHOD_NAMES[i], null ); - if ( method != null && Throwable.class.isAssignableFrom( method.getReturnType() ) ) { - return true; - } - } - catch ( NoSuchMethodException ignored ) { - } - catch ( SecurityException ignored ) { - } - } - - try { - Field field = cls.getField( "detail" ); - if ( field != null ) { - return true; - } - } - catch ( NoSuchFieldException ignored ) { - } - catch ( SecurityException ignored ) { - } - - return false; - } - - //----------------------------------------------------------------------- - /** - * Counts the number of <code>Throwable</code> objects in the - * exception chain. - * - * A throwable without cause will return <code>1</code>. - * A throwable with one cause will return <code>2</code> and so on. - * A <code>null</code> throwable will return <code>0</code>. - * - * @param throwable the throwable to inspect, may be null - * @return the count of throwables, zero if null input - */ - public static int getThrowableCount(Throwable throwable) { - int count = 0; - while ( throwable != null ) { - count++; - throwable = ExceptionUtils.getCause( throwable ); - } - return count; - } - - /** - * Returns the list of <code>Throwable</code> objects in the - * exception chain. - * - * A throwable without cause will return an array containing - * one element - the input throwable. - * A throwable with one cause will return an array containing - * two elements. - the input throwable and the cause throwable. - * A <code>null</code> throwable will return an array size zero. - * - * @param throwable the throwable to inspect, may be null - * @return the array of throwables, never null - */ - public static Throwable[] getThrowables(Throwable throwable) { - List list = new ArrayList(); - while ( throwable != null ) { - list.add( throwable ); - throwable = ExceptionUtils.getCause( throwable ); - } - return ( Throwable[] ) list.toArray( new Throwable[list.size()] ); - } - - //----------------------------------------------------------------------- - /** - * Returns the (zero based) index of the first <code>Throwable</code> - * that matches the specified type in the exception chain. - * - * A <code>null</code> throwable returns <code>-1</code>. - * A <code>null</code> type returns <code>-1</code>. - * No match in the chain returns <code>-1</code>. - * - * @param throwable the throwable to inspect, may be null - * @param type the type to search for - * @return the index into the throwable chain, -1 if no match or null input - */ - public static int indexOfThrowable(Throwable throwable, Class type) { - return indexOfThrowable( throwable, type, 0 ); - } - - /** - * Returns the (zero based) index of the first <code>Throwable</code> - * that matches the specified type in the exception chain from - * a specified index. - * - * A <code>null</code> throwable returns <code>-1</code>. - * A <code>null</code> type returns <code>-1</code>. - * No match in the chain returns <code>-1</code>. - * A negative start index is treated as zero. - * A start index greater than the number of throwables returns <code>-1</code>. - * - * @param throwable the throwable to inspect, may be null - * @param type the type to search for - * @param fromIndex the (zero based) index of the starting position, - * negative treated as zero, larger than chain size returns -1 - * @return the index into the throwable chain, -1 if no match or null input - */ - public static int indexOfThrowable(Throwable throwable, Class type, int fromIndex) { - if ( throwable == null ) { - return -1; - } - if ( fromIndex < 0 ) { - fromIndex = 0; - } - Throwable[] throwables = ExceptionUtils.getThrowables( throwable ); - if ( fromIndex >= throwables.length ) { - return -1; - } - for ( int i = fromIndex; i < throwables.length; i++ ) { - if ( throwables[i].getClass().equals( type ) ) { - return i; - } - } - return -1; - } - - //----------------------------------------------------------------------- - /** - * Prints a compact stack trace for the root cause of a throwable - * to <code>System.err</code>. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable) { - printRootCauseStackTrace( throwable, System.err ); - } - - /** - * Prints a compact stack trace for the root cause of a throwable. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output, may be null - * @param stream the stream to output to, may not be null - * @throws IllegalArgumentException if the stream is <code>null</code> - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable, PrintStream stream) { - if ( throwable == null ) { - return; - } - if ( stream == null ) { - throw new IllegalArgumentException( "The PrintStream must not be null" ); - } - String trace[] = getRootCauseStackTrace( throwable ); - for ( int i = 0; i < trace.length; i++ ) { - stream.println( trace[i] ); - } - stream.flush(); - } - - /** - * Prints a compact stack trace for the root cause of a throwable. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output, may be null - * @param writer the writer to output to, may not be null - * @throws IllegalArgumentException if the writer is <code>null</code> - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable, PrintWriter writer) { - if ( throwable == null ) { - return; - } - if ( writer == null ) { - throw new IllegalArgumentException( "The PrintWriter must not be null" ); - } - String trace[] = getRootCauseStackTrace( throwable ); - for ( int i = 0; i < trace.length; i++ ) { - writer.println( trace[i] ); - } - writer.flush(); - } - - //----------------------------------------------------------------------- - /** - * Creates a compact stack trace for the root cause of the supplied - * <code>Throwable</code>. - * - * @param throwable the throwable to examine, may be null - * @return an array of stack trace frames, never null - * @since 2.0 - */ - public static String[] getRootCauseStackTrace(Throwable throwable) { - if ( throwable == null ) { - return ArrayHelper.EMPTY_STRING_ARRAY; - } - Throwable throwables[] = getThrowables( throwable ); - int count = throwables.length; - ArrayList frames = new ArrayList(); - List nextTrace = getStackFrameList( throwables[count - 1] ); - for ( int i = count; --i >= 0; ) { - List trace = nextTrace; - if ( i != 0 ) { - nextTrace = getStackFrameList( throwables[i - 1] ); - removeCommonFrames( trace, nextTrace ); - } - if ( i == count - 1 ) { - frames.add( throwables[i].toString() ); - } - else { - frames.add( WRAPPED_MARKER + throwables[i].toString() ); - } - for ( int j = 0; j < trace.size(); j++ ) { - frames.add( trace.get( j ) ); - } - } - return ( String[] ) frames.toArray( new String[0] ); - } - - /** - * Removes common frames from the cause trace given the two stack traces. - * - * @param causeFrames stack trace of a cause throwable - * @param wrapperFrames stack trace of a wrapper throwable - * @throws IllegalArgumentException if either argument is null - * @since 2.0 - */ - public static void removeCommonFrames(List causeFrames, List wrapperFrames) { - if ( causeFrames == null || wrapperFrames == null ) { - throw new IllegalArgumentException( "The List must not be null" ); - } - int causeFrameIndex = causeFrames.size() - 1; - int wrapperFrameIndex = wrapperFrames.size() - 1; - while ( causeFrameIndex >= 0 && wrapperFrameIndex >= 0 ) { - // Remove the frame from the cause trace if it is the same - // as in the wrapper trace - String causeFrame = ( String ) causeFrames.get( causeFrameIndex ); - String wrapperFrame = ( String ) wrapperFrames.get( wrapperFrameIndex ); - if ( causeFrame.equals( wrapperFrame ) ) { - causeFrames.remove( causeFrameIndex ); - } - causeFrameIndex--; - wrapperFrameIndex--; - } - } - - //----------------------------------------------------------------------- - /** - * Gets the stack trace from a Throwable as a String. - * - * @param throwable the <code>Throwable</code> to be examined - * @return the stack trace as generated by the exception's - * <code>printStackTrace(PrintWriter)</code> method - */ - public static String getStackTrace(Throwable throwable) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - throwable.printStackTrace( pw ); - return sw.getBuffer().toString(); - } - - /** - * A way to get the entire nested stack-trace of an throwable. - * - * @param throwable the <code>Throwable</code> to be examined - * @return the nested stack trace, with the root cause first - * @since 2.0 - */ - public static String getFullStackTrace(Throwable throwable) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - Throwable[] ts = getThrowables( throwable ); - for ( int i = 0; i < ts.length; i++ ) { - ts[i].printStackTrace( pw ); - if ( isNestedThrowable( ts[i] ) ) { - break; - } - } - return sw.getBuffer().toString(); - } - - //----------------------------------------------------------------------- - /** - * Captures the stack trace associated with the specified - * <code>Throwable</code> object, decomposing it into a list of - * stack frames. - * - * @param throwable the <code>Throwable</code> to exaamine, may be null - * @return an array of strings describing each stack frame, never null - */ - public static String[] getStackFrames(Throwable throwable) { - if ( throwable == null ) { - return ArrayHelper.EMPTY_STRING_ARRAY; - } - return getStackFrames( getStackTrace( throwable ) ); - } - - /** - * Functionality shared between the - * <code>getStackFrames(Throwable)</code> methods of this and the - * {@link org.apache.commons.lang.exception.NestableDelegate} - * classes. - */ - static String[] getStackFrames(String stackTrace) { - String linebreak = LINE_SEPARATOR; - StringTokenizer frames = new StringTokenizer( stackTrace, linebreak ); - List list = new LinkedList(); - while ( frames.hasMoreTokens() ) { - list.add( frames.nextToken() ); - } - return ( String[] ) list.toArray( new String[list.size()] ); - } - - /** - * Produces a <code>List</code> of stack frames - the message - * is not included. - * - * This works in most cases - it will only fail if the exception - * message contains a line that starts with: - * <code>"   at".</code> - * - * @param t is any throwable - * @return List of stack frames - */ - static List getStackFrameList(Throwable t) { - String stackTrace = getStackTrace( t ); - String linebreak = LINE_SEPARATOR; - StringTokenizer frames = new StringTokenizer( stackTrace, linebreak ); - List list = new LinkedList(); - boolean traceStarted = false; - while ( frames.hasMoreTokens() ) { - String token = frames.nextToken(); - // Determine if the line starts with <whitespace>at - int at = token.indexOf( "at" ); - if ( at != -1 && token.substring( 0, at ).trim().length() == 0 ) { - traceStarted = true; - list.add( token ); - } - else if ( traceStarted ) { - break; - } - } - return list; - } - -} Deleted: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/Nestable.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/Nestable.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/Nestable.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -1,174 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; - -/** - * An interface to be implemented by {@link java.lang.Throwable} - * extensions which would like to be able to nest root exceptions - * inside themselves. - * - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @author Pete Gieser - * @version $Id: Nestable.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public interface Nestable { - - /** - * Returns the reference to the exception or error that caused the - * exception implementing the <code>Nestable</code> to be thrown. - * - * @return throwable that caused the original exception - */ - public Throwable getCause(); - - /** - * Returns the error message of this and any nested - * <code>Throwable</code>. - * - * @return the error message - */ - public String getMessage(); - - /** - * Returns the error message of the <code>Throwable</code> in the chain - * of <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index of the <code>Throwable</code> in the chain of - * <code>Throwable</code>s - * @return the error message, or null if the <code>Throwable</code> at the - * specified index in the chain does not contain a message - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public String getMessage(int index); - - /** - * Returns the error message of this and any nested <code>Throwable</code>s - * in an array of Strings, one element for each message. Any - * <code>Throwable</code> not containing a message is represented in the - * array by a null. This has the effect of cause the length of the returned - * array to be equal to the result of the {@link #getThrowableCount()} - * operation. - * - * @return the error messages - */ - public String[] getMessages(); - - /** - * Returns the <code>Throwable</code> in the chain of - * <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index, numbered from 0, of the <code>Throwable</code> in - * the chain of <code>Throwable</code>s - * @return the <code>Throwable</code> - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public Throwable getThrowable(int index); - - /** - * Returns the number of nested <code>Throwable</code>s represented by - * this <code>Nestable</code>, including this <code>Nestable</code>. - * - * @return the throwable count - */ - public int getThrowableCount(); - - /** - * Returns this <code>Nestable</code> and any nested <code>Throwable</code>s - * in an array of <code>Throwable</code>s, one element for each - * <code>Throwable</code>. - * - * @return the <code>Throwable</code>s - */ - public Throwable[] getThrowables(); - - /** - * Returns the index, numbered from 0, of the first occurrence of the - * specified type in the chain of <code>Throwable</code>s, or -1 if the - * specified type is not found in the chain. - * - * @param type <code>Class</code> to be found - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - */ - public int indexOfThrowable(Class type); - - /** - * Returns the index, numbered from 0, of the first <code>Throwable</code> - * that matches the specified type in the chain of <code>Throwable</code>s - * with an index greater than or equal to the specified index, or -1 if - * the type is not found. - * - * @param type <code>Class</code> to be found - * @param fromIndex the index, numbered from 0, of the starting position in - * the chain to be searched - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - * @throws IndexOutOfBoundsException if the <code>fromIndex</code> argument - * is negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public int indexOfThrowable(Class type, int fromIndex); - - /** - * Prints the stack trace of this exception to the specified print - * writer. Includes information from the exception, if any, - * which caused this exception. - * - * @param out <code>PrintWriter</code> to use for output. - */ - public void printStackTrace(PrintWriter out); - - /** - * Prints the stack trace of this exception to the specified print - * stream. Includes inforamation from the exception, if any, - * which caused this exception. - * - * @param out <code>PrintStream</code> to use for output. - */ - public void printStackTrace(PrintStream out); - - /** - * Prints the stack trace for this exception only--root cause not - * included--using the provided writer. Used by {@link - * org.apache.commons.lang.exception.NestableDelegate} to write - * individual stack traces to a buffer. The implementation of - * this method should call - * <code>super.printStackTrace(out);</code> in most cases. - * - * @param out The writer to use. - */ - public void printPartialStackTrace(PrintWriter out); - -} Deleted: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableDelegate.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableDelegate.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableDelegate.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -1,383 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.Serializable; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** - * A shared implementation of the nestable exception functionality. - * - * The code is shared between - * {@link org.apache.commons.lang.exception.NestableError NestableError}, - * {@link org.apache.commons.lang.exception.NestableException NestableException} and - * {@link org.apache.commons.lang.exception.NestableRuntimeException NestableRuntimeException}. - * - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @author Sean C. Sullivan - * @author Stephen Colebourne - * @version $Id: NestableDelegate.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public class NestableDelegate implements Serializable { - - /** - * Constructor error message. - */ - private static final String MUST_BE_THROWABLE = - "The Nestable implementation passed to the NestableDelegate(Nestable) " - + "constructor must extend java.lang.Throwable"; - - /** - * Holds the reference to the exception or error that we're - * wrapping (which must be a {@link - * org.apache.commons.lang.exception.Nestable} implementation). - */ - private Throwable nestable = null; - - /** - * Whether to print the stack trace top-down. - * This public flag may be set by calling code, typically in initialisation. - * - * @since 2.0 - */ - private static boolean topDown = true; - - /** - * Whether to trim the repeated stack trace. - * This public flag may be set by calling code, typically in initialisation. - * - * @since 2.0 - */ - private static boolean trimStackFrames = true; - - /** - * Constructs a new <code>NestableDelegate</code> instance to manage the - * specified <code>Nestable</code>. - * - * @param nestable the Nestable implementation (must extend - * {@link java.lang.Throwable}) - * @since 2.0 - */ - public NestableDelegate(Nestable nestable) { - if ( nestable instanceof Throwable ) { - this.nestable = ( Throwable ) nestable; - } - else { - throw new IllegalArgumentException( MUST_BE_THROWABLE ); - } - } - - /** - * Returns the error message of the <code>Throwable</code> in the chain - * of <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index of the <code>Throwable</code> in the chain of - * <code>Throwable</code>s - * @return the error message, or null if the <code>Throwable</code> at the - * specified index in the chain does not contain a message - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public String getMessage(int index) { - Throwable t = this.getThrowable( index ); - if ( Nestable.class.isInstance( t ) ) { - return ( ( Nestable ) t ).getMessage( 0 ); - } - else { - return t.getMessage(); - } - } - - /** - * Returns the full message contained by the <code>Nestable</code> - * and any nested <code>Throwable</code>s. - * - * @param baseMsg the base message to use when creating the full - * message. Should be generally be called via - * <code>nestableHelper.getMessage( super.getMessage() )</code>, - * where <code>super</code> is an instance of {@link - * java.lang.Throwable}. - * @return The concatenated message for this and all nested - * <code>Throwable</code>s - * @since 2.0 - */ - public String getMessage(String baseMsg) { - StringBuffer msg = new StringBuffer(); - if ( baseMsg != null ) { - msg.append( baseMsg ); - } - - Throwable nestedCause = ExceptionUtils.getCause( this.nestable ); - if ( nestedCause != null ) { - String causeMsg = nestedCause.getMessage(); - if ( causeMsg != null ) { - if ( baseMsg != null ) { - msg.append( ": " ); - } - msg.append( causeMsg ); - } - - } - return ( msg.length() > 0 ? msg.toString() : null ); - } - - /** - * Returns the error message of this and any nested <code>Throwable</code>s - * in an array of Strings, one element for each message. Any - * <code>Throwable</code> not containing a message is represented in the - * array by a null. This has the effect of cause the length of the returned - * array to be equal to the result of the {@link #getThrowableCount()} - * operation. - * - * @return the error messages - * @since 2.0 - */ - public String[] getMessages() { - Throwable[] throwables = this.getThrowables(); - String[] msgs = new String[throwables.length]; - for ( int i = 0; i < throwables.length; i++ ) { - msgs[i] = Nestable.class.isInstance( throwables[i] ) ? - ( ( Nestable ) throwables[i] ).getMessage( 0 ) : - throwables[i].getMessage(); - } - return msgs; - } - - /** - * Returns the <code>Throwable</code> in the chain of - * <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index, numbered from 0, of the <code>Throwable</code> in - * the chain of <code>Throwable</code>s - * @return the <code>Throwable</code> - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public Throwable getThrowable(int index) { - if ( index == 0 ) { - return this.nestable; - } - Throwable[] throwables = this.getThrowables(); - return throwables[index]; - } - - /** - * Returns the number of <code>Throwable</code>s contained in the - * <code>Nestable</code> contained by this delegate. - * - * @return the throwable count - * @since 2.0 - */ - public int getThrowableCount() { - return ExceptionUtils.getThrowableCount( this.nestable ); - } - - /** - * Returns this delegate's <code>Nestable</code> and any nested - * <code>Throwable</code>s in an array of <code>Throwable</code>s, one - * element for each <code>Throwable</code>. - * - * @return the <code>Throwable</code>s - * @since 2.0 - */ - public Throwable[] getThrowables() { - return ExceptionUtils.getThrowables( this.nestable ); - } - - /** - * Returns the index, numbered from 0, of the first <code>Throwable</code> - * that matches the specified type in the chain of <code>Throwable</code>s - * held in this delegate's <code>Nestable</code> with an index greater than - * or equal to the specified index, or -1 if the type is not found. - * - * @param type <code>Class</code> to be found - * @param fromIndex the index, numbered from 0, of the starting position in - * the chain to be searched - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - * @throws IndexOutOfBoundsException if the <code>fromIndex</code> argument - * is negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public int indexOfThrowable(Class type, int fromIndex) { - if ( fromIndex < 0 ) { - throw new IndexOutOfBoundsException( "The start index was out of bounds: " + fromIndex ); - } - Throwable[] throwables = ExceptionUtils.getThrowables( this.nestable ); - if ( fromIndex >= throwables.length ) { - throw new IndexOutOfBoundsException( "The start index was out of bounds: " - + fromIndex + " >= " + throwables.length ); - } - for ( int i = fromIndex; i < throwables.length; i++ ) { - if ( throwables[i].getClass().equals( type ) ) { - return i; - } - } - return -1; - } - - /** - * Prints the stack trace of this exception the the standar error - * stream. - */ - public void printStackTrace() { - printStackTrace( System.err ); - } - - /** - * Prints the stack trace of this exception to the specified - * stream. - * - * @param out <code>PrintStream</code> to use for output. - * @see #printStackTrace(PrintWriter) - */ - public void printStackTrace(PrintStream out) { - synchronized ( out ) { - PrintWriter pw = new PrintWriter( out, false ); - printStackTrace( pw ); - // Flush the PrintWriter before it's GC'ed. - pw.flush(); - } - } - - /** - * Prints the stack trace of this exception to the specified - * writer. If the Throwable class has a <code>getCause</code> - * method (i.e. running on jre1.4 or higher), this method just - * uses Throwable's printStackTrace() method. Otherwise, generates - * the stack-trace, by taking into account the 'topDown' and - * 'trimStackFrames' parameters. The topDown and trimStackFrames - * are set to 'true' by default (produces jre1.4-like stack trace). - * - * @param out <code>PrintWriter</code> to use for output. - */ - public void printStackTrace(PrintWriter out) { - Throwable throwable = this.nestable; - // if running on jre1.4 or higher, use default printStackTrace - if ( ExceptionUtils.isThrowableNested() ) { - if ( throwable instanceof Nestable ) { - ( ( Nestable ) throwable ).printPartialStackTrace( out ); - } - else { - throwable.printStackTrace( out ); - } - return; - } - - // generating the nested stack trace - List stacks = new ArrayList(); - while ( throwable != null ) { - String[] st = getStackFrames( throwable ); - stacks.add( st ); - throwable = ExceptionUtils.getCause( throwable ); - } - - // If NOT topDown, reverse the stack - String separatorLine = "Caused by: "; - if ( !topDown ) { - separatorLine = "Rethrown as: "; - Collections.reverse( stacks ); - } - - // Remove the repeated lines in the stack - if ( trimStackFrames ) trimStackFrames( stacks ); - - synchronized ( out ) { - for ( Iterator iter = stacks.iterator(); iter.hasNext(); ) { - String[] st = ( String[] ) iter.next(); - for ( int i = 0, len = st.length; i < len; i++ ) { - out.println( st[i] ); - } - if ( iter.hasNext() ) out.print( separatorLine ); - } - } - } - - /** - * Captures the stack trace associated with the specified - * <code>Throwable</code> object, decomposing it into a list of - * stack frames. - * - * @param t The <code>Throwable</code>. - * @return An array of strings describing each stack frame. - * @since 2.0 - */ - protected String[] getStackFrames(Throwable t) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - - // Avoid infinite loop between decompose() and printStackTrace(). - if ( t instanceof Nestable ) { - ( ( Nestable ) t ).printPartialStackTrace( pw ); - } - else { - t.printStackTrace( pw ); - } - return ExceptionUtils.getStackFrames( sw.getBuffer().toString() ); - } - - /** - * Trims the stack frames. The first set is left untouched. The rest - * of the frames are truncated from the bottom by comparing with - * one just on top. - * - * @param stacks The list containing String[] elements - * @since 2.0 - */ - protected void trimStackFrames(List stacks) { - for ( int size = stacks.size(), i = size - 1; i > 0; i-- ) { - String[] curr = ( String[] ) stacks.get( i ); - String[] next = ( String[] ) stacks.get( i - 1 ); - - List currList = new ArrayList( Arrays.asList( curr ) ); - List nextList = new ArrayList( Arrays.asList( next ) ); - ExceptionUtils.removeCommonFrames( currList, nextList ); - - int trimmed = curr.length - currList.size(); - if ( trimmed > 0 ) { - currList.add( "\t... " + trimmed + " more" ); - stacks.set( i, - currList.toArray( new String[currList.size()] ) ); - } - } - } -} Deleted: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableException.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableException.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableException.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -1,225 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; - -/** - * The base class of all exceptions which can contain other exceptions. - * - * It is intended to ease the debugging by carrying on the information - * about the exception which was caught and provoked throwing the - * current exception. Catching and rethrowing may occur multiple - * times, and provided that all exceptions except the first one - * are descendands of <code>NestedException</code>, when the - * exception is finally printed out using any of the <code> - * printStackTrace()</code> methods, the stacktrace will contain - * the information about all exceptions thrown and caught on - * the way. - * Running the following program - * <blockquote><pre> - * 1 import org.apache.commons.lang.exception.NestableException; - * 2 - * 3 public class Test { - * 4 public static void main( String[] args ) { - * 5 try { - * 6 a(); - * 7 } catch(Exception e) { - * 8 e.printStackTrace(); - * 9 } - * 10 } - * 11 - * 12 public static void a() throws Exception { - * 13 try { - * 14 b(); - * 15 } catch(Exception e) { - * 16 throw new NestableException("foo", e); - * 17 } - * 18 } - * 19 - * 20 public static void b() throws Exception { - * 21 try { - * 22 c(); - * 23 } catch(Exception e) { - * 24 throw new NestableException("bar", e); - * 25 } - * 26 } - * 27 - * 28 public static void c() throws Exception { - * 29 throw new Exception("baz"); - * 30 } - * 31 } - * </pre></blockquote> - * Yields the following stacktrace: - * <blockquote><pre> - * org.apache.commons.lang.exception.NestableException: foo - * at Test.a(Test.java:16) - * at Test.main(Test.java:6) - * Caused by: org.apache.commons.lang.exception.NestableException: bar - * at Test.b(Test.java:24) - * at Test.a(Test.java:14) - * ... 1 more - * Caused by: java.lang.Exception: baz - * at Test.c(Test.java:29) - * at Test.b(Test.java:22) - * ... 2 more - * </pre></blockquote> - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @version $Id: NestableException.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public class NestableException extends Exception implements Nestable { - - /** - * The helper instance which contains much of the code which we - * delegate to. - */ - protected NestableDelegate delegate = new NestableDelegate( this ); - - /** - * Holds the reference to the exception or error that caused - * this exception to be thrown. - */ - private Throwable cause = null; - - /** - * Constructs a new <code>NestableException</code> without specified - * detail message. - */ - public NestableException() { - super(); - } - - /** - * Constructs a new <code>NestableException</code> with specified - * detail message. - * - * @param msg The error message. - */ - public NestableException(String msg) { - super( msg ); - } - - /** - * Constructs a new <code>NestableException</code> with specified - * nested <code>Throwable</code>. - * - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableException(Throwable cause) { - super(); - this.cause = cause; - } - - /** - * Constructs a new <code>NestableException</code> with specified - * detail message and nested <code>Throwable</code>. - * - * @param msg the error message - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableException(String msg, Throwable cause) { - super( msg ); - this.cause = cause; - } - - public Throwable getCause() { - return cause; - } - - /** - * Returns the detail message string of this throwable. If it was - * created with a null message, returns the following: - * ( cause==null ? null : cause.toString() ). - */ - public String getMessage() { - if ( super.getMessage() != null ) { - return super.getMessage(); - } - else if ( cause != null ) { - return cause.toString(); - } - else { - return null; - } - } - - public String getMessage(int index) { - if ( index == 0 ) { - return super.getMessage(); - } - else { - return delegate.getMessage( index ); - } - } - - public String[] getMessages() { - return delegate.getMessages(); - } - - public Throwable getThrowable(int index) { - return delegate.getThrowable( index ); - } - - public int getThrowableCount() { - return delegate.getThrowableCount(); - } - - public Throwable[] getThrowables() { - return delegate.getThrowables(); - } - - public int indexOfThrowable(Class type) { - return delegate.indexOfThrowable( type, 0 ); - } - - public int indexOfThrowable(Class type, int fromIndex) { - return delegate.indexOfThrowable( type, fromIndex ); - } - - public void printStackTrace() { - delegate.printStackTrace(); - } - - public void printStackTrace(PrintStream out) { - delegate.printStackTrace( out ); - } - - public void printStackTrace(PrintWriter out) { - delegate.printStackTrace( out ); - } - - public final void printPartialStackTrace(PrintWriter out) { - super.printStackTrace( out ); - } - -} Deleted: core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java 2009-05-21 14:52:22 UTC (rev 16610) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java 2009-05-21 16:00:20 UTC (rev 16611) @@ -1,185 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.ObjectOutputStream; -import java.io.IOException; - -import antlr.RecognitionException; - -/** - * The base class of all runtime exceptions which can contain other - * exceptions. - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @version $Id: NestableRuntimeException.java 8137 2005-09-09 15:21:10Z epbernard $ - * @see org.apache.commons.lang.exception.NestableException - * @since 1.0 - */ -public class NestableRuntimeException extends RuntimeException implements Nestable { - - /** - * The helper instance which contains much of the code which we - * delegate to. - */ - protected NestableDelegate delegate = new NestableDelegate( this ); - - /** - * Holds the reference to the exception or error that caused - * this exception to be thrown. - */ - private Throwable cause = null; - - /** - * Constructs a new <code>NestableRuntimeException</code> without specified - * detail message. - */ - public NestableRuntimeException() { - super(); - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * detail message. - * - * @param msg the error message - */ - public NestableRuntimeException(String msg) { - super( msg ); - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * nested <code>Throwable</code>. - * - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableRuntimeException(Throwable cause) { - super(); - this.cause = cause; - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * detail message and nested <code>Throwable</code>. - * - * @param msg the error message - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableRuntimeException(String msg, Throwable cause) { - super( msg ); - this.cause = cause; - } - - public Throwable getCause() { - return cause; - } - - /** - * Returns the detail message string of this throwable. If it was - * created with a null message, returns the following: - * ( cause==null ? null : cause.toString( ). - */ - public String getMessage() { - if ( super.getMessage() != null ) { - return super.getMessage(); - } - else if ( cause != null ) { - return cause.toString(); - } - else { - return null; - } - } - - public String getMessage(int index) { - if ( index == 0 ) { - return super.getMessage(); - } - else { - return delegate.getMessage( index ); - } - } - - public String[] getMessages() { - return delegate.getMessages(); - } - - public Throwable getThrowable(int index) { - return delegate.getThrowable( index ); - } - - public int getThrowableCount() { - return delegate.getThrowableCount(); - } - - public Throwable[] getThrowables() { - return delegate.getThrowables(); - } - - public int indexOfThrowable(Class type) { - return delegate.indexOfThrowable( type, 0 ); - } - - public int indexOfThrowable(Class type, int fromIndex) { - return delegate.indexOfThrowable( type, fromIndex ); - } - - public void printStackTrace() { - delegate.printStackTrace(); - } - - public void printStackTrace(PrintStream out) { - delegate.printStackTrace( out ); - } - - public void printStackTrace(PrintWriter out) { - delegate.printStackTrace( out ); - } - - public final void printPartialStackTrace(PrintWriter out) { - super.printStackTrace( out ); - } - - - - private void writeObject(ObjectOutputStream oos) throws IOException { - Throwable tempCause = cause; - //don't propagate RecognitionException, might be not serializable - if ( cause instanceof RecognitionException ) { - cause = null; - } - oos.defaultWriteObject(); - cause = tempCause; - } - -}

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16610 - core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata.

by hibernate-commits＠lists.jboss.org

Author: adamw Date: 2009-05-21 10:52:22 -0400 (Thu, 21 May 2009) New Revision: 16610 Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java Log: HHH-3708: - improving error reporting for relations where only one entity is audited Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2009-05-21 14:13:32 UTC (rev 16609) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2009-05-21 14:52:22 UTC (rev 16610) @@ -161,6 +161,11 @@ EntityConfiguration referencedEntityConfiguration = mainGenerator.getEntitiesConfigurations() .get(referencedEntityName); + if (referencedEntityConfiguration == null) { + throwRelationNotAudited(referencedEntityName); + // Impossible to get here. + throw new AssertionError(); + } IdMappingData referencedIdMapping = referencedEntityConfiguration.getIdMappingData(); IdMappingData referencingIdMapping = referencingEntityConfiguration.getIdMappingData(); @@ -378,8 +383,14 @@ String prefixRelated = prefix + "_"; String referencedEntityName = getReferencedEntityName(value); - IdMappingData referencedIdMapping = mainGenerator.getEntitiesConfigurations() - .get(referencedEntityName).getIdMappingData(); + EntityConfiguration referencedEntityConfiguration = mainGenerator.getEntitiesConfigurations() + .get(referencedEntityName); + if (referencedEntityConfiguration == null) { + throwRelationNotAudited(referencedEntityName); + // Impossible to get here. + throw new AssertionError(); + } + IdMappingData referencedIdMapping = referencedEntityConfiguration.getIdMappingData(); // Adding related-entity (in this case: the referenced entities id) id mapping to the xml only if the // relation isn't inverse (so when <code>xmlMapping</code> is not null). @@ -520,4 +531,9 @@ throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in " + referencingEntityName + "!"); } + + private void throwRelationNotAudited(String referencedEntityName) { + throw new MappingException("An audited relation from " + referencingEntityName + + " to a non-audited entity: " + referencedEntityName); + } }

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16609 - core/trunk/envers/src/main/java/org/hibernate/envers/ant.

by hibernate-commits＠lists.jboss.org

Author: adamw Date: 2009-05-21 10:13:32 -0400 (Thu, 21 May 2009) New Revision: 16609 Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java Log: HHH-3706: - applying patch from Jesse Jose C (thanks!) to fix generating schema in using the ant task when using annotation configuration Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2009-05-20 21:14:27 UTC (rev 16608) +++ core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2009-05-21 14:13:32 UTC (rev 16609) @@ -33,8 +33,8 @@ */ public class AnnotationConfigurationTaskWithEnvers extends AnnotationConfigurationTask { protected void doConfiguration(Configuration configuration) { - AuditConfiguration.getFor(configuration); - - super.doConfiguration(configuration); + super.doConfiguration(configuration); + configuration.buildMappings(); + AuditConfiguration.getFor(configuration); } }

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16608 - in core/branches/Branch_3_3: cache-ehcache and 19 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-05-20 17:14:27 -0400 (Wed, 20 May 2009) New Revision: 16608 Modified: core/branches/Branch_3_3/ core/branches/Branch_3_3/cache-ehcache/ core/branches/Branch_3_3/cache-jbosscache/ core/branches/Branch_3_3/cache-jbosscache2/ core/branches/Branch_3_3/cache-oscache/ core/branches/Branch_3_3/cache-swarmcache/ core/branches/Branch_3_3/connection-c3p0/ core/branches/Branch_3_3/connection-proxool/ core/branches/Branch_3_3/core/ core/branches/Branch_3_3/distribution/ core/branches/Branch_3_3/documentation/ core/branches/Branch_3_3/documentation/manual/ core/branches/Branch_3_3/documentation/releasenotes/ core/branches/Branch_3_3/hibernate-maven-plugin/ core/branches/Branch_3_3/jmx/ core/branches/Branch_3_3/parent/ core/branches/Branch_3_3/testing/ core/branches/Branch_3_3/testsuite/ core/branches/Branch_3_3/tutorials/ core/branches/Branch_3_3/tutorials/eg/ core/branches/Branch_3_3/tutorials/web/ Log: updating svn:ignore Property changes on: core/branches/Branch_3_3 ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml atlassian-ide-plugin.xml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover atlassian-ide-plugin.xml Property changes on: core/branches/Branch_3_3/cache-ehcache ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/cache-jbosscache ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/cache-jbosscache2 ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover .settings bin + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/cache-oscache ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/cache-swarmcache ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/connection-c3p0 ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/connection-proxool ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/core ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/distribution ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/documentation ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/documentation/manual ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/documentation/releasenotes ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/hibernate-maven-plugin ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/jmx ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/parent ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/testing ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/testsuite ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/tutorials ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/tutorials/eg ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Property changes on: core/branches/Branch_3_3/tutorials/web ___________________________________________________________________ Name: svn:ignore - target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover + target local bin *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16606 - beanvalidation/trunk/validation-tck/src/main/resources.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-05-20 07:58:04 -0400 (Wed, 20 May 2009) New Revision: 16606 Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml Log: Further work on the TCK assertions. Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-05-20 09:42:21 UTC (rev 16605) +++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-05-20 11:58:04 UTC (rev 16606) @@ -234,11 +234,132 @@ raised</text> </assertion> </section> + <section id="3.1" title="Requirements on classes to be validated"> + <assertion id="a"> + <text>Properties to be validated must follow the method signature conventions for + JavaBeans read properties, as defined by the JavaBeans specification</text> + </assertion> + <assertion id="b"> + <text>Static fields and static methods are excluded from validation</text> + </assertion> + <assertion id="c"> + <text>Constraints can be applied to interfaces and superclasses</text> + </assertion> + <assertion id="d"> + <text>The target of an annotation definition can be a field, property, or type, provided + that the constraint definition supports the specified target and the constraint + supports the declared type of the target. </text> + </assertion> + </section> + <section id="3.1.1" title="Object validation"> + <assertion id="a"> + <text>Constraint declarations can be applied to a class or an interface</text> + </assertion> + </section> + <section id="3.1.2" title="Field and property validation"> + <assertion id="a"> + <text>Constraint declarations can be applied on both fields and properties for the same + object type</text> + </assertion> + <assertion id="b"> + <text>The same constraint should however not be duplicated between a field and its + associated property (the constraint validation would be applied twice)</text> + </assertion> + <assertion id="c"> + <text>When a field is annotated with a constraint declaration, field access strategy is + used to access the state validated by such constraint</text> + </assertion> + <assertion id="d"> + <text>When a property is annotated with a constraint declaration, property access + strategy is used to access the state val- idated by such constraint</text> + </assertion> + <assertion id="e"> + <text>When using field access strategy, the bean validation provider accesses the + instance variable directly</text> + </assertion> + <assertion id="f"> + <text>When using the property access strategy, the bean validation provider accesses the + state via the property accessor method.</text> + </assertion> + <assertion id="g"> + <text>The fields or methods visibility are not constrained</text> + </assertion> + <assertion id="h"> + <text>Constraints on non getter methods are not supported</text> + </assertion> + </section> + <section id="3.1.3" title="Graph validation"> + <assertion id="a"> + <text>Consider the situation where bean X contains a field of type Y. By annotating + field Y with the @Valid annotation, the Validator will validate Y (and its + properties) when X is validated.</text> + </assertion> + <assertion id="b"> + <text> The exact type Z of the value contained in the field declared of type Y + (subclass, implementation) is determined at runtime. The constraint definitions of Z + are used</text> + </assertion> + <assertion id="c"> + <text>Collection-valued, array-valued or Iterable fields and properties may also be + decorated with the @Valid annota- tion. This causes the contents of the collection, + array or iterator to be validated</text> + </assertion> + <assertion id="d"> + <text>The following types are supported, any array of objects, java.util.Collection, + java.util.Set, java.util.List, java.util.Map and any object implementing + java.lang.Iterable </text> + </assertion> + <assertion id="e"> + <text>For Map, the value of each entry is validated (the key is not validated)</text> + </assertion> + <assertion id="f"> + <text>Like regular references, its type is determined at runtime and the constraint + definitions for this particular type are used</text> + </assertion> + <assertion id="g"> + <text>The @Valid annotation is applied recursively</text> + </assertion> + </section> + <section id="3.3" title="Inheritance"> + <assertion id="a"> + <text>A constraint declaration can be placed on an interface</text> + </assertion> + <assertion id="b"> + <text>For a given class, constraint declarations held on super- classes as well as + interfaces are evaluated by the Bean Validation provider</text> + </assertion> + </section> + <section id="3.4" title="Group and group sequence"> + <assertion id="a"> + <text>If no group is explicitly declared, a constraint belongs to the Default + group</text> + </assertion> + <assertion id="b"> + <text>Groups are represented by interfaces</text> + </assertion> + <assertion id="c"> + <text>A constraint can belong to one or more groups</text> + </assertion> + <assertion id="d"> + <text>During the validation call, one or more groups are validated. All the constraints + belonging to this set of group is evaluated on the object graph</text> + </assertion> + </section> + <section id="3.4.1" title="Group inheritance"> + <assertion id="a"> + <text>A group can inherit one or more groups by using interface inheritance</text> + </assertion> + <assertion id="b"> + <text>For a given interface Z, constraints marked as belonging to the group Z (ie where + the annotation groups property contains the interface Z) or any of the super + interfaces of Z (inherited groups) are considered part of the group Z</text> + </assertion> + </section>  - + </specification>

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16605 - in validator/trunk/hibernate-validator/src: main/java/org/hibernate/validation/engine/xml and 7 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-05-20 05:42:21 -0400 (Wed, 20 May 2009) New Revision: 16605 Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/Order.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/OrderLine.java validator/trunk/hibernate-validator/src/test/resources/org/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/order-constraints.xml validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/validation.xml Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorFactoryImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java Log: HV-159 Added tests and bug fix Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorFactoryImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorFactoryImpl.java 2009-05-20 04:39:00 UTC (rev 16604) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorFactoryImpl.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -93,15 +93,17 @@ BeanMetaDataImpl<?> metaData = new BeanMetaDataImpl<T>( ( Class<T> ) beanClass, constraintHelper, annotationIgnores ); - for ( MetaConstraint<?, ? extends Annotation> constraint : mappingParser.getConstraintMap() - .get( beanClass ) ) { + + for ( MetaConstraint<?, ? extends Annotation> constraint : mappingParser.getConstraintsForClass( beanClass ) ) { metaData.addMetaConstraint( constraint ); } - for ( Member m : mappingParser.getCascadedMembers().get( beanClass ) ) { + + for ( Member m : mappingParser.getCascadedMembersForClass( beanClass ) ) { metaData.addCascadedMember( m ); } - if ( mappingParser.getDefaultSequences().containsKey( beanClass ) ) { - metaData.setDefaultGroupSequence( mappingParser.getDefaultSequences().get( beanClass ) ); + + if ( !mappingParser.getDefaultSequenceForClass( beanClass ).isEmpty() ) { + metaData.setDefaultGroupSequence( mappingParser.getDefaultSequenceForClass( beanClass ) ); } beanMetaDataCache.addBeanMetaData( ( Class<T> ) beanClass, ( BeanMetaDataImpl<T> ) metaData ); } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-20 04:39:00 UTC (rev 16604) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -118,7 +118,7 @@ for ( JAXBElement<String> mappingFileName : config.getConstraintMapping() ) { if ( log.isDebugEnabled() ) { log.debug( - "Trying to open input stream for {}.", mappingFileName + "Trying to open input stream for {}.", mappingFileName.getValue() ); InputStream in = getInputStreamForPath( mappingFileName.getValue() ); if ( in == null ) { Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java 2009-05-20 04:39:00 UTC (rev 16604) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -27,6 +27,7 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -127,16 +128,31 @@ return annotationIgnores; } - public Map<Class<?>, List<MetaConstraint<?, ? extends Annotation>>> getConstraintMap() { - return constraintMap; + public List<MetaConstraint<?, ? extends Annotation>> getConstraintsForClass(Class<?> beanClass) { + if ( constraintMap.containsKey( beanClass ) ) { + return constraintMap.get( beanClass ); + } + else { + return Collections.emptyList(); + } } - public Map<Class<?>, List<Member>> getCascadedMembers() { - return cascadedMembers; + public List<Member> getCascadedMembersForClass(Class<?> beanClass) { + if ( cascadedMembers.containsKey( beanClass ) ) { + return cascadedMembers.get( beanClass ); + } + else { + return Collections.emptyList(); + } } - public Map<Class<?>, List<Class<?>>> getDefaultSequences() { - return defaultSequences; + public List<Class<?>> getDefaultSequenceForClass(Class<?> beanClass) { + if ( defaultSequences.containsKey( beanClass ) ) { + return defaultSequences.get( beanClass ); + } + else { + return Collections.emptyList(); + } } @SuppressWarnings("unchecked") Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/Order.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/Order.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/Order.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -0,0 +1,32 @@ +// $Id$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validation.engine.xml; + +import java.util.Date; +import java.util.List; + +/** + * @author Hardy Ferentschik + */ +public class Order { + + private Date orderDate; + + private List<OrderLine> orderLines; + +} \ No newline at end of file Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/Order.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/OrderLine.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/OrderLine.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/OrderLine.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -0,0 +1,24 @@ +// $Id$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validation.engine.xml; + +/** + * @author Hardy Ferentschik + */ +public class OrderLine { +} Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/OrderLine.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java 2009-05-20 04:39:00 UTC (rev 16604) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java 2009-05-20 09:42:21 UTC (rev 16605) @@ -22,6 +22,7 @@ import javax.validation.ValidationException; import javax.validation.Validator; +import static org.testng.Assert.assertFalse; import org.testng.annotations.Test; import org.hibernate.validation.util.TestUtil; @@ -131,4 +132,15 @@ public void testInvalidValidationXml() { getValidatorWithCustomConfiguration( "META-INF/validation-invalid-xml.xml" ); } + + /** + * HV-159 + */ + @Test + public void testNoDefinedConstraints() { + Validator validator = getValidatorWithCustomConfiguration( "org/hibernate/validation/engine/xml/validation.xml" ); + assertFalse( + validator.getConstraintsForClass( Order.class ).isBeanConstrained(), "Bean should be unsonstrained" + ); + } } Added: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/order-constraints.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/order-constraints.xml (rev 0) +++ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/order-constraints.xml 2009-05-20 09:42:21 UTC (rev 16605) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<constraint-mappings + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" + xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> + + <default-package>org.hibernate.validation.engine.xml</default-package> + + <bean class="Order" ignore-annotations="false"> + </bean> + +</constraint-mappings> \ No newline at end of file Property changes on: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/order-constraints.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native Added: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/validation.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/validation.xml (rev 0) +++ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/validation.xml 2009-05-20 09:42:21 UTC (rev 16605) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config + xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"> + + <constraint-mapping>org/hibernate/validation/engine/xml/order-constraints.xml</constraint-mapping> +</validation-config> \ No newline at end of file Property changes on: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validation/engine/xml/validation.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16604 - in core/trunk: core/src/main/java/org/hibernate and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-05-20 00:39:00 -0400 (Wed, 20 May 2009) New Revision: 16604 Removed: core/trunk/core/src/main/java/org/hibernate/exception/ExceptionUtils.java core/trunk/core/src/main/java/org/hibernate/exception/Nestable.java core/trunk/core/src/main/java/org/hibernate/exception/NestableDelegate.java core/trunk/core/src/main/java/org/hibernate/exception/NestableException.java core/trunk/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java core/trunk/core/src/main/java/org/hibernate/AssertionFailure.java core/trunk/core/src/main/java/org/hibernate/HibernateException.java Log: HHH-3918: Use standard JDK exception nesting Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java =================================================================== --- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -23,6 +23,8 @@ */ package org.hibernate.test.cache.jbc2.functional; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.HashSet; import java.util.Random; import java.util.Set; @@ -42,7 +44,6 @@ import org.hibernate.cache.jbc2.JBossCacheRegionFactory; import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.exception.ExceptionUtils; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.test.cache.jbc2.functional.util.DualNodeConnectionProviderImpl; @@ -579,13 +580,21 @@ "[customerId=" + getCustomerId() + " iterationsCompleted=" + getCompletedIterations() + " completedAll=" + isSuccess() + - " causeOfFailure=" + (this.causeOfFailure != null ? ExceptionUtils.getStackTrace(causeOfFailure) : "") + "] "; + " causeOfFailure=" + (this.causeOfFailure != null ? getStackTrace(causeOfFailure) : "") + "] "; } } + + public static String getStackTrace(Throwable throwable) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter( sw, true ); + throwable.printStackTrace( pw ); + return sw.getBuffer().toString(); + } + /** * sleep between 0 and THINK_TIME_MILLIS. - * @throws RuntimeException if sleep is interruped or TERMINATE_ALL_USERS flag was set to true i + * @throws RuntimeException if sleep is interrupted or TERMINATE_ALL_USERS flag was set to true i n the meantime */ private void thinkRandomTime() { Modified: core/trunk/core/src/main/java/org/hibernate/AssertionFailure.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/AssertionFailure.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/AssertionFailure.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -24,8 +24,6 @@ */ package org.hibernate; -import org.hibernate.exception.NestableRuntimeException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +32,7 @@ * * @author Gavin King */ -public class AssertionFailure extends NestableRuntimeException { +public class AssertionFailure extends RuntimeException { private static final Logger log = LoggerFactory.getLogger( AssertionFailure.class ); Modified: core/trunk/core/src/main/java/org/hibernate/HibernateException.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/HibernateException.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/HibernateException.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -24,19 +24,18 @@ */ package org.hibernate; -import org.hibernate.exception.NestableRuntimeException; - /** - * Any exception that occurs inside the persistence layer - * or JDBC driver. <tt>SQLException</tt>s are always wrapped - * by instances of <tt>JDBCException</tt>. - * + * The base {@link Throwable} type for Hibernate. + * + * Note that all {@link java.sql.SQLException SQLExceptions} will be wrapped in some form of + * {@link JDBCException}. + * * @see JDBCException + * * @author Gavin King */ +public class HibernateException extends RuntimeException { -public class HibernateException extends NestableRuntimeException { - public HibernateException(Throwable root) { super(root); } Deleted: core/trunk/core/src/main/java/org/hibernate/exception/ExceptionUtils.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/exception/ExceptionUtils.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/exception/ExceptionUtils.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -1,705 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import org.hibernate.util.ArrayHelper; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.StringTokenizer; - -/** - * Provides utilities for manipulating and examining - * <code>Throwable</code> objects. - * - * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a> - * @author Dmitri Plotnikov - * @author Stephen Colebourne - * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a> - * @author Pete Gieser - * @version $Id: ExceptionUtils.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public final class ExceptionUtils { - - private static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); - - /** - * Used when printing stack frames to denote the start of a - * wrapped exception. - * - * Package private for accessibility by test suite. - */ - static final String WRAPPED_MARKER = " [wrapped] "; - - /** - * The names of methods commonly used to access a wrapped exception. - */ - private static final String[] CAUSE_METHOD_NAMES = { - "getCause", - "getNextException", - "getTargetException", - "getException", - "getSourceException", - "getRootCause", - "getCausedByException", - "getNested" - }; - - /** - * The Method object for JDK1.4 getCause. - */ - private static final Method THROWABLE_CAUSE_METHOD; - - static { - Method getCauseMethod; - try { - getCauseMethod = Throwable.class.getMethod( "getCause", null ); - } - catch ( Exception e ) { - getCauseMethod = null; - } - THROWABLE_CAUSE_METHOD = getCauseMethod; - } - - private ExceptionUtils() { - } - - //----------------------------------------------------------------------- - /** - * Adds to the list of method names used in the search for <code>Throwable</code> - * objects. - * - * @param methodName the methodName to add to the list, <code>null</code> - * and empty strings are ignored - * @since 2.0 - */ - /*public static void addCauseMethodName(String methodName) { - if ( StringHelper.isNotEmpty(methodName) ) { - List list = new ArrayList( Arrays.asList(CAUSE_METHOD_NAMES ); - list.add(methodName); - CAUSE_METHOD_NAMES = (String[]) list.toArray(new String[list.size()]); - } - }*/ - - /** - * Introspects the <code>Throwable</code> to obtain the cause. - * - * The method searches for methods with specific names that return a - * <code>Throwable</code> object. This will pick up most wrapping exceptions, - * including those from JDK 1.4, and - * {@link org.apache.commons.lang.exception.NestableException NestableException}. - * The method names can be added to using {@link #addCauseMethodName(String)}. - * - * The default list searched for are: - * <ul> - * <li><code>getCause()</code></li> - * <li><code>getNextException()</code></li> - * <li><code>getTargetException()</code></li> - * <li><code>getException()</code></li> - * <li><code>getSourceException()</code></li> - * <li><code>getRootCause()</code></li> - * <li><code>getCausedByException()</code></li> - * <li><code>getNested()</code></li> - * </ul> - * - * In the absence of any such method, the object is inspected for a - * <code>detail</code> field assignable to a <code>Throwable</code>. - * - * If none of the above is found, returns <code>null</code>. - * - * @param throwable the throwable to introspect for a cause, may be null - * @return the cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getCause(Throwable throwable) { - return getCause( throwable, CAUSE_METHOD_NAMES ); - } - - /** - * Introspects the <code>Throwable</code> to obtain the cause. - * - * <ol> - * <li>Try known exception types.</li> - * <li>Try the supplied array of method names.</li> - * <li>Try the field 'detail'.</li> - * </ol> - * - * A <code>null</code> set of method names means use the default set. - * A <code>null</code> in the set of method names will be ignored. - * - * @param throwable the throwable to introspect for a cause, may be null - * @param methodNames the method names, null treated as default set - * @return the cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getCause(Throwable throwable, String[] methodNames) { - if ( throwable == null ) { - return null; - } - Throwable cause = getCauseUsingWellKnownTypes( throwable ); - if ( cause == null ) { - if ( methodNames == null ) { - methodNames = CAUSE_METHOD_NAMES; - } - for ( int i = 0; i < methodNames.length; i++ ) { - String methodName = methodNames[i]; - if ( methodName != null ) { - cause = getCauseUsingMethodName( throwable, methodName ); - if ( cause != null ) { - break; - } - } - } - - if ( cause == null ) { - cause = getCauseUsingFieldName( throwable, "detail" ); - } - } - return cause; - } - - /** - * Introspects the <code>Throwable</code> to obtain the root cause. - * - * This method walks through the exception chain to the last element, - * "root" of the tree, using {@link #getCause(Throwable)}, and - * returns that exception. - * - * @param throwable the throwable to get the root cause for, may be null - * @return the root cause of the <code>Throwable</code>, - * <code>null</code> if none found or null throwable input - */ - public static Throwable getRootCause(Throwable throwable) { - Throwable cause = getCause( throwable ); - if ( cause != null ) { - throwable = cause; - while ( ( throwable = getCause( throwable ) ) != null ) { - cause = throwable; - } - } - return cause; - } - - /** - * Finds a <code>Throwable</code> for known types. - * - * Uses <code>instanceof</code> checks to examine the exception, - * looking for well known types which could contain chained or - * wrapped exceptions. - * - * @param throwable the exception to examine - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingWellKnownTypes(Throwable throwable) { - if ( throwable instanceof Nestable ) { - return ( ( Nestable ) throwable ).getCause(); - } - else if ( throwable instanceof SQLException ) { - return ( ( SQLException ) throwable ).getNextException(); - } - else if ( throwable instanceof InvocationTargetException ) { - return ( ( InvocationTargetException ) throwable ).getTargetException(); - } - else { - return null; - } - } - - /** - * Finds a <code>Throwable</code> by method name. - * - * @param throwable the exception to examine - * @param methodName the name of the method to find and invoke - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingMethodName(Throwable throwable, String methodName) { - Method method = null; - try { - method = throwable.getClass().getMethod( methodName, null ); - } - catch ( NoSuchMethodException ignored ) { - } - catch ( SecurityException ignored ) { - } - - if ( method != null && Throwable.class.isAssignableFrom( method.getReturnType() ) ) { - try { - return ( Throwable ) method.invoke( throwable, ArrayHelper.EMPTY_OBJECT_ARRAY ); - } - catch ( IllegalAccessException ignored ) { - } - catch ( IllegalArgumentException ignored ) { - } - catch ( InvocationTargetException ignored ) { - } - } - return null; - } - - /** - * Finds a <code>Throwable</code> by field name. - * - * @param throwable the exception to examine - * @param fieldName the name of the attribute to examine - * @return the wrapped exception, or <code>null</code> if not found - */ - private static Throwable getCauseUsingFieldName(Throwable throwable, String fieldName) { - Field field = null; - try { - field = throwable.getClass().getField( fieldName ); - } - catch ( NoSuchFieldException ignored ) { - } - catch ( SecurityException ignored ) { - } - - if ( field != null && Throwable.class.isAssignableFrom( field.getType() ) ) { - try { - return ( Throwable ) field.get( throwable ); - } - catch ( IllegalAccessException ignored ) { - } - catch ( IllegalArgumentException ignored ) { - } - } - return null; - } - - //----------------------------------------------------------------------- - /** - * Checks if the Throwable class has a <code>getCause</code> method. - * - * This is true for JDK 1.4 and above. - * - * @return true if Throwable is nestable - * @since 2.0 - */ - public static boolean isThrowableNested() { - return ( THROWABLE_CAUSE_METHOD != null ); - } - - /** - * Checks whether this <code>Throwable</code> class can store a cause. - * - * This method does not check whether it actually does store a cause. - * - * @param throwable the <code>Throwable</code> to examine, may be null - * @return boolean <code>true</code> if nested otherwise <code>false</code> - * @since 2.0 - */ - public static boolean isNestedThrowable(Throwable throwable) { - if ( throwable == null ) { - return false; - } - - if ( throwable instanceof Nestable ) { - return true; - } - else if ( throwable instanceof SQLException ) { - return true; - } - else if ( throwable instanceof InvocationTargetException ) { - return true; - } - else if ( isThrowableNested() ) { - return true; - } - - Class cls = throwable.getClass(); - for ( int i = 0, isize = CAUSE_METHOD_NAMES.length; i < isize; i++ ) { - try { - Method method = cls.getMethod( CAUSE_METHOD_NAMES[i], null ); - if ( method != null && Throwable.class.isAssignableFrom( method.getReturnType() ) ) { - return true; - } - } - catch ( NoSuchMethodException ignored ) { - } - catch ( SecurityException ignored ) { - } - } - - try { - Field field = cls.getField( "detail" ); - if ( field != null ) { - return true; - } - } - catch ( NoSuchFieldException ignored ) { - } - catch ( SecurityException ignored ) { - } - - return false; - } - - //----------------------------------------------------------------------- - /** - * Counts the number of <code>Throwable</code> objects in the - * exception chain. - * - * A throwable without cause will return <code>1</code>. - * A throwable with one cause will return <code>2</code> and so on. - * A <code>null</code> throwable will return <code>0</code>. - * - * @param throwable the throwable to inspect, may be null - * @return the count of throwables, zero if null input - */ - public static int getThrowableCount(Throwable throwable) { - int count = 0; - while ( throwable != null ) { - count++; - throwable = ExceptionUtils.getCause( throwable ); - } - return count; - } - - /** - * Returns the list of <code>Throwable</code> objects in the - * exception chain. - * - * A throwable without cause will return an array containing - * one element - the input throwable. - * A throwable with one cause will return an array containing - * two elements. - the input throwable and the cause throwable. - * A <code>null</code> throwable will return an array size zero. - * - * @param throwable the throwable to inspect, may be null - * @return the array of throwables, never null - */ - public static Throwable[] getThrowables(Throwable throwable) { - List list = new ArrayList(); - while ( throwable != null ) { - list.add( throwable ); - throwable = ExceptionUtils.getCause( throwable ); - } - return ( Throwable[] ) list.toArray( new Throwable[list.size()] ); - } - - //----------------------------------------------------------------------- - /** - * Returns the (zero based) index of the first <code>Throwable</code> - * that matches the specified type in the exception chain. - * - * A <code>null</code> throwable returns <code>-1</code>. - * A <code>null</code> type returns <code>-1</code>. - * No match in the chain returns <code>-1</code>. - * - * @param throwable the throwable to inspect, may be null - * @param type the type to search for - * @return the index into the throwable chain, -1 if no match or null input - */ - public static int indexOfThrowable(Throwable throwable, Class type) { - return indexOfThrowable( throwable, type, 0 ); - } - - /** - * Returns the (zero based) index of the first <code>Throwable</code> - * that matches the specified type in the exception chain from - * a specified index. - * - * A <code>null</code> throwable returns <code>-1</code>. - * A <code>null</code> type returns <code>-1</code>. - * No match in the chain returns <code>-1</code>. - * A negative start index is treated as zero. - * A start index greater than the number of throwables returns <code>-1</code>. - * - * @param throwable the throwable to inspect, may be null - * @param type the type to search for - * @param fromIndex the (zero based) index of the starting position, - * negative treated as zero, larger than chain size returns -1 - * @return the index into the throwable chain, -1 if no match or null input - */ - public static int indexOfThrowable(Throwable throwable, Class type, int fromIndex) { - if ( throwable == null ) { - return -1; - } - if ( fromIndex < 0 ) { - fromIndex = 0; - } - Throwable[] throwables = ExceptionUtils.getThrowables( throwable ); - if ( fromIndex >= throwables.length ) { - return -1; - } - for ( int i = fromIndex; i < throwables.length; i++ ) { - if ( throwables[i].getClass().equals( type ) ) { - return i; - } - } - return -1; - } - - //----------------------------------------------------------------------- - /** - * Prints a compact stack trace for the root cause of a throwable - * to <code>System.err</code>. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable) { - printRootCauseStackTrace( throwable, System.err ); - } - - /** - * Prints a compact stack trace for the root cause of a throwable. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output, may be null - * @param stream the stream to output to, may not be null - * @throws IllegalArgumentException if the stream is <code>null</code> - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable, PrintStream stream) { - if ( throwable == null ) { - return; - } - if ( stream == null ) { - throw new IllegalArgumentException( "The PrintStream must not be null" ); - } - String trace[] = getRootCauseStackTrace( throwable ); - for ( int i = 0; i < trace.length; i++ ) { - stream.println( trace[i] ); - } - stream.flush(); - } - - /** - * Prints a compact stack trace for the root cause of a throwable. - * - * The compact stack trace starts with the root cause and prints - * stack frames up to the place where it was caught and wrapped. - * Then it prints the wrapped exception and continues with stack frames - * until the wrapper exception is caught and wrapped again, etc. - * - * The method is equivalent to <code>printStackTrace</code> for throwables - * that don't have nested causes. - * - * @param throwable the throwable to output, may be null - * @param writer the writer to output to, may not be null - * @throws IllegalArgumentException if the writer is <code>null</code> - * @since 2.0 - */ - public static void printRootCauseStackTrace(Throwable throwable, PrintWriter writer) { - if ( throwable == null ) { - return; - } - if ( writer == null ) { - throw new IllegalArgumentException( "The PrintWriter must not be null" ); - } - String trace[] = getRootCauseStackTrace( throwable ); - for ( int i = 0; i < trace.length; i++ ) { - writer.println( trace[i] ); - } - writer.flush(); - } - - //----------------------------------------------------------------------- - /** - * Creates a compact stack trace for the root cause of the supplied - * <code>Throwable</code>. - * - * @param throwable the throwable to examine, may be null - * @return an array of stack trace frames, never null - * @since 2.0 - */ - public static String[] getRootCauseStackTrace(Throwable throwable) { - if ( throwable == null ) { - return ArrayHelper.EMPTY_STRING_ARRAY; - } - Throwable throwables[] = getThrowables( throwable ); - int count = throwables.length; - ArrayList frames = new ArrayList(); - List nextTrace = getStackFrameList( throwables[count - 1] ); - for ( int i = count; --i >= 0; ) { - List trace = nextTrace; - if ( i != 0 ) { - nextTrace = getStackFrameList( throwables[i - 1] ); - removeCommonFrames( trace, nextTrace ); - } - if ( i == count - 1 ) { - frames.add( throwables[i].toString() ); - } - else { - frames.add( WRAPPED_MARKER + throwables[i].toString() ); - } - for ( int j = 0; j < trace.size(); j++ ) { - frames.add( trace.get( j ) ); - } - } - return ( String[] ) frames.toArray( new String[0] ); - } - - /** - * Removes common frames from the cause trace given the two stack traces. - * - * @param causeFrames stack trace of a cause throwable - * @param wrapperFrames stack trace of a wrapper throwable - * @throws IllegalArgumentException if either argument is null - * @since 2.0 - */ - public static void removeCommonFrames(List causeFrames, List wrapperFrames) { - if ( causeFrames == null || wrapperFrames == null ) { - throw new IllegalArgumentException( "The List must not be null" ); - } - int causeFrameIndex = causeFrames.size() - 1; - int wrapperFrameIndex = wrapperFrames.size() - 1; - while ( causeFrameIndex >= 0 && wrapperFrameIndex >= 0 ) { - // Remove the frame from the cause trace if it is the same - // as in the wrapper trace - String causeFrame = ( String ) causeFrames.get( causeFrameIndex ); - String wrapperFrame = ( String ) wrapperFrames.get( wrapperFrameIndex ); - if ( causeFrame.equals( wrapperFrame ) ) { - causeFrames.remove( causeFrameIndex ); - } - causeFrameIndex--; - wrapperFrameIndex--; - } - } - - //----------------------------------------------------------------------- - /** - * Gets the stack trace from a Throwable as a String. - * - * @param throwable the <code>Throwable</code> to be examined - * @return the stack trace as generated by the exception's - * <code>printStackTrace(PrintWriter)</code> method - */ - public static String getStackTrace(Throwable throwable) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - throwable.printStackTrace( pw ); - return sw.getBuffer().toString(); - } - - /** - * A way to get the entire nested stack-trace of an throwable. - * - * @param throwable the <code>Throwable</code> to be examined - * @return the nested stack trace, with the root cause first - * @since 2.0 - */ - public static String getFullStackTrace(Throwable throwable) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - Throwable[] ts = getThrowables( throwable ); - for ( int i = 0; i < ts.length; i++ ) { - ts[i].printStackTrace( pw ); - if ( isNestedThrowable( ts[i] ) ) { - break; - } - } - return sw.getBuffer().toString(); - } - - //----------------------------------------------------------------------- - /** - * Captures the stack trace associated with the specified - * <code>Throwable</code> object, decomposing it into a list of - * stack frames. - * - * @param throwable the <code>Throwable</code> to exaamine, may be null - * @return an array of strings describing each stack frame, never null - */ - public static String[] getStackFrames(Throwable throwable) { - if ( throwable == null ) { - return ArrayHelper.EMPTY_STRING_ARRAY; - } - return getStackFrames( getStackTrace( throwable ) ); - } - - /** - * Functionality shared between the - * <code>getStackFrames(Throwable)</code> methods of this and the - * {@link org.apache.commons.lang.exception.NestableDelegate} - * classes. - */ - static String[] getStackFrames(String stackTrace) { - String linebreak = LINE_SEPARATOR; - StringTokenizer frames = new StringTokenizer( stackTrace, linebreak ); - List list = new LinkedList(); - while ( frames.hasMoreTokens() ) { - list.add( frames.nextToken() ); - } - return ( String[] ) list.toArray( new String[list.size()] ); - } - - /** - * Produces a <code>List</code> of stack frames - the message - * is not included. - * - * This works in most cases - it will only fail if the exception - * message contains a line that starts with: - * <code>"   at".</code> - * - * @param t is any throwable - * @return List of stack frames - */ - static List getStackFrameList(Throwable t) { - String stackTrace = getStackTrace( t ); - String linebreak = LINE_SEPARATOR; - StringTokenizer frames = new StringTokenizer( stackTrace, linebreak ); - List list = new LinkedList(); - boolean traceStarted = false; - while ( frames.hasMoreTokens() ) { - String token = frames.nextToken(); - // Determine if the line starts with <whitespace>at - int at = token.indexOf( "at" ); - if ( at != -1 && token.substring( 0, at ).trim().length() == 0 ) { - traceStarted = true; - list.add( token ); - } - else if ( traceStarted ) { - break; - } - } - return list; - } - -} Deleted: core/trunk/core/src/main/java/org/hibernate/exception/Nestable.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/exception/Nestable.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/exception/Nestable.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -1,174 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; - -/** - * An interface to be implemented by {@link java.lang.Throwable} - * extensions which would like to be able to nest root exceptions - * inside themselves. - * - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @author Pete Gieser - * @version $Id: Nestable.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public interface Nestable { - - /** - * Returns the reference to the exception or error that caused the - * exception implementing the <code>Nestable</code> to be thrown. - * - * @return throwable that caused the original exception - */ - public Throwable getCause(); - - /** - * Returns the error message of this and any nested - * <code>Throwable</code>. - * - * @return the error message - */ - public String getMessage(); - - /** - * Returns the error message of the <code>Throwable</code> in the chain - * of <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index of the <code>Throwable</code> in the chain of - * <code>Throwable</code>s - * @return the error message, or null if the <code>Throwable</code> at the - * specified index in the chain does not contain a message - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public String getMessage(int index); - - /** - * Returns the error message of this and any nested <code>Throwable</code>s - * in an array of Strings, one element for each message. Any - * <code>Throwable</code> not containing a message is represented in the - * array by a null. This has the effect of cause the length of the returned - * array to be equal to the result of the {@link #getThrowableCount()} - * operation. - * - * @return the error messages - */ - public String[] getMessages(); - - /** - * Returns the <code>Throwable</code> in the chain of - * <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index, numbered from 0, of the <code>Throwable</code> in - * the chain of <code>Throwable</code>s - * @return the <code>Throwable</code> - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public Throwable getThrowable(int index); - - /** - * Returns the number of nested <code>Throwable</code>s represented by - * this <code>Nestable</code>, including this <code>Nestable</code>. - * - * @return the throwable count - */ - public int getThrowableCount(); - - /** - * Returns this <code>Nestable</code> and any nested <code>Throwable</code>s - * in an array of <code>Throwable</code>s, one element for each - * <code>Throwable</code>. - * - * @return the <code>Throwable</code>s - */ - public Throwable[] getThrowables(); - - /** - * Returns the index, numbered from 0, of the first occurrence of the - * specified type in the chain of <code>Throwable</code>s, or -1 if the - * specified type is not found in the chain. - * - * @param type <code>Class</code> to be found - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - */ - public int indexOfThrowable(Class type); - - /** - * Returns the index, numbered from 0, of the first <code>Throwable</code> - * that matches the specified type in the chain of <code>Throwable</code>s - * with an index greater than or equal to the specified index, or -1 if - * the type is not found. - * - * @param type <code>Class</code> to be found - * @param fromIndex the index, numbered from 0, of the starting position in - * the chain to be searched - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - * @throws IndexOutOfBoundsException if the <code>fromIndex</code> argument - * is negative or not less than the count of <code>Throwable</code>s in the - * chain - */ - public int indexOfThrowable(Class type, int fromIndex); - - /** - * Prints the stack trace of this exception to the specified print - * writer. Includes information from the exception, if any, - * which caused this exception. - * - * @param out <code>PrintWriter</code> to use for output. - */ - public void printStackTrace(PrintWriter out); - - /** - * Prints the stack trace of this exception to the specified print - * stream. Includes inforamation from the exception, if any, - * which caused this exception. - * - * @param out <code>PrintStream</code> to use for output. - */ - public void printStackTrace(PrintStream out); - - /** - * Prints the stack trace for this exception only--root cause not - * included--using the provided writer. Used by {@link - * org.apache.commons.lang.exception.NestableDelegate} to write - * individual stack traces to a buffer. The implementation of - * this method should call - * <code>super.printStackTrace(out);</code> in most cases. - * - * @param out The writer to use. - */ - public void printPartialStackTrace(PrintWriter out); - -} Deleted: core/trunk/core/src/main/java/org/hibernate/exception/NestableDelegate.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/exception/NestableDelegate.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/exception/NestableDelegate.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -1,383 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.Serializable; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** - * A shared implementation of the nestable exception functionality. - * - * The code is shared between - * {@link org.apache.commons.lang.exception.NestableError NestableError}, - * {@link org.apache.commons.lang.exception.NestableException NestableException} and - * {@link org.apache.commons.lang.exception.NestableRuntimeException NestableRuntimeException}. - * - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @author Sean C. Sullivan - * @author Stephen Colebourne - * @version $Id: NestableDelegate.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public class NestableDelegate implements Serializable { - - /** - * Constructor error message. - */ - private static final String MUST_BE_THROWABLE = - "The Nestable implementation passed to the NestableDelegate(Nestable) " - + "constructor must extend java.lang.Throwable"; - - /** - * Holds the reference to the exception or error that we're - * wrapping (which must be a {@link - * org.apache.commons.lang.exception.Nestable} implementation). - */ - private Throwable nestable = null; - - /** - * Whether to print the stack trace top-down. - * This public flag may be set by calling code, typically in initialisation. - * - * @since 2.0 - */ - private static boolean topDown = true; - - /** - * Whether to trim the repeated stack trace. - * This public flag may be set by calling code, typically in initialisation. - * - * @since 2.0 - */ - private static boolean trimStackFrames = true; - - /** - * Constructs a new <code>NestableDelegate</code> instance to manage the - * specified <code>Nestable</code>. - * - * @param nestable the Nestable implementation (must extend - * {@link java.lang.Throwable}) - * @since 2.0 - */ - public NestableDelegate(Nestable nestable) { - if ( nestable instanceof Throwable ) { - this.nestable = ( Throwable ) nestable; - } - else { - throw new IllegalArgumentException( MUST_BE_THROWABLE ); - } - } - - /** - * Returns the error message of the <code>Throwable</code> in the chain - * of <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index of the <code>Throwable</code> in the chain of - * <code>Throwable</code>s - * @return the error message, or null if the <code>Throwable</code> at the - * specified index in the chain does not contain a message - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public String getMessage(int index) { - Throwable t = this.getThrowable( index ); - if ( Nestable.class.isInstance( t ) ) { - return ( ( Nestable ) t ).getMessage( 0 ); - } - else { - return t.getMessage(); - } - } - - /** - * Returns the full message contained by the <code>Nestable</code> - * and any nested <code>Throwable</code>s. - * - * @param baseMsg the base message to use when creating the full - * message. Should be generally be called via - * <code>nestableHelper.getMessage( super.getMessage() )</code>, - * where <code>super</code> is an instance of {@link - * java.lang.Throwable}. - * @return The concatenated message for this and all nested - * <code>Throwable</code>s - * @since 2.0 - */ - public String getMessage(String baseMsg) { - StringBuffer msg = new StringBuffer(); - if ( baseMsg != null ) { - msg.append( baseMsg ); - } - - Throwable nestedCause = ExceptionUtils.getCause( this.nestable ); - if ( nestedCause != null ) { - String causeMsg = nestedCause.getMessage(); - if ( causeMsg != null ) { - if ( baseMsg != null ) { - msg.append( ": " ); - } - msg.append( causeMsg ); - } - - } - return ( msg.length() > 0 ? msg.toString() : null ); - } - - /** - * Returns the error message of this and any nested <code>Throwable</code>s - * in an array of Strings, one element for each message. Any - * <code>Throwable</code> not containing a message is represented in the - * array by a null. This has the effect of cause the length of the returned - * array to be equal to the result of the {@link #getThrowableCount()} - * operation. - * - * @return the error messages - * @since 2.0 - */ - public String[] getMessages() { - Throwable[] throwables = this.getThrowables(); - String[] msgs = new String[throwables.length]; - for ( int i = 0; i < throwables.length; i++ ) { - msgs[i] = Nestable.class.isInstance( throwables[i] ) ? - ( ( Nestable ) throwables[i] ).getMessage( 0 ) : - throwables[i].getMessage(); - } - return msgs; - } - - /** - * Returns the <code>Throwable</code> in the chain of - * <code>Throwable</code>s at the specified index, numbererd from 0. - * - * @param index the index, numbered from 0, of the <code>Throwable</code> in - * the chain of <code>Throwable</code>s - * @return the <code>Throwable</code> - * @throws IndexOutOfBoundsException if the <code>index</code> argument is - * negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public Throwable getThrowable(int index) { - if ( index == 0 ) { - return this.nestable; - } - Throwable[] throwables = this.getThrowables(); - return throwables[index]; - } - - /** - * Returns the number of <code>Throwable</code>s contained in the - * <code>Nestable</code> contained by this delegate. - * - * @return the throwable count - * @since 2.0 - */ - public int getThrowableCount() { - return ExceptionUtils.getThrowableCount( this.nestable ); - } - - /** - * Returns this delegate's <code>Nestable</code> and any nested - * <code>Throwable</code>s in an array of <code>Throwable</code>s, one - * element for each <code>Throwable</code>. - * - * @return the <code>Throwable</code>s - * @since 2.0 - */ - public Throwable[] getThrowables() { - return ExceptionUtils.getThrowables( this.nestable ); - } - - /** - * Returns the index, numbered from 0, of the first <code>Throwable</code> - * that matches the specified type in the chain of <code>Throwable</code>s - * held in this delegate's <code>Nestable</code> with an index greater than - * or equal to the specified index, or -1 if the type is not found. - * - * @param type <code>Class</code> to be found - * @param fromIndex the index, numbered from 0, of the starting position in - * the chain to be searched - * @return index of the first occurrence of the type in the chain, or -1 if - * the type is not found - * @throws IndexOutOfBoundsException if the <code>fromIndex</code> argument - * is negative or not less than the count of <code>Throwable</code>s in the - * chain - * @since 2.0 - */ - public int indexOfThrowable(Class type, int fromIndex) { - if ( fromIndex < 0 ) { - throw new IndexOutOfBoundsException( "The start index was out of bounds: " + fromIndex ); - } - Throwable[] throwables = ExceptionUtils.getThrowables( this.nestable ); - if ( fromIndex >= throwables.length ) { - throw new IndexOutOfBoundsException( "The start index was out of bounds: " - + fromIndex + " >= " + throwables.length ); - } - for ( int i = fromIndex; i < throwables.length; i++ ) { - if ( throwables[i].getClass().equals( type ) ) { - return i; - } - } - return -1; - } - - /** - * Prints the stack trace of this exception the the standar error - * stream. - */ - public void printStackTrace() { - printStackTrace( System.err ); - } - - /** - * Prints the stack trace of this exception to the specified - * stream. - * - * @param out <code>PrintStream</code> to use for output. - * @see #printStackTrace(PrintWriter) - */ - public void printStackTrace(PrintStream out) { - synchronized ( out ) { - PrintWriter pw = new PrintWriter( out, false ); - printStackTrace( pw ); - // Flush the PrintWriter before it's GC'ed. - pw.flush(); - } - } - - /** - * Prints the stack trace of this exception to the specified - * writer. If the Throwable class has a <code>getCause</code> - * method (i.e. running on jre1.4 or higher), this method just - * uses Throwable's printStackTrace() method. Otherwise, generates - * the stack-trace, by taking into account the 'topDown' and - * 'trimStackFrames' parameters. The topDown and trimStackFrames - * are set to 'true' by default (produces jre1.4-like stack trace). - * - * @param out <code>PrintWriter</code> to use for output. - */ - public void printStackTrace(PrintWriter out) { - Throwable throwable = this.nestable; - // if running on jre1.4 or higher, use default printStackTrace - if ( ExceptionUtils.isThrowableNested() ) { - if ( throwable instanceof Nestable ) { - ( ( Nestable ) throwable ).printPartialStackTrace( out ); - } - else { - throwable.printStackTrace( out ); - } - return; - } - - // generating the nested stack trace - List stacks = new ArrayList(); - while ( throwable != null ) { - String[] st = getStackFrames( throwable ); - stacks.add( st ); - throwable = ExceptionUtils.getCause( throwable ); - } - - // If NOT topDown, reverse the stack - String separatorLine = "Caused by: "; - if ( !topDown ) { - separatorLine = "Rethrown as: "; - Collections.reverse( stacks ); - } - - // Remove the repeated lines in the stack - if ( trimStackFrames ) trimStackFrames( stacks ); - - synchronized ( out ) { - for ( Iterator iter = stacks.iterator(); iter.hasNext(); ) { - String[] st = ( String[] ) iter.next(); - for ( int i = 0, len = st.length; i < len; i++ ) { - out.println( st[i] ); - } - if ( iter.hasNext() ) out.print( separatorLine ); - } - } - } - - /** - * Captures the stack trace associated with the specified - * <code>Throwable</code> object, decomposing it into a list of - * stack frames. - * - * @param t The <code>Throwable</code>. - * @return An array of strings describing each stack frame. - * @since 2.0 - */ - protected String[] getStackFrames(Throwable t) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - - // Avoid infinite loop between decompose() and printStackTrace(). - if ( t instanceof Nestable ) { - ( ( Nestable ) t ).printPartialStackTrace( pw ); - } - else { - t.printStackTrace( pw ); - } - return ExceptionUtils.getStackFrames( sw.getBuffer().toString() ); - } - - /** - * Trims the stack frames. The first set is left untouched. The rest - * of the frames are truncated from the bottom by comparing with - * one just on top. - * - * @param stacks The list containing String[] elements - * @since 2.0 - */ - protected void trimStackFrames(List stacks) { - for ( int size = stacks.size(), i = size - 1; i > 0; i-- ) { - String[] curr = ( String[] ) stacks.get( i ); - String[] next = ( String[] ) stacks.get( i - 1 ); - - List currList = new ArrayList( Arrays.asList( curr ) ); - List nextList = new ArrayList( Arrays.asList( next ) ); - ExceptionUtils.removeCommonFrames( currList, nextList ); - - int trimmed = curr.length - currList.size(); - if ( trimmed > 0 ) { - currList.add( "\t... " + trimmed + " more" ); - stacks.set( i, - currList.toArray( new String[currList.size()] ) ); - } - } - } -} Deleted: core/trunk/core/src/main/java/org/hibernate/exception/NestableException.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/exception/NestableException.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/exception/NestableException.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -1,225 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; - -/** - * The base class of all exceptions which can contain other exceptions. - * - * It is intended to ease the debugging by carrying on the information - * about the exception which was caught and provoked throwing the - * current exception. Catching and rethrowing may occur multiple - * times, and provided that all exceptions except the first one - * are descendands of <code>NestedException</code>, when the - * exception is finally printed out using any of the <code> - * printStackTrace()</code> methods, the stacktrace will contain - * the information about all exceptions thrown and caught on - * the way. - * Running the following program - * <blockquote><pre> - * 1 import org.apache.commons.lang.exception.NestableException; - * 2 - * 3 public class Test { - * 4 public static void main( String[] args ) { - * 5 try { - * 6 a(); - * 7 } catch(Exception e) { - * 8 e.printStackTrace(); - * 9 } - * 10 } - * 11 - * 12 public static void a() throws Exception { - * 13 try { - * 14 b(); - * 15 } catch(Exception e) { - * 16 throw new NestableException("foo", e); - * 17 } - * 18 } - * 19 - * 20 public static void b() throws Exception { - * 21 try { - * 22 c(); - * 23 } catch(Exception e) { - * 24 throw new NestableException("bar", e); - * 25 } - * 26 } - * 27 - * 28 public static void c() throws Exception { - * 29 throw new Exception("baz"); - * 30 } - * 31 } - * </pre></blockquote> - * Yields the following stacktrace: - * <blockquote><pre> - * org.apache.commons.lang.exception.NestableException: foo - * at Test.a(Test.java:16) - * at Test.main(Test.java:6) - * Caused by: org.apache.commons.lang.exception.NestableException: bar - * at Test.b(Test.java:24) - * at Test.a(Test.java:14) - * ... 1 more - * Caused by: java.lang.Exception: baz - * at Test.c(Test.java:29) - * at Test.b(Test.java:22) - * ... 2 more - * </pre></blockquote> - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @version $Id: NestableException.java 4782 2004-11-21 00:11:27Z pgmjsd $ - * @since 1.0 - */ -public class NestableException extends Exception implements Nestable { - - /** - * The helper instance which contains much of the code which we - * delegate to. - */ - protected NestableDelegate delegate = new NestableDelegate( this ); - - /** - * Holds the reference to the exception or error that caused - * this exception to be thrown. - */ - private Throwable cause = null; - - /** - * Constructs a new <code>NestableException</code> without specified - * detail message. - */ - public NestableException() { - super(); - } - - /** - * Constructs a new <code>NestableException</code> with specified - * detail message. - * - * @param msg The error message. - */ - public NestableException(String msg) { - super( msg ); - } - - /** - * Constructs a new <code>NestableException</code> with specified - * nested <code>Throwable</code>. - * - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableException(Throwable cause) { - super(); - this.cause = cause; - } - - /** - * Constructs a new <code>NestableException</code> with specified - * detail message and nested <code>Throwable</code>. - * - * @param msg the error message - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableException(String msg, Throwable cause) { - super( msg ); - this.cause = cause; - } - - public Throwable getCause() { - return cause; - } - - /** - * Returns the detail message string of this throwable. If it was - * created with a null message, returns the following: - * ( cause==null ? null : cause.toString() ). - */ - public String getMessage() { - if ( super.getMessage() != null ) { - return super.getMessage(); - } - else if ( cause != null ) { - return cause.toString(); - } - else { - return null; - } - } - - public String getMessage(int index) { - if ( index == 0 ) { - return super.getMessage(); - } - else { - return delegate.getMessage( index ); - } - } - - public String[] getMessages() { - return delegate.getMessages(); - } - - public Throwable getThrowable(int index) { - return delegate.getThrowable( index ); - } - - public int getThrowableCount() { - return delegate.getThrowableCount(); - } - - public Throwable[] getThrowables() { - return delegate.getThrowables(); - } - - public int indexOfThrowable(Class type) { - return delegate.indexOfThrowable( type, 0 ); - } - - public int indexOfThrowable(Class type, int fromIndex) { - return delegate.indexOfThrowable( type, fromIndex ); - } - - public void printStackTrace() { - delegate.printStackTrace(); - } - - public void printStackTrace(PrintStream out) { - delegate.printStackTrace( out ); - } - - public void printStackTrace(PrintWriter out) { - delegate.printStackTrace( out ); - } - - public final void printPartialStackTrace(PrintWriter out) { - super.printStackTrace( out ); - } - -} Deleted: core/trunk/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java 2009-05-19 15:56:55 UTC (rev 16603) +++ core/trunk/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java 2009-05-20 04:39:00 UTC (rev 16604) @@ -1,185 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ -package org.hibernate.exception; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.ObjectOutputStream; -import java.io.IOException; - -import antlr.RecognitionException; - -/** - * The base class of all runtime exceptions which can contain other - * exceptions. - * - * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a> - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a> - * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> - * @author <a href="mailto:steven@caswell.name">Steven Caswell</a> - * @version $Id: NestableRuntimeException.java 8137 2005-09-09 15:21:10Z epbernard $ - * @see org.apache.commons.lang.exception.NestableException - * @since 1.0 - */ -public class NestableRuntimeException extends RuntimeException implements Nestable { - - /** - * The helper instance which contains much of the code which we - * delegate to. - */ - protected NestableDelegate delegate = new NestableDelegate( this ); - - /** - * Holds the reference to the exception or error that caused - * this exception to be thrown. - */ - private Throwable cause = null; - - /** - * Constructs a new <code>NestableRuntimeException</code> without specified - * detail message. - */ - public NestableRuntimeException() { - super(); - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * detail message. - * - * @param msg the error message - */ - public NestableRuntimeException(String msg) { - super( msg ); - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * nested <code>Throwable</code>. - * - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableRuntimeException(Throwable cause) { - super(); - this.cause = cause; - } - - /** - * Constructs a new <code>NestableRuntimeException</code> with specified - * detail message and nested <code>Throwable</code>. - * - * @param msg the error message - * @param cause the exception or error that caused this exception to be - * thrown - */ - public NestableRuntimeException(String msg, Throwable cause) { - super( msg ); - this.cause = cause; - } - - public Throwable getCause() { - return cause; - } - - /** - * Returns the detail message string of this throwable. If it was - * created with a null message, returns the following: - * ( cause==null ? null : cause.toString( ). - */ - public String getMessage() { - if ( super.getMessage() != null ) { - return super.getMessage(); - } - else if ( cause != null ) { - return cause.toString(); - } - else { - return null; - } - } - - public String getMessage(int index) { - if ( index == 0 ) { - return super.getMessage(); - } - else { - return delegate.getMessage( index ); - } - } - - public String[] getMessages() { - return delegate.getMessages(); - } - - public Throwable getThrowable(int index) { - return delegate.getThrowable( index ); - } - - public int getThrowableCount() { - return delegate.getThrowableCount(); - } - - public Throwable[] getThrowables() { - return delegate.getThrowables(); - } - - public int indexOfThrowable(Class type) { - return delegate.indexOfThrowable( type, 0 ); - } - - public int indexOfThrowable(Class type, int fromIndex) { - return delegate.indexOfThrowable( type, fromIndex ); - } - - public void printStackTrace() { - delegate.printStackTrace(); - } - - public void printStackTrace(PrintStream out) { - delegate.printStackTrace( out ); - } - - public void printStackTrace(PrintWriter out) { - delegate.printStackTrace( out ); - } - - public final void printPartialStackTrace(PrintWriter out) { - super.printStackTrace( out ); - } - - - - private void writeObject(ObjectOutputStream oos) throws IOException { - Throwable tempCause = cause; - //don't propagate RecognitionException, might be not serializable - if ( cause instanceof RecognitionException ) { - cause = null; - } - oos.defaultWriteObject(); - cause = tempCause; - } - -}

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16603 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validation/engine/xml and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-05-19 11:56:55 -0400 (Tue, 19 May 2009) New Revision: 16603 Added: validator/trunk/hibernate-validator/src/test/resources/META-INF/validation-invalid-xml.xml Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java Log: HV-133 Extended the TestUtil class using custom context classloaders Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-19 13:54:01 UTC (rev 16602) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-19 15:56:55 UTC (rev 16603) @@ -224,15 +224,18 @@ } catch ( JAXBException e ) { log.error( "Error parsing validation.xml: {}", e.getMessage() ); + throw new ValidationException( "Unable to parse " + VALIDATION_XML_FILE); } return validationConfig; } private InputStream getInputStreamForPath(String path) { - InputStream inputStream = this.getClass().getResourceAsStream( path ); - // try absolute path - if ( inputStream == null && !path.startsWith( "/" ) ) { - inputStream = this.getClass().getResourceAsStream( "/" + path ); + // try the context class loader first + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( path ); + + // try the current class loader + if ( inputStream == null ) { + inputStream = this.getClass().getResourceAsStream( path ); } return inputStream; } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java 2009-05-19 13:54:01 UTC (rev 16602) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/xml/XmlConfigurationTest.java 2009-05-19 15:56:55 UTC (rev 16603) @@ -19,6 +19,7 @@ import java.util.Set; import javax.validation.ConstraintViolation; +import javax.validation.ValidationException; import javax.validation.Validator; import org.testng.annotations.Test; @@ -26,6 +27,7 @@ import org.hibernate.validation.util.TestUtil; import static org.hibernate.validation.util.TestUtil.assertNumberOfViolations; import static org.hibernate.validation.util.TestUtil.getValidator; +import static org.hibernate.validation.util.TestUtil.getValidatorWithCustomConfiguration; /** * @author Hardy Ferentschik @@ -124,4 +126,9 @@ constraintViolations = validator.validate( user ); assertNumberOfViolations( constraintViolations, 0 ); } + + @Test(expectedExceptions = ValidationException.class) + public void testInvalidValidationXml() { + getValidatorWithCustomConfiguration( "META-INF/validation-invalid-xml.xml" ); + } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-05-19 13:54:01 UTC (rev 16602) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-05-19 15:56:55 UTC (rev 16603) @@ -17,6 +17,7 @@ */ package org.hibernate.validation.util; +import java.io.InputStream; import java.util.Set; import javax.validation.ConstraintDescriptor; import javax.validation.ConstraintViolation; @@ -25,6 +26,7 @@ import javax.validation.Validation; import javax.validation.Validator; +import org.slf4j.Logger; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -36,6 +38,7 @@ * @author Hardy Ferentschik */ public class TestUtil { + private static final Logger log = LoggerFactory.make(); private static Validator hibernateValidator; @@ -52,6 +55,34 @@ return hibernateValidator; } + /** + * @param path The path to the xml file which should server as <code>validation.xml</code> for the returned + * <code>Validator</code>. + * + * @return A <code>Validator</code> instance which respects the configuration specified in the file with the path + * <code>path</code>. + */ + public static Validator getValidatorWithCustomConfiguration(String path) { + Thread.currentThread().setContextClassLoader( new CustomValidationXmlClassLoader( path ) ); + + HibernateValidatorConfiguration configuration = Validation + .byProvider( HibernateValidatorConfiguration.class ) + .configure(); + return configuration.buildValidatorFactory().getValidator(); + } + + /** + * @return A <code>Validator</code> instance which ignores validation.xml</code>. + */ + public static Validator getValidatorIgnoringValidationXml() { + Thread.currentThread().setContextClassLoader( new IgnoringValidationXmlClassLoader() ); + + HibernateValidatorConfiguration configuration = Validation + .byProvider( HibernateValidatorConfiguration.class ) + .configure(); + return configuration.buildValidatorFactory().getValidator(); + } + public static ConstraintDescriptor<?> getSingleConstraintDescriptorFor(Class<?> clazz, String property) { Set<ConstraintDescriptor<?>> constraintDescriptors = getConstraintDescriptorsFor( clazz, property ); assertTrue( @@ -114,4 +145,36 @@ public static void assertNumberOfViolations(Set violations, int expectedViolations) { assertEquals( violations.size(), expectedViolations, "Wrong number of constraint violations" ); } + + private static class CustomValidationXmlClassLoader extends ClassLoader { + private final String customValidationXmlPath; + + CustomValidationXmlClassLoader(String pathToCustomValidationXml) { + super( CustomValidationXmlClassLoader.class.getClassLoader() ); + customValidationXmlPath = pathToCustomValidationXml; + } + + public InputStream getResourceAsStream(String path) { + String finalPath = path; + if ( "META-INF/validation.xml".equals( path ) ) { + log.info( "Using {} as validation.xml", customValidationXmlPath ); + finalPath = customValidationXmlPath; + } + return super.getResourceAsStream( finalPath ); + } + } + + private static class IgnoringValidationXmlClassLoader extends ClassLoader { + IgnoringValidationXmlClassLoader() { + super( IgnoringValidationXmlClassLoader.class.getClassLoader() ); + } + + public InputStream getResourceAsStream(String path) { + if ( "META-INF/validation.xml".equals( path ) ) { + log.info( "Ignoring call to load validation.xml" ); + return null; + } + return super.getResourceAsStream( path ); + } + } } Added: validator/trunk/hibernate-validator/src/test/resources/META-INF/validation-invalid-xml.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/META-INF/validation-invalid-xml.xml (rev 0) +++ validator/trunk/hibernate-validator/src/test/resources/META-INF/validation-invalid-xml.xml 2009-05-19 15:56:55 UTC (rev 16603) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +</validation-confi> \ No newline at end of file Property changes on: validator/trunk/hibernate-validator/src/test/resources/META-INF/validation-invalid-xml.xml ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r16602 - entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb.

by hibernate-commits＠lists.jboss.org

Author: jcosta(a)redhat.com Date: 2009-05-19 09:54:01 -0400 (Tue, 19 May 2009) New Revision: 16602 Modified: entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java Log: JBPAPP-1998 - Backported: Added additional try/catch in AbstractEntityManagerImpl.wrapStaleStateException Modified: entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java =================================================================== --- entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-05-19 13:45:23 UTC (rev 16601) +++ entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-05-19 13:54:01 UTC (rev 16602) @@ -636,12 +636,16 @@ StaleObjectStateException sose = (StaleObjectStateException) e; Serializable identifier = sose.getIdentifier(); if (identifier != null) { - Object entity = getRawSession().load( sose.getEntityName(), identifier ); - if ( entity instanceof Serializable ) { - //avoid some user errors regarding boundary crossing - pe = new OptimisticLockException( null, e, entity ); - } - else { + try { + Object entity = getRawSession().load( sose.getEntityName(), identifier ); + if ( entity instanceof Serializable ) { + //avoid some user errors regarding boundary crossing + pe = new OptimisticLockException( null, e, entity ); + } + else { + pe = new OptimisticLockException( e ); + } + } catch (EntityNotFoundException enfe) { pe = new OptimisticLockException( e ); } }

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits May 2009