This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit be4e981b42fb997368cb59175bf2a12f5e1c5e61
Author: longfei.jiang <longfei.ji...@kyligence.io>
AuthorDate: Tue Apr 4 16:17:47 2023 +0800
[DIRTY] fix maven package error
---
.../org/apache/kylin/rest/service/BasicService.java | 3 +--
.../org/apache/kylin/rest/service/ServiceTestBase.java | 2 +-
.../org/apache/kylin/rest/service/SourceTestCase.java | 2 +-
.../kylin/rest/config/initialize/JobSchedulerTest.java | 10 +++++-----
.../rest/service/ModelServiceSemanticUpdateTest.java | 5 ++---
.../kylin/engine/spark/utils/SparkJobFactoryUtils.java | 12 ++++++------
.../streaming/jobs/impl/StreamingJobLauncherTest.java | 17 -----------------
7 files changed, 16 insertions(+), 35 deletions(-)
diff --git
a/src/common-service/src/main/java/org/apache/kylin/rest/service/BasicService.java
b/src/common-service/src/main/java/org/apache/kylin/rest/service/BasicService.java
index e6cfd173f1..cfbf3354e9 100644
---
a/src/common-service/src/main/java/org/apache/kylin/rest/service/BasicService.java
+++
b/src/common-service/src/main/java/org/apache/kylin/rest/service/BasicService.java
@@ -32,9 +32,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.KylinConfig;
import
org.apache.kylin.common.persistence.transaction.BroadcastEventReadyNotifier;
import org.apache.kylin.common.util.JsonUtil;
-import org.apache.kylin.metadata.epoch.EpochManager;
-import org.apache.kylin.metadata.project.EnhancedUnitOfWork;
import org.apache.kylin.common.util.Pair;
+import org.apache.kylin.metadata.epoch.EpochManager;
import org.apache.kylin.metadata.project.EnhancedUnitOfWork;
import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.streaming.DataParserManager;
diff --git
a/src/common-service/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
b/src/common-service/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
index 0b26f1b49e..f6fcc3af3b 100644
---
a/src/common-service/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
+++
b/src/common-service/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.NLocalFileMetadataTestCase;
import org.apache.kylin.engine.spark.utils.SparkJobFactoryUtils;
+import org.apache.kylin.metadata.user.ManagedUser;
import org.apache.kylin.rest.constant.Constant;
import org.junit.After;
import org.junit.AfterClass;
@@ -48,7 +49,6 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
-import io.kyligence.kap.metadata.user.ManagedUser;
import io.kyligence.kap.secondstorage.SecondStorageUpdater;
@RunWith(SpringJUnit4ClassRunner.class)
diff --git
a/src/common-service/src/test/java/org/apache/kylin/rest/service/SourceTestCase.java
b/src/common-service/src/test/java/org/apache/kylin/rest/service/SourceTestCase.java
index d4ba9d53a9..132e592f54 100644
---
a/src/common-service/src/test/java/org/apache/kylin/rest/service/SourceTestCase.java
+++
b/src/common-service/src/test/java/org/apache/kylin/rest/service/SourceTestCase.java
@@ -31,6 +31,7 @@ import org.apache.kylin.job.execution.ExecutableState;
import org.apache.kylin.job.execution.NExecutableManager;
import org.apache.kylin.metadata.cube.model.NDataflowManager;
import org.apache.kylin.metadata.cube.model.NIndexPlanManager;
+import org.apache.kylin.metadata.epoch.EpochManager;
import org.apache.kylin.metadata.model.NDataModelManager;
import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.project.ProjectInstance;
@@ -42,7 +43,6 @@ import
org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
-import io.kyligence.kap.metadata.epoch.EpochManager;
import lombok.val;
public class SourceTestCase extends NLocalFileMetadataTestCase {
diff --git
a/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerTest.java
b/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerTest.java
index 10d392434b..98a2dc6b69 100644
---
a/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerTest.java
+++
b/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerTest.java
@@ -35,6 +35,11 @@ import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.exception.KylinException;
import org.apache.kylin.common.persistence.transaction.UnitOfWork;
import org.apache.kylin.common.util.NLocalFileMetadataTestCase;
+import org.apache.kylin.engine.spark.job.ExecutableAddCuboidHandler;
+import org.apache.kylin.engine.spark.job.ExecutableAddSegmentHandler;
+import org.apache.kylin.engine.spark.job.ExecutableMergeOrRefreshHandler;
+import org.apache.kylin.engine.spark.job.NSparkCubingJob;
+import org.apache.kylin.engine.spark.job.NSparkMergingJob;
import org.apache.kylin.engine.spark.utils.SparkJobFactoryUtils;
import org.apache.kylin.job.engine.JobEngineConfig;
import org.apache.kylin.job.execution.AbstractExecutable;
@@ -61,11 +66,6 @@ import org.junit.rules.ExpectedException;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.kyligence.kap.engine.spark.job.ExecutableAddCuboidHandler;
-import io.kyligence.kap.engine.spark.job.ExecutableAddSegmentHandler;
-import io.kyligence.kap.engine.spark.job.ExecutableMergeOrRefreshHandler;
-import io.kyligence.kap.engine.spark.job.NSparkCubingJob;
-import io.kyligence.kap.engine.spark.job.NSparkMergingJob;
import lombok.val;
import lombok.var;
import lombok.extern.slf4j.Slf4j;
diff --git
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceSemanticUpdateTest.java
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceSemanticUpdateTest.java
index 8ceca79b41..9fe9ea8aaf 100644
---
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceSemanticUpdateTest.java
+++
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceSemanticUpdateTest.java
@@ -39,6 +39,8 @@ import
org.apache.kylin.common.persistence.transaction.UnitOfWork;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.common.util.NLocalFileMetadataTestCase;
import org.apache.kylin.cube.model.SelectRule;
+import org.apache.kylin.engine.spark.job.ExecutableAddCuboidHandler;
+import org.apache.kylin.engine.spark.job.NSparkCubingJob;
import org.apache.kylin.engine.spark.utils.SparkJobFactoryUtils;
import org.apache.kylin.job.execution.AbstractExecutable;
import org.apache.kylin.job.execution.ExecutableState;
@@ -96,9 +98,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.kyligence.kap.engine.spark.job.ExecutableAddCuboidHandler;
-import io.kyligence.kap.engine.spark.job.NSparkCubingJob;
-import io.kyligence.kap.metadata.recommendation.candidate.JdbcRawRecStore;
import lombok.val;
import lombok.var;
import lombok.extern.slf4j.Slf4j;
diff --git
a/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/utils/SparkJobFactoryUtils.java
b/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/utils/SparkJobFactoryUtils.java
index f83d6eb712..8f9c7223c3 100644
---
a/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/utils/SparkJobFactoryUtils.java
+++
b/src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/utils/SparkJobFactoryUtils.java
@@ -19,17 +19,17 @@
package org.apache.kylin.engine.spark.utils;
import org.apache.commons.lang.StringUtils;
+import org.apache.kylin.engine.spark.job.NSparkCubingJob;
+import org.apache.kylin.engine.spark.job.NSparkCubingStep;
+import org.apache.kylin.engine.spark.job.NSparkMergingJob;
+import org.apache.kylin.engine.spark.job.NSparkSnapshotJob;
import org.apache.kylin.job.execution.AbstractExecutable;
import org.apache.kylin.metadata.cube.model.NBatchConstants;
-import io.kyligence.kap.engine.spark.job.NSparkCubingJob;
-import io.kyligence.kap.engine.spark.job.NSparkCubingStep;
-import io.kyligence.kap.engine.spark.job.NSparkMergingJob;
-import io.kyligence.kap.engine.spark.job.NSparkSnapshotJob;
-
public class SparkJobFactoryUtils {
- private SparkJobFactoryUtils() {}
+ private SparkJobFactoryUtils() {
+ }
public static void initJobFactory() {
// register jobFactory in static function
diff --git
a/src/streaming/src/test/java/org/apache/kylin/streaming/jobs/impl/StreamingJobLauncherTest.java
b/src/streaming/src/test/java/org/apache/kylin/streaming/jobs/impl/StreamingJobLauncherTest.java
index 2bef1b243d..05255cc9d5 100644
---
a/src/streaming/src/test/java/org/apache/kylin/streaming/jobs/impl/StreamingJobLauncherTest.java
+++
b/src/streaming/src/test/java/org/apache/kylin/streaming/jobs/impl/StreamingJobLauncherTest.java
@@ -521,23 +521,6 @@ public class StreamingJobLauncherTest extends
NLocalFileMetadataTestCase {
Assert.assertNotNull(mockup.sparkConf.get("spark.yarn.am.extraJavaOptions"));
}
- @Test
- public void testAddParserJar() throws Exception {
- val modelId = "e78a89dd-847f-4574-8afa-8768b4228b72";
- val launcher = new StreamingJobLauncher();
- launcher.init(PROJECT, modelId, JobTypeEnum.STREAMING_BUILD);
- val mockup = new MockupSparkLauncher();
- ReflectionTestUtils.setField(launcher, "launcher", mockup);
- val mockLaunch = PowerMockito.spy(launcher);
- PowerMockito.when(mockLaunch,
"getParserName").thenReturn("io.kyligence.kap.parser.TimedJsonStreamParser2");
- DataParserInfo dataParserInfo = new DataParserInfo(PROJECT,
DEFAULT_PARSER_NAME, "default");
- PowerMockito.when(mockLaunch, "getDataParser",
Mockito.anyString()).thenReturn(dataParserInfo);
- PowerMockito.doReturn("default").when(mockLaunch, "getParserJarPath",
dataParserInfo);
- ReflectionTestUtils.invokeMethod(mockLaunch, "addParserJar", mockup);
- mockup.startApplication();
- Assert.assertTrue(mockup.jars.contains("default"));
- }
-
static class MockupSparkLauncher extends SparkLauncher {
private Map<String, String> sparkConf;
private List<String> files;
