Skip to content

Commit d8b93a8

Browse files
SQiShERSQiShER
committed
Code style, cleanup, consistency
1 parent b3d5c2e commit d8b93a8

File tree

6 files changed

+85
-92
lines changed

6 files changed

+85
-92
lines changed

‎src/integration-test/java/de/danielbechler/diff/categories/CategoriesTestIT.groovy‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,45 @@ package de.danielbechler.diff.categories
22

33
import de.danielbechler.diff.ObjectDifferBuilder
44
import de.danielbechler.diff.introspection.ObjectDiffProperty
5-
import de.danielbechler.diff.node.DiffNode
6-
import de.danielbechler.diff.node.Visit
75
import de.danielbechler.diff.path.NodePath
86
import spock.lang.Specification
97

10-
class CategoriesTestIT extends Specification{
8+
class CategoriesTestIT extends Specification {
119

12-
def "should return all categories"(){
10+
def "should return all categories"() {
1311
setup:
14-
def obj1 = new MyObject("aaa","aaa")
15-
def obj2 = new MyObject("bbb","bbb")
16-
def differ = ObjectDifferBuilder.startBuilding()
17-
.categories()
18-
.ofNode(NodePath.with("firstString")).toBe("cat1")
19-
.ofNode(NodePath.with("secondString")).toBe("cat1")
20-
.and()
21-
.build()
22-
def node = differ.compare(obj1,obj2)
23-
24-
expect :
25-
node.getChild("firstString").getCategories() == ["cat1"] as Set
26-
node.getChild("secondString").getCategories() == ["cat1", "catAnnotation"] as Set
12+
def obj1 = new MyObject("aaa", "aaa")
13+
def obj2 = new MyObject("bbb", "bbb")
14+
def differ = ObjectDifferBuilder.startBuilding()
15+
.categories()
16+
.ofNode(NodePath.with("firstString")).toBe("cat1")
17+
.ofNode(NodePath.with("secondString")).toBe("cat1")
18+
.and()
19+
.build()
20+
def node = differ.compare(obj1, obj2)
21+
22+
expect:
23+
node.getChild("firstString").getCategories() == ["cat1"] as Set
24+
node.getChild("secondString").getCategories() == ["cat1", "catAnnotation"] as Set
2725
}
2826

29-
class MyObject{
30-
27+
@SuppressWarnings("GroovyUnusedDeclaration")
28+
class MyObject {
3129
def firstString
32-
def secondString
33-
34-
MyObject(firstString,secondString) {
30+
def secondString
3531

32+
MyObject(firstString, secondString) {
3633
this.firstString = firstString
3734
this.secondString = secondString
3835
}
3936

40-
@ObjectDiffProperty(categories = ["catAnnotation"])
37+
@ObjectDiffProperty(categories = ["catAnnotation"])
4138
def getSecondString() {
4239
return secondString
4340
}
41+
42+
void setSecondString(secondString) {
43+
this.secondString = secondString
44+
}
4445
}
4546
}

‎src/main/java/de/danielbechler/diff/differ/DifferDispatcher.java‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public final void clearInstanceMemory()
8989
workingThreadLocal.remove();
9090
baseThreadLocal.remove();
9191
}
92-
92+
9393
/**
9494
* Delegates the call to an appropriate {@link Differ}.
9595
*
@@ -107,7 +107,7 @@ public DiffNode dispatch(final DiffNode parentNode,
107107
{
108108
parentNode.addChild(node);
109109
}
110-
if(node != null)
110+
if (node != null)
111111
{
112112
node.addCategories(categoryResolver.resolveCategories(node));
113113
}
@@ -204,43 +204,36 @@ private DiffNode compare(final DiffNode parentNode, final Instances instances)
204204
return differ.compare(parentNode, instances);
205205
}
206206

207-
protected void forgetInstances(final DiffNode parentNode, final Instances instances)
207+
protected static void forgetInstances(final DiffNode parentNode, final Instances instances)
208208
{
209-
final NodePath nodePath;
210-
if (parentNode != null)
211-
{
212-
final NodePath parentPath = parentNode.getPath();
213-
final ElementSelector elementSelector = instances.getSourceAccessor().getElementSelector();
214-
nodePath = NodePath.startBuildingFrom(parentPath).element(elementSelector).build();
215-
}
216-
else
217-
{
218-
nodePath = NodePath.withRoot();
219-
}
209+
final NodePath nodePath = getNodePath(parentNode, instances);
220210
logger.debug("[ {} ] Forgetting --- WORKING: {} <=> BASE: {}", nodePath, instances.getWorking(), instances.getBase());
221211
workingThreadLocal.get().remove(instances.getWorking());
222212
baseThreadLocal.get().remove(instances.getBase());
223213
}
224214

225-
protected void rememberInstances(final DiffNode parentNode, final Instances instances)
215+
private static NodePath getNodePath(final DiffNode parentNode, final Instances instances)
226216
{
227-
final NodePath nodePath;
228-
if (parentNode != null)
217+
if (parentNode == null)
229218
{
230-
final NodePath parentPath = parentNode.getPath();
231-
final ElementSelector elementSelector = instances.getSourceAccessor().getElementSelector();
232-
nodePath = NodePath.startBuildingFrom(parentPath).element(elementSelector).build();
219+
return NodePath.withRoot();
233220
}
234221
else
235222
{
236-
nodePath = NodePath.withRoot();
223+
final NodePath parentPath = parentNode.getPath();
224+
final ElementSelector elementSelector = instances.getSourceAccessor().getElementSelector();
225+
return NodePath.startBuildingFrom(parentPath).element(elementSelector).build();
237226
}
238-
logger.debug("[ {} ] Remembering --- WORKING: {} <=> BASE: {}", nodePath, instances.getWorking(), instances.getBase());
227+
}
239228

229+
protected static void rememberInstances(final DiffNode parentNode, final Instances instances)
230+
{
231+
final NodePath nodePath = getNodePath(parentNode, instances);
232+
logger.debug("[ {} ] Remembering --- WORKING: {} <=> BASE: {}", nodePath, instances.getWorking(), instances.getBase());
240233
transactionalPushToCircularReferenceDetectors(nodePath, instances);
241234
}
242235

243-
private void transactionalPushToCircularReferenceDetectors(final NodePath nodePath, final Instances instances)
236+
private static void transactionalPushToCircularReferenceDetectors(final NodePath nodePath, final Instances instances)
244237
{
245238
workingThreadLocal.get().push(instances.getWorking(), nodePath);
246239

‎src/main/java/de/danielbechler/diff/inclusion/InclusionService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,5 +279,4 @@ public ObjectDifferBuilder and()
279279
{
280280
return rootConfiguration;
281281
}
282-
283282
}

‎src/main/java/de/danielbechler/diff/node/DiffNode.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class DiffNode
6868
private Class<?> valueType;
6969
private TypeInfo valueTypeInfo;
7070
private IdentityStrategy childIdentityStrategy;
71-
private final Set<String> additionalCategories = new TreeSet<String>();
71+
private final Collection<String> additionalCategories = new TreeSet<String>();
7272

7373
public void setChildIdentityStrategy(final IdentityStrategy identityStrategy)
7474
{
@@ -579,7 +579,7 @@ public boolean isExcluded()
579579
* Returns an unmodifiable {@link java.util.Set} of {@link java.lang.String} with the categories of this node.
580580
*
581581
* @return an unmodifiable {@link java.util.Set} of {@link java.lang.String} with the categories of this node
582-
*/
582+
*/
583583
public final Set<String> getCategories()
584584
{
585585
final Set<String> categories = new TreeSet<String>();
@@ -785,7 +785,7 @@ public enum State
785785

786786
private final String reason;
787787

788-
private State(final String reason)
788+
State(final String reason)
789789
{
790790
this.reason = reason;
791791
}
@@ -799,7 +799,7 @@ public String getReason()
799799
/**
800800
* Visitor to traverse a node graph.
801801
*/
802-
public static interface Visitor
802+
public interface Visitor
803803
{
804804
void node(DiffNode node, Visit visit);
805805
}

‎src/test/java/de/danielbechler/diff/differ/DifferDispatcherTest.groovy‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
package de.danielbechler.diff.differ
1818

19-
import de.danielbechler.diff.access.*
19+
import de.danielbechler.diff.access.Instances
20+
import de.danielbechler.diff.access.PropertyAwareAccessor
2021
import de.danielbechler.diff.category.CategoryResolver
2122
import de.danielbechler.diff.circular.CircularReferenceDetector
2223
import de.danielbechler.diff.circular.CircularReferenceDetectorFactory
@@ -27,7 +28,6 @@ import de.danielbechler.diff.introspection.PropertyAccessExceptionHandler
2728
import de.danielbechler.diff.introspection.PropertyAccessExceptionHandlerResolver
2829
import de.danielbechler.diff.introspection.PropertyReadException
2930
import de.danielbechler.diff.node.DiffNode
30-
import spock.lang.Ignore
3131
import spock.lang.Specification
3232
import spock.lang.Subject
3333

@@ -67,28 +67,28 @@ class DifferDispatcherTest extends Specification {
6767
propertyAccessExceptionHandlerResolver,
6868
categoryResolver)
6969

70-
@Ignore
71-
def "when a circular reference is detected"() {
72-
given:
73-
def accessor = Stub Accessor
74-
def accessedInstances = Mock Instances, {
75-
areNull() >> false
76-
getBase() >> new Object()
77-
getWorking() >> new Object()
78-
}
79-
def instances = Mock Instances, {
80-
access(_ as Accessor) >> accessedInstances
81-
getSourceAccessor() >> accessor
82-
}
83-
def node = DiffNode.newRootNode()
84-
85-
when:
86-
differDispatcher.dispatch(node, instances, accessor)
87-
88-
then:
89-
differDispatcher.workingCircularReferenceDetector.size() == 1
90-
differDispatcher.baseCircularReferenceDetector.size() == 1
91-
}
70+
// @Ignore
71+
// def "when a circular reference is detected"() {
72+
// given:
73+
// def accessor = Stub Accessor
74+
// def accessedInstances = Mock Instances, {
75+
// areNull() >> false
76+
// getBase() >> new Object()
77+
// getWorking() >> new Object()
78+
// }
79+
// def instances = Mock Instances, {
80+
// access(_ as Accessor) >> accessedInstances
81+
// getSourceAccessor() >> accessor
82+
// }
83+
// def node = DiffNode.newRootNode()
84+
//
85+
// when:
86+
// differDispatcher.dispatch(node, instances, accessor)
87+
//
88+
// then:
89+
// differDispatcher.workingCircularReferenceDetector.size() == 1
90+
// differDispatcher.baseCircularReferenceDetector.size() == 1
91+
// }
9292

9393
def 'should delegate property read exception to exception handler'() {
9494
def propertyExceptionHandler = Mock PropertyAccessExceptionHandler

‎src/test/java/de/danielbechler/diff/node/DiffNodeTest.groovy‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -246,31 +246,31 @@ class DiffNodeTest extends Specification {
246246
doesOrDoesNotImplement = expectedResult ? 'implements' : 'does not implement'
247247
}
248248

249-
def "should return added categories"(){
249+
def "should return added categories"() {
250250
given:
251-
def node = new DiffNode(null, Mock(Accessor), Object)
252-
node.addCategories(["addedCategory"] as List)
253-
expect :
254-
node.getCategories() == ["addedCategory"] as Set
251+
def node = new DiffNode(null, Mock(Accessor), Object)
252+
node.addCategories(["addedCategory"] as List)
253+
expect:
254+
node.getCategories() == ["addedCategory"] as Set
255255
}
256256

257-
def "categories should not be modifiable by a client directly"(){
257+
def "categories should not be modifiable by a client directly"() {
258258

259259
when:
260-
def node = new DiffNode(null, Mock(Accessor), Object)
261-
def cats = node.getCategories()
262-
cats.removeAll()
263-
then :
264-
thrown UnsupportedOperationException
260+
def node = new DiffNode(null, Mock(Accessor), Object)
261+
def cats = node.getCategories()
262+
cats.removeAll()
263+
then:
264+
thrown UnsupportedOperationException
265265
}
266266

267-
def "should throw exception when added a null collection"(){
267+
def "should throw exception when added a null collection"() {
268268

269269
when:
270-
def node = new DiffNode(null, Mock(Accessor), Object)
271-
node.addCategories(null)
272-
then :
273-
def ex = thrown(IllegalArgumentException)
274-
ex.message == "'additionalCategories' must not be null"
270+
def node = new DiffNode(null, Mock(Accessor), Object)
271+
node.addCategories(null)
272+
then:
273+
def ex = thrown(IllegalArgumentException)
274+
ex.message == "'additionalCategories' must not be null"
275275
}
276276
}

0 commit comments

Comments
 (0)