Make the code compatible with Java 7

Author: Fabrice-TIERCELIN

samples/src/test/java/org/autorefactor/refactoring/rules/samples_in/HashMapRatherThanTreeMapSample.java

@@ -28,16 +28,14 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.TreeMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.Observer;
-import java.util.Map.Entry;
-import java.util.function.BiConsumer;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 public class HashMapRatherThanTreeMapSample {
 
@@ -86,7 +84,7 @@ public Date replaceTreeMapWithLoop(List<Date> dates) {
             map.put(date.getTime(), date);
         }
 
-        return map.replace(789L, new Date());
+        return map.remove(789L);
     }
 
     public Observer replaceTreeMapWithModifier() {
@@ -196,11 +194,6 @@ public String doNotReplaceFloorKey(String key) {
         return map.floorKey(key);
     }
 
-    public void doNotReplaceForEach(BiConsumer<? super String,? super Long> action) {
-        TreeMap<String, Long> map = new TreeMap<String, Long>();
-        map.forEach(action);
-    }
-
     public SortedMap<String,Long> doNotReplaceHeadMap(String toKey) {
         TreeMap<String, Long> map = new TreeMap<String, Long>();
         return map.headMap(toKey);
@@ -283,15 +276,10 @@ public void refactorWithMethods(Map<Integer, String> anotherMap) throws Interrup
         map.containsKey(123);
         map.containsValue("Lorem ipsum");
         map.get(123);
-        map.getOrDefault(123, "Lorem ipsum");
         map.isEmpty();
         map.put(123, "Lorem ipsum");
         map.putAll(anotherMap);
-        map.putIfAbsent(123, "Lorem ipsum");
         map.remove(123);
-        map.remove(123, "Lorem ipsum");
-        map.replace(123, "Lorem ipsum");
-        map.replace(123, "Lorem", "Ipsum");
         map.size();
         map.notify();
         map.notifyAll();

samples/src/test/java/org/autorefactor/refactoring/rules/samples_in/HashSetRatherThanTreeSetSample.java

@@ -29,18 +29,11 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.TreeSet;
 import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
 import java.util.NavigableSet;
-import java.util.Observer;
-import java.util.Map.Entry;
-import java.util.function.BiConsumer;
 import java.util.Set;
-import java.util.SortedMap;
 import java.util.SortedSet;
-import java.util.Spliterator;
+import java.util.TreeSet;
 
 public class HashSetRatherThanTreeSetSample {
 
@@ -209,11 +202,6 @@ public String doNotReplacePollLast() {
         return set.pollLast();
     }
 
-    public Spliterator<String> doNotReplaceSpliterator() {
-        TreeSet<String> set = new TreeSet<String>();
-        return set.spliterator();
-    }
-
     public NavigableSet<String> doNotReplaceSubSet(String fromElement, boolean fromInclusive, String toElement,
             boolean toInclusive) {
         TreeSet<String> set = new TreeSet<String>();

samples/src/test/java/org/autorefactor/refactoring/rules/samples_out/HashMapRatherThanTreeMapSample.java

@@ -28,16 +28,14 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.TreeMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.Observer;
-import java.util.Map.Entry;
-import java.util.function.BiConsumer;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 public class HashMapRatherThanTreeMapSample {
 
@@ -86,7 +84,7 @@ public Date replaceTreeMapWithLoop(List<Date> dates) {
             map.put(date.getTime(), date);
         }
 
-        return map.replace(789L, new Date());
+        return map.remove(789L);
     }
 
     public Observer replaceTreeMapWithModifier() {
@@ -196,11 +194,6 @@ public String doNotReplaceFloorKey(String key) {
         return map.floorKey(key);
     }
 
-    public void doNotReplaceForEach(BiConsumer<? super String,? super Long> action) {
-        TreeMap<String, Long> map = new TreeMap<String, Long>();
-        map.forEach(action);
-    }
-
     public SortedMap<String,Long> doNotReplaceHeadMap(String toKey) {
         TreeMap<String, Long> map = new TreeMap<String, Long>();
         return map.headMap(toKey);
@@ -283,15 +276,10 @@ public void refactorWithMethods(Map<Integer, String> anotherMap) throws Interrup
         map.containsKey(123);
         map.containsValue("Lorem ipsum");
         map.get(123);
-        map.getOrDefault(123, "Lorem ipsum");
         map.isEmpty();
         map.put(123, "Lorem ipsum");
         map.putAll(anotherMap);
-        map.putIfAbsent(123, "Lorem ipsum");
         map.remove(123);
-        map.remove(123, "Lorem ipsum");
-        map.replace(123, "Lorem ipsum");
-        map.replace(123, "Lorem", "Ipsum");
         map.size();
         map.notify();
         map.notifyAll();

samples/src/test/java/org/autorefactor/refactoring/rules/samples_out/HashSetRatherThanTreeSetSample.java

@@ -29,18 +29,11 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.TreeSet;
 import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
 import java.util.NavigableSet;
-import java.util.Observer;
-import java.util.Map.Entry;
-import java.util.function.BiConsumer;
 import java.util.Set;
-import java.util.SortedMap;
 import java.util.SortedSet;
-import java.util.Spliterator;
+import java.util.TreeSet;
 
 public class HashSetRatherThanTreeSetSample {
 
@@ -209,11 +202,6 @@ public String doNotReplacePollLast() {
         return set.pollLast();
     }
 
-    public Spliterator<String> doNotReplaceSpliterator() {
-        TreeSet<String> set = new TreeSet<String>();
-        return set.spliterator();
-    }
-
     public NavigableSet<String> doNotReplaceSubSet(String fromElement, boolean fromInclusive, String toElement,
             boolean toInclusive) {
         TreeSet<String> set = new TreeSet<String>();