Skip to content

Commit 2a9d96f

Browse files
Maros-1984Maros-1984
committed
Exception handler able to catch getter and setter exceptions
Exception handler able to catch getter and setter exceptions (2nd try).
1 parent d8b820f commit 2a9d96f

File tree

10 files changed

+83
-21
lines changed

10 files changed

+83
-21
lines changed

‎src/main/java/de/danielbechler/diff/BeanDiffer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package de.danielbechler.diff;
1818

1919
import de.danielbechler.diff.accessor.*;
20+
import de.danielbechler.diff.accessor.exception.ExceptionListener;
2021
import de.danielbechler.diff.introspect.*;
2122
import de.danielbechler.diff.node.*;
2223
import de.danielbechler.util.*;
@@ -34,11 +35,11 @@ final class BeanDiffer implements Differ<Node>
3435
private BeanPropertyComparisonDelegator beanPropertyComparisonDelegator;
3536
private DefaultNodeFactory defaultNodeFactory = new DefaultNodeFactory();
3637

37-
public BeanDiffer(final DifferDelegator delegator, final NodeInspector nodeInspector)
38+
public BeanDiffer(final DifferDelegator delegator, final NodeInspector nodeInspector, final ExceptionListener exceptionListener)
3839
{
3940
Assert.notNull(delegator, "delegator");
4041
Assert.notNull(nodeInspector, "configuration");
41-
this.beanPropertyComparisonDelegator = new BeanPropertyComparisonDelegator(delegator, nodeInspector);
42+
this.beanPropertyComparisonDelegator = new BeanPropertyComparisonDelegator(delegator, nodeInspector, exceptionListener);
4243
this.nodeInspector = nodeInspector;
4344
}
4445

‎src/main/java/de/danielbechler/diff/BeanPropertyComparisonDelegator.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
package de.danielbechler.diff;
1818

1919
import de.danielbechler.diff.accessor.*;
20+
import de.danielbechler.diff.accessor.exception.ExceptionListener;
21+
import de.danielbechler.diff.accessor.exception.PropertyReadException;
22+
import de.danielbechler.diff.accessor.exception.PropertyWriteException;
2023
import de.danielbechler.diff.node.*;
2124
import de.danielbechler.util.*;
2225

@@ -26,14 +29,17 @@ class BeanPropertyComparisonDelegator
2629
private final DifferDelegator delegator;
2730
private final NodeInspector nodeInspector;
2831
private PropertyNodeFactory propertyNodeFactory = new PropertyNodeFactory();
32+
private final ExceptionListener exceptionListener;
2933

30-
public BeanPropertyComparisonDelegator(final DifferDelegator delegator, final NodeInspector nodeInspector)
34+
public BeanPropertyComparisonDelegator(final DifferDelegator delegator, final NodeInspector nodeInspector, final ExceptionListener exceptionListener)
3135
{
3236
Assert.notNull(delegator, "delegator");
3337
Assert.notNull(nodeInspector, "nodeInspector");
38+
Assert.notNull(exceptionListener, "exceptionListener");
3439

3540
this.delegator = delegator;
3641
this.nodeInspector = nodeInspector;
42+
this.exceptionListener = exceptionListener;
3743
}
3844

3945
public Node compare(final Node beanNode, final Instances beanInstances, final Accessor propertyAccessor)
@@ -51,7 +57,13 @@ public Node compare(final Node beanNode, final Instances beanInstances, final Ac
5157
}
5258
else
5359
{
54-
return delegator.delegate(beanNode, beanInstances.access(propertyAccessor));
60+
try {
61+
return delegator.delegate(beanNode, beanInstances.access(propertyAccessor));
62+
} catch(PropertyReadException e) {
63+
return exceptionListener.onPropertyReadException(e, propertyNode);
64+
} catch(PropertyWriteException e) {
65+
return exceptionListener.onPropertyWriteException(e, propertyNode);
66+
}
5567
}
5668
}
5769

‎src/main/java/de/danielbechler/diff/DifferFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ else if (Map.class.isAssignableFrom(type))
5050
}
5151
else
5252
{
53-
return new BeanDiffer(delegator, configuration);
53+
return new BeanDiffer(delegator, configuration, configuration.getExceptionListener());
5454
}
5555
}
5656

‎src/main/java/de/danielbechler/diff/accessor/PropertyAccessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ private void invokeWriteMethod(final Object target, final Object value)
8686
}
8787
catch (Exception e)
8888
{
89-
logFailedSet(value);
90-
91-
final PropertyWriteException ex = new PropertyWriteException(e);
89+
final PropertyWriteException ex = new PropertyWriteException(e, value);
9290
ex.setPropertyName(propertyName);
9391
ex.setTargetType(getType());
9492
throw ex;

‎src/main/java/de/danielbechler/diff/accessor/exception/DefaultExceptionListener.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package de.danielbechler.diff.accessor.exception;
22

3-
import de.danielbechler.diff.node.*;
4-
import org.slf4j.*;
3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
6+
import de.danielbechler.diff.node.Node;
57

68
/**
79
* Handler for recoverable exceptional states which logs the warning or info messages into log. The exception
@@ -19,4 +21,15 @@ public void onCircularReferenceException(final Node node)
1921
+ "this instance along the current path.";
2022
logger.warn(message, node.getPropertyPath());
2123
}
22-
}
24+
25+
public Node onPropertyWriteException(final PropertyWriteException ex, final Node propertyNode)
26+
{
27+
logger.info("Couldn't set new value '{}' for property '{}'", ex.getNewValue(), ex.getPropertyName());
28+
throw ex;
29+
}
30+
31+
public Node onPropertyReadException(final PropertyReadException ex, final Node propertyNode)
32+
{
33+
throw ex;
34+
}
35+
}

‎src/main/java/de/danielbechler/diff/accessor/exception/ExceptionListener.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,26 @@ public interface ExceptionListener
1414
* @param node The node which has been detected to cause a circular reference.
1515
*/
1616
void onCircularReferenceException(Node node);
17-
}
17+
18+
/**
19+
* Called when PropertyWriteException happens.
20+
*
21+
* @param e
22+
* PropertyWriteException itself.
23+
* @param propertyNode
24+
* Node of the property that we were unable to write to.
25+
* @return Resulting node.
26+
*/
27+
Node onPropertyWriteException(PropertyWriteException e, Node propertyNode);
28+
29+
/**
30+
* Called when PropertyReadException happens.
31+
*
32+
* @param ex
33+
* The PropertyReadException itself.
34+
* @param propertyNode
35+
* Node of the property that we were unable to read.
36+
* @return Node as a result of wrong read.
37+
*/
38+
Node onPropertyReadException(PropertyReadException ex, Node propertyNode);
39+
}

‎src/main/java/de/danielbechler/diff/accessor/exception/PropertyWriteException.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,22 @@
2020
public class PropertyWriteException extends PropertyException
2121
{
2222
private static final long serialVersionUID = 1L;
23+
private final Object newValue;
2324

24-
public PropertyWriteException(final Throwable cause)
25+
public PropertyWriteException(final Throwable cause, final Object newValue)
2526
{
2627
super(cause);
28+
this.newValue = newValue;
2729
}
2830

2931
@Override
3032
public String getMessage()
3133
{
3234
return "Error while invoking write method. ";
3335
}
36+
37+
public Object getNewValue()
38+
{
39+
return newValue;
40+
}
3441
}

‎src/test/java/de/danielbechler/diff/BeanDifferShould.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
package de.danielbechler.diff;
1818

1919
import de.danielbechler.diff.accessor.*;
20+
import de.danielbechler.diff.accessor.exception.DefaultExceptionListener;
2021
import de.danielbechler.diff.introspect.*;
2122
import de.danielbechler.diff.mock.*;
2223
import de.danielbechler.diff.node.*;
2324
import de.danielbechler.diff.path.*;
25+
2426
import org.mockito.Mock;
2527
import org.testng.annotations.*;
2628

@@ -51,7 +53,7 @@ public void setUp()
5153
{
5254
initMocks(this);
5355
configuration = new Configuration();
54-
differ = new BeanDiffer(delegator, configuration);
56+
differ = new BeanDiffer(delegator, configuration, configuration.getExceptionListener());
5557
differ.setIntrospector(introspector);
5658
}
5759

@@ -165,12 +167,13 @@ public void compare_bean_via_introspection_and_delegate_comparison_of_properties
165167

166168
when(defaultNodeFactory.createNode(Node.ROOT, beanInstances)).thenReturn(beanNode);
167169
when(configuration.isIntrospectible(beanNode)).thenReturn(true);
170+
when(configuration.getExceptionListener()).thenReturn(new DefaultExceptionListener());
168171
doReturn(beanType).when(beanInstances).getType();
169172
when(introspector.introspect(beanType)).thenReturn(asList(propertyAccessor));
170173
when(beanPropertyComparer.compare(beanNode, beanInstances, propertyAccessor)).thenReturn(propertyNode);
171174
when(configuration.isReturnable(propertyNode)).thenReturn(true);
172175

173-
differ = new BeanDiffer(delegator, configuration);
176+
differ = new BeanDiffer(delegator, configuration, configuration.getExceptionListener());
174177
differ.setIntrospector(introspector);
175178
differ.setBeanPropertyComparisonDelegator(beanPropertyComparer);
176179
differ.setDefaultNodeFactory(defaultNodeFactory);
@@ -183,12 +186,12 @@ public void compare_bean_via_introspection_and_delegate_comparison_of_properties
183186
@Test(expectedExceptions = IllegalArgumentException.class)
184187
public void fail_construction_without_delegator()
185188
{
186-
new BeanDiffer(null, configuration);
189+
new BeanDiffer(null, configuration, configuration.getExceptionListener());
187190
}
188191

189192
@Test(expectedExceptions = IllegalArgumentException.class)
190193
public void fail_construction_without_configuration()
191194
{
192-
new BeanDiffer(delegator, null);
195+
new BeanDiffer(delegator, null, new DefaultExceptionListener());
193196
}
194197
}

‎src/test/java/de/danielbechler/diff/BeanPropertyComparisonDelegatorShould.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
package de.danielbechler.diff;
1818

1919
import de.danielbechler.diff.accessor.*;
20+
import de.danielbechler.diff.accessor.exception.DefaultExceptionListener;
2021
import de.danielbechler.diff.node.*;
22+
2123
import org.mockito.Mock;
2224
import org.testng.annotations.*;
2325

@@ -42,8 +44,8 @@ public class BeanPropertyComparisonDelegatorShould
4244
protected void setUp() throws Exception
4345
{
4446
initMocks(this);
45-
46-
beanPropertyComparisonDelegator = new BeanPropertyComparisonDelegator(delegator, configuration);
47+
when(configuration.getExceptionListener()).thenReturn(new DefaultExceptionListener());
48+
beanPropertyComparisonDelegator = new BeanPropertyComparisonDelegator(delegator, configuration, configuration.getExceptionListener());
4749
beanPropertyComparisonDelegator.setPropertyNodeFactory(propertyNodeFactory);
4850
}
4951

@@ -94,13 +96,13 @@ public void delegate_property_comparison()
9496
@Test(expectedExceptions = IllegalArgumentException.class)
9597
public void fail_if_constructed_without_delegator()
9698
{
97-
new BeanPropertyComparisonDelegator(null, configuration);
99+
new BeanPropertyComparisonDelegator(null, configuration, configuration.getExceptionListener());
98100
}
99101

100102
@Test(expectedExceptions = IllegalArgumentException.class)
101103
public void fail_if_constructed_without_configuration()
102104
{
103-
new BeanPropertyComparisonDelegator(delegator, null);
105+
new BeanPropertyComparisonDelegator(delegator, null, new DefaultExceptionListener());
104106
}
105107

106108
@Test(expectedExceptions = IllegalArgumentException.class)

‎src/test/java/de/danielbechler/diff/DifferFactoryShould.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616

1717
package de.danielbechler.diff;
1818

19+
import de.danielbechler.diff.accessor.exception.DefaultExceptionListener;
1920
import de.danielbechler.diff.mock.*;
21+
2022
import org.mockito.Mock;
2123
import org.testng.annotations.*;
2224

2325
import java.util.*;
2426

2527
import static org.fest.assertions.api.Assertions.*;
28+
import static org.mockito.Mockito.when;
2629
import static org.mockito.MockitoAnnotations.*;
2730

2831
/** @author Daniel Bechler */
@@ -38,6 +41,7 @@ public class DifferFactoryShould
3841
public void initDifferFactory()
3942
{
4043
initMocks(this);
44+
when(configuration.getExceptionListener()).thenReturn(new DefaultExceptionListener());
4145
differFactory = new DifferFactory(configuration);
4246
}
4347

0 commit comments

Comments
 (0)