svn commit: r1706797 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java

[js...@apache.org]

Author: jsedding
Date: Mon Oct  5 11:01:48 2015
New Revision: 1706797

URL: http://svn.apache.org/viewvc?rev=1706797&view=rev
Log:
OAK-3460 - Progress logging for RepositorySidegrade

- fix generic type inference issue in java 6

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java?rev=1706797&r1=1706796&r2=1706797&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/AssertingPeriodicReporter.java Mon Oct  5 11:01:48 2015
@@ -72,14 +72,14 @@ class AssertingPeriodicReporter extends
     }
 
     public static Matcher<AssertingPeriodicReporter> hasReportedNode(final int count, final Matcher<String> pathMatcher) {
-        return hasReports(hasEntry(equalTo((long) count), pathMatcher), whatever());
+        return hasReports(typesafeHasEntry(equalTo((long) count), pathMatcher), whatever());
     }
 
     public static Matcher<AssertingPeriodicReporter> hasReportedNodes(final String... paths) {
         final List<Matcher<? super AssertingPeriodicReporter>> matchers =
                 new ArrayList<Matcher<? super AssertingPeriodicReporter>>();
         for (final String path : paths) {
-            matchers.add(hasReports(hasEntry(any(Long.class), equalTo(path)), whatever()));
+            matchers.add(hasReports(typesafeHasEntry(any(Long.class), equalTo(path)), whatever()));
         }
         return allOf(matchers);
     }
@@ -89,7 +89,7 @@ class AssertingPeriodicReporter extends
     }
 
     public static Matcher<AssertingPeriodicReporter> hasReportedProperty(final int count, final Matcher<String> pathMatcher) {
-        return hasReports(whatever(), hasEntry(equalTo((long) count), pathMatcher));
+        return hasReports(whatever(), typesafeHasEntry(equalTo((long) count), pathMatcher));
     }
 
     public static Matcher<AssertingPeriodicReporter> hasReportedProperty(final String... paths) {
@@ -97,14 +97,11 @@ class AssertingPeriodicReporter extends
         for (final String path : paths) {
             pathMatchers.add(equalTo(path));
         }
-        return hasReports(whatever(), hasEntry(any(Long.class), allOf(pathMatchers)));
+        return hasReports(whatever(), typesafeHasEntry(any(Long.class), allOf(pathMatchers)));
     }
 
     private static Matcher<Map<? extends Long, ? extends String>> whatever() {
-        return anyOf(
-            hasEntry(any(Long.class), any(String.class)),
-            anything()
-        );
+        return anyOf(typesafeHasEntry(any(Long.class), any(String.class)), anything());
     }
 
     private static Matcher<AssertingPeriodicReporter> hasReports(
@@ -131,21 +128,10 @@ class AssertingPeriodicReporter extends
         };
     }
 
-    private static Matcher<AssertingPeriodicReporter> hasPropertyMapContaining(
-            final Matcher<Map<? extends Long, ? extends String>> mapMatcher) {
-
-        return new org.hamcrest.TypeSafeMatcher<AssertingPeriodicReporter>() {
-            @Override
-            protected boolean matchesSafely(final AssertingPeriodicReporter reporter) {
-                return mapMatcher.matches(reporter.reportedProperties);
-            }
-
-            @Override
-            public void describeTo(final Description description) {
-                description
-                        .appendText("Has reported properties ")
-                        .appendDescriptionOf(mapMatcher);
-            }
-        };
+    // Java 6 fails to infer generics correctly if hasEntry is not wrapped in this
+    // method.
+    private static Matcher<Map<? extends Long, ? extends String>> typesafeHasEntry(
+            final Matcher<Long> countMatcher, final Matcher<String> pathMatcher) {
+        return hasEntry(countMatcher, pathMatcher);
     }
 }