This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch package in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 72e77655253a2d6df18ba742cbf2ae2b73c6d8a5 Author: benjobs <[email protected]> AuthorDate: Sat Sep 23 18:56:26 2023 +0800 [Improve] package name improvement --- .../apache/streampark/console/core/annotation/AppUpdated.java | 2 +- .../streampark/console/core/aspect/StreamParkAspect.java | 2 +- .../core/{task => component}/FlinkCheckpointProcessor.java | 3 ++- .../service/application/impl/ApplicationActionServiceImpl.java | 6 +++--- .../service/application/impl/ApplicationInfoServiceImpl.java | 10 +++++----- .../service/application/impl/ApplicationManageServiceImpl.java | 8 ++++---- .../console/core/service/impl/AppBuildPipeServiceImpl.java | 2 +- .../console/core/service/impl/FlinkClusterServiceImpl.java | 4 ++-- .../console/core/service/impl/ProjectServiceImpl.java | 2 +- .../console/core/service/impl/SavePointServiceImpl.java | 2 +- .../console/core/{task => watcher}/FlinkAppHttpWatcher.java | 3 ++- .../console/core/{task => watcher}/FlinkAppLostWatcher.java | 6 +++--- .../console/core/{task => watcher}/FlinkClusterWatcher.java | 2 +- .../core/{task => watcher}/FlinkK8sChangeEventListener.java | 5 +++-- .../console/core/{task => watcher}/FlinkK8sObserverStub.java | 2 +- .../console/core/{task => watcher}/FlinkK8sWatcherWrapper.java | 2 +- .../streampark/console/core/task/FlinkK8sObserverBroker.scala | 1 + .../console/core/service/ApplicationManageServiceITest.java | 4 ++-- 18 files changed, 35 insertions(+), 31 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java index cfb2a5563..22591bea1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java @@ -17,7 +17,7 @@ package org.apache.streampark.console.core.annotation; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/StreamParkAspect.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/StreamParkAspect.java index a15583333..dc38b9784 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/StreamParkAspect.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/StreamParkAspect.java @@ -28,7 +28,7 @@ import org.apache.streampark.console.core.enums.PermissionType; import org.apache.streampark.console.core.enums.UserType; import org.apache.streampark.console.core.service.CommonService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.console.system.entity.AccessToken; import org.apache.streampark.console.system.entity.Member; import org.apache.streampark.console.system.entity.User; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkCheckpointProcessor.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java similarity index 98% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkCheckpointProcessor.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java index 440170c42..848a440bd 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkCheckpointProcessor.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.component; import org.apache.streampark.console.core.bean.AlertTemplate; import org.apache.streampark.console.core.entity.Application; @@ -26,6 +26,7 @@ import org.apache.streampark.console.core.metrics.flink.CheckPoints; import org.apache.streampark.console.core.service.SavePointService; import org.apache.streampark.console.core.service.alert.AlertService; import org.apache.streampark.console.core.service.application.ApplicationActionService; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java index a364c1db9..c7bbd3ea0 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java @@ -65,8 +65,8 @@ import org.apache.streampark.console.core.service.VariableService; import org.apache.streampark.console.core.service.application.ApplicationActionService; import org.apache.streampark.console.core.service.application.ApplicationInfoService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverterStub; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.flink.client.FlinkClient; import org.apache.streampark.flink.client.bean.CancelRequest; import org.apache.streampark.flink.client.bean.CancelResponse; @@ -113,8 +113,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.Bridge.toTrackId; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.isKubernetesApp; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp; @Slf4j @Service diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java index 528f31169..c79d2f1cc 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java @@ -41,9 +41,9 @@ import org.apache.streampark.console.core.service.FlinkClusterService; import org.apache.streampark.console.core.service.FlinkEnvService; import org.apache.streampark.console.core.service.SavePointService; import org.apache.streampark.console.core.service.application.ApplicationInfoService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; -import org.apache.streampark.console.core.task.FlinkClusterWatcher; -import org.apache.streampark.console.core.task.FlinkK8sObserverStub; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkClusterWatcher; +import org.apache.streampark.console.core.watcher.FlinkK8sObserverStub; import org.apache.streampark.flink.core.conf.ParameterCli; import org.apache.streampark.flink.kubernetes.FlinkK8sWatcher; import org.apache.streampark.flink.kubernetes.helper.KubernetesDeploymentHelper; @@ -74,8 +74,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import static org.apache.streampark.common.enums.StorageType.LFS; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.Bridge.toTrackId; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.isKubernetesApp; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp; @Slf4j @Service diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java index 4a46462ff..56223779d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java @@ -53,9 +53,9 @@ import org.apache.streampark.console.core.service.SavePointService; import org.apache.streampark.console.core.service.SettingService; import org.apache.streampark.console.core.service.YarnQueueService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; -import org.apache.streampark.console.core.task.FlinkK8sObserverStub; import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverterStub; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkK8sObserverStub; import org.apache.streampark.flink.kubernetes.FlinkK8sWatcher; import org.apache.streampark.flink.packer.pipeline.PipelineStatus; @@ -89,8 +89,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.Bridge.toTrackId; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.isKubernetesApp; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp; @Slf4j @Service diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java index 8c3120638..637b20c0c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java @@ -60,7 +60,7 @@ import org.apache.streampark.console.core.service.SettingService; import org.apache.streampark.console.core.service.application.ApplicationActionService; import org.apache.streampark.console.core.service.application.ApplicationInfoService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.flink.packer.docker.DockerConf; import org.apache.streampark.flink.packer.maven.Artifact; import org.apache.streampark.flink.packer.maven.DependencyInfo; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java index d7f62ab08..48c925a40 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java @@ -32,8 +32,8 @@ import org.apache.streampark.console.core.service.FlinkClusterService; import org.apache.streampark.console.core.service.FlinkEnvService; import org.apache.streampark.console.core.service.YarnQueueService; import org.apache.streampark.console.core.service.application.ApplicationInfoService; -import org.apache.streampark.console.core.task.FlinkClusterWatcher; -import org.apache.streampark.console.core.task.FlinkK8sObserverStub; +import org.apache.streampark.console.core.watcher.FlinkClusterWatcher; +import org.apache.streampark.console.core.watcher.FlinkK8sObserverStub; import org.apache.streampark.flink.client.FlinkClient; import org.apache.streampark.flink.client.bean.DeployRequest; import org.apache.streampark.flink.client.bean.DeployResponse; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 416e162b8..e42bbc47e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -38,8 +38,8 @@ import org.apache.streampark.console.core.enums.ReleaseState; import org.apache.streampark.console.core.mapper.ProjectMapper; import org.apache.streampark.console.core.service.ProjectService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; import org.apache.streampark.console.core.task.ProjectBuildTask; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.flink.configuration.MemorySize; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java index 526ef2565..51c3fd093 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java @@ -44,7 +44,7 @@ import org.apache.streampark.console.core.service.FlinkClusterService; import org.apache.streampark.console.core.service.FlinkEnvService; import org.apache.streampark.console.core.service.SavePointService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.flink.client.FlinkClient; import org.apache.streampark.flink.client.bean.SavepointResponse; import org.apache.streampark.flink.client.bean.TriggerSavepointRequest; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java similarity index 99% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java index ce034f404..19853b6da 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.common.enums.ExecutionMode; import org.apache.streampark.common.util.HttpClientUtils; @@ -23,6 +23,7 @@ import org.apache.streampark.common.util.ThreadUtils; import org.apache.streampark.common.util.YarnUtils; import org.apache.streampark.console.base.util.JacksonUtils; import org.apache.streampark.console.core.bean.AlertTemplate; +import org.apache.streampark.console.core.component.FlinkCheckpointProcessor; import org.apache.streampark.console.core.entity.Application; import org.apache.streampark.console.core.entity.FlinkCluster; import org.apache.streampark.console.core.enums.FlinkAppState; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppLostWatcher.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java similarity index 96% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppLostWatcher.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java index ebb3ab76c..1f91f239e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppLostWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.console.core.bean.AlertProbeMsg; import org.apache.streampark.console.core.bean.AlertTemplate; @@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import static org.apache.streampark.console.core.enums.FlinkAppState.LOST; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.Bridge.toTrackId; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.isKubernetesApp; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp; /** This implementation is currently used for probe on yarn,remote,K8s mode */ @Slf4j diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkClusterWatcher.java similarity index 99% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkClusterWatcher.java index f94df947b..bb1048be4 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkClusterWatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.common.conf.CommonConfig; import org.apache.streampark.common.conf.InternalConfigHolder; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sChangeEventListener.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java similarity index 97% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sChangeEventListener.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java index c097dfb5b..9bd08ed9c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sChangeEventListener.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.common.enums.ExecutionMode; import org.apache.streampark.common.util.ThreadUtils; import org.apache.streampark.console.core.bean.AlertTemplate; +import org.apache.streampark.console.core.component.FlinkCheckpointProcessor; import org.apache.streampark.console.core.entity.Application; import org.apache.streampark.console.core.enums.FlinkAppState; import org.apache.streampark.console.core.enums.OptionState; @@ -60,7 +61,7 @@ import static org.apache.streampark.console.core.enums.FlinkAppState.Bridge.toK8 * * <p>Use FlinkK8sChangeListenerV2 listeners instead: * - * @link org.apache.streampark.console.core.task.FlinkK8sChangeListenerV2 + * @link org.apache.streampark.console.core.watcher.FlinkK8sChangeListenerV2 */ @Deprecated @Slf4j diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sObserverStub.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sObserverStub.java similarity index 97% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sObserverStub.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sObserverStub.java index ffc282026..99bc19c4e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sObserverStub.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sObserverStub.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.console.core.entity.Application; import org.apache.streampark.console.core.entity.FlinkCluster; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sWatcherWrapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java similarity index 99% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sWatcherWrapper.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java index 6c82fe142..a60f8f6ec 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkK8sWatcherWrapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.common.conf.K8sFlinkConfig; import org.apache.streampark.common.enums.ExecutionMode; diff --git a/streampark-console/streampark-console-service/src/main/scala/org/apache/streampark/console/core/task/FlinkK8sObserverBroker.scala b/streampark-console/streampark-console-service/src/main/scala/org/apache/streampark/console/core/task/FlinkK8sObserverBroker.scala index 6725bba4b..d0d5e60ca 100644 --- a/streampark-console/streampark-console-service/src/main/scala/org/apache/streampark/console/core/task/FlinkK8sObserverBroker.scala +++ b/streampark-console/streampark-console-service/src/main/scala/org/apache/streampark/console/core/task/FlinkK8sObserverBroker.scala @@ -30,6 +30,7 @@ import org.apache.streampark.console.core.service.alert.AlertService import org.apache.streampark.console.core.service.application.ApplicationInfoService import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverter import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverter.{applicationToTrackKey, clusterMetricsToFlinkMetricCV, flinkClusterToClusterKey, k8sDeployStateToClusterState} +import org.apache.streampark.console.core.watcher.FlinkK8sObserverStub import org.apache.streampark.flink.kubernetes.model.FlinkMetricCV import org.apache.streampark.flink.kubernetes.v2.model._ import org.apache.streampark.flink.kubernetes.v2.model.TrackKey.{ApplicationJobKey, ClusterKey} diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationManageServiceITest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationManageServiceITest.java index 79ee5ca43..b1ae5166a 100644 --- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationManageServiceITest.java +++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationManageServiceITest.java @@ -29,7 +29,7 @@ import org.apache.streampark.console.core.enums.ReleaseState; import org.apache.streampark.console.core.service.application.ApplicationActionService; import org.apache.streampark.console.core.service.application.ApplicationManageService; import org.apache.streampark.console.core.service.impl.FlinkClusterServiceImpl; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.testcontainer.flink.FlinkStandaloneSessionCluster; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -45,7 +45,7 @@ import java.util.Base64; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import static org.apache.streampark.console.core.task.FlinkAppHttpWatcher.WATCHING_INTERVAL; +import static org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher.WATCHING_INTERVAL; import static org.assertj.core.api.Assertions.assertThat; /**
