From 4ae8f24e733d613b416f7f5b23506eb01800d647 Mon Sep 17 00:00:00 2001
From: Kim YoungJin <smilup2244@gmail.com>
Date: Tue, 16 May 2023 17:41:43 +0900
Subject: [PATCH] [#9922] Separated flink-clean.xml

---
 .../applicationContext-flink-clean.xml          |  5 +++++
 .../main/resources/applicationContext-flink.xml |  1 +
 .../applicationContext-flink-clean.xml          |  9 +++++++++
 .../applicationContext-flink-extend.xml         | 17 -----------------
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 flink/src/main/resources/applicationContext-flink-clean.xml
 create mode 100644 hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-clean.xml
 delete mode 100644 hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-extend.xml

diff --git a/flink/src/main/resources/applicationContext-flink-clean.xml b/flink/src/main/resources/applicationContext-flink-clean.xml
new file mode 100644
index 000000000000..05ff08c616a7
--- /dev/null
+++ b/flink/src/main/resources/applicationContext-flink-clean.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+</beans>
diff --git a/flink/src/main/resources/applicationContext-flink.xml b/flink/src/main/resources/applicationContext-flink.xml
index 0c9dd3092f78..b74788abe1bf 100644
--- a/flink/src/main/resources/applicationContext-flink.xml
+++ b/flink/src/main/resources/applicationContext-flink.xml
@@ -9,6 +9,7 @@
 
     <import resource="classpath:applicationContext-flink-profile.xml"/>
     <import resource="classpath:applicationContext-flink-extend.xml"/>
+    <import resource="classpath:applicationContext-flink-clean.xml"/>
     <import resource="classpath:applicationContext-hbase.xml"/>
     <import resource="classpath:applicationContext-cache.xml"/>
 
diff --git a/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-clean.xml b/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-clean.xml
new file mode 100644
index 000000000000..61cf6fa7f025
--- /dev/null
+++ b/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-clean.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="hbase2HadoopResourceCleanerRegistry" class="com.navercorp.pinpoint.flink.hbase.Hbase2HadoopResourceCleanerRegistry" />
+
+</beans>
+
diff --git a/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-extend.xml b/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-extend.xml
deleted file mode 100644
index 5fe90fcafda6..000000000000
--- a/hbase2-module/hbase2-flink/src/main/resources/applicationContext-flink-extend.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="tBaseFlatMapperInterceptor" class="com.navercorp.pinpoint.flink.process.DefaultTBaseFlatMapperInterceptor"/>
-    <bean id="statisticsDaoInterceptor" class="com.navercorp.pinpoint.flink.dao.hbase.DefaultStatisticsDaoInterceptor"/>
-    <bean id="applicationStatBoWindowInterceptor" class="com.navercorp.pinpoint.flink.function.DefaultApplicationStatBoWindowInterceptor"/>
-
-    <bean id="tableNameProvider" class="com.navercorp.pinpoint.common.hbase.HbaseTableNameProvider">
-        <constructor-arg index="0" value="${hbase.namespace:default}"/>
-    </bean>
-
-    <bean id="hbase2HadoopResourceCleanerRegistry" class="com.navercorp.pinpoint.flink.hbase.Hbase2HadoopResourceCleanerRegistry" />
-
-</beans>
-