Skip to content

Commit 1422649

Browse files
SQiShERSQiShER
committed
Made adjustments to the InclusionService
1 parent 3e87b71 commit 1422649

File tree

4 files changed

+46
-44
lines changed

4 files changed

+46
-44
lines changed

‎pom.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
18+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1920

2021
<parent>
2122
<groupId>org.sonatype.oss</groupId>
@@ -55,8 +56,8 @@
5556
<url>https://github.com/SQiShER/java-object-diff</url>
5657
<connection>scm:git:ssh://git@github.com/SQiShER/java-object-diff.git</connection>
5758
<developerConnection>scm:git:ssh://git@github.com/SQiShER/java-object-diff.git</developerConnection>
58-
<tag>HEAD</tag>
59-
</scm>
59+
<tag>HEAD</tag>
60+
</scm>
6061

6162
<issueManagement>
6263
<system>GitHub</system>
@@ -98,7 +99,7 @@
9899
<plugin>
99100
<artifactId>maven-release-plugin</artifactId>
100101
<configuration>
101-
<scmCommentPrefix />
102+
<scmCommentPrefix/>
102103
</configuration>
103104
</plugin>
104105
<plugin>
@@ -435,7 +436,7 @@
435436
<exclude>**/*Example.class</exclude>
436437
</excludes>
437438
</instrumentation>
438-
<check />
439+
<check/>
439440
</configuration>
440441
</plugin>
441442
<plugin>

‎src/integration-test/java/de/danielbechler/diff/inclusion/InclusionAT.groovy‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import de.danielbechler.diff.ObjectDifferBuilder
2020
import de.danielbechler.diff.introspection.ObjectDiffProperty
2121
import de.danielbechler.diff.path.NodePath
2222
import de.danielbechler.diff.selector.CollectionItemElementSelector
23+
import groovy.transform.EqualsAndHashCode
2324
import spock.lang.Specification
2425

2526
/**
@@ -29,8 +30,8 @@ import spock.lang.Specification
2930
class InclusionAT extends Specification {
3031

3132
def objectDifferBuilder = ObjectDifferBuilder.startBuilding()
32-
def base = new Album(artist: 'Pharrell Williams', songs: ['Happy'])
33-
def working = new Album(artist: 'N.E.R.D.', songs: ['It'])
33+
def base = new Album(artist: new Artist(name: 'Pharrell Williams'), songs: [new Song(durationInSeconds: 130, title: 'Happy')])
34+
def working = new Album(artist: new Artist(name: 'N.E.R.D.'), songs: [new Song(durationInSeconds: 150, title: 'It')])
3435

3536
def 'exclude an element by type'() {
3637
given:
@@ -74,7 +75,7 @@ class InclusionAT extends Specification {
7475

7576
def 'include an element by type'() {
7677
given:
77-
objectDifferBuilder.inclusion().include().type(ArrayList)
78+
objectDifferBuilder.inclusion().include().type(ArrayList).type(Song)
7879
when:
7980
def node = objectDifferBuilder.build().compare(working, base)
8081
then:
@@ -139,32 +140,43 @@ class InclusionAT extends Specification {
139140
when:
140141
def node = objectDifferBuilder.build().compare(working, base)
141142
then:
142-
node.getChild('songs').getChild(new CollectionItemElementSelector('Happy')).removed
143-
node.getChild('songs').getChild(new CollectionItemElementSelector('It')).added
143+
node.getChild('songs').getChild(new CollectionItemElementSelector(new Song(title: 'Happy'))).removed
144+
node.getChild('songs').getChild(new CollectionItemElementSelector(new Song(title: 'It'))).added
144145
}
145146

146147
def 'including an element by path implicitly includes its parents'() {
147148
given:
148149
objectDifferBuilder.inclusion()
149-
.include().node(NodePath.startBuilding().propertyName('songs').collectionItem('Happy').build())
150+
.include().node(NodePath.startBuilding().propertyName('songs').collectionItem(new Song(title: 'Happy')).build())
150151
when:
151152
def node = objectDifferBuilder.build().compare(working, base)
152153
then:
153-
node.getChild('songs').getChild(new CollectionItemElementSelector('Happy')).removed
154+
node.getChild('songs').getChild(new CollectionItemElementSelector(new Song(title: 'Happy'))).removed
154155
node.getChild('songs').childCount() == 1
155156
}
156157

157158
class Album {
158-
def String artist
159-
def ArrayList<String> songs
159+
def Artist artist
160+
def ArrayList<Song> songs
160161

161162
@ObjectDiffProperty(categories = ['foo'])
162-
ArrayList<String> getSongs() {
163+
ArrayList<Song> getSongs() {
163164
return songs
164165
}
165166

166-
void setSongs(ArrayList<String> songs) {
167+
void setSongs(ArrayList<Song> songs) {
167168
this.songs = songs
168169
}
169170
}
171+
172+
@EqualsAndHashCode(includeFields = true)
173+
class Artist {
174+
def String name
175+
}
176+
177+
@EqualsAndHashCode(includeFields = true, includes = ['title'])
178+
class Song {
179+
def String title
180+
def int durationInSeconds
181+
}
170182
}

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

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import de.danielbechler.diff.ObjectDifferBuilder;
2020
import de.danielbechler.diff.category.CategoryResolver;
2121
import de.danielbechler.diff.node.DiffNode;
22-
import de.danielbechler.diff.node.Visit;
2322
import de.danielbechler.diff.path.NodePath;
2423
import de.danielbechler.diff.selector.BeanPropertyElementSelector;
2524
import de.danielbechler.diff.selector.ElementSelector;
@@ -28,7 +27,6 @@
2827
import java.util.HashMap;
2928
import java.util.List;
3029
import java.util.Map;
31-
import java.util.concurrent.atomic.AtomicBoolean;
3230

3331
import static de.danielbechler.diff.inclusion.Inclusion.EXCLUDED;
3432
import static de.danielbechler.diff.inclusion.Inclusion.INCLUDED;
@@ -93,11 +91,7 @@ private boolean isExcluded(final DiffNode node)
9391
{
9492
if (hasInclusions(EXCLUDED))
9593
{
96-
if (node.isExcluded())
97-
{
98-
return true;
99-
}
100-
else if (isExcludedByPath(node))
94+
if (isExcludedByPath(node))
10195
{
10296
return true;
10397
}
@@ -150,29 +144,15 @@ private boolean isIncludedByCategory(final DiffNode node)
150144

151145
private boolean isIncludedByType(final DiffNode node)
152146
{
153-
final AtomicBoolean result = new AtomicBoolean(false);
154-
node.visitParents(new DiffNode.Visitor()
147+
if (typeInclusions.get(node.getValueType()) == INCLUDED)
155148
{
156-
public void node(final DiffNode node, final Visit visit)
157-
{
158-
if (node.getValueType() != null)
159-
{
160-
if (typeInclusions.get(node.getValueType()) == INCLUDED)
161-
{
162-
result.set(true);
163-
visit.stop();
164-
}
165-
}
166-
}
167-
});
168-
if (node.getValueType() != null)
169-
{
170-
if (typeInclusions.get(node.getValueType()) == INCLUDED)
171-
{
172-
result.set(true);
173-
}
149+
return true;
174150
}
175-
return result.get();
151+
// else if (node.getParentNode() != null && typeInclusions.get(node.getParentNode().getValueType()) == INCLUDED)
152+
// {
153+
// return true;
154+
// }
155+
return false;
176156
}
177157

178158
private boolean isIncludedByPropertyName(final DiffNode node)

‎src/test/java/de/danielbechler/diff/inclusion/InclusionServiceTest.groovy‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,15 @@ class InclusionServiceTest extends Specification {
128128
inclusionService.isIgnored(node) == false
129129
}
130130

131+
def "isIgnored: should return 'true' if node is excluded via annotation"() {
132+
setup:
133+
accessor.isExcludedByAnnotation() >> true
134+
135+
expect:
136+
inclusionService.isIgnored(node) == true
137+
}
138+
139+
131140
def "isIgnored: should return 'true' if node is excluded via path"() {
132141
setup:
133142
inclusionService.exclude().node(nodePath)

0 commit comments

Comments
 (0)