Skip to content
This repository was archived by the owner on Oct 4, 2018. It is now read-only.

Commit ac2a776

Browse files
SQiShERSQiShER
committed
Implemented runtime type detection
1 parent 67d9a8c commit ac2a776

6 files changed

Lines changed: 122 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,12 @@ public boolean areNull()
184184

185185
public Class<?> getType()
186186
{
187+
final Set<Class<?>> types = Classes.typesOf(working, base, fresh);
187188
if (sourceAccessor instanceof TypeAwareAccessor)
188189
{
189-
return ((TypeAwareAccessor) sourceAccessor).getType();
190+
final Class<?> sharedType = Classes.mostSpecificSharedType(types);
191+
return sharedType != null ? sharedType : ((TypeAwareAccessor) sourceAccessor).getType();
190192
}
191-
final Set<Class<?>> types = Classes.typesOf(working, base, fresh);
192193
if (types.isEmpty())
193194
{
194195
return null;

‎src/main/java/de/danielbechler/util/Classes.java‎

Lines changed: 71 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.slf4j.*;
2020

21+
import java.io.*;
2122
import java.lang.reflect.*;
2223
import java.net.*;
2324
import java.util.*;
@@ -51,13 +52,6 @@ private static Set<Class<?>> getWrapperTypes()
5152

5253
public static boolean isPrimitiveNumericType(final Class<?> clazz)
5354
{
54-
// numericTypes.add(Character.class);
55-
// numericTypes.add(Byte.class);
56-
// numericTypes.add(Short.class);
57-
// numericTypes.add(Integer.class);
58-
// numericTypes.add(Long.class);
59-
// numericTypes.add(Float.class);
60-
// numericTypes.add(Double.class);
6155
return PRIMITIVE_NUMERIC_TYPES.contains(clazz);
6256
}
6357

@@ -158,4 +152,74 @@ public static boolean allAssignableFrom(final Class<?> sharedType,
158152
return matching;
159153
}
160154

155+
/**
156+
* This method will not extract the interfaces of the given types, since there is no way to determine, which
157+
* interface is the most specific one (due to their compositional nature). However, if one or more interfaces
158+
* are given as type, they will be considered as most specific shared type.
159+
*
160+
* @return The most specific class (or interface) shared by all given types.
161+
*/
162+
public static Class<?> mostSpecificSharedType(final Collection<Class<?>> types)
163+
{
164+
final Collection<Class<?>> potentiallySharedTypes = superclassesOf(types);
165+
potentiallySharedTypes.addAll(types);
166+
167+
final Collection<Class<?>> sharedTypes = new TreeSet<Class<?>>(new ClassComparator());
168+
for (final Class<?> potentiallySharedType : potentiallySharedTypes)
169+
{
170+
int matches = 0;
171+
for (final Class<?> type : types)
172+
{
173+
if (potentiallySharedType.isAssignableFrom(type))
174+
{
175+
matches++;
176+
}
177+
}
178+
if (matches == types.size())
179+
{
180+
sharedTypes.add(potentiallySharedType);
181+
}
182+
}
183+
if (sharedTypes.isEmpty())
184+
{
185+
return null;
186+
}
187+
return sharedTypes.iterator().next();
188+
}
189+
190+
private static Collection<Class<?>> superclassesOf(final Iterable<Class<?>> types)
191+
{
192+
final Collection<Class<?>> superclasses = new HashSet<Class<?>>();
193+
for (final Class<?> type : types)
194+
{
195+
Class<?> superclass = type.getSuperclass();
196+
while (superclass != null && superclass != Object.class)
197+
{
198+
superclasses.add(superclass);
199+
superclass = superclass.getSuperclass();
200+
}
201+
}
202+
return superclasses;
203+
}
204+
205+
private static class ClassComparator implements Comparator<Class<?>>, Serializable
206+
{
207+
private static final long serialVersionUID = 56568941407903459L;
208+
209+
public int compare(final Class<?> o1, final Class<?> o2)
210+
{
211+
if (o1.isAssignableFrom(o2))
212+
{
213+
return 1;
214+
}
215+
else if (o2.isAssignableFrom(o1))
216+
{
217+
return -1;
218+
}
219+
else
220+
{
221+
return 0;
222+
}
223+
}
224+
}
161225
}

‎src/test/java/de/danielbechler/diff/integration/issues/issue65/Hat.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package de.danielbechler.diff.integration.issues.issue65;
1818

1919
/** @author Daniel Bechler */
20+
@SuppressWarnings("UnusedDeclaration")
2021
public class Hat
2122
{
2223
private int size;

‎src/test/java/de/danielbechler/diff/integration/issues/issue65/Person.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package de.danielbechler.diff.integration.issues.issue65;
1818

1919
/** @author Daniel Bechler */
20+
@SuppressWarnings("UnusedDeclaration")
2021
public class Person
2122
{
2223
private Hat hat;
2324

2425
public Person(final Hat hat)
2526
{
26-
super();
2727
this.hat = hat;
2828
}
2929

‎src/test/java/de/danielbechler/diff/integration/issues/issue65/TopHat.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package de.danielbechler.diff.integration.issues.issue65;
1818

1919
/** @author Daniel Bechler */
20+
@SuppressWarnings("UnusedDeclaration")
2021
public class TopHat extends Hat
2122
{
2223
private int height;

‎src/test/resources/de/danielbechler/util/ClassesSpecification.groovy‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright 2013 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.util
18+
19+
import spock.lang.Specification
20+
import spock.lang.Unroll
21+
22+
import java.util.concurrent.ConcurrentSkipListMap
23+
24+
/**
25+
* @author Daniel Bechler
26+
*/
27+
class ClassesSpecification extends Specification
28+
{
29+
@Unroll
30+
def "Classes.mostSpecificSharedType should return #expectedResult for #types"()
31+
{
32+
expect:
33+
Classes.mostSpecificSharedType(types) == expectedResult
34+
35+
where:
36+
types || expectedResult
37+
[TreeMap, TreeMap] || TreeMap
38+
[ConcurrentSkipListMap, TreeMap] || AbstractMap
39+
[ConcurrentSkipListMap, TreeMap, HashMap] || AbstractMap
40+
[ArrayList, AbstractList] || AbstractList
41+
[CharSequence, String] || CharSequence
42+
[Serializable, Serializable] || Serializable
43+
[String, Map, Date] || null
44+
}
45+
}

0 commit comments

Comments
 (0)