Identify eventreader with id

cdapio · Jul 19, 2023 · e87b961 · e87b961
1 parent 031752f
commit e87b961
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.../src/main/java/io/cdap/cdap/internal/events/StartProgramEventReaderExtensionProvider.java b/.../src/main/java/io/cdap/cdap/internal/events/StartProgramEventReaderExtensionProvider.java
@@ -80,13 +80,13 @@ public Map<String, EventReader<StartProgramEvent>> loadEventReaders() {
   @Override
   protected Set<String> getSupportedTypesForProvider(EventReader eventReader) {
     if (enabledEventReaders == null ||
-            !enabledEventReaders.contains(eventReader.getClass().getName())) {
+            !enabledEventReaders.contains(eventReader.getId())) {
       LOG.debug("{} is not present in the allowed list of event readers.",
-              eventReader.getClass().getName());
+              eventReader.getId());
       return Collections.emptySet();
     }
 
-    return Collections.singleton(eventReader.getClass().getName());
+    return Collections.singleton(eventReader.getId());
   }
 
   @Override

diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/events/StartProgramEventSubscriber.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/events/StartProgramEventSubscriber.java
@@ -82,9 +82,9 @@ public boolean initialize() {
       try {
         reader.initialize(
                 new DefaultEventReaderContext(String.format("%s.%s.",
-                        Constants.Event.START_EVENT_PREFIX, reader.getClass().getName()), cConf));
+                        Constants.Event.START_EVENT_PREFIX, reader.getId()), cConf));
       } catch (Exception e) {
-        LOG.error("Failed to initialize reader: {}", reader.getClass().getSimpleName(), e);
+        LOG.error("Failed to initialize reader: {}", reader.getId(), e);
         eventReaderIterator.remove();
       }
     }

diff --git a/.../test/java/io/cdap/cdap/internal/events/StartProgramEventReaderExtensionProviderTest.java b/.../test/java/io/cdap/cdap/internal/events/StartProgramEventReaderExtensionProviderTest.java
@@ -33,7 +33,6 @@ public class StartProgramEventReaderExtensionProviderTest {
   @Test
   public void testEnabledEventReaderFilter() {
     EventReader mockReader = new DummyEventReader();
-    String mockReaderName = mockReader.getClass().getName();
     CConfiguration cConf = CConfiguration.create();
 
     StartProgramEventReaderExtensionProvider readerExtensionProvider1
@@ -42,10 +41,10 @@ public void testEnabledEventReaderFilter() {
     Assert.assertTrue(test1.isEmpty());
 
     //Test with reader class name enabled
-    cConf.setStrings(Constants.Event.START_EVENTS_READER_EXTENSIONS_ENABLED_LIST, mockReaderName);
+    cConf.setStrings(Constants.Event.START_EVENTS_READER_EXTENSIONS_ENABLED_LIST, mockReader.getId());
     StartProgramEventReaderExtensionProvider readerExtensionProvider2
             = new StartProgramEventReaderExtensionProvider(cConf);
     Set<String> test2 = readerExtensionProvider2.getSupportedTypesForProvider(mockReader);
-    Assert.assertTrue(test2.contains(mockReaderName));
+    Assert.assertTrue(test2.contains(mockReader.getId()));
   }
 }
diff --git a/cdap-common/src/main/java/io/cdap/cdap/extension/AbstractExtensionLoader.java b/cdap-common/src/main/java/io/cdap/cdap/extension/AbstractExtensionLoader.java
@@ -211,6 +211,7 @@ protected EXTENSION prepareSystemExtension(EXTENSION extension) {
   private void putEntriesIfAbsent(Map<EXTENSION_TYPE, EXTENSION> result,
       Map<EXTENSION_TYPE, EXTENSION> entries) {
     for (Map.Entry<EXTENSION_TYPE, EXTENSION> entry : entries.entrySet()) {
+      // TODO: Handle duplicate keys (currently silently ignores duplicates)
       if (!result.containsKey(entry.getKey())) {
         result.put(entry.getKey(), entry.getValue());
       }