Skip to content

Commit 0b9db64

Browse files
SQiShERSQiShER
committed
Simplified configuration API and wrote AT for introspection configuration.
1 parent 870da86 commit 0b9db64

File tree

9 files changed

+246
-58
lines changed

9 files changed

+246
-58
lines changed

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2014 Daniel Bechler
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package de.danielbechler.diff;
18+
19+
import de.danielbechler.diff.category.CategoryConfiguration;
20+
import de.danielbechler.diff.circular.CircularReferenceConfiguration;
21+
import de.danielbechler.diff.comparison.ComparisonConfiguration;
22+
import de.danielbechler.diff.filtering.ReturnableNodeConfiguration;
23+
import de.danielbechler.diff.inclusion.InclusionConfiguration;
24+
import de.danielbechler.diff.introspection.IntrospectionConfiguration;
25+
26+
/**
27+
* Created by Daniel Bechler.
28+
*/
29+
public interface Configuration
30+
{
31+
ReturnableNodeConfiguration filtering();
32+
33+
IntrospectionConfiguration introspection();
34+
35+
CircularReferenceConfiguration circularReferenceHandling();
36+
37+
InclusionConfiguration inclusion();
38+
39+
ComparisonConfiguration comparison();
40+
41+
CategoryConfiguration categories();
42+
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
*/
4545
public final class ObjectDifferBuilder
4646
{
47-
private final Configuration configuration = new Configuration();
47+
private final Configuration configuration = new ConfigurationImpl();
48+
private final IntrospectionService introspectionService = new IntrospectionService(configuration);
4849
private final CategoryService categoryService = new CategoryService();
49-
private final InclusionService<Configuration> inclusionService = new InclusionService<Configuration>(categoryService, configuration);
50+
private final InclusionService inclusionService = new InclusionService(categoryService, configuration);
5051
private final ComparisonService comparisonService = new ComparisonService();
5152
private final ReturnableNodeService returnableNodeService = new ReturnableNodeService();
52-
private final IntrospectionService introspectionService = new IntrospectionService();
5353
private final CircularReferenceService circularReferenceService = new CircularReferenceService();
5454

5555
private ObjectDifferBuilder()
@@ -61,11 +61,6 @@ public static ObjectDiffer buildDefault()
6161
return startBuilding().build();
6262
}
6363

64-
public static ObjectDifferBuilder startBuilding()
65-
{
66-
return new ObjectDifferBuilder();
67-
}
68-
6964
public ObjectDiffer build()
7065
{
7166
final DifferProvider differProvider = new DifferProvider();
@@ -77,6 +72,11 @@ public ObjectDiffer build()
7772
return new ObjectDiffer(differDispatcher);
7873
}
7974

75+
public static ObjectDifferBuilder startBuilding()
76+
{
77+
return new ObjectDifferBuilder();
78+
}
79+
8080
/**
8181
* Configure the way the ObjectDiffer should behave.
8282
*/
@@ -85,9 +85,9 @@ public final Configuration configure()
8585
return configuration;
8686
}
8787

88-
public class Configuration
88+
public class ConfigurationImpl implements de.danielbechler.diff.Configuration
8989
{
90-
private Configuration()
90+
private ConfigurationImpl()
9191
{
9292
}
9393

@@ -120,7 +120,7 @@ public CircularReferenceConfiguration circularReferenceHandling()
120120
* Allows to in- or exclude nodes based on property name, object type, category or location in the object
121121
* graph.
122122
*/
123-
public InclusionConfiguration<Configuration> inclusion()
123+
public InclusionConfiguration inclusion()
124124
{
125125
return inclusionService;
126126
}

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package de.danielbechler.diff.inclusion;
1818

19+
import de.danielbechler.diff.Configuration;
1920
import de.danielbechler.diff.path.NodePath;
2021

2122
/**
@@ -29,49 +30,49 @@
2930
*
3031
* @author Daniel Bechler
3132
*/
32-
public interface InclusionConfiguration<T>
33+
public interface InclusionConfiguration
3334
{
3435
/**
3536
* Includes elements (and implicitly all their children) based on certain criteria, unless their parent element
3637
* is excluded.
3738
*/
38-
ToInclude<T> include();
39+
ToInclude include();
3940

40-
ToExclude<T> exclude();
41+
ToExclude exclude();
4142

42-
public interface ToInclude<T>
43+
public interface ToInclude
4344
{
44-
ToIncludeAndReturn<T> category(String category);
45+
ToIncludeAndReturn category(String category);
4546

46-
ToIncludeAndReturn<T> type(Class<?> type);
47+
ToIncludeAndReturn type(Class<?> type);
4748

48-
ToIncludeAndReturn<T> node(NodePath nodePath);
49+
ToIncludeAndReturn node(NodePath nodePath);
4950

50-
ToIncludeAndReturn<T> propertyName(String propertyName);
51+
ToIncludeAndReturn propertyName(String propertyName);
5152

52-
ToExclude<T> exclude();
53+
ToExclude exclude();
5354
}
5455

55-
public interface ToIncludeAndReturn<T> extends ToInclude<T>
56+
public interface ToIncludeAndReturn extends ToInclude
5657
{
57-
T and();
58+
Configuration and();
5859
}
5960

60-
public interface ToExclude<T>
61+
public interface ToExclude
6162
{
62-
ToExcludeAndReturn<T> category(String category);
63+
ToExcludeAndReturn category(String category);
6364

64-
ToExcludeAndReturn<T> type(Class<?> type);
65+
ToExcludeAndReturn type(Class<?> type);
6566

66-
ToExcludeAndReturn<T> node(NodePath nodePath);
67+
ToExcludeAndReturn node(NodePath nodePath);
6768

68-
ToExcludeAndReturn<T> propertyName(String property);
69+
ToExcludeAndReturn propertyName(String property);
6970

70-
ToInclude<T> include();
71+
ToInclude include();
7172
}
7273

73-
public interface ToExcludeAndReturn<T> extends ToExclude<T>
74+
public interface ToExcludeAndReturn extends ToExclude
7475
{
75-
T and();
76+
Configuration and();
7677
}
7778
}

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package de.danielbechler.diff.inclusion;
1818

19+
import de.danielbechler.diff.Configuration;
1920
import de.danielbechler.diff.category.CategoryResolver;
2021
import de.danielbechler.diff.node.DiffNode;
2122
import de.danielbechler.diff.node.Visit;
@@ -35,18 +36,18 @@
3536
/**
3637
*
3738
*/
38-
public class InclusionService<T> implements InclusionConfiguration<T>, IsIgnoredResolver
39+
public class InclusionService implements InclusionConfiguration, IsIgnoredResolver
3940
{
4041
private final CategoryResolver categoryResolver;
41-
private final T rootConfiguration;
42+
private final Configuration rootConfiguration;
4243
private final InclusionNode nodeInclusions = new InclusionNode();
4344
private final Map<Class<?>, Inclusion> typeInclusions = new HashMap<Class<?>, Inclusion>();
4445
private final Map<String, Inclusion> categoryInclusions = new HashMap<String, Inclusion>();
4546
private final Map<String, Inclusion> propertyNameInclusions = new HashMap<String, Inclusion>();
46-
private final ToInclude<T> includeAndReturn = new ToIncludeAndReturnImpl();
47-
private final ToExclude<T> excludeAndReturn = new ToExcludeAndReturnImpl();
47+
private final ToInclude includeAndReturn = new ToIncludeAndReturnImpl();
48+
private final ToExclude excludeAndReturn = new ToExcludeAndReturnImpl();
4849

49-
public InclusionService(final CategoryResolver categoryResolver, final T rootConfiguration)
50+
public InclusionService(final CategoryResolver categoryResolver, final Configuration rootConfiguration)
5051
{
5152
Assert.notNull(categoryResolver, "categoryResolver");
5253
Assert.notNull(rootConfiguration, "rootConfiguration");
@@ -261,85 +262,85 @@ private boolean isIncludedByParentPropertyName(final DiffNode node)
261262
return false;
262263
}
263264

264-
public ToInclude<T> include()
265+
public ToInclude include()
265266
{
266267
return includeAndReturn;
267268
}
268269

269-
public ToExclude<T> exclude()
270+
public ToExclude exclude()
270271
{
271272
return excludeAndReturn;
272273
}
273274

274-
private class ToExcludeAndReturnImpl implements ToExcludeAndReturn<T>
275+
private class ToExcludeAndReturnImpl implements ToExcludeAndReturn
275276
{
276-
public T and()
277+
public Configuration and()
277278
{
278279
return rootConfiguration;
279280
}
280281

281-
public ToExcludeAndReturn<T> category(final String category)
282+
public ToExcludeAndReturn category(final String category)
282283
{
283284
categoryInclusions.put(category, EXCLUDED);
284285
return this;
285286
}
286287

287-
public ToExcludeAndReturn<T> type(final Class<?> type)
288+
public ToExcludeAndReturn type(final Class<?> type)
288289
{
289290
typeInclusions.put(type, EXCLUDED);
290291
return this;
291292
}
292293

293-
public ToExcludeAndReturn<T> node(final NodePath nodePath)
294+
public ToExcludeAndReturn node(final NodePath nodePath)
294295
{
295296
nodeInclusions.getNodeForPath(nodePath).setValue(EXCLUDED);
296297
return this;
297298
}
298299

299-
public ToExcludeAndReturn<T> propertyName(final String propertyName)
300+
public ToExcludeAndReturn propertyName(final String propertyName)
300301
{
301302
propertyNameInclusions.put(propertyName, EXCLUDED);
302303
return this;
303304
}
304305

305-
public ToInclude<T> include()
306+
public ToInclude include()
306307
{
307308
return InclusionService.this.include();
308309
}
309310
}
310311

311-
private class ToIncludeAndReturnImpl implements ToIncludeAndReturn<T>
312+
private class ToIncludeAndReturnImpl implements ToIncludeAndReturn
312313
{
313-
public T and()
314+
public Configuration and()
314315
{
315316
return rootConfiguration;
316317
}
317318

318-
public ToIncludeAndReturn<T> category(final String category)
319+
public ToIncludeAndReturn category(final String category)
319320
{
320321
categoryInclusions.put(category, INCLUDED);
321322
return this;
322323
}
323324

324-
public ToIncludeAndReturn<T> type(final Class<?> type)
325+
public ToIncludeAndReturn type(final Class<?> type)
325326
{
326327
typeInclusions.put(type, INCLUDED);
327328
return this;
328329
}
329330

330-
public ToIncludeAndReturn<T> node(final NodePath nodePath)
331+
public ToIncludeAndReturn node(final NodePath nodePath)
331332
{
332333
nodeInclusions.getNodeForPath(nodePath).setValue(INCLUDED);
333334
return this;
334335
}
335336

336-
public ToIncludeAndReturn<T> propertyName(final String propertyName)
337+
public ToIncludeAndReturn propertyName(final String propertyName)
337338
{
338339
propertyNameInclusions.put(propertyName, INCLUDED);
339340
return this;
340341
}
341342

342-
public ToExclude<T> exclude()
343+
public ToExclude exclude()
343344
{
344345
return InclusionService.this.exclude();
345346
}

‎src/main/java/de/danielbechler/diff/introspection/IntrospectionConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package de.danielbechler.diff.introspection;
1818

19+
import de.danielbechler.diff.Configuration;
1920
import de.danielbechler.diff.path.NodePath;
2021

2122
/**
@@ -36,6 +37,8 @@ public interface IntrospectionConfiguration
3637

3738
Of ofNode(NodePath path);
3839

40+
Configuration and();
41+
3942
public static interface Of
4043
{
4144
IntrospectionConfiguration toUse(Introspector introspector);

‎src/main/java/de/danielbechler/diff/introspection/IntrospectionService.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package de.danielbechler.diff.introspection;
1818

19+
import de.danielbechler.diff.Configuration;
1920
import de.danielbechler.diff.node.DiffNode;
2021
import de.danielbechler.diff.path.NodePath;
2122
import de.danielbechler.diff.path.NodePathValueHolder;
@@ -34,14 +35,12 @@ public class IntrospectionService implements IntrospectionConfiguration, IsIntro
3435
private final Map<Class<?>, IntrospectionMode> typeIntrospectionModeMap = new HashMap<Class<?>, IntrospectionMode>();
3536
private final NodePathValueHolder<Introspector> nodePathIntrospectorHolder = new NodePathValueHolder<Introspector>();
3637
private final NodePathValueHolder<IntrospectionMode> nodePathIntrospectionModeHolder = new NodePathValueHolder<IntrospectionMode>();
38+
private final Configuration configuration;
3739
private Introspector defaultIntrospector = new StandardBeanIntrospector();
3840

39-
private static boolean isPrimitiveTypeEnumOrArray(final Class<?> nodeType)
41+
public IntrospectionService(final Configuration configuration)
4042
{
41-
return Classes.isPrimitiveType(nodeType)
42-
|| Classes.isPrimitiveWrapperType(nodeType)
43-
|| nodeType.isEnum()
44-
|| nodeType.isArray();
43+
this.configuration = configuration;
4544
}
4645

4746
public boolean isIntrospectable(final DiffNode node)
@@ -66,6 +65,14 @@ else if (typeIntrospectionModeMap.get(nodeType) == IntrospectionMode.DISABLED)
6665
return true;
6766
}
6867

68+
private static boolean isPrimitiveTypeEnumOrArray(final Class<?> nodeType)
69+
{
70+
return Classes.isPrimitiveType(nodeType)
71+
|| Classes.isPrimitiveWrapperType(nodeType)
72+
|| nodeType.isEnum()
73+
|| nodeType.isArray();
74+
}
75+
6976
public Introspector introspectorForNode(final DiffNode node)
7077
{
7178
final Introspector typeIntrospector = typeIntrospectorMap.get(node.getValueType());
@@ -138,6 +145,11 @@ public IntrospectionConfiguration toBeDisabled()
138145
};
139146
}
140147

148+
public Configuration and()
149+
{
150+
return configuration;
151+
}
152+
141153
public enum IntrospectionMode
142154
{
143155
ENABLED,

0 commit comments

Comments
 (0)