You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/03/19 04:45:02 UTC
[incubator-linkis] 07/07: fix build error
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 8953caac5c11902915098302a2827708c2f86777
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 22:02:06 2022 +0800
fix build error
---
.../restful/api/ConfigurationRestfulApi.java | 85 +---------------------
.../linkis/configuration/conf/Configuration.scala | 4 +-
2 files changed, 5 insertions(+), 84 deletions(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
index 2d2055c..6ca907d 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
@@ -17,7 +17,7 @@
package org.apache.linkis.configuration.restful.api;
-import org.apache.linkis.configuration.conf.Configuration;
+import org.apache.linkis.common.conf.Configuration;
import org.apache.linkis.configuration.entity.*;
import org.apache.linkis.configuration.exception.ConfigurationException;
import org.apache.linkis.configuration.service.CategoryService;
@@ -35,11 +35,7 @@ import org.apache.linkis.server.utils.ModuleUserUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -48,7 +44,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@RestController
@@ -59,9 +54,6 @@ public class ConfigurationRestfulApi {
@Autowired private CategoryService categoryService;
- private static String[] adminArray =
- Configuration.GOVERNANCE_STATION_ADMIN().getValue().split(",");
-
ObjectMapper mapper = new ObjectMapper();
private static final String NULL = "null";
@@ -89,77 +81,6 @@ public class ConfigurationRestfulApi {
return Message.ok();
}
- // TODO addKeyForCreator
-
- // @GET
- // @Path("/addKeyForCreator")
- // public Message addKeyForCreator(HttpServletRequest req,
- // @RequestParam(value="engineType",required=false) String
- // engineType,
- // @RequestParam(value="creator",required=false) String
- // creator,
- // @RequestParam(value="token",required=false) String token,
- // @RequestParam(value="keyJson",required=false) String
- // keyJson) throws ConfigurationException {
- // String username = SecurityFilter.getLoginUsername(req);
- // if(StringUtils.isEmpty(engineType) || StringUtils.isEmpty(creator) ||
- // StringUtils.isEmpty(token)){
- // throw new ConfigurationException("params cannot be empty!");
- // }
- // //todo 检验token
- // if(!token.equals(ConfigurationConfiguration.COPYKEYTOKEN)){
- // throw new ConfigurationException("token is error");
- // }
- // List<ConfigKey> keys =
- // configurationService.listKeyByCreatorAndAppName(creator,engineType);
- // if(keys.isEmpty()){
- // //判断和copyKeyFromIDE相反,只允许在有key的情况下添加
- // throw new ConfigurationException(creator + ":" + engineType + ",keys is empty
- // ,cannot add key");
- // }
- // ConfigKey configKey = BDPJettyServerHelper.gson().fromJson(keyJson, ConfigKey.class);
- // // TODO: 2019/12/30 configKey参数校验
- // configurationService.addKey(creator,engineType,configKey);
- // return Message.ok();
- // }
-
- // TODO copyKey
-
- // @GET
- // @Path("/copyKeyFromIDE")
- // public Message copyKeyFromIDE(HttpServletRequest req,
- // @RequestParam(value="appName",required=false) String
- // appName,
- // @RequestParam(value="creator",required=false) String
- // creator,
- // @RequestParam(value="token",required=false) String token)
- // throws ConfigurationException {
- // String username = SecurityFilter.getLoginUsername(req);
- // if(StringUtils.isEmpty(appName) || StringUtils.isEmpty(creator) ||
- // StringUtils.isEmpty(token)){
- // throw new ConfigurationException("params cannot be empty!");
- // }
- // //todo检验token
- // if(!token.equals(ConfigurationConfiguration.COPYKEYTOKEN)){
- // throw new ConfigurationException("token is error");
- // }
- // List<ConfigKey> keys =
- // configurationService.listKeyByCreatorAndAppName(creator,appName);
- // if(!keys.isEmpty()){
- // throw new ConfigurationException(creator + ":" + appName + ",keys is no empty,
- // cannot copy key");
- // }
- // configurationService.insertCreator(creator);
- // List<ConfigKey> IDEkeys =
- // configurationService.listKeyByCreatorAndAppName("IDE",appName);
- // if (IDEkeys.isEmpty()) {
- // throw new ConfigurationException("IDE:"+ appName + ",cannot find any key to
- // copy");
- // }
- // IDEkeys.forEach(k ->configurationService.copyKeyFromIDE(k,creator,appName));
- // return Message.ok();
- // }
-
@RequestMapping(path = "/getFullTreesByAppName", method = RequestMethod.GET)
public Message getFullTreesByAppName(
HttpServletRequest req,
@@ -316,7 +237,7 @@ public class ConfigurationRestfulApi {
}
private void checkAdmin(String userName) throws ConfigurationException {
- if (adminArray != null && !Arrays.asList(adminArray).contains(userName)) {
+ if (!Configuration.isAdmin(userName)) {
throw new ConfigurationException("only admin can modify category(只有管理员才能修改目录)");
}
}
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
index 7bbbfcd..4fd9880 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.configuration.conf
-import org.apache.linkis.common.conf.{CommonVars, Configuration}
+import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.manager.label.entity.engine.EngineType
import scala.collection.JavaConverters.asScalaBufferConverter
@@ -37,7 +37,7 @@ object Configuration {
val USE_CREATOR_DEFAULE_VALUE = CommonVars.apply("wds.linkis.configuration.use.creator.default.value", false).getValue
- val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org