#2617: [Fix-9221] [alert-server] optimization and gracefully close (#9246)

* [Fix-9221] [alert-server] optimization and gracefully close This closes #9221 * [Fix-9221] [alert-server] remove unused mock data This closes #9221 * [Fix-9221] [alert-server] remove unused mock data This closes #9221 * [Fix-9221] [alert-server] remove unnecessary Mockito stubbings * [Fix-9221] [alert-server] init AlertPluginManager in AlertServer * [Fix-9221] [alert-server] AlertServerTest add AlertPluginManager installPlugin * [Fix-9221] [alert-server] replace @Eventlistener with @PostConstruct * [Fix-9221] [alert-server] sonar check solution * [Improvement-9221] [alert] update constructor injection and replace IStoppable with Closeable Co-authored-by: guoshupei <guoshupei@lixiang.com>
3 years ago · aba9e79588
2 changed files with 146 additions and 38 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit ab0357027d4a06aa26df6bf2345e429d9b9b6c5c
+Subproject commit ca95d2f9282fd234d954194bab40a5bfc713c433
--- a/commit.yml
+++ b/commit.yml
@ -2,40 +2,148 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '787db2be5726f46c54db7749b696c5fe2d078e21'
-    oldFile: !uuid 'fbb1757d8f341890ab550590be779bf202af8f41'
-  /dolphinscheduler-api/src:
-    newFile: !uuid 'a7d7956e52547ae24f9c1e464eb61c1895449181'
-    oldFile: !uuid '5b8d496232defa40dc9a12ddb7e053bd2def326f'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'da3f940fee7a63849a6eaf910ff6948604b07717'
-    oldFile: !uuid 'b6e6e1a76699689ea6a281afdecdfa3807704cf3'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '3687dd8d20101d1cea57c58a440d5bfee49f8a69'
-    oldFile: !uuid '6318f5ca072b95007bd6ffbf21e613b0e87f8241'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '453a6ae3b1d0e00856790c576b7a59f927a0e4d3'
-    oldFile: !uuid '2250c98cd8bd27cd63db2699fa84879acd91c1c9'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '4e5eb240778898ce446c08db4ec7ed05bced5919'
-    oldFile: !uuid '1ddde76061eb33e296d6e05b9a26250e97d78bea'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '782d595916403f54338cc658e1be24e5e70d5f30'
-    oldFile: !uuid 'bcc69459a3cdb3d05daa93468c31e558edfe99eb'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'ab55f07fa4f0f0db054db470c76d1e38a96e1125'
-    oldFile: !uuid '838aa1858dcaed73c363f0d96b30c7e9d2270991'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '4e3f506a86a38c7ddeb5ef6a6526c04f417c9e46'
-    oldFile: !uuid '5aa4d649171341d2cc19876c2f96279adb31501c'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid '87cf3674368d1e02b04a8c01f5b68008fbd04b3f'
-    oldFile: !uuid '984b13ca0f75c15ba8fde0c59fce5c037a54254c'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
-    newFile: !uuid '44868243148f24cd46b66e147593dc36156414de'
-    oldFile: !uuid '093771d01d48796a7f06d8786a44f9eaba6a72e9'
-gitCommitId: !uuid 'ab0357027d4a06aa26df6bf2345e429d9b9b6c5c'
-renames: {
-  }
-revisionId: 2616
+  /dolphinscheduler-alert:
+    newFile: !uuid '9fe62f5d84822f5fcc4ce1c8489aa2746950b724'
+    oldFile: !uuid '007223511e651ed310e345852b19b35646b1bd4b'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server:
+    newFile: !uuid 'd1ac6dc1009d4eba8aa286a1581c2012854a914c'
+    oldFile: !uuid '6c43a9d3682ba99a58b25dfb8ee9f76066c47225'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src:
+    newFile: !uuid 'df65cfc7ce15fde47745fcacc3536b2131735af3'
+    oldFile: !uuid '98b91d94a65efaec15b894886823ca125930dc82'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main:
+    newFile: !uuid '25d221af569c0863ea7d6b073e467d59c49fd197'
+    oldFile: !uuid 'f1e12f55b0703f394506758bb2767e2443981c8f'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java:
+    newFile: !uuid 'ad3f7b116dd26e16f1d219fab181e9d59450092c'
+    oldFile: !uuid '7984af1f8f73ad1dd57ed408f040832105957ff5'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org:
+    newFile: !uuid '9f7e3a56e32e352618f40ffcbfd3a3bbc84c9c28'
+    oldFile: !uuid '2f170cf61e4bada4e7030608132a89296e5ca69e'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache:
+    newFile: !uuid 'd31bd00a024b8d92b627286d0f3877fa60d689b4'
+    oldFile: !uuid '769e8bcf75ea6870a4b4c92e7343c84cf4d585c6'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '50c929c43b7b91b88f7ff8f60ccb7c6b1e8b0520'
+    oldFile: !uuid '978cffbdbe04fc510047d00e40537c66f4b4af8c'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert:
+    newFile: !uuid '891203d8d71a9c35186eda277e6b82c25d76cd47'
+    oldFile: !uuid 'e25d961ff5880ecddcfc8a0f4caf41edaa0dd16d'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java
+  : newFile: !uuid 'cc84769304301f2aa93951e98175380095b2a1e4'
+    oldFile: !uuid 'f590d31aeed4e24b3eb95bf1ab5ec23b43035610'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertRequestProcessor.java
+  : newFile: !uuid '6bb4aa0049931f94eda2f6c1b3ef853708af9b83'
+    oldFile: !uuid 'c85292f725387856df8abab65b580cdb8e98993b'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSender.java:
+    newFile: null
+    oldFile: !uuid '3ddc5c57953f57b199d015b1dbf485bd8aa80c42'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java
+  : newFile: !uuid 'af4791353712e8bdd54873caab1da0225b95ca96'
+    oldFile: null
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java:
+    newFile: !uuid '60bd09e6e2b82141a0b4050c83e6dec7c52c5b5e'
+    oldFile: !uuid '6b18befe39e341e15264efaac6daf833e70873a5'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test:
+    newFile: !uuid 'ae1f4bd4af1589dc80c24fdecd7d0202a1289495'
+    oldFile: !uuid '645b6854bbea47aa4d3a28b78a2a535879be6b91'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java:
+    newFile: !uuid 'fce99a3f6876eeb56b80c640ec71feaf548f6fba'
+    oldFile: !uuid '9e29d5290f6a6a854d38087c35d58453eec5cc9a'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org:
+    newFile: !uuid '70fe57deb250dfe1b439c653dfcf72998bbbf9ef'
+    oldFile: !uuid 'da0bc5fec11d2bbe98a46df9512c5c1f4ed7bacb'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache:
+    newFile: !uuid '80a8852a9f6be30e055e3d235a548d2a54ab1230'
+    oldFile: !uuid '768ed4e8f327f6cea17f85cb0445c272e20437cc'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '9d2bca016fbae683ccafae56557fed417ab54f51'
+    oldFile: !uuid 'e496dc551e4eb96ae5046ec822bce37cde2d807c'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert:
+    newFile: !uuid '7533bd25fc8589847942ccd4482cf9dbf28a6cf7'
+    oldFile: !uuid '2038fbad18f507699263353275708184d4c03b2b'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java:
+    newFile: !uuid 'c37cf6fe7aff635a0d3b57612c8c975872ee38e6'
+    oldFile: !uuid '911b912d760c80c123a0d8f83bc7fd1bcdbdd567'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/processor:
+    newFile: !uuid 'a9a983b6ac74c250e4a0690e118cfc84e28d0643'
+    oldFile: !uuid '271c8c779bf54716d29129ca770b50c25b2d3cd7'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
+  : newFile: !uuid '41277fad50bfae4d5a1a7b8207fc4085115ca344'
+    oldFile: !uuid '64e92a02add8ab163d8fc16b4547dff6eefb1bd2'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner:
+    newFile: !uuid 'a5238bb6ecbdadbe2f549bbc55b4ee3fc86ec965'
+    oldFile: !uuid 'f0db85dcd2154ca37d45d563c2eb556f2b761448'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java
+  : newFile: !uuid '7b7853daf5c25a4e57c859352a72b08eef8a5070'
+    oldFile: null
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
+  : newFile: null
+    oldFile: !uuid '4060e46345003883fbf234ee8b36d6fe40f0b7d0'
+  /dolphinscheduler-common:
+    newFile: !uuid '3f746910910674ec73721468968a314abdcc04d9'
+    oldFile: !uuid 'e2a32c9ff535e7e4ebf8938e78e8877f04ae8e7f'
+  /dolphinscheduler-common/src:
+    newFile: !uuid 'f4cb1ce2c5048189e1e456cf437a569dbbc35af9'
+    oldFile: !uuid 'da247dd4b819a0f6a30117e4ec2bc3310af0d0a3'
+  /dolphinscheduler-common/src/main:
+    newFile: !uuid '7b6631c54ede6b65692525e9a2f84026a97c99eb'
+    oldFile: !uuid '5a5d9ec85a82cfa4828e09e5f4434f82a2e30b4f'
+  /dolphinscheduler-common/src/main/java:
+    newFile: !uuid 'b522c36674ffd6f9a2f54b11ee9c4e1eac3efab2'
+    oldFile: !uuid '3694816bac85fa8b849ba36a6c9e83fc43ef1bd4'
+  /dolphinscheduler-common/src/main/java/org:
+    newFile: !uuid 'ad2cd253c13e0b942d8590bf925b8f5884c4d29a'
+    oldFile: !uuid '6a8be67e009a6db6cb2b3c6a2bf0ad034edd936f'
+  /dolphinscheduler-common/src/main/java/org/apache:
+    newFile: !uuid '5eceb2a963c417737d3fe42cf15e24b7df30a543'
+    oldFile: !uuid '8aa6bd8b5a46041f3fe0b5b520396f97e83c1180'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'fffd98efe142f35de7c7645d95d636fdf235d5fc'
+    oldFile: !uuid 'f81a4c485d7ec1eb4d487d2a70b2d806ade4ca4d'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
+    newFile: !uuid '2d3b81e803fd31716f1baabd00e31d18f0b66957'
+    oldFile: !uuid 'cd777b3b56b629a7022e070552c7b6dd3067ea41'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java:
+    newFile: !uuid '4199627f71557963393bc3434bde29a0e29a7573'
+    oldFile: !uuid '0572e8f9ec732fe90e06428af893e0bee755b2e1'
+  /dolphinscheduler-remote:
+    newFile: !uuid '487a0cfce222d4d8443684b5e479dc0172ec60bc'
+    oldFile: !uuid 'a025c0f758027564682218b9c28883e794c4d9f4'
+  /dolphinscheduler-remote/src:
+    newFile: !uuid 'c14686564de7912abc3064ec4dfbf8c4d09538ad'
+    oldFile: !uuid '4f789115732f67956bcfd0b6fd1996a52cf79973'
+  /dolphinscheduler-remote/src/main:
+    newFile: !uuid 'cbb4dbfd0eccea93642aaa430bc04d97d40a847a'
+    oldFile: !uuid 'd98c6d01659bc6f049e850fa49c6636c3500a884'
+  /dolphinscheduler-remote/src/main/java:
+    newFile: !uuid 'e756800236d789f7bc8abc6bbbcb2f2b13bcba80'
+    oldFile: !uuid '1c403f1be2888d3a7f010c76df1c569a38db4660'
+  /dolphinscheduler-remote/src/main/java/org:
+    newFile: !uuid '52b37aadc2a1d5329379cf08a9255ba08e407171'
+    oldFile: !uuid '85a87d0a335354dd333ea41c8cb6aa8061b3e45a'
+  /dolphinscheduler-remote/src/main/java/org/apache:
+    newFile: !uuid 'cb0fabe3fb1a86c2cf742aeafa742267755e71cc'
+    oldFile: !uuid 'accda3f421bf4be97872ab7fbb0c9152104bff8c'
+  /dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'bac09f2212d54afd274350bc6a6892ed3fd770fb'
+    oldFile: !uuid 'ddd4cf231fc51b1df5412746ff17af9d3d820025'
+  /dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote:
+    newFile: !uuid '45cac0debe5121b6c7214a7a0f5cb305a70ad251'
+    oldFile: !uuid 'c51527c3e6e1949e80f9ace4b32c6f6b041944a4'
+  /dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command:
+    newFile: !uuid '63f6ca38cc7cca6a4a9d2bccc2f19fc218f36d73'
+    oldFile: !uuid 'a13046de00b7aba4c1bd32b3eabc36fcbccad471'
+  /dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert:
+    newFile: !uuid '3a6b1cd169b264cd6137da305774b638cfca980d'
+    oldFile: !uuid '1e3f6467db143486bd1af90d73ca694a765f8f84'
+  /dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java:
+    newFile: !uuid '83c81c9fbe59f3bfab31bc5097750cc0a31fa10f'
+    oldFile: !uuid 'ba37e22d2a3fc3765b168ab887495d48adb75748'
+gitCommitId: !uuid 'ca95d2f9282fd234d954194bab40a5bfc713c433'
+renames:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java
+  : /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSender.java
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java
+  : /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
+revisionId: 2617