tidy up generics

sf105 · sf105 · commit 8494a1367020 · 2016-05-13T09:51:25.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java b/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
@@ -72,15 +72,15 @@ private boolean hasMatchingValues(T item, Description mismatchDescription) {
     }
 
     private static <T> List<PropertyMatcher> propertyMatchersFor(T bean, PropertyDescriptor[] descriptors) {
-        List<PropertyMatcher> result = new ArrayList<PropertyMatcher>(descriptors.length);
+        List<PropertyMatcher> result = new ArrayList<>(descriptors.length);
         for (PropertyDescriptor propertyDescriptor : descriptors) {
             result.add(new PropertyMatcher(propertyDescriptor, bean));
         }
         return result;
     }
 
     private static Set<String> propertyNamesFrom(PropertyDescriptor[] descriptors) {
-        HashSet<String> result = new HashSet<String>();
+        HashSet<String> result = new HashSet<>();
         for (PropertyDescriptor propertyDescriptor : descriptors) {
             result.add(propertyDescriptor.getDisplayName());
         }
@@ -134,7 +134,7 @@ private static Object readProperty(Method method, Object target) {
      *     the bean against which examined beans are compared
      */
     public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {
-        return new SamePropertyValuesAs<T>(expectedBean);
+        return new SamePropertyValuesAs<>(expectedBean);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,15 @@ private boolean hasMatchingValues(T item, Description mismatchDescription) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private static <T> List<PropertyMatcher> propertyMatchersFor(T bean, PropertyDescriptor[] descriptors) {`
`75`		`- List<PropertyMatcher> result = new ArrayList<PropertyMatcher>(descriptors.length);`
	`75`	`+ List<PropertyMatcher> result = new ArrayList<>(descriptors.length);`
`76`	`76`	`for (PropertyDescriptor propertyDescriptor : descriptors) {`
`77`	`77`	`result.add(new PropertyMatcher(propertyDescriptor, bean));`
`78`	`78`	`}`
`79`	`79`	`return result;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private static Set<String> propertyNamesFrom(PropertyDescriptor[] descriptors) {`
`83`		`- HashSet<String> result = new HashSet<String>();`
	`83`	`+ HashSet<String> result = new HashSet<>();`
`84`	`84`	`for (PropertyDescriptor propertyDescriptor : descriptors) {`
`85`	`85`	`result.add(propertyDescriptor.getDisplayName());`
`86`	`86`	`}`
`@@ -134,7 +134,7 @@ private static Object readProperty(Method method, Object target) {`
`134`	`134`	`* the bean against which examined beans are compared`
`135`	`135`	`*/`
`136`	`136`	`public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {`
`137`		`- return new SamePropertyValuesAs<T>(expectedBean);`
	`137`	`+ return new SamePropertyValuesAs<>(expectedBean);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`}`