#28 Adapt Chronograph for Passage Operator

Remove BrickAdapter Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · May 16, 2020 · 05f4e14 · 05f4e14
1 parent c149a83
commit 05f4e14
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 45 deletions.
diff --git a/...lipse.chronograph.api/src/org/eclipse/chronograph/internal/api/adapters/BrickAdapter.java b/...lipse.chronograph.api/src/org/eclipse/chronograph/internal/api/adapters/BrickAdapter.java
diff --git a/...nograph.base/src/org/eclipse/chronograph/internal/providers/BrickContentProviderImpl.java b/...nograph.base/src/org/eclipse/chronograph/internal/providers/BrickContentProviderImpl.java
@@ -14,10 +14,10 @@
 package org.eclipse.chronograph.internal.providers;
 
 import java.util.List;
+import java.util.function.Function;
 
 import org.eclipse.chronograph.internal.api.Brick;
 import org.eclipse.chronograph.internal.api.Group;
-import org.eclipse.chronograph.internal.api.adapters.BrickAdapter;
 import org.eclipse.chronograph.internal.api.builders.BrickBuilder;
 import org.eclipse.chronograph.internal.api.providers.BrickContentProvider;
 
@@ -31,27 +31,27 @@
 public class BrickContentProviderImpl<I, D> implements BrickContentProvider<I> {
 
 	private final BrickBuilder<List<I>, D> builder;
-	private final BrickAdapter<D, Brick> adapter;
-
-	public BrickContentProviderImpl(BrickBuilder<List<I>, D> brickBuilder, BrickAdapter<D, Brick> brickAdapter) {
+	private final Function<List<D>, List<Brick>> adapter;
 
+	public BrickContentProviderImpl(BrickBuilder<List<I>, D> brickBuilder,
+			Function<List<D>, List<Brick>> brickAdapter) {
 		this.builder = brickBuilder;
 		this.adapter = brickAdapter;
 	}
 
 	@Override
 	public List<Brick> getBricksByGroup(List<I> input, Group group) {
-		return adapter.adapt(builder.applyGroup(input, group.id()));
+		return adapter.apply(builder.applyGroup(input, group.id()));
 	}
 
 	@Override
 	public List<Brick> getBricksBySubGroup(List<I> input, String groupId, Group subGroup) {
-		return adapter.adapt(builder.applySubGroup(input, groupId, subGroup.id()));
+		return adapter.apply(builder.applySubGroup(input, groupId, subGroup.id()));
 	}
 
 	@Override
 	public List<Brick> getBricks(List<I> input) {
-		return adapter.adapt(builder.apply(input));
+		return adapter.apply(builder.apply(input));
 	}
 
 }
diff --git a/....chronograph.api.tests/src/org/eclipse/chronograph/api/brick/test/BrickProvidersTest.java b/....chronograph.api.tests/src/org/eclipse/chronograph/api/brick/test/BrickProvidersTest.java
@@ -25,13 +25,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 import org.eclipse.chronograph.api.test.TestInputObject;
 import org.eclipse.chronograph.api.test.TestInputObjects;
 import org.eclipse.chronograph.internal.api.Brick;
 import org.eclipse.chronograph.internal.api.Group;
 import org.eclipse.chronograph.internal.api.Section;
-import org.eclipse.chronograph.internal.api.adapters.BrickAdapter;
 import org.eclipse.chronograph.internal.api.builders.BrickBuilder;
 import org.eclipse.chronograph.internal.base.GroupImpl;
 import org.eclipse.chronograph.internal.base.SectionImpl;
@@ -48,7 +48,7 @@
 public class BrickProvidersTest {
 	private List<TestInputObject> input = new ArrayList<>();
 	private BrickBuilder<List<TestInputObject>, TestInputObject> testBrickBuilder;
-	private BrickAdapter<TestInputObject, Brick> testBrickAdapter;
+	private Function<List<TestInputObject>, List<Brick>> testBrickAdapter;
 	private BrickContentProviderImpl<TestInputObject, TestInputObject> testBrickProvider;
 
 	@Before

diff --git a/...se.chronograph.api.tests/src/org/eclipse/chronograph/api/brick/test/TestBrickAdapter.java b/...se.chronograph.api.tests/src/org/eclipse/chronograph/api/brick/test/TestBrickAdapter.java
@@ -28,13 +28,12 @@
 
 import org.eclipse.chronograph.api.test.TestInputObject;
 import org.eclipse.chronograph.internal.api.Brick;
-import org.eclipse.chronograph.internal.api.adapters.BrickAdapter;
 import org.eclipse.chronograph.internal.base.BrickImpl;
 
-public class TestBrickAdapter implements BrickAdapter<TestInputObject, Brick> {
+public class TestBrickAdapter implements Function<List<TestInputObject>, List<Brick>> {
 
 	@Override
-	public List<Brick> adapt(List<TestInputObject> inputObjects) {
+	public List<Brick> apply(List<TestInputObject> inputObjects) {
 		Map<TestInputObject, Brick> objectsToBricks = new HashMap<>();
 
 		List<Brick> bricks = inputObjects.stream()