- * Licensed 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 com.example; - -import com.netflix.conductor.annotations.protogen.ProtoField; -import com.netflix.conductor.annotations.protogen.ProtoMessage; - -@ProtoMessage -public class Example { - @ProtoField(id = 1) - public String name; - - @ProtoField(id = 2) - public Long count; -} diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/AbstractMessage.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/AbstractMessage.java deleted file mode 100644 index bc92d901f..000000000 --- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/AbstractMessage.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright 2022 Netflix, Inc. - *
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import com.netflix.conductor.annotations.protogen.ProtoEnum;
-import com.netflix.conductor.annotations.protogen.ProtoMessage;
-import com.netflix.conductor.annotationsprocessor.protogen.types.MessageType;
-import com.netflix.conductor.annotationsprocessor.protogen.types.TypeMapper;
-
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeSpec;
-
-public abstract class AbstractMessage {
- protected Class clazz;
- protected MessageType type;
- protected List
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import javax.lang.model.element.Modifier;
-
-import com.netflix.conductor.annotationsprocessor.protogen.types.MessageType;
-
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-
-public class Enum extends AbstractMessage {
- public enum MapType {
- FROM_PROTO("fromProto"),
- TO_PROTO("toProto");
-
- private final String methodName;
-
- MapType(String m) {
- methodName = m;
- }
-
- public String getMethodName() {
- return methodName;
- }
- }
-
- public Enum(Class cls, MessageType parent) {
- super(cls, parent);
-
- int protoIndex = 0;
- for (java.lang.reflect.Field field : cls.getDeclaredFields()) {
- if (field.isEnumConstant()) fields.add(new EnumField(protoIndex++, field));
- }
- }
-
- @Override
- public String getProtoClass() {
- return "enum";
- }
-
- private MethodSpec javaMap(MapType mt, TypeName from, TypeName to) {
- MethodSpec.Builder method = MethodSpec.methodBuilder(mt.getMethodName());
- method.addModifiers(Modifier.PUBLIC);
- method.returns(to);
- method.addParameter(from, "from");
-
- method.addStatement("$T to", to);
- method.beginControlFlow("switch (from)");
-
- for (Field field : fields) {
- String fromName = (mt == MapType.TO_PROTO) ? field.getName() : field.getProtoName();
- String toName = (mt == MapType.TO_PROTO) ? field.getProtoName() : field.getName();
- method.addStatement("case $L: to = $T.$L; break", fromName, to, toName);
- }
-
- method.addStatement(
- "default: throw new $T(\"Unexpected enum constant: \" + from)",
- IllegalArgumentException.class);
- method.endControlFlow();
- method.addStatement("return to");
- return method.build();
- }
-
- @Override
- protected void javaMapFromProto(TypeSpec.Builder type) {
- type.addMethod(
- javaMap(
- MapType.FROM_PROTO,
- this.type.getJavaProtoType(),
- TypeName.get(this.clazz)));
- }
-
- @Override
- protected void javaMapToProto(TypeSpec.Builder type) {
- type.addMethod(
- javaMap(MapType.TO_PROTO, TypeName.get(this.clazz), this.type.getJavaProtoType()));
- }
-
- public class EnumField extends Field {
- protected EnumField(int index, java.lang.reflect.Field field) {
- super(index, field);
- }
-
- @Override
- public String getProtoTypeDeclaration() {
- return String.format("%s = %d", getProtoName(), getProtoIndex());
- }
- }
-}
diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/Message.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/Message.java
deleted file mode 100644
index 9dfaf2883..000000000
--- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/Message.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.lang.model.element.Modifier;
-
-import com.netflix.conductor.annotations.protogen.ProtoField;
-import com.netflix.conductor.annotations.protogen.ProtoMessage;
-import com.netflix.conductor.annotationsprocessor.protogen.types.AbstractType;
-import com.netflix.conductor.annotationsprocessor.protogen.types.MessageType;
-import com.netflix.conductor.annotationsprocessor.protogen.types.TypeMapper;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeSpec;
-
-public class Message extends AbstractMessage {
- public Message(Class cls, MessageType parent) {
- super(cls, parent);
-
- for (java.lang.reflect.Field field : clazz.getDeclaredFields()) {
- ProtoField ann = field.getAnnotation(ProtoField.class);
- if (ann == null) continue;
-
- fields.add(new MessageField(ann.id(), field));
- }
- }
-
- protected ProtoMessage getAnnotation() {
- return (ProtoMessage) this.clazz.getAnnotation(ProtoMessage.class);
- }
-
- @Override
- public String getProtoClass() {
- return "message";
- }
-
- @Override
- protected void javaMapToProto(TypeSpec.Builder type) {
- if (!getAnnotation().toProto() || getAnnotation().wrapper()) return;
-
- ClassName javaProtoType = (ClassName) this.type.getJavaProtoType();
- MethodSpec.Builder method = MethodSpec.methodBuilder("toProto");
- method.addModifiers(Modifier.PUBLIC);
- method.returns(javaProtoType);
- method.addParameter(this.clazz, "from");
-
- method.addStatement(
- "$T to = $T.newBuilder()", javaProtoType.nestedClass("Builder"), javaProtoType);
-
- for (Field field : this.fields) {
- if (field instanceof MessageField) {
- AbstractType fieldType = ((MessageField) field).getAbstractType();
- fieldType.mapToProto(field.getName(), method);
- }
- }
-
- method.addStatement("return to.build()");
- type.addMethod(method.build());
- }
-
- @Override
- protected void javaMapFromProto(TypeSpec.Builder type) {
- if (!getAnnotation().fromProto() || getAnnotation().wrapper()) return;
-
- MethodSpec.Builder method = MethodSpec.methodBuilder("fromProto");
- method.addModifiers(Modifier.PUBLIC);
- method.returns(this.clazz);
- method.addParameter(this.type.getJavaProtoType(), "from");
-
- method.addStatement("$T to = new $T()", this.clazz, this.clazz);
-
- for (Field field : this.fields) {
- if (field instanceof MessageField) {
- AbstractType fieldType = ((MessageField) field).getAbstractType();
- fieldType.mapFromProto(field.getName(), method);
- }
- }
-
- method.addStatement("return to");
- type.addMethod(method.build());
- }
-
- public static class MessageField extends Field {
- protected AbstractType type;
-
- protected MessageField(int index, java.lang.reflect.Field field) {
- super(index, field);
- }
-
- public AbstractType getAbstractType() {
- if (type == null) {
- type = TypeMapper.INSTANCE.get(field.getGenericType());
- }
- return type;
- }
-
- private static Pattern CAMEL_CASE_RE = Pattern.compile("(?<=[a-z])[A-Z]");
-
- private static String toUnderscoreCase(String input) {
- Matcher m = CAMEL_CASE_RE.matcher(input);
- StringBuilder sb = new StringBuilder();
- while (m.find()) {
- m.appendReplacement(sb, "_" + m.group());
- }
- m.appendTail(sb);
- return sb.toString().toLowerCase();
- }
-
- @Override
- public String getProtoTypeDeclaration() {
- return String.format(
- "%s %s = %d",
- getAbstractType().getProtoType(), toUnderscoreCase(getName()), getProtoIndex());
- }
-
- @Override
- public void getDependencies(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.netflix.conductor.annotationsprocessor.protogen.types.TypeMapper;
-
-import com.squareup.javapoet.ClassName;
-
-public class ProtoFile {
- public static String PROTO_SUFFIX = "Pb";
-
- private ClassName baseClass;
- private AbstractMessage message;
- private String filePath;
-
- private String protoPackageName;
- private String javaPackageName;
- private String goPackageName;
-
- public ProtoFile(
- Class object,
- String protoPackageName,
- String javaPackageName,
- String goPackageName) {
- this.protoPackageName = protoPackageName;
- this.javaPackageName = javaPackageName;
- this.goPackageName = goPackageName;
-
- String className = object.getSimpleName() + PROTO_SUFFIX;
- this.filePath = "model/" + object.getSimpleName().toLowerCase() + ".proto";
- this.baseClass = ClassName.get(this.javaPackageName, className);
- this.message = new Message(object, TypeMapper.INSTANCE.baseClass(baseClass, filePath));
- }
-
- public String getJavaClassName() {
- return baseClass.simpleName();
- }
-
- public String getFilePath() {
- return filePath;
- }
-
- public String getProtoPackageName() {
- return protoPackageName;
- }
-
- public String getJavaPackageName() {
- return javaPackageName;
- }
-
- public String getGoPackageName() {
- return goPackageName;
- }
-
- public AbstractMessage getMessage() {
- return message;
- }
-
- public Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.*;
-
-import javax.annotation.Generated;
-import javax.lang.model.element.Modifier;
-
-import com.netflix.conductor.annotations.protogen.ProtoMessage;
-
-import com.github.jknack.handlebars.EscapingStrategy;
-import com.github.jknack.handlebars.Handlebars;
-import com.github.jknack.handlebars.Template;
-import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
-import com.github.jknack.handlebars.io.TemplateLoader;
-import com.google.common.reflect.ClassPath;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeSpec;
-
-public class ProtoGen {
- private static final String GENERATOR_NAME =
- "com.netflix.conductor.annotationsprocessor.protogen";
-
- private String protoPackageName;
- private String javaPackageName;
- private String goPackageName;
- private List
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.io.File;
-import java.io.IOException;
-
-public class ProtoGenTask {
- private String protoPackage;
- private String javaPackage;
- private String goPackage;
-
- private File protosDir;
- private File mapperDir;
- private String mapperPackage;
-
- private File sourceJar;
- private String sourcePackage;
-
- public String getProtoPackage() {
- return protoPackage;
- }
-
- public void setProtoPackage(String protoPackage) {
- this.protoPackage = protoPackage;
- }
-
- public String getJavaPackage() {
- return javaPackage;
- }
-
- public void setJavaPackage(String javaPackage) {
- this.javaPackage = javaPackage;
- }
-
- public String getGoPackage() {
- return goPackage;
- }
-
- public void setGoPackage(String goPackage) {
- this.goPackage = goPackage;
- }
-
- public File getProtosDir() {
- return protosDir;
- }
-
- public void setProtosDir(File protosDir) {
- this.protosDir = protosDir;
- }
-
- public File getMapperDir() {
- return mapperDir;
- }
-
- public void setMapperDir(File mapperDir) {
- this.mapperDir = mapperDir;
- }
-
- public String getMapperPackage() {
- return mapperPackage;
- }
-
- public void setMapperPackage(String mapperPackage) {
- this.mapperPackage = mapperPackage;
- }
-
- public File getSourceJar() {
- return sourceJar;
- }
-
- public void setSourceJar(File sourceJar) {
- this.sourceJar = sourceJar;
- }
-
- public String getSourcePackage() {
- return sourcePackage;
- }
-
- public void setSourcePackage(String sourcePackage) {
- this.sourcePackage = sourcePackage;
- }
-
- public void generate() {
- ProtoGen generator = new ProtoGen(protoPackage, javaPackage, goPackage);
- try {
- generator.processPackage(sourceJar, sourcePackage);
- generator.writeMapper(mapperDir, mapperPackage);
- generator.writeProtos(protosDir);
- } catch (IOException e) {
- System.err.printf("protogen: failed with %s\n", e);
- }
- }
-
- public static void main(String[] args) {
- if (args == null || args.length < 8) {
- throw new RuntimeException(
- "protogen configuration incomplete, please provide all required (8) inputs");
- }
- ProtoGenTask task = new ProtoGenTask();
- int argsId = 0;
- task.setProtoPackage(args[argsId++]);
- task.setJavaPackage(args[argsId++]);
- task.setGoPackage(args[argsId++]);
- task.setProtosDir(new File(args[argsId++]));
- task.setMapperDir(new File(args[argsId++]));
- task.setMapperPackage(args[argsId++]);
- task.setSourceJar(new File(args[argsId++]));
- task.setSourcePackage(args[argsId]);
- System.out.println("Running protogen with arguments: " + task);
- task.generate();
- System.out.println("protogen completed.");
- }
-
- @Override
- public String toString() {
- return "ProtoGenTask{"
- + "protoPackage='"
- + protoPackage
- + '\''
- + ", javaPackage='"
- + javaPackage
- + '\''
- + ", goPackage='"
- + goPackage
- + '\''
- + ", protosDir="
- + protosDir
- + ", mapperDir="
- + mapperDir
- + ", mapperPackage='"
- + mapperPackage
- + '\''
- + ", sourceJar="
- + sourceJar
- + ", sourcePackage='"
- + sourcePackage
- + '\''
- + '}';
- }
-}
diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/AbstractType.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/AbstractType.java
deleted file mode 100644
index fbfa8e72c..000000000
--- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/AbstractType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-
-public abstract class AbstractType {
- Type javaType;
- TypeName javaProtoType;
-
- AbstractType(Type javaType, TypeName javaProtoType) {
- this.javaType = javaType;
- this.javaProtoType = javaProtoType;
- }
-
- public Type getJavaType() {
- return javaType;
- }
-
- public TypeName getJavaProtoType() {
- return javaProtoType;
- }
-
- public abstract String getProtoType();
-
- public abstract TypeName getRawJavaType();
-
- public abstract void mapToProto(String field, MethodSpec.Builder method);
-
- public abstract void mapFromProto(String field, MethodSpec.Builder method);
-
- public abstract void getDependencies(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.lang.model.element.Modifier;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-
-public class ExternMessageType extends MessageType {
- private String externProtoType;
-
- public ExternMessageType(
- Type javaType, ClassName javaProtoType, String externProtoType, String protoFilePath) {
- super(javaType, javaProtoType, protoFilePath);
- this.externProtoType = externProtoType;
- }
-
- @Override
- public String getProtoType() {
- return externProtoType;
- }
-
- @Override
- public void generateAbstractMethods(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-
-abstract class GenericType extends AbstractType {
- public GenericType(Type type) {
- super(type, null);
- }
-
- protected Class getRawType() {
- ParameterizedType tt = (ParameterizedType) this.getJavaType();
- return (Class) tt.getRawType();
- }
-
- protected AbstractType resolveGenericParam(int idx) {
- ParameterizedType tt = (ParameterizedType) this.getJavaType();
- Type[] types = tt.getActualTypeArguments();
-
- AbstractType abstractType = TypeMapper.INSTANCE.get(types[idx]);
- if (abstractType instanceof GenericType) {
- return WrappedType.wrap((GenericType) abstractType);
- }
- return abstractType;
- }
-
- public abstract String getWrapperSuffix();
-
- public abstract AbstractType getValueType();
-
- public abstract TypeName resolveJavaProtoType();
-
- @Override
- public TypeName getRawJavaType() {
- return ClassName.get(getRawType());
- }
-
- @Override
- public void getDependencies(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.stream.Collectors;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-
-public class ListType extends GenericType {
- private AbstractType valueType;
-
- public ListType(Type type) {
- super(type);
- }
-
- @Override
- public String getWrapperSuffix() {
- return "List";
- }
-
- @Override
- public AbstractType getValueType() {
- if (valueType == null) {
- valueType = resolveGenericParam(0);
- }
- return valueType;
- }
-
- @Override
- public void mapToProto(String field, MethodSpec.Builder method) {
- AbstractType subtype = getValueType();
- if (subtype instanceof ScalarType) {
- method.addStatement(
- "to.$L( from.$L() )",
- protoMethodName("addAll", field),
- javaMethodName("get", field));
- } else {
- method.beginControlFlow(
- "for ($T elem : from.$L())",
- subtype.getJavaType(),
- javaMethodName("get", field));
- method.addStatement("to.$L( toProto(elem) )", protoMethodName("add", field));
- method.endControlFlow();
- }
- }
-
- @Override
- public void mapFromProto(String field, MethodSpec.Builder method) {
- AbstractType subtype = getValueType();
- Type entryType = subtype.getJavaType();
- Class collector = TypeMapper.PROTO_LIST_TYPES.get(getRawType());
-
- if (subtype instanceof ScalarType) {
- if (entryType.equals(String.class)) {
- method.addStatement(
- "to.$L( from.$L().stream().collect($T.toCollection($T::new)) )",
- javaMethodName("set", field),
- protoMethodName("get", field) + "List",
- Collectors.class,
- collector);
- } else {
- method.addStatement(
- "to.$L( from.$L() )",
- javaMethodName("set", field),
- protoMethodName("get", field) + "List");
- }
- } else {
- method.addStatement(
- "to.$L( from.$L().stream().map(this::fromProto).collect($T.toCollection($T::new)) )",
- javaMethodName("set", field),
- protoMethodName("get", field) + "List",
- Collectors.class,
- collector);
- }
- }
-
- @Override
- public TypeName resolveJavaProtoType() {
- return ParameterizedTypeName.get(
- (ClassName) getRawJavaType(), getValueType().getJavaProtoType());
- }
-
- @Override
- public String getProtoType() {
- return "repeated " + getValueType().getProtoType();
- }
-}
diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MapType.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MapType.java
deleted file mode 100644
index fe642fdec..000000000
--- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MapType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-
-public class MapType extends GenericType {
- private AbstractType keyType;
- private AbstractType valueType;
-
- public MapType(Type type) {
- super(type);
- }
-
- @Override
- public String getWrapperSuffix() {
- return "Map";
- }
-
- @Override
- public AbstractType getValueType() {
- if (valueType == null) {
- valueType = resolveGenericParam(1);
- }
- return valueType;
- }
-
- public AbstractType getKeyType() {
- if (keyType == null) {
- keyType = resolveGenericParam(0);
- }
- return keyType;
- }
-
- @Override
- public void mapToProto(String field, MethodSpec.Builder method) {
- AbstractType valueType = getValueType();
- if (valueType instanceof ScalarType) {
- method.addStatement(
- "to.$L( from.$L() )",
- protoMethodName("putAll", field),
- javaMethodName("get", field));
- } else {
- TypeName typeName =
- ParameterizedTypeName.get(
- Map.Entry.class,
- getKeyType().getJavaType(),
- getValueType().getJavaType());
- method.beginControlFlow(
- "for ($T pair : from.$L().entrySet())", typeName, javaMethodName("get", field));
- method.addStatement(
- "to.$L( pair.getKey(), toProto( pair.getValue() ) )",
- protoMethodName("put", field));
- method.endControlFlow();
- }
- }
-
- @Override
- public void mapFromProto(String field, MethodSpec.Builder method) {
- AbstractType valueType = getValueType();
- if (valueType instanceof ScalarType) {
- method.addStatement(
- "to.$L( from.$L() )",
- javaMethodName("set", field),
- protoMethodName("get", field) + "Map");
- } else {
- Type keyType = getKeyType().getJavaType();
- Type valueTypeJava = getValueType().getJavaType();
- TypeName valueTypePb = getValueType().getJavaProtoType();
-
- ParameterizedTypeName entryType =
- ParameterizedTypeName.get(
- ClassName.get(Map.Entry.class), TypeName.get(keyType), valueTypePb);
- ParameterizedTypeName mapType =
- ParameterizedTypeName.get(Map.class, keyType, valueTypeJava);
- ParameterizedTypeName hashMapType =
- ParameterizedTypeName.get(HashMap.class, keyType, valueTypeJava);
- String mapName = field + "Map";
-
- method.addStatement("$T $L = new $T()", mapType, mapName, hashMapType);
- method.beginControlFlow(
- "for ($T pair : from.$L().entrySet())",
- entryType,
- protoMethodName("get", field) + "Map");
- method.addStatement("$L.put( pair.getKey(), fromProto( pair.getValue() ) )", mapName);
- method.endControlFlow();
- method.addStatement("to.$L($L)", javaMethodName("set", field), mapName);
- }
- }
-
- @Override
- public TypeName resolveJavaProtoType() {
- return ParameterizedTypeName.get(
- (ClassName) getRawJavaType(),
- getKeyType().getJavaProtoType(),
- getValueType().getJavaProtoType());
- }
-
- @Override
- public String getProtoType() {
- AbstractType keyType = getKeyType();
- AbstractType valueType = getValueType();
- if (!(keyType instanceof ScalarType)) {
- throw new IllegalArgumentException(
- "cannot map non-scalar map key: " + this.getJavaType());
- }
- return String.format("map<%s, %s>", keyType.getProtoType(), valueType.getProtoType());
- }
-}
diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MessageType.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MessageType.java
deleted file mode 100644
index d57228773..000000000
--- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/types/MessageType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Set;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-
-public class MessageType extends AbstractType {
- private String protoFilePath;
-
- public MessageType(Type javaType, ClassName javaProtoType, String protoFilePath) {
- super(javaType, javaProtoType);
- this.protoFilePath = protoFilePath;
- }
-
- @Override
- public String getProtoType() {
- List
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-
-public class ScalarType extends AbstractType {
- private String protoType;
-
- public ScalarType(Type javaType, TypeName javaProtoType, String protoType) {
- super(javaType, javaProtoType);
- this.protoType = protoType;
- }
-
- @Override
- public String getProtoType() {
- return protoType;
- }
-
- @Override
- public TypeName getRawJavaType() {
- return getJavaProtoType();
- }
-
- @Override
- public void mapFromProto(String field, MethodSpec.Builder method) {
- method.addStatement(
- "to.$L( from.$L() )", javaMethodName("set", field), protoMethodName("get", field));
- }
-
- private boolean isNullableType() {
- final Type jt = getJavaType();
- return jt.equals(Boolean.class)
- || jt.equals(Byte.class)
- || jt.equals(Character.class)
- || jt.equals(Short.class)
- || jt.equals(Integer.class)
- || jt.equals(Long.class)
- || jt.equals(Double.class)
- || jt.equals(Float.class)
- || jt.equals(String.class);
- }
-
- @Override
- public void mapToProto(String field, MethodSpec.Builder method) {
- final boolean nullable = isNullableType();
- String getter =
- (getJavaType().equals(boolean.class) || getJavaType().equals(Boolean.class))
- ? javaMethodName("is", field)
- : javaMethodName("get", field);
-
- if (nullable) method.beginControlFlow("if (from.$L() != null)", getter);
-
- method.addStatement("to.$L( from.$L() )", protoMethodName("set", field), getter);
-
- if (nullable) method.endControlFlow();
- }
-
- @Override
- public void getDependencies(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import com.google.protobuf.Any;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.TypeName;
-
-public class TypeMapper {
- static Map
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen.types;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.lang.model.element.Modifier;
-
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-
-public class WrappedType extends AbstractType {
- private AbstractType realType;
- private MessageType wrappedType;
-
- public static WrappedType wrap(GenericType realType) {
- Type valueType = realType.getValueType().getJavaType();
- if (!(valueType instanceof Class))
- throw new IllegalArgumentException("cannot wrap primitive type: " + valueType);
-
- String className = ((Class) valueType).getSimpleName() + realType.getWrapperSuffix();
- MessageType wrappedType = TypeMapper.INSTANCE.get(className);
- if (wrappedType == null)
- throw new IllegalArgumentException("missing wrapper class: " + className);
- return new WrappedType(realType, wrappedType);
- }
-
- public WrappedType(AbstractType realType, MessageType wrappedType) {
- super(realType.getJavaType(), wrappedType.getJavaProtoType());
- this.realType = realType;
- this.wrappedType = wrappedType;
- }
-
- @Override
- public String getProtoType() {
- return wrappedType.getProtoType();
- }
-
- @Override
- public TypeName getRawJavaType() {
- return realType.getRawJavaType();
- }
-
- @Override
- public void mapToProto(String field, MethodSpec.Builder method) {
- wrappedType.mapToProto(field, method);
- }
-
- @Override
- public void mapFromProto(String field, MethodSpec.Builder method) {
- wrappedType.mapFromProto(field, method);
- }
-
- @Override
- public void getDependencies(Set
- * Licensed 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 com.netflix.conductor.annotationsprocessor.protogen;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
-
-import static org.junit.Assert.*;
-
-public class ProtoGenTest {
- private static final Charset charset = StandardCharsets.UTF_8;
-
- @Rule public TemporaryFolder folder = new TemporaryFolder();
-
- @Test
- public void happyPath() throws Exception {
- File rootDir = folder.getRoot();
- String protoPackage = "protoPackage";
- String javaPackage = "abc.protogen.example";
- String goPackage = "goPackage";
- String sourcePackage = "com.example";
- String mapperPackage = "mapperPackage";
-
- File jarFile = new File("./build/libs/example.jar");
- assertTrue(jarFile.exists());
-
- File mapperDir = new File(rootDir, "mapperDir");
- mapperDir.mkdirs();
-
- File protosDir = new File(rootDir, "protosDir");
- protosDir.mkdirs();
-
- File modelDir = new File(protosDir, "model");
- modelDir.mkdirs();
-
- ProtoGen generator = new ProtoGen(protoPackage, javaPackage, goPackage);
- generator.processPackage(jarFile, sourcePackage);
- generator.writeMapper(mapperDir, mapperPackage);
- generator.writeProtos(protosDir);
-
- List
- * Licensed 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 com.netflix.conductor.annotations.protogen;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * ProtoEnum annotates an enum type that will be exposed via the GRPC API as a native Protocol
- * Buffers enum.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ProtoEnum {}
diff --git a/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoField.java b/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoField.java
deleted file mode 100644
index 25ab478c8..000000000
--- a/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoField.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotations.protogen;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * ProtoField annotates a field inside an struct with metadata on how to expose it on its
- * corresponding Protocol Buffers struct. For a field to be exposed in a ProtoBuf struct, the
- * containing struct must also be annotated with a {@link ProtoMessage} or {@link ProtoEnum} tag.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ProtoField {
- /**
- * Mandatory. Sets the Protocol Buffer ID for this specific field. Once a field has been
- * annotated with a given ID, the ID can never change to a different value or the resulting
- * Protocol Buffer struct will not be backwards compatible.
- *
- * @return the numeric ID for the field
- */
- int id();
-}
diff --git a/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoMessage.java b/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoMessage.java
deleted file mode 100644
index d66e4aa43..000000000
--- a/annotations/src/main/java/com/netflix/conductor/annotations/protogen/ProtoMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.annotations.protogen;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * ProtoMessage annotates a given Java class so it becomes exposed via the GRPC API as a native
- * Protocol Buffers struct. The annotated class must be a POJO.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ProtoMessage {
- /**
- * Sets whether the generated mapping code will contain a helper to translate the POJO for this
- * class into the equivalent ProtoBuf object.
- *
- * @return whether this class will generate a mapper to ProtoBuf objects
- */
- boolean toProto() default true;
-
- /**
- * Sets whether the generated mapping code will contain a helper to translate the ProtoBuf
- * object for this class into the equivalent POJO.
- *
- * @return whether this class will generate a mapper from ProtoBuf objects
- */
- boolean fromProto() default true;
-
- /**
- * Sets whether this is a wrapper class that will be used to encapsulate complex nested type
- * interfaces. Wrapper classes are not directly exposed by the ProtoBuf API and must be mapped
- * manually.
- *
- * @return whether this is a wrapper class
- */
- boolean wrapper() default false;
-}
diff --git a/assets/images/blunder_icon.png b/assets/images/blunder_icon.png
new file mode 100644
index 000000000..a2d8795b5
Binary files /dev/null and b/assets/images/blunder_icon.png differ
diff --git a/assets/images/success_icon.png b/assets/images/success_icon.png
new file mode 100644
index 000000000..4f58aa5a3
Binary files /dev/null and b/assets/images/success_icon.png differ
diff --git a/awss3-storage/README.md b/awss3-storage/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/awss3-storage/build.gradle b/awss3-storage/build.gradle
deleted file mode 100644
index adda2bb42..000000000
--- a/awss3-storage/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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.
- */
-
-dependencies {
- implementation project(':conductor-common')
- implementation project(':conductor-core')
- compileOnly 'org.springframework.boot:spring-boot-starter'
-
- implementation "com.amazonaws:aws-java-sdk-s3:${revAwsSdk}"
- implementation "org.apache.commons:commons-lang3"
-}
diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock
deleted file mode 100644
index 5e4642332..000000000
--- a/awss3-storage/dependencies.lock
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "annotationProcessor": {
- "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.6.7"
- }
- },
- "compileClasspath": {
- "com.amazonaws:aws-java-sdk-s3": {
- "locked": "1.11.86"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- }
- },
- "runtimeClasspath": {
- "com.amazonaws:aws-java-sdk-s3": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.3.8"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- }
- },
- "testCompileClasspath": {
- "com.amazonaws:aws-java-sdk-s3": {
- "locked": "1.11.86"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- },
- "testRuntimeClasspath": {
- "com.amazonaws:aws-java-sdk-s3": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.3.8"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- }
-}
\ No newline at end of file
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
deleted file mode 100644
index a188c8504..000000000
--- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.s3.config;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.conductor.common.utils.ExternalPayloadStorage;
-import com.netflix.conductor.core.utils.IDGenerator;
-import com.netflix.conductor.s3.storage.S3PayloadStorage;
-
-@Configuration
-@EnableConfigurationProperties(S3Properties.class)
-@ConditionalOnProperty(name = "conductor.external-payload-storage.type", havingValue = "s3")
-public class S3Configuration {
-
- @Bean
- public ExternalPayloadStorage s3ExternalPayloadStorage(
- IDGenerator idGenerator, S3Properties properties) {
- return new S3PayloadStorage(idGenerator, properties);
- }
-}
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
deleted file mode 100644
index 94a515f72..000000000
--- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.s3.config;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.convert.DurationUnit;
-
-@ConfigurationProperties("conductor.external-payload-storage.s3")
-public class S3Properties {
-
- /** The s3 bucket name where the payloads will be stored */
- private String bucketName = "conductor_payloads";
-
- /** The time (in seconds) for which the signed url will be valid */
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration signedUrlExpirationDuration = Duration.ofSeconds(5);
-
- /** The AWS region of the s3 bucket */
- private String region = "us-east-1";
-
- public String getBucketName() {
- return bucketName;
- }
-
- public void setBucketName(String bucketName) {
- this.bucketName = bucketName;
- }
-
- public Duration getSignedUrlExpirationDuration() {
- return signedUrlExpirationDuration;
- }
-
- public void setSignedUrlExpirationDuration(Duration signedUrlExpirationDuration) {
- this.signedUrlExpirationDuration = signedUrlExpirationDuration;
- }
-
- public String getRegion() {
- return region;
- }
-
- public void setRegion(String region) {
- this.region = region;
- }
-}
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/storage/S3PayloadStorage.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/storage/S3PayloadStorage.java
deleted file mode 100644
index 86e57e685..000000000
--- a/awss3-storage/src/main/java/com/netflix/conductor/s3/storage/S3PayloadStorage.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.s3.storage;
-
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.util.Date;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.common.run.ExternalStorageLocation;
-import com.netflix.conductor.common.utils.ExternalPayloadStorage;
-import com.netflix.conductor.core.exception.ApplicationException;
-import com.netflix.conductor.core.utils.IDGenerator;
-import com.netflix.conductor.s3.config.S3Properties;
-
-import com.amazonaws.HttpMethod;
-import com.amazonaws.SdkClientException;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.*;
-
-/**
- * An implementation of {@link ExternalPayloadStorage} using AWS S3 for storing large JSON payload
- * data.
- *
- * NOTE: The S3 client assumes that access to S3 is configured on the instance.
- *
- * @see DefaultAWSCredentialsProviderChain
- */
-public class S3PayloadStorage implements ExternalPayloadStorage {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(S3PayloadStorage.class);
- private static final String CONTENT_TYPE = "application/json";
-
- private final IDGenerator idGenerator;
- private final AmazonS3 s3Client;
- private final String bucketName;
- private final long expirationSec;
-
- public S3PayloadStorage(IDGenerator idGenerator, S3Properties properties) {
- this.idGenerator = idGenerator;
- bucketName = properties.getBucketName();
- expirationSec = properties.getSignedUrlExpirationDuration().getSeconds();
- String region = properties.getRegion();
- s3Client = AmazonS3ClientBuilder.standard().withRegion(region).build();
- }
-
- /**
- * @param operation the type of {@link Operation} to be performed
- * @param payloadType the {@link PayloadType} that is being accessed
- * @return a {@link ExternalStorageLocation} object which contains the pre-signed URL and the s3
- * object key for the json payload
- */
- @Override
- public ExternalStorageLocation getLocation(
- Operation operation, PayloadType payloadType, String path) {
- try {
- ExternalStorageLocation externalStorageLocation = new ExternalStorageLocation();
-
- Date expiration = new Date();
- long expTimeMillis = expiration.getTime() + 1000 * expirationSec;
- expiration.setTime(expTimeMillis);
-
- HttpMethod httpMethod = HttpMethod.GET;
- if (operation == Operation.WRITE) {
- httpMethod = HttpMethod.PUT;
- }
-
- String objectKey;
- if (StringUtils.isNotBlank(path)) {
- objectKey = path;
- } else {
- objectKey = getObjectKey(payloadType);
- }
- externalStorageLocation.setPath(objectKey);
-
- GeneratePresignedUrlRequest generatePresignedUrlRequest =
- new GeneratePresignedUrlRequest(bucketName, objectKey)
- .withMethod(httpMethod)
- .withExpiration(expiration);
-
- externalStorageLocation.setUri(
- s3Client.generatePresignedUrl(generatePresignedUrlRequest)
- .toURI()
- .toASCIIString());
- return externalStorageLocation;
- } catch (SdkClientException e) {
- String msg =
- String.format(
- "Error communicating with S3 - operation:%s, payloadType: %s, path: %s",
- operation, payloadType, path);
- LOGGER.error(msg, e);
- throw new ApplicationException(ApplicationException.Code.BACKEND_ERROR, msg, e);
- } catch (URISyntaxException e) {
- String msg = "Invalid URI Syntax";
- LOGGER.error(msg, e);
- throw new ApplicationException(ApplicationException.Code.INTERNAL_ERROR, msg, e);
- }
- }
-
- /**
- * Uploads the payload to the given s3 object key. It is expected that the caller retrieves the
- * object key using {@link #getLocation(Operation, PayloadType, String)} before making this
- * call.
- *
- * @param path the s3 key of the object to be uploaded
- * @param payload an {@link InputStream} containing the json payload which is to be uploaded
- * @param payloadSize the size of the json payload in bytes
- */
- @Override
- public void upload(String path, InputStream payload, long payloadSize) {
- try {
- ObjectMetadata objectMetadata = new ObjectMetadata();
- objectMetadata.setContentType(CONTENT_TYPE);
- objectMetadata.setContentLength(payloadSize);
- PutObjectRequest request =
- new PutObjectRequest(bucketName, path, payload, objectMetadata);
- s3Client.putObject(request);
- } catch (SdkClientException e) {
- String msg =
- String.format(
- "Error uploading to S3 - path:%s, payloadSize: %d", path, payloadSize);
- LOGGER.error(msg, e);
- throw new ApplicationException(ApplicationException.Code.BACKEND_ERROR, msg, e);
- }
- }
-
- /**
- * Downloads the payload stored in the s3 object.
- *
- * @param path the S3 key of the object
- * @return an input stream containing the contents of the object Caller is expected to close the
- * input stream.
- */
- @Override
- public InputStream download(String path) {
- try {
- S3Object s3Object = s3Client.getObject(new GetObjectRequest(bucketName, path));
- return s3Object.getObjectContent();
- } catch (SdkClientException e) {
- String msg = String.format("Error downloading from S3 - path:%s", path);
- LOGGER.error(msg, e);
- throw new ApplicationException(ApplicationException.Code.BACKEND_ERROR, msg, e);
- }
- }
-
- private String getObjectKey(PayloadType payloadType) {
- StringBuilder stringBuilder = new StringBuilder();
- switch (payloadType) {
- case WORKFLOW_INPUT:
- stringBuilder.append("workflow/input/");
- break;
- case WORKFLOW_OUTPUT:
- stringBuilder.append("workflow/output/");
- break;
- case TASK_INPUT:
- stringBuilder.append("task/input/");
- break;
- case TASK_OUTPUT:
- stringBuilder.append("task/output/");
- break;
- }
- stringBuilder.append(idGenerator.generate()).append(".json");
- return stringBuilder.toString();
- }
-}
diff --git a/awss3-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/awss3-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index d8c1f34e5..000000000
--- a/awss3-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "hints": [
- {
- "name": "conductor.external-payload-storage.type",
- "values": [
- {
- "value": "s3",
- "description": "Use AWS S3 as the external payload storage."
- }
- ]
- }
- ]
-}
diff --git a/awssqs-event-queue/README.md b/awssqs-event-queue/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/awssqs-event-queue/build.gradle b/awssqs-event-queue/build.gradle
deleted file mode 100644
index a795acf2c..000000000
--- a/awssqs-event-queue/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-dependencies {
- implementation project(':conductor-common')
- implementation project(':conductor-core')
- compileOnly 'org.springframework.boot:spring-boot-starter'
-
- implementation "org.apache.commons:commons-lang3"
- // SBMTODO: remove guava dep
- implementation "com.google.guava:guava:${revGuava}"
-
- implementation "com.amazonaws:aws-java-sdk-sqs:${revAwsSdk}"
-
- implementation "io.reactivex:rxjava:${revRxJava}"
-
- testImplementation 'org.springframework.boot:spring-boot-starter'
- testImplementation project(':conductor-common').sourceSets.test.output
-}
\ No newline at end of file
diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock
deleted file mode 100644
index dc5736a9f..000000000
--- a/awssqs-event-queue/dependencies.lock
+++ /dev/null
@@ -1,408 +0,0 @@
-{
- "annotationProcessor": {
- "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.6.7"
- }
- },
- "compileClasspath": {
- "com.amazonaws:aws-java-sdk-sqs": {
- "locked": "1.11.86"
- },
- "com.google.guava:guava": {
- "locked": "30.0-jre"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "io.reactivex:rxjava": {
- "locked": "1.2.2"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- }
- },
- "runtimeClasspath": {
- "com.amazonaws:aws-java-sdk-sqs": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.guava:guava": {
- "locked": "30.0-jre"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- }
- },
- "testCompileClasspath": {
- "com.amazonaws:aws-java-sdk-sqs": {
- "locked": "1.11.86"
- },
- "com.google.guava:guava": {
- "locked": "30.0-jre"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "io.reactivex:rxjava": {
- "locked": "1.2.2"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- },
- "testRuntimeClasspath": {
- "com.amazonaws:aws-java-sdk-sqs": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.guava:guava": {
- "locked": "30.0-jre"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- }
-}
\ No newline at end of file
diff --git a/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueConfiguration.java b/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueConfiguration.java
deleted file mode 100644
index 2ee425e7c..000000000
--- a/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueConfiguration.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.sqs.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.conductor.core.config.ConductorProperties;
-import com.netflix.conductor.core.events.EventQueueProvider;
-import com.netflix.conductor.core.events.queue.ObservableQueue;
-import com.netflix.conductor.model.TaskModel.Status;
-import com.netflix.conductor.sqs.eventqueue.SQSObservableQueue.Builder;
-
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.services.sqs.AmazonSQSClient;
-import rx.Scheduler;
-
-@Configuration
-@EnableConfigurationProperties(SQSEventQueueProperties.class)
-@ConditionalOnProperty(name = "conductor.event-queues.sqs.enabled", havingValue = "true")
-public class SQSEventQueueConfiguration {
-
- @ConditionalOnMissingBean
- @Bean
- public AmazonSQSClient getSQSClient(AWSCredentialsProvider credentialsProvider) {
- return new AmazonSQSClient(credentialsProvider);
- }
-
- @Bean
- public EventQueueProvider sqsEventQueueProvider(
- AmazonSQSClient sqsClient, SQSEventQueueProperties properties, Scheduler scheduler) {
- return new SQSEventQueueProvider(sqsClient, properties, scheduler);
- }
-
- @ConditionalOnProperty(
- name = "conductor.default-event-queue.type",
- havingValue = "sqs",
- matchIfMissing = true)
- @Bean
- public Map
- * Licensed 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 com.netflix.conductor.sqs.config;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.convert.DurationUnit;
-
-@ConfigurationProperties("conductor.event-queues.sqs")
-public class SQSEventQueueProperties {
-
- /** The maximum number of messages to be fetched from the queue in a single request */
- private int batchSize = 1;
-
- /** The polling interval (in milliseconds) */
- private Duration pollTimeDuration = Duration.ofMillis(100);
-
- /** The visibility timeout (in seconds) for the message on the queue */
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration visibilityTimeout = Duration.ofSeconds(60);
-
- /** The prefix to be used for the default listener queues */
- private String listenerQueuePrefix = "";
-
- /** The AWS account Ids authorized to send messages to the queues */
- private String authorizedAccounts = "";
-
- public int getBatchSize() {
- return batchSize;
- }
-
- public void setBatchSize(int batchSize) {
- this.batchSize = batchSize;
- }
-
- public Duration getPollTimeDuration() {
- return pollTimeDuration;
- }
-
- public void setPollTimeDuration(Duration pollTimeDuration) {
- this.pollTimeDuration = pollTimeDuration;
- }
-
- public Duration getVisibilityTimeout() {
- return visibilityTimeout;
- }
-
- public void setVisibilityTimeout(Duration visibilityTimeout) {
- this.visibilityTimeout = visibilityTimeout;
- }
-
- public String getListenerQueuePrefix() {
- return listenerQueuePrefix;
- }
-
- public void setListenerQueuePrefix(String listenerQueuePrefix) {
- this.listenerQueuePrefix = listenerQueuePrefix;
- }
-
- public String getAuthorizedAccounts() {
- return authorizedAccounts;
- }
-
- public void setAuthorizedAccounts(String authorizedAccounts) {
- this.authorizedAccounts = authorizedAccounts;
- }
-}
diff --git a/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueProvider.java b/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueProvider.java
deleted file mode 100644
index 5ad88dc69..000000000
--- a/awssqs-event-queue/src/main/java/com/netflix/conductor/sqs/config/SQSEventQueueProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.sqs.config;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.lang.NonNull;
-
-import com.netflix.conductor.core.events.EventQueueProvider;
-import com.netflix.conductor.core.events.queue.ObservableQueue;
-import com.netflix.conductor.sqs.eventqueue.SQSObservableQueue;
-
-import com.amazonaws.services.sqs.AmazonSQSClient;
-import rx.Scheduler;
-
-public class SQSEventQueueProvider implements EventQueueProvider {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(SQSEventQueueProvider.class);
- private final Map
- * Licensed 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 com.netflix.conductor.sqs.eventqueue;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.core.events.queue.Message;
-import com.netflix.conductor.core.events.queue.ObservableQueue;
-import com.netflix.conductor.metrics.Monitors;
-
-import com.amazonaws.auth.policy.Action;
-import com.amazonaws.auth.policy.Policy;
-import com.amazonaws.auth.policy.Principal;
-import com.amazonaws.auth.policy.Resource;
-import com.amazonaws.auth.policy.Statement;
-import com.amazonaws.auth.policy.Statement.Effect;
-import com.amazonaws.auth.policy.actions.SQSActions;
-import com.amazonaws.services.sqs.AmazonSQSClient;
-import com.amazonaws.services.sqs.model.BatchResultErrorEntry;
-import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
-import com.amazonaws.services.sqs.model.CreateQueueRequest;
-import com.amazonaws.services.sqs.model.CreateQueueResult;
-import com.amazonaws.services.sqs.model.DeleteMessageBatchRequest;
-import com.amazonaws.services.sqs.model.DeleteMessageBatchRequestEntry;
-import com.amazonaws.services.sqs.model.DeleteMessageBatchResult;
-import com.amazonaws.services.sqs.model.GetQueueAttributesResult;
-import com.amazonaws.services.sqs.model.ListQueuesRequest;
-import com.amazonaws.services.sqs.model.ListQueuesResult;
-import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
-import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-import com.amazonaws.services.sqs.model.SendMessageBatchRequest;
-import com.amazonaws.services.sqs.model.SendMessageBatchRequestEntry;
-import com.amazonaws.services.sqs.model.SendMessageBatchResult;
-import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
-import rx.Observable;
-import rx.Observable.OnSubscribe;
-import rx.Scheduler;
-
-public class SQSObservableQueue implements ObservableQueue {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(SQSObservableQueue.class);
- private static final String QUEUE_TYPE = "sqs";
-
- private final String queueName;
- private final int visibilityTimeoutInSeconds;
- private final int batchSize;
- private final AmazonSQSClient client;
- private final long pollTimeInMS;
- private final String queueURL;
- private final Scheduler scheduler;
- private volatile boolean running;
-
- private SQSObservableQueue(
- String queueName,
- AmazonSQSClient client,
- int visibilityTimeoutInSeconds,
- int batchSize,
- long pollTimeInMS,
- List
- * Licensed 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 com.netflix.conductor.sqs.eventqueue;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.stubbing.Answer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.netflix.conductor.common.config.TestObjectMapperConfiguration;
-import com.netflix.conductor.common.metadata.tasks.Task;
-import com.netflix.conductor.common.metadata.tasks.TaskResult;
-import com.netflix.conductor.core.events.queue.DefaultEventQueueProcessor;
-import com.netflix.conductor.core.events.queue.Message;
-import com.netflix.conductor.core.events.queue.ObservableQueue;
-import com.netflix.conductor.core.execution.WorkflowExecutor;
-import com.netflix.conductor.model.TaskModel;
-import com.netflix.conductor.model.TaskModel.Status;
-import com.netflix.conductor.model.WorkflowModel;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.util.concurrent.Uninterruptibles;
-
-import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_WAIT;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
-@SuppressWarnings("unchecked")
-@ContextConfiguration(classes = {TestObjectMapperConfiguration.class})
-@RunWith(SpringRunner.class)
-public class DefaultEventQueueProcessorTest {
-
- private static SQSObservableQueue queue;
- private static WorkflowExecutor workflowExecutor;
- private DefaultEventQueueProcessor defaultEventQueueProcessor;
-
- @Autowired private ObjectMapper objectMapper;
-
- private static final List
- * Licensed 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 com.netflix.conductor.sqs.eventqueue;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-import org.mockito.stubbing.Answer;
-
-import com.netflix.conductor.core.events.queue.Message;
-
-import com.amazonaws.services.sqs.AmazonSQSClient;
-import com.amazonaws.services.sqs.model.ListQueuesRequest;
-import com.amazonaws.services.sqs.model.ListQueuesResult;
-import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
-import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-import com.google.common.util.concurrent.Uninterruptibles;
-import rx.Observable;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class SQSObservableQueueTest {
-
- @Test
- public void test() {
-
- List
- * Licensed 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.
- */
-
-// Establish version and status
-ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
-
-subprojects {
- tasks.withType(Javadoc).all { enabled = false }
-}
-
-apply from: "$rootDir/dependencies.gradle"
-apply from: "$rootDir/springboot-bom-overrides.gradle"
-
-allprojects {
- apply plugin: 'nebula.netflixoss'
- apply plugin: 'io.spring.dependency-management'
- apply plugin: 'java-library'
- apply plugin: 'project-report'
-
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
-
- group = 'com.netflix.conductor'
-
- configurations.all {
- exclude group: 'ch.qos.logback', module: 'logback-classic'
- exclude group: 'ch.qos.logback', module: 'logback-core'
- exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
- exclude group: 'org.slf4j', module: 'slf4j-log4j12'
- }
-
- repositories {
- mavenCentral()
-
- // oss-candidate for -rc.* verions:
- maven {
- url "https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates"
- }
-
- /**
- * This repository locates artifacts that don't exist in maven central but we had to backup from jcenter
- * The exclusiveContent
- */
- exclusiveContent {
- forRepository {
- maven {
- url "https://artifactory-oss.prod.netflix.net/artifactory/required-jcenter-modules-backup"
- }
- }
- filter {
- includeGroupByRegex "com\\.github\\.vmg.*"
- }
- }
- }
-
- dependencyManagement {
- imports {
- // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/2.6.7/reference/htmlsingle/#appendix.dependency-versions
- mavenBom(SpringBootPlugin.BOM_COORDINATES)
- }
- }
-
- dependencies {
- implementation('org.apache.logging.log4j:log4j-core') {
- version {
- strictly '2.17.1'
- }
- }
- implementation('org.apache.logging.log4j:log4j-api') {
- version {
- strictly '2.17.1'
- }
- }
- implementation('org.apache.logging.log4j:log4j-slf4j-impl') {
- version {
- strictly '2.17.1'
- }
- }
- implementation('org.apache.logging.log4j:log4j-jul') {
- version {
- strictly '2.17.1'
- }
- }
- implementation('org.apache.logging.log4j:log4j-web') {
- version {
- strictly '2.17.1'
- }
- }
- annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-
- testImplementation('org.springframework.boot:spring-boot-starter-test')
- testImplementation('org.springframework.boot:spring-boot-starter-log4j2')
- testImplementation 'junit:junit'
- }
-
- // processes additional configuration metadata json file as described here
- // https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/reference/html/appendix-configuration-metadata.html#configuration-metadata-additional-metadata
- compileJava.inputs.files(processResources)
-
- test {
- useJUnitPlatform()
- testLogging {
- events = ["SKIPPED", "FAILED"]
- exceptionFormat = "full"
- displayGranularity = 1
- showStandardStreams = false
- }
- }
-}
-
-// all client and their related modules are published with Java 8 compatibility
-["annotations", "common", "client", "client-spring", "grpc", "grpc-client"].each {
- project(":conductor-$it") {
- compileJava {
- options.release = 8
- }
- }
-}
-
-jacocoTestReport {
- reports {
- html.required = true
- xml.required = true
- csv.required = false
- }
-}
-
-task server {
- dependsOn ':conductor-server:bootRun'
-}
-
-sonarqube {
- properties {
- property "sonar.projectKey", "com.netflix.conductor:conductor"
- property "sonar.organization", "netflix"
- property "sonar.host.url", "https://sonarcloud.io"
- }
-}
-
-configure(allprojects - project(':conductor-grpc')) {
- apply plugin: 'com.diffplug.spotless'
-
- spotless {
- java {
- googleJavaFormat().aosp()
- removeUnusedImports()
- importOrder('java', 'javax', 'org', 'com.netflix', '', '\\#com.netflix', '\\#')
- licenseHeaderFile("$rootDir/licenseheader.txt")
- }
- }
-}
-
-['cassandra-persistence', 'core', 'redis-concurrency-limit', 'test-harness', 'client'].each {
- configure(project(":conductor-$it")) {
- spotless {
- groovy {
- importOrder('java', 'javax', 'org', 'com.netflix', '', '\\#com.netflix', '\\#')
- licenseHeaderFile("$rootDir/licenseheader.txt")
- }
- }
- }
-}
diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle
deleted file mode 100644
index 6fee6f8ff..000000000
--- a/cassandra-persistence/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Netflix, Inc.
- *
- * Licensed 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.
- */
-apply plugin: 'groovy'
-
-dependencies {
- compileOnly 'org.springframework.boot:spring-boot-starter'
-
- implementation project(':conductor-common')
- implementation project(':conductor-core')
- implementation "com.datastax.cassandra:cassandra-driver-core:${revCassandra}"
- implementation "org.apache.commons:commons-lang3"
-
- testImplementation project(':conductor-core').sourceSets.test.output
- testImplementation project(':conductor-common').sourceSets.test.output
-
- testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
- testImplementation "org.spockframework:spock-core:${revSpock}"
- testImplementation "org.spockframework:spock-spring:${revSpock}"
- testImplementation "org.testcontainers:spock:${revTestContainer}"
- testImplementation "org.testcontainers:cassandra:${revTestContainer}"
- testImplementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
-}
diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock
deleted file mode 100644
index 984da1f3f..000000000
--- a/cassandra-persistence/dependencies.lock
+++ /dev/null
@@ -1,417 +0,0 @@
-{
- "annotationProcessor": {
- "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.6.7"
- }
- },
- "compileClasspath": {
- "com.datastax.cassandra:cassandra-driver-core": {
- "locked": "3.10.2"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- }
- },
- "runtimeClasspath": {
- "com.datastax.cassandra:cassandra-driver-core": {
- "locked": "3.10.2"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.3.8"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- }
- },
- "testCompileClasspath": {
- "com.datastax.cassandra:cassandra-driver-core": {
- "locked": "3.10.2"
- },
- "com.google.protobuf:protobuf-java": {
- "locked": "3.13.0"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.codehaus.groovy:groovy-all": {
- "locked": "2.5.13"
- },
- "org.spockframework:spock-core": {
- "locked": "1.3-groovy-2.5"
- },
- "org.spockframework:spock-spring": {
- "locked": "1.3-groovy-2.5"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- },
- "org.testcontainers:cassandra": {
- "locked": "1.15.3"
- },
- "org.testcontainers:spock": {
- "locked": "1.15.3"
- }
- },
- "testRuntimeClasspath": {
- "com.datastax.cassandra:cassandra-driver-core": {
- "locked": "3.10.2"
- },
- "com.fasterxml.jackson.core:jackson-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.13.2.1"
- },
- "com.github.ben-manes.caffeine:caffeine": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.9.3"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.13.0"
- },
- "com.jayway.jsonpath:json-path": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.6.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-core": {
- "project": true
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.122.0"
- },
- "com.spotify:completable-futures": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "0.3.3"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.7"
- },
- "io.reactivex:rxjava": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.3.8"
- },
- "jakarta.activation:jakarta.activation-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "1.2.2"
- },
- "jakarta.xml.bind:jakarta.xml.bind-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.3.3"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common",
- "com.netflix.conductor:conductor-core"
- ],
- "locked": "2.17.1"
- },
- "org.codehaus.groovy:groovy-all": {
- "locked": "2.5.13"
- },
- "org.spockframework:spock-core": {
- "locked": "1.3-groovy-2.5"
- },
- "org.spockframework:spock-spring": {
- "locked": "1.3-groovy-2.5"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- },
- "org.testcontainers:cassandra": {
- "locked": "1.15.3"
- },
- "org.testcontainers:spock": {
- "locked": "1.15.3"
- }
- }
-}
\ No newline at end of file
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java
deleted file mode 100644
index 2d2725f3e..000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.conductor.cassandra.dao.CassandraEventHandlerDAO;
-import com.netflix.conductor.cassandra.dao.CassandraExecutionDAO;
-import com.netflix.conductor.cassandra.dao.CassandraMetadataDAO;
-import com.netflix.conductor.cassandra.dao.CassandraPollDataDAO;
-import com.netflix.conductor.cassandra.util.Statements;
-import com.netflix.conductor.dao.EventHandlerDAO;
-import com.netflix.conductor.dao.ExecutionDAO;
-import com.netflix.conductor.dao.MetadataDAO;
-
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Metadata;
-import com.datastax.driver.core.Session;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(CassandraProperties.class)
-@ConditionalOnProperty(name = "conductor.db.type", havingValue = "cassandra")
-public class CassandraConfiguration {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraConfiguration.class);
-
- @Bean
- public Cluster cluster(CassandraProperties properties) {
- String host = properties.getHostAddress();
- int port = properties.getPort();
-
- LOGGER.info("Connecting to cassandra cluster with host:{}, port:{}", host, port);
-
- Cluster cluster = Cluster.builder().addContactPoint(host).withPort(port).build();
-
- Metadata metadata = cluster.getMetadata();
- LOGGER.info("Connected to cluster: {}", metadata.getClusterName());
- metadata.getAllHosts()
- .forEach(
- h ->
- LOGGER.info(
- "Datacenter:{}, host:{}, rack: {}",
- h.getDatacenter(),
- h.getEndPoint().resolve().getHostName(),
- h.getRack()));
- return cluster;
- }
-
- @Bean
- public Session session(Cluster cluster) {
- LOGGER.info("Initializing cassandra session");
- return cluster.connect();
- }
-
- @Bean
- public MetadataDAO cassandraMetadataDAO(
- Session session,
- ObjectMapper objectMapper,
- CassandraProperties properties,
- Statements statements) {
- return new CassandraMetadataDAO(session, objectMapper, properties, statements);
- }
-
- @Bean
- public ExecutionDAO cassandraExecutionDAO(
- Session session,
- ObjectMapper objectMapper,
- CassandraProperties properties,
- Statements statements) {
- return new CassandraExecutionDAO(session, objectMapper, properties, statements);
- }
-
- @Bean
- public EventHandlerDAO cassandraEventHandlerDAO(
- Session session,
- ObjectMapper objectMapper,
- CassandraProperties properties,
- Statements statements) {
- return new CassandraEventHandlerDAO(session, objectMapper, properties, statements);
- }
-
- @Bean
- public CassandraPollDataDAO cassandraPollDataDAO() {
- return new CassandraPollDataDAO();
- }
-
- @Bean
- public Statements statements(CassandraProperties cassandraProperties) {
- return new Statements(cassandraProperties.getKeyspace());
- }
-}
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraProperties.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraProperties.java
deleted file mode 100644
index 28d3eee97..000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraProperties.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.config;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.convert.DurationUnit;
-
-import com.datastax.driver.core.ConsistencyLevel;
-
-@ConfigurationProperties("conductor.cassandra")
-public class CassandraProperties {
-
- /** The address for the cassandra database host */
- private String hostAddress = "127.0.0.1";
-
- /** The port to be used to connect to the cassandra database instance */
- private int port = 9142;
-
- /** The name of the cassandra cluster */
- private String cluster = "";
-
- /** The keyspace to be used in the cassandra datastore */
- private String keyspace = "conductor";
-
- /**
- * The number of tasks to be stored in a single partition which will be used for sharding
- * workflows in the datastore
- */
- private int shardSize = 100;
-
- /** The replication strategy with which to configure the keyspace */
- private String replicationStrategy = "SimpleStrategy";
-
- /** The key to be used while configuring the replication factor */
- private String replicationFactorKey = "replication_factor";
-
- /** The replication factor value with which the keyspace is configured */
- private int replicationFactorValue = 3;
-
- /** The consistency level to be used for read operations */
- private ConsistencyLevel readConsistencyLevel = ConsistencyLevel.LOCAL_QUORUM;
-
- /** The consistency level to be used for write operations */
- private ConsistencyLevel writeConsistencyLevel = ConsistencyLevel.LOCAL_QUORUM;
-
- /** The time in seconds after which the in-memory task definitions cache will be refreshed */
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration taskDefCacheRefreshInterval = Duration.ofSeconds(60);
-
- /** The time in seconds after which the in-memory event handler cache will be refreshed */
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration eventHandlerCacheRefreshInterval = Duration.ofSeconds(60);
-
- /** The time to live in seconds for which the event execution will be persisted */
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration eventExecutionPersistenceTtl = Duration.ZERO;
-
- public String getHostAddress() {
- return hostAddress;
- }
-
- public void setHostAddress(String hostAddress) {
- this.hostAddress = hostAddress;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getCluster() {
- return cluster;
- }
-
- public void setCluster(String cluster) {
- this.cluster = cluster;
- }
-
- public String getKeyspace() {
- return keyspace;
- }
-
- public void setKeyspace(String keyspace) {
- this.keyspace = keyspace;
- }
-
- public int getShardSize() {
- return shardSize;
- }
-
- public void setShardSize(int shardSize) {
- this.shardSize = shardSize;
- }
-
- public String getReplicationStrategy() {
- return replicationStrategy;
- }
-
- public void setReplicationStrategy(String replicationStrategy) {
- this.replicationStrategy = replicationStrategy;
- }
-
- public String getReplicationFactorKey() {
- return replicationFactorKey;
- }
-
- public void setReplicationFactorKey(String replicationFactorKey) {
- this.replicationFactorKey = replicationFactorKey;
- }
-
- public int getReplicationFactorValue() {
- return replicationFactorValue;
- }
-
- public void setReplicationFactorValue(int replicationFactorValue) {
- this.replicationFactorValue = replicationFactorValue;
- }
-
- public ConsistencyLevel getReadConsistencyLevel() {
- return readConsistencyLevel;
- }
-
- public void setReadConsistencyLevel(ConsistencyLevel readConsistencyLevel) {
- this.readConsistencyLevel = readConsistencyLevel;
- }
-
- public ConsistencyLevel getWriteConsistencyLevel() {
- return writeConsistencyLevel;
- }
-
- public void setWriteConsistencyLevel(ConsistencyLevel writeConsistencyLevel) {
- this.writeConsistencyLevel = writeConsistencyLevel;
- }
-
- public Duration getTaskDefCacheRefreshInterval() {
- return taskDefCacheRefreshInterval;
- }
-
- public void setTaskDefCacheRefreshInterval(Duration taskDefCacheRefreshInterval) {
- this.taskDefCacheRefreshInterval = taskDefCacheRefreshInterval;
- }
-
- public Duration getEventHandlerCacheRefreshInterval() {
- return eventHandlerCacheRefreshInterval;
- }
-
- public void setEventHandlerCacheRefreshInterval(Duration eventHandlerCacheRefreshInterval) {
- this.eventHandlerCacheRefreshInterval = eventHandlerCacheRefreshInterval;
- }
-
- public Duration getEventExecutionPersistenceTtl() {
- return eventExecutionPersistenceTtl;
- }
-
- public void setEventExecutionPersistenceTtl(Duration eventExecutionPersistenceTtl) {
- this.eventExecutionPersistenceTtl = eventExecutionPersistenceTtl;
- }
-}
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/dao/CassandraBaseDAO.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/dao/CassandraBaseDAO.java
deleted file mode 100644
index c576be8e9..000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/dao/CassandraBaseDAO.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.dao;
-
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.cassandra.config.CassandraProperties;
-import com.netflix.conductor.metrics.Monitors;
-
-import com.datastax.driver.core.DataType;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-
-import static com.netflix.conductor.cassandra.util.Constants.DAO_NAME;
-import static com.netflix.conductor.cassandra.util.Constants.ENTITY_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_EXECUTION_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_HANDLER_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_HANDLER_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.HANDLERS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.MESSAGE_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.PAYLOAD_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.SHARD_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_EVENT_EXECUTIONS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_EVENT_HANDLERS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_DEFS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_DEF_LIMIT;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_LOOKUP;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOWS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOW_DEFS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOW_DEFS_INDEX;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEF_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TOTAL_PARTITIONS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TOTAL_TASKS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_INDEX_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_INDEX_VALUE;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_NAME_VERSION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_VERSION_KEY;
-
-/**
- * Creates the keyspace and tables.
- *
- * CREATE KEYSPACE IF NOT EXISTS conductor WITH replication = { 'class' :
- * 'NetworkTopologyStrategy', 'us-east': '3'};
- *
- * CREATE TABLE IF NOT EXISTS conductor.workflows ( workflow_id uuid, shard_id int, task_id text,
- * entity text, payload text, total_tasks int STATIC, total_partitions int STATIC, PRIMARY
- * KEY((workflow_id, shard_id), entity, task_id) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.task_lookup( task_id uuid, workflow_id uuid, PRIMARY KEY
- * (task_id) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.task_def_limit( task_def_name text, task_id uuid,
- * workflow_id uuid, PRIMARY KEY ((task_def_name), task_id_key) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.workflow_definitions( workflow_def_name text, version
- * int, workflow_definition text, PRIMARY KEY ((workflow_def_name), version) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.workflow_defs_index( workflow_def_version_index text,
- * workflow_def_name_version text, workflow_def_index_value text,PRIMARY KEY
- * ((workflow_def_version_index), workflow_def_name_version) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.task_definitions( task_defs text, task_def_name text,
- * task_definition text, PRIMARY KEY ((task_defs), task_def_name) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.event_handlers( handlers text, event_handler_name text,
- * event_handler text, PRIMARY KEY ((handlers), event_handler_name) );
- *
- * CREATE TABLE IF NOT EXISTS conductor.event_executions( message_id text, event_handler_name
- * text, event_execution_id text, payload text, PRIMARY KEY ((message_id, event_handler_name),
- * event_execution_id) );
- */
-public abstract class CassandraBaseDAO {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraBaseDAO.class);
-
- private final ObjectMapper objectMapper;
- protected final Session session;
- protected final CassandraProperties properties;
-
- private boolean initialized = false;
-
- public CassandraBaseDAO(
- Session session, ObjectMapper objectMapper, CassandraProperties properties) {
- this.session = session;
- this.objectMapper = objectMapper;
- this.properties = properties;
-
- init();
- }
-
- private void init() {
- try {
- if (!initialized) {
- session.execute(getCreateKeyspaceStatement());
- session.execute(getCreateWorkflowsTableStatement());
- session.execute(getCreateTaskLookupTableStatement());
- session.execute(getCreateTaskDefLimitTableStatement());
- session.execute(getCreateWorkflowDefsTableStatement());
- session.execute(getCreateWorkflowDefsIndexTableStatement());
- session.execute(getCreateTaskDefsTableStatement());
- session.execute(getCreateEventHandlersTableStatement());
- session.execute(getCreateEventExecutionsTableStatement());
- LOGGER.info(
- "{} initialization complete! Tables created!", getClass().getSimpleName());
- initialized = true;
- }
- } catch (Exception e) {
- LOGGER.error("Error initializing and setting up keyspace and table in cassandra", e);
- throw e;
- }
- }
-
- private String getCreateKeyspaceStatement() {
- return SchemaBuilder.createKeyspace(properties.getKeyspace())
- .ifNotExists()
- .with()
- .replication(
- ImmutableMap.of(
- "class",
- properties.getReplicationStrategy(),
- properties.getReplicationFactorKey(),
- properties.getReplicationFactorValue()))
- .durableWrites(true)
- .getQueryString();
- }
-
- private String getCreateWorkflowsTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_WORKFLOWS)
- .ifNotExists()
- .addPartitionKey(WORKFLOW_ID_KEY, DataType.uuid())
- .addPartitionKey(SHARD_ID_KEY, DataType.cint())
- .addClusteringColumn(ENTITY_KEY, DataType.text())
- .addClusteringColumn(TASK_ID_KEY, DataType.text())
- .addColumn(PAYLOAD_KEY, DataType.text())
- .addStaticColumn(TOTAL_TASKS_KEY, DataType.cint())
- .addStaticColumn(TOTAL_PARTITIONS_KEY, DataType.cint())
- .getQueryString();
- }
-
- private String getCreateTaskLookupTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_TASK_LOOKUP)
- .ifNotExists()
- .addPartitionKey(TASK_ID_KEY, DataType.uuid())
- .addColumn(WORKFLOW_ID_KEY, DataType.uuid())
- .getQueryString();
- }
-
- private String getCreateTaskDefLimitTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_TASK_DEF_LIMIT)
- .ifNotExists()
- .addPartitionKey(TASK_DEF_NAME_KEY, DataType.text())
- .addClusteringColumn(TASK_ID_KEY, DataType.uuid())
- .addColumn(WORKFLOW_ID_KEY, DataType.uuid())
- .getQueryString();
- }
-
- private String getCreateWorkflowDefsTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_WORKFLOW_DEFS)
- .ifNotExists()
- .addPartitionKey(WORKFLOW_DEF_NAME_KEY, DataType.text())
- .addClusteringColumn(WORKFLOW_VERSION_KEY, DataType.cint())
- .addColumn(WORKFLOW_DEFINITION_KEY, DataType.text())
- .getQueryString();
- }
-
- private String getCreateWorkflowDefsIndexTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_WORKFLOW_DEFS_INDEX)
- .ifNotExists()
- .addPartitionKey(WORKFLOW_DEF_INDEX_KEY, DataType.text())
- .addClusteringColumn(WORKFLOW_DEF_NAME_VERSION_KEY, DataType.text())
- .addColumn(WORKFLOW_DEF_INDEX_VALUE, DataType.text())
- .getQueryString();
- }
-
- private String getCreateTaskDefsTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_TASK_DEFS)
- .ifNotExists()
- .addPartitionKey(TASK_DEFS_KEY, DataType.text())
- .addClusteringColumn(TASK_DEF_NAME_KEY, DataType.text())
- .addColumn(TASK_DEFINITION_KEY, DataType.text())
- .getQueryString();
- }
-
- private String getCreateEventHandlersTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_EVENT_HANDLERS)
- .ifNotExists()
- .addPartitionKey(HANDLERS_KEY, DataType.text())
- .addClusteringColumn(EVENT_HANDLER_NAME_KEY, DataType.text())
- .addColumn(EVENT_HANDLER_KEY, DataType.text())
- .getQueryString();
- }
-
- private String getCreateEventExecutionsTableStatement() {
- return SchemaBuilder.createTable(properties.getKeyspace(), TABLE_EVENT_EXECUTIONS)
- .ifNotExists()
- .addPartitionKey(MESSAGE_ID_KEY, DataType.text())
- .addPartitionKey(EVENT_HANDLER_NAME_KEY, DataType.text())
- .addClusteringColumn(EVENT_EXECUTION_ID_KEY, DataType.text())
- .addColumn(PAYLOAD_KEY, DataType.text())
- .getQueryString();
- }
-
- String toJson(Object value) {
- try {
- return objectMapper.writeValueAsString(value);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
-
- * Licensed 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 com.netflix.conductor.cassandra.dao;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.annotations.Trace;
-import com.netflix.conductor.cassandra.config.CassandraProperties;
-import com.netflix.conductor.cassandra.util.Statements;
-import com.netflix.conductor.common.metadata.events.EventHandler;
-import com.netflix.conductor.core.exception.ApplicationException;
-import com.netflix.conductor.core.exception.ApplicationException.Code;
-import com.netflix.conductor.dao.EventHandlerDAO;
-import com.netflix.conductor.metrics.Monitors;
-
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_HANDLER_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.HANDLERS_KEY;
-
-@Trace
-public class CassandraEventHandlerDAO extends CassandraBaseDAO implements EventHandlerDAO {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraEventHandlerDAO.class);
- private static final String CLASS_NAME = CassandraEventHandlerDAO.class.getSimpleName();
-
- private volatile Map
- * Licensed 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 com.netflix.conductor.cassandra.dao;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.annotations.Trace;
-import com.netflix.conductor.cassandra.config.CassandraProperties;
-import com.netflix.conductor.cassandra.util.Statements;
-import com.netflix.conductor.common.metadata.events.EventExecution;
-import com.netflix.conductor.common.metadata.tasks.TaskDef;
-import com.netflix.conductor.core.exception.ApplicationException;
-import com.netflix.conductor.core.exception.ApplicationException.Code;
-import com.netflix.conductor.dao.ConcurrentExecutionLimitDAO;
-import com.netflix.conductor.dao.ExecutionDAO;
-import com.netflix.conductor.metrics.Monitors;
-import com.netflix.conductor.model.TaskModel;
-import com.netflix.conductor.model.WorkflowModel;
-
-import com.datastax.driver.core.*;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-
-import static com.netflix.conductor.cassandra.util.Constants.*;
-
-@Trace
-public class CassandraExecutionDAO extends CassandraBaseDAO
- implements ExecutionDAO, ConcurrentExecutionLimitDAO {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraExecutionDAO.class);
- private static final String CLASS_NAME = CassandraExecutionDAO.class.getSimpleName();
-
- private final PreparedStatement insertWorkflowStatement;
- private final PreparedStatement insertTaskStatement;
- private final PreparedStatement insertEventExecutionStatement;
-
- private final PreparedStatement selectTotalStatement;
- private final PreparedStatement selectTaskStatement;
- private final PreparedStatement selectWorkflowStatement;
- private final PreparedStatement selectWorkflowWithTasksStatement;
- private final PreparedStatement selectTaskLookupStatement;
- private final PreparedStatement selectTasksFromTaskDefLimitStatement;
- private final PreparedStatement selectEventExecutionsStatement;
-
- private final PreparedStatement updateWorkflowStatement;
- private final PreparedStatement updateTotalTasksStatement;
- private final PreparedStatement updateTotalPartitionsStatement;
- private final PreparedStatement updateTaskLookupStatement;
- private final PreparedStatement updateTaskDefLimitStatement;
- private final PreparedStatement updateEventExecutionStatement;
-
- private final PreparedStatement deleteWorkflowStatement;
- private final PreparedStatement deleteTaskStatement;
- private final PreparedStatement deleteTaskLookupStatement;
- private final PreparedStatement deleteTaskDefLimitStatement;
- private final PreparedStatement deleteEventExecutionStatement;
-
- private final int eventExecutionsTTL;
-
- public CassandraExecutionDAO(
- Session session,
- ObjectMapper objectMapper,
- CassandraProperties properties,
- Statements statements) {
- super(session, objectMapper, properties);
-
- eventExecutionsTTL = (int) properties.getEventExecutionPersistenceTtl().getSeconds();
-
- this.insertWorkflowStatement =
- session.prepare(statements.getInsertWorkflowStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.insertTaskStatement =
- session.prepare(statements.getInsertTaskStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.insertEventExecutionStatement =
- session.prepare(statements.getInsertEventExecutionStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
-
- this.selectTotalStatement =
- session.prepare(statements.getSelectTotalStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectTaskStatement =
- session.prepare(statements.getSelectTaskStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectWorkflowStatement =
- session.prepare(statements.getSelectWorkflowStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectWorkflowWithTasksStatement =
- session.prepare(statements.getSelectWorkflowWithTasksStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectTaskLookupStatement =
- session.prepare(statements.getSelectTaskFromLookupTableStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectTasksFromTaskDefLimitStatement =
- session.prepare(statements.getSelectTasksFromTaskDefLimitStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
- this.selectEventExecutionsStatement =
- session.prepare(
- statements
- .getSelectAllEventExecutionsForMessageFromEventExecutionsStatement())
- .setConsistencyLevel(properties.getReadConsistencyLevel());
-
- this.updateWorkflowStatement =
- session.prepare(statements.getUpdateWorkflowStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.updateTotalTasksStatement =
- session.prepare(statements.getUpdateTotalTasksStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.updateTotalPartitionsStatement =
- session.prepare(statements.getUpdateTotalPartitionsStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.updateTaskLookupStatement =
- session.prepare(statements.getUpdateTaskLookupStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.updateTaskDefLimitStatement =
- session.prepare(statements.getUpdateTaskDefLimitStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.updateEventExecutionStatement =
- session.prepare(statements.getUpdateEventExecutionStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
-
- this.deleteWorkflowStatement =
- session.prepare(statements.getDeleteWorkflowStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.deleteTaskStatement =
- session.prepare(statements.getDeleteTaskStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.deleteTaskLookupStatement =
- session.prepare(statements.getDeleteTaskLookupStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.deleteTaskDefLimitStatement =
- session.prepare(statements.getDeleteTaskDefLimitStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- this.deleteEventExecutionStatement =
- session.prepare(statements.getDeleteEventExecutionsStatement())
- .setConsistencyLevel(properties.getWriteConsistencyLevel());
- }
-
- @Override
- public List
- * Licensed 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 com.netflix.conductor.cassandra.dao;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.annotations.Trace;
-import com.netflix.conductor.annotations.VisibleForTesting;
-import com.netflix.conductor.cassandra.config.CassandraProperties;
-import com.netflix.conductor.cassandra.util.Statements;
-import com.netflix.conductor.common.metadata.tasks.TaskDef;
-import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
-import com.netflix.conductor.core.exception.ApplicationException;
-import com.netflix.conductor.core.exception.ApplicationException.Code;
-import com.netflix.conductor.dao.MetadataDAO;
-import com.netflix.conductor.metrics.Monitors;
-
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_INDEX_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_NAME_VERSION_KEY;
-
-@Trace
-public class CassandraMetadataDAO extends CassandraBaseDAO implements MetadataDAO {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMetadataDAO.class);
- private static final String CLASS_NAME = CassandraMetadataDAO.class.getSimpleName();
- private static final String INDEX_DELIMITER = "/";
-
- private Map
- * Licensed 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 com.netflix.conductor.cassandra.dao;
-
-import java.util.List;
-
-import com.netflix.conductor.common.metadata.tasks.PollData;
-import com.netflix.conductor.dao.PollDataDAO;
-
-/**
- * This is a dummy implementation and this feature is not implemented for Cassandra backed
- * Conductor.
- */
-public class CassandraPollDataDAO implements PollDataDAO {
-
- @Override
- public void updateLastPollData(String taskDefName, String domain, String workerId) {
- throw new UnsupportedOperationException(
- "This method is not implemented in CassandraPollDataDAO. Please use ExecutionDAOFacade instead.");
- }
-
- @Override
- public PollData getPollData(String taskDefName, String domain) {
- throw new UnsupportedOperationException(
- "This method is not implemented in CassandraPollDataDAO. Please use ExecutionDAOFacade instead.");
- }
-
- @Override
- public List
- * Licensed 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 com.netflix.conductor.cassandra.util;
-
-public interface Constants {
-
- String DAO_NAME = "cassandra";
-
- String TABLE_WORKFLOWS = "workflows";
- String TABLE_TASK_LOOKUP = "task_lookup";
- String TABLE_TASK_DEF_LIMIT = "task_def_limit";
- String TABLE_WORKFLOW_DEFS = "workflow_definitions";
- String TABLE_WORKFLOW_DEFS_INDEX = "workflow_defs_index";
- String TABLE_TASK_DEFS = "task_definitions";
- String TABLE_EVENT_HANDLERS = "event_handlers";
- String TABLE_EVENT_EXECUTIONS = "event_executions";
-
- String WORKFLOW_ID_KEY = "workflow_id";
- String SHARD_ID_KEY = "shard_id";
- String TASK_ID_KEY = "task_id";
- String ENTITY_KEY = "entity";
- String PAYLOAD_KEY = "payload";
- String TOTAL_TASKS_KEY = "total_tasks";
- String TOTAL_PARTITIONS_KEY = "total_partitions";
- String TASK_DEF_NAME_KEY = "task_def_name";
- String WORKFLOW_DEF_NAME_KEY = "workflow_def_name";
- String WORKFLOW_VERSION_KEY = "version";
- String WORKFLOW_DEFINITION_KEY = "workflow_definition";
- String WORKFLOW_DEF_INDEX_KEY = "workflow_def_version_index";
- String WORKFLOW_DEF_INDEX_VALUE = "workflow_def_index_value";
- String WORKFLOW_DEF_NAME_VERSION_KEY = "workflow_def_name_version";
- String TASK_DEFS_KEY = "task_defs";
- String TASK_DEFINITION_KEY = "task_definition";
- String HANDLERS_KEY = "handlers";
- String EVENT_HANDLER_NAME_KEY = "event_handler_name";
- String EVENT_HANDLER_KEY = "event_handler";
- String MESSAGE_ID_KEY = "message_id";
- String EVENT_EXECUTION_ID_KEY = "event_execution_id";
-
- String ENTITY_TYPE_WORKFLOW = "workflow";
- String ENTITY_TYPE_TASK = "task";
-
- int DEFAULT_SHARD_ID = 1;
- int DEFAULT_TOTAL_PARTITIONS = 1;
-}
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java
deleted file mode 100644
index 38eff7d84..000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/util/Statements.java
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.util;
-
-import com.datastax.driver.core.querybuilder.QueryBuilder;
-
-import static com.netflix.conductor.cassandra.util.Constants.ENTITY_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.ENTITY_TYPE_TASK;
-import static com.netflix.conductor.cassandra.util.Constants.ENTITY_TYPE_WORKFLOW;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_EXECUTION_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_HANDLER_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.EVENT_HANDLER_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.HANDLERS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.MESSAGE_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.PAYLOAD_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.SHARD_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_EVENT_EXECUTIONS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_EVENT_HANDLERS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_DEFS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_DEF_LIMIT;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_TASK_LOOKUP;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOWS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOW_DEFS;
-import static com.netflix.conductor.cassandra.util.Constants.TABLE_WORKFLOW_DEFS_INDEX;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEFS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_DEF_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TASK_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TOTAL_PARTITIONS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.TOTAL_TASKS_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEFINITION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_INDEX_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_INDEX_VALUE;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_NAME_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_DEF_NAME_VERSION_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_ID_KEY;
-import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_VERSION_KEY;
-
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.set;
-
-/**
- * DML statements
- *
- * MetadataDAO
- *
- *
- * Licensed 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 com.netflix.conductor.cassandra.dao
-
-import com.netflix.conductor.common.metadata.events.EventExecution
-import com.netflix.conductor.common.metadata.events.EventHandler
-
-import spock.lang.Subject
-
-class CassandraEventHandlerDAOSpec extends CassandraSpec {
-
- @Subject
- CassandraEventHandlerDAO eventHandlerDAO
-
- CassandraExecutionDAO executionDAO
-
- def setup() {
- eventHandlerDAO = new CassandraEventHandlerDAO(session, objectMapper, cassandraProperties, statements)
- executionDAO = new CassandraExecutionDAO(session, objectMapper, cassandraProperties, statements)
- }
-
- def testEventHandlerCRUD() {
- given:
- String event = "event"
- String eventHandlerName1 = "event_handler1"
- String eventHandlerName2 = "event_handler2"
-
- EventHandler eventHandler = new EventHandler()
- eventHandler.setName(eventHandlerName1)
- eventHandler.setEvent(event)
-
- when: // create event handler
- eventHandlerDAO.addEventHandler(eventHandler)
- List
- * Licensed 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 com.netflix.conductor.cassandra.dao
-
-import com.netflix.conductor.common.metadata.events.EventExecution
-import com.netflix.conductor.common.metadata.tasks.TaskDef
-import com.netflix.conductor.common.metadata.workflow.WorkflowDef
-import com.netflix.conductor.common.metadata.workflow.WorkflowTask
-import com.netflix.conductor.core.exception.ApplicationException
-import com.netflix.conductor.core.utils.IDGenerator
-import com.netflix.conductor.model.TaskModel
-import com.netflix.conductor.model.WorkflowModel
-
-import spock.lang.Subject
-
-import static com.netflix.conductor.common.metadata.events.EventExecution.Status.COMPLETED
-import static com.netflix.conductor.common.metadata.events.EventExecution.Status.IN_PROGRESS
-import static com.netflix.conductor.core.exception.ApplicationException.Code.INVALID_INPUT
-
-class CassandraExecutionDAOSpec extends CassandraSpec {
-
- @Subject
- CassandraExecutionDAO executionDAO
-
- def setup() {
- executionDAO = new CassandraExecutionDAO(session, objectMapper, cassandraProperties, statements)
- }
-
- def "verify if tasks are validated"() {
- given:
- def tasks = []
-
- // create tasks for a workflow and add to list
- TaskModel task1 = new TaskModel(workflowInstanceId: 'uuid', taskId: 'task1id', referenceTaskName: 'task1')
- TaskModel task2 = new TaskModel(workflowInstanceId: 'uuid', taskId: 'task2id', referenceTaskName: 'task2')
- tasks << task1 << task2
-
- when:
- executionDAO.validateTasks(tasks)
-
- then:
- noExceptionThrown()
-
- and:
- // add a task from a different workflow to the list
- TaskModel task3 = new TaskModel(workflowInstanceId: 'other-uuid', taskId: 'task3id', referenceTaskName: 'task3')
- tasks << task3
-
- when:
- executionDAO.validateTasks(tasks)
-
- then:
- def ex = thrown(ApplicationException.class)
- ex.message == "Tasks of multiple workflows cannot be created/updated simultaneously"
- }
-
- def "workflow CRUD"() {
- given:
- String workflowId = new IDGenerator().generate()
- WorkflowDef workflowDef = new WorkflowDef()
- workflowDef.name = "def1"
- workflowDef.setVersion(1)
- WorkflowModel workflow = new WorkflowModel()
- workflow.setWorkflowDefinition(workflowDef)
- workflow.setWorkflowId(workflowId)
- workflow.setInput(new HashMap<>())
- workflow.setStatus(WorkflowModel.Status.RUNNING)
- workflow.setCreateTime(System.currentTimeMillis())
-
- when:
- // create a new workflow in the datastore
- String id = executionDAO.createWorkflow(workflow)
-
- then:
- workflowId == id
-
- when:
- // read the workflow from the datastore
- WorkflowModel found = executionDAO.getWorkflow(workflowId)
-
- then:
- workflow == found
-
- and:
- // update the workflow
- workflow.setStatus(WorkflowModel.Status.COMPLETED)
- executionDAO.updateWorkflow(workflow)
-
- when:
- found = executionDAO.getWorkflow(workflowId)
-
- then:
- workflow == found
-
- when:
- // remove the workflow from datastore
- boolean removed = executionDAO.removeWorkflow(workflowId)
-
- then:
- removed
-
- when:
- // read workflow again
- workflow = executionDAO.getWorkflow(workflowId, true)
-
- then:
- workflow == null
- }
-
- def "create tasks and verify methods that read tasks and workflow"() {
- given: 'we create a workflow'
- String workflowId = new IDGenerator().generate()
- WorkflowDef workflowDef = new WorkflowDef(name: 'def1', version: 1)
- WorkflowModel workflow = new WorkflowModel(workflowDefinition: workflowDef, workflowId: workflowId, input: new HashMap(), status: WorkflowModel.Status.RUNNING, createTime: System.currentTimeMillis())
- executionDAO.createWorkflow(workflow)
-
- and: 'create tasks for this workflow'
- TaskModel task1 = new TaskModel(workflowInstanceId: workflowId, taskType: 'task1', referenceTaskName: 'task1', status: TaskModel.Status.SCHEDULED, taskId: new IDGenerator().generate())
- TaskModel task2 = new TaskModel(workflowInstanceId: workflowId, taskType: 'task2', referenceTaskName: 'task2', status: TaskModel.Status.SCHEDULED, taskId: new IDGenerator().generate())
- TaskModel task3 = new TaskModel(workflowInstanceId: workflowId, taskType: 'task3', referenceTaskName: 'task3', status: TaskModel.Status.SCHEDULED, taskId: new IDGenerator().generate())
-
- def taskList = [task1, task2, task3]
-
- when: 'add the tasks to the datastore'
- List
- * Licensed 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 com.netflix.conductor.cassandra.dao
-
-import com.netflix.conductor.common.metadata.tasks.TaskDef
-import com.netflix.conductor.common.metadata.workflow.WorkflowDef
-
-import spock.lang.Subject
-
-class CassandraMetadataDAOSpec extends CassandraSpec {
-
- @Subject
- CassandraMetadataDAO metadataDAO
-
- def setup() {
- metadataDAO = new CassandraMetadataDAO(session, objectMapper, cassandraProperties, statements)
- }
-
- def cleanup() {
-
- }
-
- def "CRUD on WorkflowDef"() throws Exception {
- given:
- String name = "workflow_def_1"
- int version = 1
-
- WorkflowDef workflowDef = new WorkflowDef()
- workflowDef.setName(name)
- workflowDef.setVersion(version)
- workflowDef.setOwnerEmail("test@junit.com")
-
- when: 'create workflow definition'
- metadataDAO.createWorkflowDef(workflowDef)
-
- then: // fetch the workflow definition
- def defOptional = metadataDAO.getWorkflowDef(name, version)
- defOptional.present
- defOptional.get() == workflowDef
-
- and: // register a higher version
- int higherVersion = 2
- workflowDef.setVersion(higherVersion)
- workflowDef.setDescription("higher version")
-
- when: // register the higher version definition
- metadataDAO.createWorkflowDef(workflowDef)
- defOptional = metadataDAO.getWorkflowDef(name, higherVersion)
-
- then: // fetch the higher version
- defOptional.present
- defOptional.get() == workflowDef
-
- when: // fetch latest version
- defOptional = metadataDAO.getLatestWorkflowDef(name)
-
- then:
- defOptional && defOptional.present
- defOptional.get() == workflowDef
-
- when: // modify the definition
- workflowDef.setOwnerEmail("test@junit.com")
- metadataDAO.updateWorkflowDef(workflowDef)
- defOptional = metadataDAO.getWorkflowDef(name, higherVersion)
-
- then: // fetch the workflow definition
- defOptional.present
- defOptional.get() == workflowDef
-
- when: // delete workflow def
- metadataDAO.removeWorkflowDef(name, higherVersion)
- defOptional = metadataDAO.getWorkflowDef(name, higherVersion)
-
- then:
- defOptional.empty
- }
-
- def "CRUD on TaskDef"() {
- given:
- String task1Name = "task1"
- String task2Name = "task2"
-
- when: // fetch all task defs
- def taskDefList = metadataDAO.getAllTaskDefs()
-
- then:
- taskDefList.empty
-
- when: // register a task definition
- TaskDef taskDef = new TaskDef()
- taskDef.setName(task1Name)
- metadataDAO.createTaskDef(taskDef)
- taskDefList = metadataDAO.getAllTaskDefs()
-
- then: // fetch all task defs
- taskDefList && taskDefList.size() == 1
-
- when: // fetch the task def
- def returnTaskDef = metadataDAO.getTaskDef(task1Name)
-
- then:
- returnTaskDef == taskDef
-
- when: // register another task definition
- TaskDef taskDef1 = new TaskDef()
- taskDef1.setName(task2Name)
- metadataDAO.createTaskDef(taskDef1)
- // fetch all task defs
- taskDefList = metadataDAO.getAllTaskDefs()
-
- then:
- taskDefList && taskDefList.size() == 2
-
- when: // update task def
- taskDef.setOwnerEmail("juni@test.com")
- metadataDAO.updateTaskDef(taskDef)
- returnTaskDef = metadataDAO.getTaskDef(task1Name)
-
- then:
- returnTaskDef == taskDef
-
- when: // delete task def
- metadataDAO.removeTaskDef(task2Name)
- taskDefList = metadataDAO.getAllTaskDefs()
-
- then:
- taskDefList && taskDefList.size() == 1
- // fetch deleted task def
- metadataDAO.getTaskDef(task2Name) == null
- }
-
- def "parse index string"() {
- expect:
- def pair = metadataDAO.getWorkflowNameAndVersion(nameVersionStr)
- pair.left == workflowName
- pair.right == version
-
- where:
- nameVersionStr << ['name/1', 'namespace/name/3', '/namespace/name_with_lodash/2', 'name//4', 'name-with$%/895']
- workflowName << ['name', 'namespace/name', '/namespace/name_with_lodash', 'name/', 'name-with$%']
- version << [1, 3, 2, 4, 895]
- }
-
- def "parse index string - incorrect values"() {
- when:
- metadataDAO.getWorkflowNameAndVersion("name_with_no_version")
-
- then:
- def ex = thrown(IllegalStateException.class)
- println(ex.message)
-
- when:
- metadataDAO.getWorkflowNameAndVersion("name_with_no_version/")
-
- then:
- ex = thrown(IllegalStateException.class)
- println(ex.message)
-
- when:
- metadataDAO.getWorkflowNameAndVersion("name/non_number_version")
-
- then:
- ex = thrown(IllegalStateException.class)
- println(ex.message)
- }
-}
diff --git a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraSpec.groovy b/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraSpec.groovy
deleted file mode 100644
index a5393210b..000000000
--- a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraSpec.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.dao
-
-import java.time.Duration
-
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.test.context.ContextConfiguration
-import org.testcontainers.containers.CassandraContainer
-import org.testcontainers.spock.Testcontainers
-
-import com.netflix.conductor.cassandra.config.CassandraProperties
-import com.netflix.conductor.cassandra.util.Statements
-import com.netflix.conductor.common.config.TestObjectMapperConfiguration
-
-import com.datastax.driver.core.ConsistencyLevel
-import com.datastax.driver.core.Session
-import com.fasterxml.jackson.databind.ObjectMapper
-import groovy.transform.PackageScope
-import spock.lang.Shared
-import spock.lang.Specification
-
-@ContextConfiguration(classes = [TestObjectMapperConfiguration.class])
-@Testcontainers
-@PackageScope
-abstract class CassandraSpec extends Specification {
-
- @Shared
- CassandraContainer cassandra = new CassandraContainer()
-
- @Shared
- Session session
-
- @Autowired
- ObjectMapper objectMapper
-
- CassandraProperties cassandraProperties
- Statements statements
-
- def setupSpec() {
- session = cassandra.cluster.newSession()
- }
-
- def setup() {
- String keyspaceName = "junit"
- cassandraProperties = Mock(CassandraProperties.class) {
- getKeyspace() >> keyspaceName
- getReplicationStrategy() >> "SimpleStrategy"
- getReplicationFactorKey() >> "replication_factor"
- getReplicationFactorValue() >> 1
- getReadConsistencyLevel() >> ConsistencyLevel.LOCAL_ONE
- getWriteConsistencyLevel() >> ConsistencyLevel.LOCAL_ONE
- getTaskDefCacheRefreshInterval() >> Duration.ofSeconds(60)
- getEventHandlerCacheRefreshInterval() >> Duration.ofSeconds(60)
- getEventExecutionPersistenceTtl() >> Duration.ofSeconds(5)
- }
-
- statements = new Statements(keyspaceName)
- }
-}
diff --git a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/util/StatementsSpec.groovy b/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/util/StatementsSpec.groovy
deleted file mode 100644
index f826a3620..000000000
--- a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/util/StatementsSpec.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.cassandra.util
-
-import spock.lang.Specification
-import spock.lang.Subject
-
-class StatementsSpec extends Specification {
-
- @Subject
- Statements subject
-
- def setup() {
- subject = new Statements('test')
- }
-
- def "verify statements"() {
- when:
- subject
-
- then:
- with(subject) {
- insertWorkflowDefStatement == "INSERT INTO test.workflow_definitions (workflow_def_name,version,workflow_definition) VALUES (?,?,?) IF NOT EXISTS;"
- insertTaskDefStatement == "INSERT INTO test.task_definitions (task_defs,task_def_name,task_definition) VALUES ('task_defs',?,?);"
- selectWorkflowDefStatement == "SELECT workflow_definition FROM test.workflow_definitions WHERE workflow_def_name=? AND version=?;"
- selectAllWorkflowDefVersionsByNameStatement == "SELECT * FROM test.workflow_definitions WHERE workflow_def_name=?;"
- selectAllWorkflowDefsStatement == "SELECT * FROM test.workflow_defs_index WHERE workflow_def_version_index=?;"
- selectTaskDefStatement == "SELECT task_definition FROM test.task_definitions WHERE task_defs='task_defs' AND task_def_name=?;"
- selectAllTaskDefsStatement == "SELECT * FROM test.task_definitions WHERE task_defs=?;"
- updateWorkflowDefStatement == "UPDATE test.workflow_definitions SET workflow_definition=? WHERE workflow_def_name=? AND version=?;"
- deleteWorkflowDefStatement == "DELETE FROM test.workflow_definitions WHERE workflow_def_name=? AND version=?;"
- deleteWorkflowDefIndexStatement == "DELETE FROM test.workflow_defs_index WHERE workflow_def_version_index=? AND workflow_def_name_version=?;"
- deleteTaskDefStatement == "DELETE FROM test.task_definitions WHERE task_defs='task_defs' AND task_def_name=?;"
- insertWorkflowStatement == "INSERT INTO test.workflows (workflow_id,shard_id,task_id,entity,payload,total_tasks,total_partitions) VALUES (?,?,?,'workflow',?,?,?);"
- insertTaskStatement == "INSERT INTO test.workflows (workflow_id,shard_id,task_id,entity,payload) VALUES (?,?,?,'task',?);"
- insertEventExecutionStatement == "INSERT INTO test.event_executions (message_id,event_handler_name,event_execution_id,payload) VALUES (?,?,?,?) IF NOT EXISTS;"
- selectTotalStatement == "SELECT total_tasks,total_partitions FROM test.workflows WHERE workflow_id=? AND shard_id=1;"
- selectTaskStatement == "SELECT payload FROM test.workflows WHERE workflow_id=? AND shard_id=? AND entity='task' AND task_id=?;"
- selectWorkflowStatement == "SELECT payload FROM test.workflows WHERE workflow_id=? AND shard_id=1 AND entity='workflow';"
- selectWorkflowWithTasksStatement == "SELECT * FROM test.workflows WHERE workflow_id=? AND shard_id=?;"
- selectTaskFromLookupTableStatement == "SELECT workflow_id FROM test.task_lookup WHERE task_id=?;"
- selectTasksFromTaskDefLimitStatement == "SELECT * FROM test.task_def_limit WHERE task_def_name=?;"
- selectAllEventExecutionsForMessageFromEventExecutionsStatement == "SELECT * FROM test.event_executions WHERE message_id=? AND event_handler_name=?;"
- updateWorkflowStatement == "UPDATE test.workflows SET payload=? WHERE workflow_id=? AND shard_id=1 AND entity='workflow' AND task_id='';"
- updateTotalTasksStatement == "UPDATE test.workflows SET total_tasks=? WHERE workflow_id=? AND shard_id=?;"
- updateTotalPartitionsStatement == "UPDATE test.workflows SET total_partitions=?,total_tasks=? WHERE workflow_id=? AND shard_id=1;"
- updateTaskLookupStatement == "UPDATE test.task_lookup SET workflow_id=? WHERE task_id=?;"
- updateTaskDefLimitStatement == "UPDATE test.task_def_limit SET workflow_id=? WHERE task_def_name=? AND task_id=?;"
- updateEventExecutionStatement == "UPDATE test.event_executions USING TTL ? SET payload=? WHERE message_id=? AND event_handler_name=? AND event_execution_id=?;"
- deleteWorkflowStatement == "DELETE FROM test.workflows WHERE workflow_id=? AND shard_id=?;"
- deleteTaskLookupStatement == "DELETE FROM test.task_lookup WHERE task_id=?;"
- deleteTaskStatement == "DELETE FROM test.workflows WHERE workflow_id=? AND shard_id=? AND entity='task' AND task_id=?;"
- deleteTaskDefLimitStatement == "DELETE FROM test.task_def_limit WHERE task_def_name=? AND task_id=?;"
- deleteEventExecutionsStatement == "DELETE FROM test.event_executions WHERE message_id=? AND event_handler_name=? AND event_execution_id=?;"
- insertEventHandlerStatement == "INSERT INTO test.event_handlers (handlers,event_handler_name,event_handler) VALUES ('handlers',?,?);"
- selectAllEventHandlersStatement == "SELECT * FROM test.event_handlers WHERE handlers=?;"
- deleteEventHandlerStatement == "DELETE FROM test.event_handlers WHERE handlers='handlers' AND event_handler_name=?;"
- }
- }
-}
diff --git a/client-spring/build.gradle b/client-spring/build.gradle
deleted file mode 100644
index f975f701c..000000000
--- a/client-spring/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-
-dependencies {
-
- implementation project(':conductor-common')
- api project(':conductor-client')
-
- implementation "com.netflix.eureka:eureka-client:${revEurekaClient}"
- implementation 'org.springframework.boot:spring-boot-starter'
-}
diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock
deleted file mode 100644
index b04d70e85..000000000
--- a/client-spring/dependencies.lock
+++ /dev/null
@@ -1,361 +0,0 @@
-{
- "annotationProcessor": {
- "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.6.7"
- }
- },
- "compileClasspath": {
- "com.netflix.conductor:conductor-client": {
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- }
- },
- "runtimeClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2.1"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.13.2"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.13.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-client": {
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.7"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.slf4j:slf4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.7.36"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- }
- },
- "testCompileClasspath": {
- "com.netflix.conductor:conductor-client": {
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- },
- "testRuntimeClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2.1"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.13.2"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.13.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-client": {
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "2.7"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-client",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.slf4j:slf4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-client"
- ],
- "locked": "1.7.36"
- },
- "org.springframework.boot:spring-boot-starter": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- }
-}
\ No newline at end of file
diff --git a/client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java b/client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java
deleted file mode 100644
index 55c82e576..000000000
--- a/client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.spring;
-
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties("conductor.client")
-public class ClientProperties {
-
- private String rootUri;
-
- private String workerNamePrefix = "workflow-worker-%d";
-
- private int threadCount = 1;
-
- private Duration sleepWhenRetryDuration = Duration.ofMillis(500);
-
- private int updateRetryCount = 3;
-
- private Map
- * Licensed 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 com.netflix.conductor.client.spring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.conductor.client.automator.TaskRunnerConfigurer;
-import com.netflix.conductor.client.http.TaskClient;
-import com.netflix.conductor.client.worker.Worker;
-import com.netflix.discovery.EurekaClient;
-
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(ClientProperties.class)
-public class ConductorClientAutoConfiguration {
-
- @Autowired(required = false)
- private EurekaClient eurekaClient;
-
- @Autowired(required = false)
- private List
- * Licensed 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 com.netflix.conductor.client.spring;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-
-import com.netflix.conductor.client.worker.Worker;
-import com.netflix.conductor.common.metadata.tasks.Task;
-import com.netflix.conductor.common.metadata.tasks.TaskResult;
-
-@SpringBootApplication
-public class ExampleClient {
-
- public static void main(String[] args) {
-
- SpringApplication.run(ExampleClient.class, args);
- }
-
- @Bean
- public Worker worker() {
- return new Worker() {
- @Override
- public String getTaskDefName() {
- return "taskDef";
- }
-
- @Override
- public TaskResult execute(Task task) {
- return new TaskResult(task);
- }
- };
- }
-}
diff --git a/client/build.gradle b/client/build.gradle
deleted file mode 100644
index 477fea1f3..000000000
--- a/client/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
- dependencies {
- classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5"
- }
-}
-
-apply plugin: 'groovy'
-
-configurations.all {
- exclude group: 'amazon', module: 'aws-java-sdk'
-}
-
-dependencies {
- implementation project(':conductor-common')
-
- implementation "com.sun.jersey:jersey-client:${revJersey}"
-
- implementation "com.netflix.spectator:spectator-api:${revSpectator}"
- implementation ("com.netflix.eureka:eureka-client:${revEurekaClient}") {
- exclude group: 'com.google.guava', module: 'guava'
- }
- implementation "com.amazonaws:aws-java-sdk-core:${revAwsSdk}"
-
- implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider"
- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
-
- implementation "org.apache.commons:commons-lang3"
- implementation "commons-io:commons-io:${revCommonsIo}"
-
- implementation "org.slf4j:slf4j-api"
-
- testImplementation "org.powermock:powermock-module-junit4:${revPowerMock}"
- testImplementation "org.powermock:powermock-api-mockito2:${revPowerMock}"
-
- testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
- testImplementation "org.spockframework:spock-core:${revSpock}"
- testImplementation "org.spockframework:spock-spring:${revSpock}"
-}
diff --git a/client/dependencies.lock b/client/dependencies.lock
deleted file mode 100644
index 52da1b208..000000000
--- a/client/dependencies.lock
+++ /dev/null
@@ -1,349 +0,0 @@
-{
- "annotationProcessor": {
- "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.6.7"
- }
- },
- "compileClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "locked": "2.13.2"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "locked": "2.7"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.slf4j:slf4j-api": {
- "locked": "1.7.36"
- }
- },
- "runtimeClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2.1"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "locked": "2.13.2"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.13.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "locked": "2.7"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.slf4j:slf4j-api": {
- "locked": "1.7.36"
- }
- },
- "testCompileClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "locked": "2.13.2"
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "locked": "2.7"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.commons:commons-lang3": {
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.1"
- },
- "org.codehaus.groovy:groovy-all": {
- "locked": "2.5.13"
- },
- "org.powermock:powermock-api-mockito2": {
- "locked": "2.0.9"
- },
- "org.powermock:powermock-module-junit4": {
- "locked": "2.0.9"
- },
- "org.slf4j:slf4j-api": {
- "locked": "1.7.36"
- },
- "org.spockframework:spock-core": {
- "locked": "1.3-groovy-2.5"
- },
- "org.spockframework:spock-spring": {
- "locked": "1.3-groovy-2.5"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- },
- "testRuntimeClasspath": {
- "com.amazonaws:aws-java-sdk-core": {
- "locked": "1.11.86"
- },
- "com.fasterxml.jackson.core:jackson-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.core:jackson-databind": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.13.2.1"
- },
- "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
- "locked": "2.13.2"
- },
- "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
- "locked": "2.13.2"
- },
- "com.google.protobuf:protobuf-java": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.13.0"
- },
- "com.netflix.conductor:conductor-annotations": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "project": true
- },
- "com.netflix.conductor:conductor-common": {
- "project": true
- },
- "com.netflix.eureka:eureka-client": {
- "locked": "1.10.10"
- },
- "com.netflix.spectator:spectator-api": {
- "locked": "0.122.0"
- },
- "com.sun.jersey:jersey-client": {
- "locked": "1.19.4"
- },
- "commons-io:commons-io": {
- "locked": "2.7"
- },
- "junit:junit": {
- "locked": "4.13.2"
- },
- "org.apache.bval:bval-jsr": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.0.5"
- },
- "org.apache.commons:commons-lang3": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "3.12.0"
- },
- "org.apache.logging.log4j:log4j-api": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-core": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-jul": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-slf4j-impl": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.apache.logging.log4j:log4j-web": {
- "firstLevelTransitive": [
- "com.netflix.conductor:conductor-annotations",
- "com.netflix.conductor:conductor-common"
- ],
- "locked": "2.17.1"
- },
- "org.codehaus.groovy:groovy-all": {
- "locked": "2.5.13"
- },
- "org.powermock:powermock-api-mockito2": {
- "locked": "2.0.9"
- },
- "org.powermock:powermock-module-junit4": {
- "locked": "2.0.9"
- },
- "org.slf4j:slf4j-api": {
- "locked": "1.7.36"
- },
- "org.spockframework:spock-core": {
- "locked": "1.3-groovy-2.5"
- },
- "org.spockframework:spock-spring": {
- "locked": "1.3-groovy-2.5"
- },
- "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.6.7"
- },
- "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.6.7"
- }
- }
-}
\ No newline at end of file
diff --git a/client/spotbugsExclude.xml b/client/spotbugsExclude.xml
deleted file mode 100644
index 29b642ca7..000000000
--- a/client/spotbugsExclude.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- * Licensed 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 com.netflix.conductor.client.automator;
-
-import java.util.concurrent.Semaphore;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A class wrapping a semaphore which holds the number of permits available for polling and
- * executing tasks.
- */
-class PollingSemaphore {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(PollingSemaphore.class);
- private final Semaphore semaphore;
-
- PollingSemaphore(int numSlots) {
- LOGGER.debug("Polling semaphore initialized with {} permits", numSlots);
- semaphore = new Semaphore(numSlots);
- }
-
- /**
- * Signals if polling is allowed based on whether a permit can be acquired.
- *
- * @return {@code true} - if permit is acquired {@code false} - if permit could not be acquired
- */
- boolean canPoll() {
- boolean acquired = semaphore.tryAcquire();
- LOGGER.debug("Trying to acquire permit: {}", acquired);
- return acquired;
- }
-
- /** Signals that processing is complete and the permit can be released. */
- void complete() {
- LOGGER.debug("Completed execution; releasing permit");
- semaphore.release();
- }
-
- /**
- * Gets the number of threads available for processing.
- *
- * @return number of available permits
- */
- int availableThreads() {
- int available = semaphore.availablePermits();
- LOGGER.debug("Number of available permits: {}", available);
- return available;
- }
-}
diff --git a/client/src/main/java/com/netflix/conductor/client/automator/TaskPollExecutor.java b/client/src/main/java/com/netflix/conductor/client/automator/TaskPollExecutor.java
deleted file mode 100644
index d2299826f..000000000
--- a/client/src/main/java/com/netflix/conductor/client/automator/TaskPollExecutor.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.automator;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.*;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.commons.lang3.time.StopWatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import com.netflix.conductor.client.config.PropertyFactory;
-import com.netflix.conductor.client.http.TaskClient;
-import com.netflix.conductor.client.telemetry.MetricsContainer;
-import com.netflix.conductor.client.worker.Worker;
-import com.netflix.conductor.common.metadata.tasks.Task;
-import com.netflix.conductor.common.metadata.tasks.TaskResult;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.spectator.api.Registry;
-import com.netflix.spectator.api.Spectator;
-import com.netflix.spectator.api.patterns.ThreadPoolMonitor;
-
-/**
- * Manages the threadpool used by the workers for execution and server communication (polling and
- * task update).
- */
-class TaskPollExecutor {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(TaskPollExecutor.class);
-
- private static final Registry REGISTRY = Spectator.globalRegistry();
-
- private final EurekaClient eurekaClient;
- private final TaskClient taskClient;
- private final int updateRetryCount;
- private final ExecutorService executorService;
- private final Map
- * Licensed 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 com.netflix.conductor.client.automator;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.client.exception.ConductorClientException;
-import com.netflix.conductor.client.http.TaskClient;
-import com.netflix.conductor.client.worker.Worker;
-import com.netflix.discovery.EurekaClient;
-
-/** Configures automated polling of tasks and execution via the registered {@link Worker}s. */
-public class TaskRunnerConfigurer {
- private static final Logger LOGGER = LoggerFactory.getLogger(TaskRunnerConfigurer.class);
- private static final String INVALID_THREAD_COUNT =
- "Invalid worker thread count specified, use either shared thread pool or config thread count per task";
- private static final String MISSING_TASK_THREAD_COUNT =
- "Missing task thread count config for %s";
-
- private ScheduledExecutorService scheduledExecutorService;
-
- private final EurekaClient eurekaClient;
- private final TaskClient taskClient;
- private final List Please see {@link TaskRunnerConfigurer#init()} method. The method must be called after
- * this constructor for the polling to start.
- */
- public TaskRunnerConfigurer build() {
- return new TaskRunnerConfigurer(this);
- }
- }
-
- /**
- * @return Thread Count for the shared executor pool
- */
- public int getThreadCount() {
- return threadCount;
- }
-
- /**
- * @return Thread Count for individual task type
- */
- public Map
- * Licensed 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 com.netflix.conductor.client.config;
-
-public interface ConductorClientConfiguration {
-
- /**
- * @return the workflow input payload size threshold in KB, beyond which the payload will be
- * processed based on {@link
- * ConductorClientConfiguration#isExternalPayloadStorageEnabled()}.
- */
- int getWorkflowInputPayloadThresholdKB();
-
- /**
- * @return the max value of workflow input payload size threshold in KB, beyond which the
- * payload will be rejected regardless external payload storage is enabled.
- */
- int getWorkflowInputMaxPayloadThresholdKB();
-
- /**
- * @return the task output payload size threshold in KB, beyond which the payload will be
- * processed based on {@link
- * ConductorClientConfiguration#isExternalPayloadStorageEnabled()}.
- */
- int getTaskOutputPayloadThresholdKB();
-
- /**
- * @return the max value of task output payload size threshold in KB, beyond which the payload
- * will be rejected regardless external payload storage is enabled.
- */
- int getTaskOutputMaxPayloadThresholdKB();
-
- /**
- * @return the flag which controls the use of external storage for storing workflow/task input
- * and output JSON payloads with size greater than threshold. If it is set to true, the
- * payload is stored in external location. If it is set to false, the payload is rejected
- * and the task/workflow execution fails.
- */
- boolean isExternalPayloadStorageEnabled();
-}
diff --git a/client/src/main/java/com/netflix/conductor/client/config/DefaultConductorClientConfiguration.java b/client/src/main/java/com/netflix/conductor/client/config/DefaultConductorClientConfiguration.java
deleted file mode 100644
index f15cf3bab..000000000
--- a/client/src/main/java/com/netflix/conductor/client/config/DefaultConductorClientConfiguration.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.config;
-
-/**
- * A default implementation of {@link ConductorClientConfiguration} where external payload storage
- * is disabled.
- */
-public class DefaultConductorClientConfiguration implements ConductorClientConfiguration {
-
- @Override
- public int getWorkflowInputPayloadThresholdKB() {
- return 5120;
- }
-
- @Override
- public int getWorkflowInputMaxPayloadThresholdKB() {
- return 10240;
- }
-
- @Override
- public int getTaskOutputPayloadThresholdKB() {
- return 3072;
- }
-
- @Override
- public int getTaskOutputMaxPayloadThresholdKB() {
- return 10240;
- }
-
- @Override
- public boolean isExternalPayloadStorageEnabled() {
- return false;
- }
-}
diff --git a/client/src/main/java/com/netflix/conductor/client/config/PropertyFactory.java b/client/src/main/java/com/netflix/conductor/client/config/PropertyFactory.java
deleted file mode 100644
index 443b85481..000000000
--- a/client/src/main/java/com/netflix/conductor/client/config/PropertyFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.config;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.netflix.config.DynamicProperty;
-
-/** Used to configure the Conductor workers using properties. */
-public class PropertyFactory {
-
- private final DynamicProperty global;
- private final DynamicProperty local;
-
- private static final String PROPERTY_PREFIX = "conductor.worker";
-
- private static final ConcurrentHashMap
- * Licensed 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 com.netflix.conductor.client.exception;
-
-import java.util.List;
-
-import com.netflix.conductor.common.validation.ErrorResponse;
-import com.netflix.conductor.common.validation.ValidationError;
-
-/** Client exception thrown from Conductor api clients. */
-public class ConductorClientException extends RuntimeException {
-
- private int status;
- private String message;
- private String instance;
- private String code;
- private boolean retryable;
-
- public List
- * Licensed 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 com.netflix.conductor.client.exception;
-
-import java.io.InputStream;
-
-public class RequestHandlerException extends RuntimeException {
-
- private InputStream response;
- private int status;
-
- public RequestHandlerException(InputStream response, int status) {
- this.response = response;
- this.status = status;
- }
-
- public RequestHandlerException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public RequestHandlerException(String message) {
- super(message);
- }
-
- public InputStream getResponse() {
- return response;
- }
-
- public int getStatus() {
- return status;
- }
-
- public boolean hasResponse() {
- return response != null;
- }
-}
diff --git a/client/src/main/java/com/netflix/conductor/client/http/ClientBase.java b/client/src/main/java/com/netflix/conductor/client/http/ClientBase.java
deleted file mode 100644
index e04f96feb..000000000
--- a/client/src/main/java/com/netflix/conductor/client/http/ClientBase.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.http;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Map;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.client.config.ConductorClientConfiguration;
-import com.netflix.conductor.client.config.DefaultConductorClientConfiguration;
-import com.netflix.conductor.client.exception.ConductorClientException;
-import com.netflix.conductor.client.exception.RequestHandlerException;
-import com.netflix.conductor.client.http.jersey.JerseyRequestHandler;
-import com.netflix.conductor.common.config.ObjectMapperProvider;
-import com.netflix.conductor.common.run.ExternalStorageLocation;
-import com.netflix.conductor.common.utils.ExternalPayloadStorage;
-import com.netflix.conductor.common.validation.ErrorResponse;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-
-/** Abstract client for the REST server */
-public abstract class ClientBase {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(ClientBase.class);
-
- private final RequestHandler requestHandler;
-
- private String root = "";
-
- protected final ObjectMapper objectMapper;
-
- private final PayloadStorage payloadStorage;
-
- protected final ConductorClientConfiguration conductorClientConfiguration;
-
- protected ClientBase(
- RequestHandler requestHandler, ConductorClientConfiguration clientConfiguration) {
- this.objectMapper = new ObjectMapperProvider().getObjectMapper();
-
- if (requestHandler == null) {
- // https://github.com/FasterXML/jackson-databind/issues/2683
- if (isNewerJacksonVersion()) {
- objectMapper.registerModule(new JavaTimeModule());
- }
- this.requestHandler =
- new JerseyRequestHandler(new DefaultClientConfig(), null, objectMapper);
- } else {
- this.requestHandler = requestHandler;
- }
-
- this.conductorClientConfiguration =
- ObjectUtils.defaultIfNull(
- clientConfiguration, new DefaultConductorClientConfiguration());
- this.payloadStorage = new PayloadStorage();
- }
-
- public void setRootURI(String root) {
- this.root = root;
- }
-
- protected void delete(String url, Object... uriVariables) {
- deleteWithUriVariables(url, null, uriVariables);
- }
-
- protected void deleteWithUriVariables(
- String url, Object[] queryParams, Object... uriVariables) {
- URI uri = getURIBuilder(getFullUrl(url), queryParams).build(uriVariables);
- try {
- requestHandler.delete(uri);
- } catch (RequestHandlerException rhe) {
- throw createClientException(rhe);
- }
- }
-
- protected void put(String url, Object[] queryParams, Object request, Object... uriVariables) {
- URI uri = getURIBuilder(getFullUrl(url), queryParams).build(uriVariables);
- try {
- requestHandler.put(uri, request);
- } catch (RequestHandlerException rhe) {
- throw createClientException(rhe);
- }
- }
-
- protected void post(String url, Object request) {
- postForEntity(url, request, null, null);
- }
-
- protected void postWithUriVariables(String url, Object... uriVariables) {
- postForEntity(url, null, null, null, uriVariables);
- }
-
- protected
- * Licensed 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 com.netflix.conductor.client.http;
-
-import java.util.List;
-
-import org.apache.commons.lang3.Validate;
-
-import com.netflix.conductor.client.config.ConductorClientConfiguration;
-import com.netflix.conductor.common.metadata.events.EventHandler;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
-// Client class for all Event Handler operations
-public class EventClient extends ClientBase {
-
- private static final TypeReference
- * Licensed 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 com.netflix.conductor.client.http;
-
-import java.util.List;
-
-import org.apache.commons.lang3.Validate;
-
-import com.netflix.conductor.client.config.ConductorClientConfiguration;
-import com.netflix.conductor.common.metadata.tasks.TaskDef;
-import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
-
-public class MetadataClient extends ClientBase {
-
- /** Creates a default metadata client */
- public MetadataClient() {
- this(null);
- }
-
- public MetadataClient(RequestHandler requestHandler) {
- this(requestHandler, null);
- }
-
- public MetadataClient(
- RequestHandler requestHandler, ConductorClientConfiguration clientConfiguration) {
- super(requestHandler, clientConfiguration);
- }
-
- // Workflow Metadata Operations
-
- /**
- * Register a workflow definition with the server
- *
- * @param workflowDef the workflow definition
- */
- public void registerWorkflowDef(WorkflowDef workflowDef) {
- Validate.notNull(workflowDef, "Worfklow definition cannot be null");
- post("metadata/workflow", workflowDef);
- }
-
- /**
- * Updates a list of existing workflow definitions
- *
- * @param workflowDefs List of workflow definitions to be updated
- */
- public void updateWorkflowDefs(List
- * Licensed 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 com.netflix.conductor.client.http;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import com.netflix.conductor.client.exception.RequestHandlerException;
-
-public interface RequestHandler {
- void delete(URI uri) throws RequestHandlerException;
-
- InputStream put(URI uri, Object body) throws RequestHandlerException;
-
- InputStream post(URI uri, Object body) throws RequestHandlerException;
-
- InputStream get(URI uri) throws RequestHandlerException;
-}
diff --git a/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java b/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
deleted file mode 100644
index 40c7528e6..000000000
--- a/client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *
- * Licensed 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 com.netflix.conductor.client.http;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.netflix.conductor.client.config.ConductorClientConfiguration;
-import com.netflix.conductor.client.exception.ConductorClientException;
-import com.netflix.conductor.client.telemetry.MetricsContainer;
-import com.netflix.conductor.common.metadata.tasks.PollData;
-import com.netflix.conductor.common.metadata.tasks.Task;
-import com.netflix.conductor.common.metadata.tasks.TaskExecLog;
-import com.netflix.conductor.common.metadata.tasks.TaskResult;
-import com.netflix.conductor.common.run.SearchResult;
-import com.netflix.conductor.common.run.TaskSummary;
-import com.netflix.conductor.common.utils.ExternalPayloadStorage;
-import com.netflix.conductor.common.utils.ExternalPayloadStorage.PayloadType;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
-/** Client for conductor task management including polling for task, updating task status etc. */
-public class TaskClient extends ClientBase {
-
- private static final TypeReference
- *
- *
- * ExecutionDAO
- *
- *
- *
- *
- * EventHandlerDAO
- *
- *
- *
- */
-public class Statements {
-
- private final String keyspace;
-
- public Statements(String keyspace) {
- this.keyspace = keyspace;
- }
-
- // MetadataDAO
- // Insert Statements
-
- /**
- * @return cql query statement to insert a new workflow definition into the
- * "workflow_definitions" table
- */
- public String getInsertWorkflowDefStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOW_DEFS)
- .value(WORKFLOW_DEF_NAME_KEY, bindMarker())
- .value(WORKFLOW_VERSION_KEY, bindMarker())
- .value(WORKFLOW_DEFINITION_KEY, bindMarker())
- .ifNotExists()
- .getQueryString();
- }
-
- /**
- * @return cql query statement to insert a workflow def name version index into the
- * "workflow_defs_index" table
- */
- public String getInsertWorkflowDefVersionIndexStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOW_DEFS_INDEX)
- .value(WORKFLOW_DEF_INDEX_KEY, WORKFLOW_DEF_INDEX_KEY)
- .value(WORKFLOW_DEF_NAME_VERSION_KEY, bindMarker())
- .value(WORKFLOW_DEF_INDEX_VALUE, bindMarker())
- .getQueryString();
- }
-
- /**
- * @return cql query statement to insert a new task definition into the "task_definitions" table
- */
- public String getInsertTaskDefStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_TASK_DEFS)
- .value(TASK_DEFS_KEY, TASK_DEFS_KEY)
- .value(TASK_DEF_NAME_KEY, bindMarker())
- .value(TASK_DEFINITION_KEY, bindMarker())
- .getQueryString();
- }
-
- // Select Statements
-
- /**
- * @return cql query statement to fetch a workflow definition by name and version from the
- * "workflow_definitions" table
- */
- public String getSelectWorkflowDefStatement() {
- return QueryBuilder.select(WORKFLOW_DEFINITION_KEY)
- .from(keyspace, TABLE_WORKFLOW_DEFS)
- .where(eq(WORKFLOW_DEF_NAME_KEY, bindMarker()))
- .and(eq(WORKFLOW_VERSION_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve all versions of a workflow definition by name from
- * the "workflow_definitions" table
- */
- public String getSelectAllWorkflowDefVersionsByNameStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_WORKFLOW_DEFS)
- .where(eq(WORKFLOW_DEF_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to fetch all workflow def names and version from the
- * "workflow_defs_index" table
- */
- public String getSelectAllWorkflowDefsStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_WORKFLOW_DEFS_INDEX)
- .where(eq(WORKFLOW_DEF_INDEX_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to fetch a task definition by name from the "task_definitions"
- * table
- */
- public String getSelectTaskDefStatement() {
- return QueryBuilder.select(TASK_DEFINITION_KEY)
- .from(keyspace, TABLE_TASK_DEFS)
- .where(eq(TASK_DEFS_KEY, TASK_DEFS_KEY))
- .and(eq(TASK_DEF_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve all task definitions from the "task_definitions"
- * table
- */
- public String getSelectAllTaskDefsStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_TASK_DEFS)
- .where(eq(TASK_DEFS_KEY, bindMarker()))
- .getQueryString();
- }
-
- // Update Statement
-
- /**
- * @return cql query statement to update a workflow definitinos in the "workflow_definitions"
- * table
- */
- public String getUpdateWorkflowDefStatement() {
- return QueryBuilder.update(keyspace, TABLE_WORKFLOW_DEFS)
- .with(set(WORKFLOW_DEFINITION_KEY, bindMarker()))
- .where(eq(WORKFLOW_DEF_NAME_KEY, bindMarker()))
- .and(eq(WORKFLOW_VERSION_KEY, bindMarker()))
- .getQueryString();
- }
-
- // Delete Statements
-
- /**
- * @return cql query statement to delete a workflow definition by name and version from the
- * "workflow_definitions" table
- */
- public String getDeleteWorkflowDefStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_WORKFLOW_DEFS)
- .where(eq(WORKFLOW_DEF_NAME_KEY, bindMarker()))
- .and(eq(WORKFLOW_VERSION_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete a workflow def name/version from the
- * "workflow_defs_index" table
- */
- public String getDeleteWorkflowDefIndexStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_WORKFLOW_DEFS_INDEX)
- .where(eq(WORKFLOW_DEF_INDEX_KEY, bindMarker()))
- .and(eq(WORKFLOW_DEF_NAME_VERSION_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete a task definition by name from the "task_definitions"
- * table
- */
- public String getDeleteTaskDefStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_TASK_DEFS)
- .where(eq(TASK_DEFS_KEY, TASK_DEFS_KEY))
- .and(eq(TASK_DEF_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-
- // ExecutionDAO
- // Insert Statements
-
- /**
- * @return cql query statement to insert a new workflow into the "workflows" table
- */
- public String getInsertWorkflowStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOWS)
- .value(WORKFLOW_ID_KEY, bindMarker())
- .value(SHARD_ID_KEY, bindMarker())
- .value(TASK_ID_KEY, bindMarker())
- .value(ENTITY_KEY, ENTITY_TYPE_WORKFLOW)
- .value(PAYLOAD_KEY, bindMarker())
- .value(TOTAL_TASKS_KEY, bindMarker())
- .value(TOTAL_PARTITIONS_KEY, bindMarker())
- .getQueryString();
- }
-
- /**
- * @return cql query statement to insert a new task into the "workflows" table
- */
- public String getInsertTaskStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_WORKFLOWS)
- .value(WORKFLOW_ID_KEY, bindMarker())
- .value(SHARD_ID_KEY, bindMarker())
- .value(TASK_ID_KEY, bindMarker())
- .value(ENTITY_KEY, ENTITY_TYPE_TASK)
- .value(PAYLOAD_KEY, bindMarker())
- .getQueryString();
- }
-
- /**
- * @return cql query statement to insert a new event execution into the "event_executions" table
- */
- public String getInsertEventExecutionStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_EVENT_EXECUTIONS)
- .value(MESSAGE_ID_KEY, bindMarker())
- .value(EVENT_HANDLER_NAME_KEY, bindMarker())
- .value(EVENT_EXECUTION_ID_KEY, bindMarker())
- .value(PAYLOAD_KEY, bindMarker())
- .ifNotExists()
- .getQueryString();
- }
-
- // Select Statements
-
- /**
- * @return cql query statement to retrieve the total_tasks and total_partitions for a workflow
- * from the "workflows" table
- */
- public String getSelectTotalStatement() {
- return QueryBuilder.select(TOTAL_TASKS_KEY, TOTAL_PARTITIONS_KEY)
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, 1))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve a task from the "workflows" table
- */
- public String getSelectTaskStatement() {
- return QueryBuilder.select(PAYLOAD_KEY)
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, bindMarker()))
- .and(eq(ENTITY_KEY, ENTITY_TYPE_TASK))
- .and(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve a workflow (without its tasks) from the "workflows"
- * table
- */
- public String getSelectWorkflowStatement() {
- return QueryBuilder.select(PAYLOAD_KEY)
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, 1))
- .and(eq(ENTITY_KEY, ENTITY_TYPE_WORKFLOW))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve a workflow with its tasks from the "workflows" table
- */
- public String getSelectWorkflowWithTasksStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve the workflow_id for a particular task_id from the
- * "task_lookup" table
- */
- public String getSelectTaskFromLookupTableStatement() {
- return QueryBuilder.select(WORKFLOW_ID_KEY)
- .from(keyspace, TABLE_TASK_LOOKUP)
- .where(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve all task ids for a given taskDefName with concurrent
- * execution limit configured from the "task_def_limit" table
- */
- public String getSelectTasksFromTaskDefLimitStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_TASK_DEF_LIMIT)
- .where(eq(TASK_DEF_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to retrieve all event executions for a given message and event
- * handler from the "event_executions" table
- */
- public String getSelectAllEventExecutionsForMessageFromEventExecutionsStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_EVENT_EXECUTIONS)
- .where(eq(MESSAGE_ID_KEY, bindMarker()))
- .and(eq(EVENT_HANDLER_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-
- // Update Statements
-
- /**
- * @return cql query statement to update a workflow in the "workflows" table
- */
- public String getUpdateWorkflowStatement() {
- return QueryBuilder.update(keyspace, TABLE_WORKFLOWS)
- .with(set(PAYLOAD_KEY, bindMarker()))
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, 1))
- .and(eq(ENTITY_KEY, ENTITY_TYPE_WORKFLOW))
- .and(eq(TASK_ID_KEY, ""))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to update the total_tasks in a shard for a workflow in the
- * "workflows" table
- */
- public String getUpdateTotalTasksStatement() {
- return QueryBuilder.update(keyspace, TABLE_WORKFLOWS)
- .with(set(TOTAL_TASKS_KEY, bindMarker()))
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to update the total_partitions for a workflow in the "workflows"
- * table
- */
- public String getUpdateTotalPartitionsStatement() {
- return QueryBuilder.update(keyspace, TABLE_WORKFLOWS)
- .with(set(TOTAL_PARTITIONS_KEY, bindMarker()))
- .and(set(TOTAL_TASKS_KEY, bindMarker()))
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, 1))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to add a new task_id to workflow_id mapping to the "task_lookup"
- * table
- */
- public String getUpdateTaskLookupStatement() {
- return QueryBuilder.update(keyspace, TABLE_TASK_LOOKUP)
- .with(set(WORKFLOW_ID_KEY, bindMarker()))
- .where(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to add a new task_id to the "task_def_limit" table
- */
- public String getUpdateTaskDefLimitStatement() {
- return QueryBuilder.update(keyspace, TABLE_TASK_DEF_LIMIT)
- .with(set(WORKFLOW_ID_KEY, bindMarker()))
- .where(eq(TASK_DEF_NAME_KEY, bindMarker()))
- .and(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to update an event execution in the "event_executions" table
- */
- public String getUpdateEventExecutionStatement() {
- return QueryBuilder.update(keyspace, TABLE_EVENT_EXECUTIONS)
- .using(QueryBuilder.ttl(bindMarker()))
- .with(set(PAYLOAD_KEY, bindMarker()))
- .where(eq(MESSAGE_ID_KEY, bindMarker()))
- .and(eq(EVENT_HANDLER_NAME_KEY, bindMarker()))
- .and(eq(EVENT_EXECUTION_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- // Delete statements
-
- /**
- * @return cql query statement to delete a workflow from the "workflows" table
- */
- public String getDeleteWorkflowStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete a task_id to workflow_id mapping from the "task_lookup"
- * table
- */
- public String getDeleteTaskLookupStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_TASK_LOOKUP)
- .where(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete a task from the "workflows" table
- */
- public String getDeleteTaskStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_WORKFLOWS)
- .where(eq(WORKFLOW_ID_KEY, bindMarker()))
- .and(eq(SHARD_ID_KEY, bindMarker()))
- .and(eq(ENTITY_KEY, ENTITY_TYPE_TASK))
- .and(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete a task_id from the "task_def_limit" table
- */
- public String getDeleteTaskDefLimitStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_TASK_DEF_LIMIT)
- .where(eq(TASK_DEF_NAME_KEY, bindMarker()))
- .and(eq(TASK_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- /**
- * @return cql query statement to delete an event execution from the "event_execution" table
- */
- public String getDeleteEventExecutionsStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_EVENT_EXECUTIONS)
- .where(eq(MESSAGE_ID_KEY, bindMarker()))
- .and(eq(EVENT_HANDLER_NAME_KEY, bindMarker()))
- .and(eq(EVENT_EXECUTION_ID_KEY, bindMarker()))
- .getQueryString();
- }
-
- // EventHandlerDAO
- // Insert Statements
-
- /**
- * @return cql query statement to insert an event handler into the "event_handlers" table
- */
- public String getInsertEventHandlerStatement() {
- return QueryBuilder.insertInto(keyspace, TABLE_EVENT_HANDLERS)
- .value(HANDLERS_KEY, HANDLERS_KEY)
- .value(EVENT_HANDLER_NAME_KEY, bindMarker())
- .value(EVENT_HANDLER_KEY, bindMarker())
- .getQueryString();
- }
-
- // Select Statements
-
- /**
- * @return cql query statement to retrieve all event handlers from the "event_handlers" table
- */
- public String getSelectAllEventHandlersStatement() {
- return QueryBuilder.select()
- .all()
- .from(keyspace, TABLE_EVENT_HANDLERS)
- .where(eq(HANDLERS_KEY, bindMarker()))
- .getQueryString();
- }
-
- // Delete Statements
-
- /**
- * @return cql query statement to delete an event handler by name from the "event_handlers"
- * table
- */
- public String getDeleteEventHandlerStatement() {
- return QueryBuilder.delete()
- .from(keyspace, TABLE_EVENT_HANDLERS)
- .where(eq(HANDLERS_KEY, HANDLERS_KEY))
- .and(eq(EVENT_HANDLER_NAME_KEY, bindMarker()))
- .getQueryString();
- }
-}
diff --git a/cassandra-persistence/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/cassandra-persistence/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 8c1d52fe4..000000000
--- a/cassandra-persistence/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "properties": [
- {
- "name": "conductor.cassandra.write-consistency-level",
- "defaultValue": "LOCAL_QUORUM"
- },
- {
- "name": "conductor.cassandra.read-consistency-level",
- "defaultValue": "LOCAL_QUORUM"
- }
- ],
- "hints": [
- {
- "name": "conductor.cassandra.write-consistency-level",
- "providers": [
- {
- "name": "handle-as",
- "parameters": {
- "target": "java.lang.Enum"
- }
- }
- ]
- },
- {
- "name": "conductor.cassandra.read-consistency-level",
- "providers": [
- {
- "name": "handle-as",
- "parameters": {
- "target": "java.lang.Enum"
- }
- }
- ]
- }
- ]
-}
diff --git a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraEventHandlerDAOSpec.groovy b/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraEventHandlerDAOSpec.groovy
deleted file mode 100644
index 214f3722d..000000000
--- a/cassandra-persistence/src/test/groovy/com/netflix/conductor/cassandra/dao/CassandraEventHandlerDAOSpec.groovy
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2022 Netflix, Inc.
- *