[FLINK-19130] [core] Allow ObjectContainer to add alias keys
This extends the ObjectContainer to set alias keys that returns the same
instance. This is required for the StatefulFunctionsRepository, since we
want to share the same instance for different keys (depending on which
interface we expose to different components).
diff --git a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/di/ObjectContainer.java b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/di/ObjectContainer.java
index 7292a2e..8d43bcf 100644
--- a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/di/ObjectContainer.java
+++ b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/di/ObjectContainer.java
@@ -51,6 +51,14 @@
factories.put(new Key(type, label), () -> createReflectively(actual));
}
+ public <T, ET> void addAlias(
+ String newLabel,
+ Class<? super T> newType,
+ String existingLabel,
+ Class<? super ET> existingType) {
+ factories.put(new Key(newType, newLabel), () -> get(existingType, existingLabel));
+ }
+
public <T> void add(String label, Lazy<T> lazyValue) {
factories.put(new Key(Lazy.class, label), () -> lazyValue.withContainer(this));
}
diff --git a/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/di/ObjectContainerTest.java b/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/di/ObjectContainerTest.java
new file mode 100644
index 0000000..b532fed
--- /dev/null
+++ b/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/di/ObjectContainerTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.flink.statefun.flink.core.di;
+
+import static org.hamcrest.CoreMatchers.theInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+
+public class ObjectContainerTest {
+
+ @Test
+ public void addAliasTest() {
+ final ObjectContainer container = new ObjectContainer();
+
+ container.add("label-1", InterfaceA.class, TestClass.class);
+ container.addAlias("label-2", InterfaceB.class, "label-1", InterfaceA.class);
+
+ assertThat(
+ container.get(InterfaceB.class, "label-2"),
+ theInstance(container.get(InterfaceA.class, "label-1")));
+ }
+
+ private interface InterfaceA {}
+
+ private interface InterfaceB {}
+
+ private static class TestClass implements InterfaceA, InterfaceB {}
+}
