This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new dabe65f95 [Improve] Remove unused methods in the controller (#2628)
dabe65f95 is described below
commit dabe65f9568637c8969427cc65632ee55b27cb9d
Author: benjobs <[email protected]>
AuthorDate: Sat Apr 15 12:14:16 2023 +0800
[Improve] Remove unused methods in the controller (#2628)
* [Improve] Remove unused classes and methods
* [Improve] jackson dependency bug fixed
---
pom.xml | 6 ++
streampark-common/pom.xml | 75 +++-------------------
.../common/enums/CheckpointStorage.scala | 22 -------
.../streampark/common/enums/RestartStrategy.scala | 39 -----------
.../streampark/common/enums/StateBackend.scala | 22 -------
.../apache/streampark/common/util/JsonUtils.scala | 7 +-
.../org/apache/streampark/common/util/Logger.scala | 3 +-
.../streampark-console-service/pom.xml | 5 ++
.../console/system/controller/MenuController.java | 12 ----
.../console/system/controller/UserController.java | 35 ----------
.../system/security/AuthenticationType.java | 35 ----------
.../system/security/impl/AuthenticatorImpl.java | 1 -
.../security/impl/{ldap => }/LdapService.java | 2 +-
.../impl/ldap/LdapUserNotExistActionType.java | 34 ----------
.../console/system/service/UserService.java | 15 -----
.../system/service/impl/UserServiceImpl.java | 16 -----
.../streampark-flink-client-api/pom.xml | 1 +
.../flink/client/bean/SubmitRequest.scala | 2 +-
.../streampark-flink-client-core/pom.xml | 40 ++++++++++++
.../flink/connector/doris/bean/RespContent.java | 2 +-
.../doris/internal/DorisSinkFunction.java | 9 ++-
.../doris/internal/DorisStreamLoader.java | 3 +-
.../connector/http/internal/HttpWriterTask.scala | 5 +-
.../streampark/flink/proxy/FlinkShimsProxy.scala | 4 +-
streampark-shaded/pom.xml | 39 ++++-------
.../streampark-shaded-jackson/pom.xml | 23 +------
.../pom.xml | 15 +++--
27 files changed, 104 insertions(+), 368 deletions(-)
diff --git a/pom.xml b/pom.xml
index 40801c4c4..741ed8950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,6 +531,12 @@
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<!-- logback -->
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/streampark-common/pom.xml b/streampark-common/pom.xml
index 4b6df9976..9f20548b1 100644
--- a/streampark-common/pom.xml
+++ b/streampark-common/pom.xml
@@ -50,12 +50,6 @@
<artifactId>enumeratum_${scala.binary.version}</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
@@ -83,28 +77,6 @@
<artifactId>config</artifactId>
</dependency>
- <dependency>
- <groupId>org.json4s</groupId>
- <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
<!--hbase-->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -115,12 +87,6 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
<optional>true</optional>
</dependency>
@@ -148,25 +114,6 @@
<artifactId>httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>2.6.0</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ivy</groupId>
- <artifactId>ivy</artifactId>
- <version>2.4.0</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
@@ -177,7 +124,13 @@
<!--logback -->
<dependency>
<groupId>org.apache.streampark</groupId>
- <artifactId>streampark-shaded-logback</artifactId>
+ <artifactId>streampark-shaded-slf4j</artifactId>
+ <version>${streampark.shaded.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+ <artifactId>streampark-shaded-jackson</artifactId>
<version>${streampark.shaded.version}</version>
</dependency>
@@ -210,22 +163,14 @@
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
-
<include>com.fasterxml.jackson.*:*</include>
<include>com.beachape:*</include>
+ <include>io.netty:netty-resolver</include>
</includes>
</artifactSet>
<relocations>
<relocation>
-
<pattern>com.fasterxml.jackson.code</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.code</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.module</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.module</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.databind</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.databind</shadedPattern>
+ <pattern>io.netty.resolver</pattern>
+
<shadedPattern>${streampark.shaded.package}.io.netty.resolver</shadedPattern>
</relocation>
</relocations>
<filters>
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/CheckpointStorage.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/enums/CheckpointStorage.scala
deleted file mode 100644
index 232c24260..000000000
---
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/CheckpointStorage.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.streampark.common.enums
-
-object CheckpointStorage extends Enumeration {
- type CheckpointStorage = Value
- val jobmanager, filesystem = Value
-}
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/RestartStrategy.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/enums/RestartStrategy.scala
deleted file mode 100644
index d538e3ea8..000000000
---
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/RestartStrategy.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.streampark.common.enums
-
-object RestartStrategy extends Enumeration {
- type RestartStrategy = Value
- val `fixed-delay`, `failure-rate`, `none` = Value
-
- /**
- * @param name
- * @return
- */
- def byName(name: String): Value = {
- if (name == null) null
- else {
- values.find(_.toString.replace("$minus", "-").equalsIgnoreCase(name))
match {
- case Some(v) => v
- case _ =>
- throw new IllegalArgumentException(
- "[StreamPark] RestartStrategy must be
(fixed-delay|failure-rate|none)")
- }
- }
- }
-
-}
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/StateBackend.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/enums/StateBackend.scala
deleted file mode 100644
index 687aa84ed..000000000
---
a/streampark-common/src/main/scala/org/apache/streampark/common/enums/StateBackend.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.streampark.common.enums
-
-object StateBackend extends Enumeration {
- type StateBackend = Value
- val jobmanager, filesystem, rocksdb, hashmap = Value
-}
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/JsonUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/JsonUtils.scala
index 3917f3d2d..05128f3dd 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/JsonUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/JsonUtils.scala
@@ -16,9 +16,8 @@
*/
package org.apache.streampark.common.util
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper,
SerializationFeature}
-import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import
org.apache.streampark.shaded.com.fasterxml.jackson.annotation.JsonInclude
+import
org.apache.streampark.shaded.com.fasterxml.jackson.databind.{DeserializationFeature,
ObjectMapper, SerializationFeature}
import java.text.SimpleDateFormat
@@ -28,8 +27,6 @@ object JsonUtils extends Serializable {
private val mapper = new ObjectMapper()
- mapper.registerModule(DefaultScalaModule)
-
// ignore fields that exist in the json string and do not exist in the java
obj
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/Logger.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/Logger.scala
index 956eefd6c..583fc91f2 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/Logger.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/Logger.scala
@@ -141,8 +141,9 @@ private[this] object LoggerFactory extends
LoggerFactoryBinder {
configurator.setContext(loggerContext)
val text = FileUtils
.readString(new File(path))
- .replaceAll("ch.qos.logback", s"$shadedPackage.ch.qos.logback")
.replaceAll("org.slf4j", s"$shadedPackage.org.slf4j")
+ .replaceAll("ch.qos.logback", s"$shadedPackage.ch.qos.logback")
+ .replaceAll("org.apache.log4j", s"$shadedPackage.org.apache.log4j")
val input = new
ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8))
configurator.doConfigure(input)
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index 9953f4816..9259dadcb 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -405,6 +405,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
+
<!-- logback -->
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
index 1d846a6cf..79288f803 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -25,18 +25,15 @@ import
org.apache.streampark.console.system.service.MenuService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.Map;
@@ -73,15 +70,6 @@ public class MenuController {
return RestResponse.success();
}
- @DeleteMapping("delete")
- @RequiresPermissions("menu:delete")
- public RestResponse deleteMenus(@NotBlank(message = "{required}") String
menuIds)
- throws Exception {
- String[] ids = menuIds.split(StringPool.COMMA);
- this.menuService.deleteMenus(ids);
- return RestResponse.success();
- }
-
@PutMapping("update")
@RequiresPermissions("menu:update")
public RestResponse updateMenu(@Valid Menu menu) throws Exception {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index f96d81257..cf927d677 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -21,7 +21,6 @@ import org.apache.streampark.console.base.domain.ResponseCode;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiAlertException;
-import org.apache.streampark.console.base.util.ShaHashUtils;
import org.apache.streampark.console.core.enums.LoginType;
import org.apache.streampark.console.core.enums.UserType;
import org.apache.streampark.console.core.service.CommonService;
@@ -30,7 +29,6 @@ import org.apache.streampark.console.system.entity.User;
import org.apache.streampark.console.system.service.TeamService;
import org.apache.streampark.console.system.service.UserService;
-import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -40,7 +38,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -64,11 +61,6 @@ public class UserController {
@Autowired private CommonService commonService;
- @PostMapping("detail")
- public User detail(@NotBlank(message = "{required}") @PathVariable String
username) {
- return this.userService.findByName(username);
- }
-
@PostMapping("list")
@RequiresPermissions(
value = {"user:view", "app:view"},
@@ -100,21 +92,6 @@ public class UserController {
return RestResponse.success();
}
- @PutMapping("profile")
- public RestResponse updateProfile(@Valid User user) throws Exception {
- this.userService.updateProfile(user);
- return RestResponse.success();
- }
-
- @PutMapping("avatar")
- public RestResponse updateAvatar(
- @NotBlank(message = "{required}") String username,
- @NotBlank(message = "{required}") String avatar)
- throws Exception {
- this.userService.updateAvatar(username, avatar);
- return RestResponse.success();
- }
-
@PostMapping("getNoTokenUser")
public RestResponse getNoTokenUser() {
List<User> userList = this.userService.getNoTokenUser();
@@ -127,18 +104,6 @@ public class UserController {
return RestResponse.success(result);
}
- @PostMapping("check/password")
- public RestResponse checkPassword(
- @NotBlank(message = "{required}") String username,
- @NotBlank(message = "{required}") String password) {
-
- User user = userService.findByName(username);
- String salt = user.getSalt();
- String encryptPassword = ShaHashUtils.encrypt(salt, password);
- boolean result = StringUtils.equals(user.getPassword(), encryptPassword);
- return RestResponse.success(result);
- }
-
@PutMapping("password")
public RestResponse updatePassword(User user) throws Exception {
userService.updatePassword(user);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/AuthenticationType.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/AuthenticationType.java
deleted file mode 100644
index 023976de1..000000000
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/AuthenticationType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.streampark.console.system.security;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-
-/** authentication type */
-public enum AuthenticationType {
- PASSWORD(0, "verify via user name and password"),
- LDAP(1, "verify via LDAP server"),
- ;
-
- AuthenticationType(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- @EnumValue private final int code;
- private final String desc;
-}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
index 4c0356cd1..916f4ae27 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
@@ -23,7 +23,6 @@ import org.apache.streampark.console.core.enums.LoginType;
import org.apache.streampark.console.core.enums.UserType;
import org.apache.streampark.console.system.entity.User;
import org.apache.streampark.console.system.security.Authenticator;
-import org.apache.streampark.console.system.security.impl.ldap.LdapService;
import org.apache.streampark.console.system.service.UserService;
import org.apache.commons.lang3.StringUtils;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/LdapService.java
similarity index 98%
rename from
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapService.java
rename to
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/LdapService.java
index a04b8ed8b..be5de6519 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/LdapService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.console.system.security.impl.ldap;
+package org.apache.streampark.console.system.security.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapUserNotExistActionType.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapUserNotExistActionType.java
deleted file mode 100644
index 567974e41..000000000
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/ldap/LdapUserNotExistActionType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.streampark.console.system.security.impl.ldap;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-
-public enum LdapUserNotExistActionType {
- CREATE(0, "automatically create user when user not exist"),
- DENY(1, "deny log-in when user not exist"),
- ;
-
- LdapUserNotExistActionType(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- @EnumValue private final int code;
- private final String desc;
-}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
index 4aa3fe927..fdcdfb943 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
@@ -77,21 +77,6 @@ public interface UserService extends IService<User> {
*/
void deleteUser(Long userId) throws Exception;
- /**
- * update user
- *
- * @param user user
- */
- void updateProfile(User user) throws Exception;
-
- /**
- * update user avatar
- *
- * @param username name
- * @param avatar avatar
- */
- void updateAvatar(String username, String avatar) throws Exception;
-
/**
* update password
*
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index 01c1365a8..531a1e3a7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -119,22 +119,6 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
this.memberService.deleteByUserId(userId);
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateProfile(User user) {
- updateById(user);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateAvatar(String username, String avatar) {
- User user = new User();
- user.setAvatar(avatar);
- LambdaQueryWrapper<User> queryWrapper =
- new LambdaQueryWrapper<User>().eq(User::getUsername, username);
- this.baseMapper.update(user, queryWrapper);
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
public void updatePassword(User userParam) {
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
index 988d475b0..f77f89154 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
@@ -66,6 +66,7 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
index eaae692e9..1d7725fbb 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
@@ -23,8 +23,8 @@ import org.apache.streampark.common.enums._
import org.apache.streampark.common.util.{DeflaterUtils, HdfsUtils,
PropertiesUtils}
import org.apache.streampark.flink.packer.pipeline.{BuildResult,
ShadedBuildResponse}
import org.apache.streampark.flink.util.FlinkUtils
+import org.apache.streampark.shaded.com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.ObjectMapper
import org.apache.commons.io.FileUtils
import org.apache.flink.runtime.jobgraph.{SavepointConfigOptions,
SavepointRestoreSettings}
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml
index a05603dc3..7d73d0043 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml
@@ -78,8 +78,48 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
+ </dependency>
+
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <artifactSet>
+ <includes>
+ <include>org.json4s:*</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/RespContent.java
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/RespContent.java
index 2da714560..87f20dab2 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/RespContent.java
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/RespContent.java
@@ -17,7 +17,7 @@
package org.apache.streampark.flink.connector.doris.bean;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import
org.apache.streampark.shaded.com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
index f7d8305af..5018d2451 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
@@ -23,6 +23,7 @@ import
org.apache.streampark.flink.connector.doris.bean.DorisSinkBufferEntry;
import
org.apache.streampark.flink.connector.doris.bean.DorisSinkRowDataWithMeta;
import org.apache.streampark.flink.core.scala.StreamingContext;
+import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.ListStateDescriptor;
import org.apache.flink.api.common.typeinfo.TypeHint;
@@ -35,7 +36,6 @@ import
org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
-import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,8 +78,8 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T>
implements Checkpo
long start = System.nanoTime();
if (value instanceof DorisSinkRowDataWithMeta) {
DorisSinkRowDataWithMeta data = (DorisSinkRowDataWithMeta) value;
- if (Strings.isNullOrEmpty(data.getDatabase())
- || Strings.isNullOrEmpty(data.getTable())
+ if (StringUtils.isEmpty(data.getDatabase())
+ || StringUtils.isEmpty(data.getTable())
|| null == data.getDataRows()) {
LOGGER.warn(
String.format(
@@ -89,8 +89,7 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T>
implements Checkpo
}
dorisSinkWriter.writeRecords(data.getDatabase(), data.getTable(),
data.getDataRows());
} else {
- if (Strings.isNullOrEmpty(dorisConfig.database())
- || Strings.isNullOrEmpty(dorisConfig.table())) {
+ if (StringUtils.isEmpty(dorisConfig.database()) ||
StringUtils.isEmpty(dorisConfig.table())) {
throw new RuntimeException(
" database|table is empt ,please check your config or create
DorisSinkRowDataWithMeta instance");
}
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
index 4e11cae92..cc5ab8294 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
@@ -23,8 +23,9 @@ import
org.apache.streampark.flink.connector.doris.bean.LoadStatusFailedExceptio
import org.apache.streampark.flink.connector.doris.bean.RespContent;
import org.apache.streampark.flink.connector.doris.util.DorisDelimiterParser;
+import
org.apache.streampark.shaded.com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.commons.codec.binary.Base64;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpHeaders;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/src/main/scala/org/apache/streampark/flink/connector/http/internal/HttpWriterTask.scala
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/src/main/scala/org/apache/streampark/flink/connector/http/internal/HttpWriterTask.scala
index 399c2669a..2fa31999e 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/src/main/scala/org/apache/streampark/flink/connector/http/internal/HttpWriterTask.scala
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/src/main/scala/org/apache/streampark/flink/connector/http/internal/HttpWriterTask.scala
@@ -25,6 +25,7 @@ import io.netty.handler.codec.http.HttpHeaders
import org.apache.http.client.methods._
import org.asynchttpclient.{AsyncHttpClient, ListenableFuture, Request,
Response}
+import java.util
import java.util.concurrent.{BlockingQueue, ExecutorService, TimeUnit}
import scala.collection.JavaConversions._
@@ -80,13 +81,13 @@ case class HttpWriterTask(
Try(uriAndParams(1).trim).getOrElse(null) match {
case null =>
case params =>
- var paramMap = Map[String, String]()
+ val paramMap = new util.HashMap[String, String]()
params
.split("&")
.foreach(
x => {
val param = x.split("=")
- paramMap += param.head -> param.last
+ paramMap.put(param.head, param.last)
})
if (paramMap.nonEmpty) {
builder.setHeader(HttpHeaders.Names.CONTENT_TYPE,
HttpHeaders.Values.APPLICATION_JSON)
diff --git
a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
index 88e6c2919..3641735f9 100644
---
a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
+++
b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
@@ -34,7 +34,9 @@ object FlinkShimsProxy extends Logger {
private[this] val VERIFY_SQL_CLASS_LOADER_CACHE = MutableMap[String,
ClassLoader]()
private[this] val INCLUDE_PATTERN: Pattern =
- Pattern.compile("(json4s|jackson)(.*).jar", Pattern.CASE_INSENSITIVE |
Pattern.DOTALL)
+ Pattern.compile(
+ "(streampark-shaded-jackson-)(.*).jar",
+ Pattern.CASE_INSENSITIVE | Pattern.DOTALL)
private[this] def getFlinkShimsResourcePattern(flinkLargeVersion: String) =
Pattern.compile(
diff --git a/streampark-shaded/pom.xml b/streampark-shaded/pom.xml
index 915312da8..0abce0de0 100644
--- a/streampark-shaded/pom.xml
+++ b/streampark-shaded/pom.xml
@@ -25,6 +25,11 @@
<name>StreamPark : Shaded Parent</name>
<packaging>pom</packaging>
+ <modules>
+ <module>streampark-shaded-slf4j</module>
+ <module>streampark-shaded-jackson</module>
+ </modules>
+
<properties>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.11</logback.version>
@@ -38,13 +43,19 @@
<dependencyManagement>
<dependencies>
- <!--log4j -->
+ <!--slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<!-- logback -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -74,35 +85,9 @@
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- <version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</dependencyManagement>
- <modules>
- <module>streampark-shaded-logback</module>
- <module>streampark-shaded-jackson</module>
- </modules>
-
<profiles>
<profile>
<id>scala-2.11</id>
diff --git a/streampark-shaded/streampark-shaded-jackson/pom.xml
b/streampark-shaded/streampark-shaded-jackson/pom.xml
index 5c5b085ab..433cf8bbe 100644
--- a/streampark-shaded/streampark-shaded-jackson/pom.xml
+++ b/streampark-shaded/streampark-shaded-jackson/pom.xml
@@ -24,7 +24,7 @@
<version>1.0.0</version>
</parent>
- <artifactId>streampark-shaded-jackson_${scala.binary.version}</artifactId>
+ <artifactId>streampark-shaded-jackson</artifactId>
<name>StreamPark : Shaded Jackson </name>
<dependencies>
@@ -40,11 +40,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
@@ -68,20 +63,8 @@
</artifactSet>
<relocations>
<relocation>
-
<pattern>com.fasterxml.jackson.code</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.code</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.module</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.module</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.module</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.module</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.databind</pattern>
-
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson.databind</shadedPattern>
+ <pattern>com.fasterxml.jackson</pattern>
+
<shadedPattern>${streampark.shaded.package}.com.fasterxml.jackson</shadedPattern>
</relocation>
</relocations>
<filters>
diff --git a/streampark-shaded/streampark-shaded-logback/pom.xml
b/streampark-shaded/streampark-shaded-slf4j/pom.xml
similarity index 89%
rename from streampark-shaded/streampark-shaded-logback/pom.xml
rename to streampark-shaded/streampark-shaded-slf4j/pom.xml
index 5a47af8d6..6464603b9 100644
--- a/streampark-shaded/streampark-shaded-logback/pom.xml
+++ b/streampark-shaded/streampark-shaded-slf4j/pom.xml
@@ -24,8 +24,8 @@
<version>1.0.0</version>
</parent>
- <artifactId>streampark-shaded-logback</artifactId>
- <name>StreamPark : Shaded Logback </name>
+ <artifactId>streampark-shaded-slf4j</artifactId>
+ <name>StreamPark : Shaded Slf4j </name>
<dependencies>
@@ -35,6 +35,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!-- logback -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -61,7 +67,6 @@
<artifactSet>
<includes>
<include>org.slf4j:*:*</include>
-
<include>org.apache.logging.log4j:*:*</include>
<include>ch.qos.logback:*:*</include>
</includes>
</artifactSet>
@@ -74,10 +79,6 @@
<pattern>ch.qos.logback</pattern>
<shadedPattern>${streampark.shaded.package}.ch.qos.logback</shadedPattern>
</relocation>
- <relocation>
- <pattern>org.apache.logging.log4j</pattern>
-
<shadedPattern>${streampark.shaded.package}.org.apache.logging.log4j</shadedPattern>
- </relocation>
<relocation>
<pattern>org.apache.log4j</pattern>
<shadedPattern>${streampark.shaded.package}.org.apache.log4j</shadedPattern>
