chore(lombok): simplify class and use configuration files

This commit is contained in:
tchiotludo
2019-10-20 21:02:15 +02:00
parent f43212384e
commit 8ee7c6f1c6
12 changed files with 40 additions and 46 deletions

View File

@@ -16,21 +16,19 @@ import java.util.Optional;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "type", visible = true)
@SuperBuilder
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
abstract public class Task {
@NotNull
private String id;
protected String id;
private String type;
protected String type;
@Nullable
private Retry retry;
protected Retry retry;
private int timeout;
protected int timeout;
private List<Task> errors;
protected List<Task> errors;
public List<TaskRun> toTaskRun(Execution execution) {
return Collections.singletonList(TaskRun.of(execution, this));

View File

@@ -3,8 +3,8 @@ package org.floworc.core.models.triggers.types;
import lombok.*;
import org.floworc.core.models.triggers.Trigger;
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Value
public class Schedule extends Trigger {
private String expression;

View File

@@ -11,11 +11,10 @@ import org.slf4j.Logger;
import org.slf4j.event.Level;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Echo extends Task implements RunnableTask {
private String format;

View File

@@ -11,11 +11,10 @@ import org.floworc.core.runners.RunOutput;
import org.slf4j.Logger;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Return extends Task implements RunnableTask {
private String format;

View File

@@ -7,11 +7,10 @@ import lombok.experimental.SuperBuilder;
import java.util.List;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Each extends Parallel {
private List<String> values;
}

View File

@@ -13,11 +13,9 @@ import java.util.Optional;
import java.util.stream.Collectors;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Parallel extends Task implements FlowableTask {
private Integer concurrent;

View File

@@ -10,11 +10,10 @@ import java.util.List;
import java.util.Map;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Switch extends Task implements FlowableTask {
private Map<String, List<Task>> cases;

View File

@@ -18,11 +18,10 @@ import java.util.Arrays;
import java.util.List;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class Bash extends Task implements RunnableTask {
private String[] commands;

View File

@@ -1,2 +1,4 @@
lombok.addLombokGeneratedAnnotation = true
lombok.anyConstructor.addConstructorProperties = true
lombok.anyConstructor.addConstructorProperties = true
lombok.equalsAndHashCode.callSuper = call
lombok.tostring.callsuper = call

View File

@@ -31,10 +31,10 @@ import java.io.InputStreamReader;
import java.net.URI;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Value
@Slf4j
@ToString
@EqualsAndHashCode
@Getter
@NoArgsConstructor
public class CsvToAvro extends Task implements RunnableTask {
@NotNull
private URI source;

View File

@@ -23,11 +23,10 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class BigQueryFetch extends Task implements RunnableTask {
private String sql;
@Builder.Default
@@ -35,6 +34,7 @@ public class BigQueryFetch extends Task implements RunnableTask {
private List<String> positionalParameters;
private Map<String, String> namedParameters;
@Builder.Default
private transient BigQuery connection = new BigQueryConnection().of();
@Override

View File

@@ -16,17 +16,18 @@ import org.slf4j.Logger;
import java.net.URI;
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ToString
@EqualsAndHashCode
@Getter
@FieldDefaults(level= AccessLevel.PROTECTED)
@AllArgsConstructor
@NoArgsConstructor
public class GcsCopy extends Task implements RunnableTask {
private String from;
private String to;
@Builder.Default
private boolean delete = false;
@Builder.Default
private transient GcsConnection gcsConnection = new GcsConnection();
@Override