Java 11 migrate all remaining s (#1120)

* Moves saga to Java 11

* Moves semaphore to Java 11

* Moves servant to Java 11

* Moves serverless to Java 11

* Moves service-layer to Java 11

* Moves service-locator to Java 11

* Moves sharding to Java 11

* Moves singleton to Java 11

* Moves spatial-partition to Java 11

* Moves specification to Java 11

* Moves state to Java 11

* Moves step-builder to Java 11

* Moves strategy to Java 11

* Moves subclass-sandbox to Java 11

* Fixes checkstyle issues
This commit is contained in:
Anurag Agarwal
2020-01-04 22:06:08 +05:30
committed by Ilkka Seppälä
parent 310ae50248
commit cd2a2e7711
98 changed files with 718 additions and 855 deletions
@@ -23,12 +23,13 @@
package com.iluwatar.spatialpartition;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Hashtable;
import java.util.Random;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
/**
@@ -39,41 +40,34 @@ class QuadTreeTest {
@Test
void queryTest() {
ArrayList<Point> points = new ArrayList<Point>();
Random rand = new Random();
var points = new ArrayList<Point>();
var rand = new Random();
for (int i = 0; i < 20; i++) {
Bubble p = new Bubble(rand.nextInt(300), rand.nextInt(300), i, rand.nextInt(2) + 1);
var p = new Bubble(rand.nextInt(300), rand.nextInt(300), i, rand.nextInt(2) + 1);
points.add(p);
}
Rect field = new Rect(150,150,300,300); //size of field
Rect queryRange = new Rect(70,130,100,100); //result = all points lying in this rectangle
var field = new Rect(150, 150, 300, 300); //size of field
var queryRange = new Rect(70, 130, 100, 100); //result = all points lying in this rectangle
//points found in the query range using quadtree and normal method is same
assertTrue(QuadTreeTest.quadTreeTest(points, field, queryRange).equals(QuadTreeTest.verify(points, queryRange)));
var points1 = QuadTreeTest.quadTreeTest(points, field, queryRange);
var points2 = QuadTreeTest.verify(points, queryRange);
assertEquals(points1, points2);
}
static Hashtable<Integer, Point> quadTreeTest(ArrayList<Point> points, Rect field, Rect queryRange) {
static Hashtable<Integer, Point> quadTreeTest(Collection<Point> points, Rect field, Rect queryRange) {
//creating quadtree and inserting all points
QuadTree qTree = new QuadTree(queryRange, 4);
for (int i = 0; i < points.size(); i++) {
qTree.insert(points.get(i));
}
var qTree = new QuadTree(queryRange, 4);
points.forEach(qTree::insert);
ArrayList<Point> queryResult = qTree.query(field, new ArrayList<Point>());
Hashtable<Integer, Point> result = new Hashtable<Integer, Point>();
for (int i = 0; i < queryResult.size(); i++) {
Point p = queryResult.get(i);
result.put(p.id, p);
}
return result;
return qTree
.query(field, new ArrayList<>())
.stream()
.collect(Collectors.toMap(p -> p.id, p -> p, (a, b) -> b, Hashtable::new));
}
static Hashtable<Integer, Point> verify(ArrayList<Point> points, Rect queryRange) {
Hashtable<Integer, Point> result = new Hashtable<Integer, Point>();
for (int i = 0; i < points.size(); i++) {
if (queryRange.contains(points.get(i))) {
result.put(points.get(i).id, points.get(i));
}
}
return result;
static Hashtable<Integer, Point> verify(Collection<Point> points, Rect queryRange) {
return points.stream()
.filter(queryRange::contains)
.collect(Collectors.toMap(point -> point.id, point -> point, (a, b) -> b, Hashtable::new));
}
}