|
|
@@ -19,18 +19,17 @@ import java.util.List;
|
|
|
public class PipelineFactory {
|
|
|
/**
|
|
|
* 流水线初始化
|
|
|
- * @param configJson configJson 流水线配置的json字符串
|
|
|
- * @param namespace 流水线的k8s namespace,devcloud后端采用{@code Project}中的{@code name}作为namespace
|
|
|
- * @param deployName 流水线部署k8s的应用名称,devcloud后端采用{@code Pipeline}中的{@code name} 作为project name
|
|
|
- * @param templateName 模板名称
|
|
|
+ *
|
|
|
+ * @param configJson configJson 流水线配置的json字符串
|
|
|
+ * @param namespace 流水线的k8s namespace,devcloud后端采用{@code Project}中的{@code name}作为namespace
|
|
|
+ * @param deployName 流水线部署k8s的应用名称,devcloud后端采用{@code Pipeline}中的{@code name} 作为project name
|
|
|
* @return
|
|
|
*/
|
|
|
- public static Pipeline init(String configJson, String namespace, String deployName, String templateName) throws PipelineException {
|
|
|
+ public static Pipeline init(String configJson, String namespace, String deployName) throws PipelineException {
|
|
|
//初始化context
|
|
|
Context context = Context.builder()
|
|
|
.deployName(deployName)
|
|
|
.namespace(namespace)
|
|
|
- .templateName(templateName)
|
|
|
.build();
|
|
|
Handler firstHandler = initHandlerChainAndContext(configJson);
|
|
|
return new PipelineImpl(firstHandler, context);
|
|
|
@@ -44,7 +43,6 @@ public class PipelineFactory {
|
|
|
AbstractHandler head = new AbstractHandler() {
|
|
|
@Override
|
|
|
public void process(Context context) throws PipelineException {
|
|
|
-
|
|
|
}
|
|
|
};
|
|
|
Handler cur = head;
|
|
|
@@ -52,15 +50,16 @@ public class PipelineFactory {
|
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
List<ObjectNode> handlers;
|
|
|
try {
|
|
|
- handlers = mapper.readValue(configJson, new TypeReference<List<ObjectNode>>() {});
|
|
|
- for (ObjectNode node : handlers){
|
|
|
- String name = node.get("name").toString().replaceAll("\"","");
|
|
|
+ handlers = mapper.readValue(configJson, new TypeReference<List<ObjectNode>>() {
|
|
|
+ });
|
|
|
+ for (ObjectNode node : handlers) {
|
|
|
+ String name = node.get("name").toString().replaceAll("\"", "");
|
|
|
JsonNode configs = node.get("configs");
|
|
|
- cur.setNextHandler(HandlerConfigTable.transToHandler(name,configs));
|
|
|
+ cur.setNextHandler(HandlerConfigTable.transToHandler(name, configs));
|
|
|
cur = cur.getNextHandler();
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- throw new PipelineException(HttpStatus.SC_BAD_REQUEST,PipelineException.CONFIG_TRANSFER_ERROR,e);
|
|
|
+ throw new PipelineException(HttpStatus.SC_BAD_REQUEST, PipelineException.CONFIG_TRANSFER_ERROR, e);
|
|
|
}
|
|
|
return head.getNextHandler();
|
|
|
}
|