diff --git a/src/main/java/ru/kirillius/pf/sdn/api/flow/Flow.java b/src/main/java/ru/kirillius/pf/sdn/api/flow/Flow.java index 57602f5..6a1f2b0 100644 --- a/src/main/java/ru/kirillius/pf/sdn/api/flow/Flow.java +++ b/src/main/java/ru/kirillius/pf/sdn/api/flow/Flow.java @@ -2,7 +2,7 @@ package ru.kirillius.pf.sdn.api.flow; import lombok.*; import ru.kirillius.pf.sdn.api.Networking.NetworkScope; -import ru.kirillius.pf.sdn.entity.PipelineConfig; +import ru.kirillius.pf.sdn.entity.FlowConfig; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference; @RequiredArgsConstructor() public class Flow { @Getter - private final PipelineConfig config; + private final FlowConfig config; private final List actions; private final AtomicBoolean running = new AtomicBoolean(false); diff --git a/src/main/java/ru/kirillius/pf/sdn/entity/PipelineConfig.java b/src/main/java/ru/kirillius/pf/sdn/entity/FlowConfig.java similarity index 91% rename from src/main/java/ru/kirillius/pf/sdn/entity/PipelineConfig.java rename to src/main/java/ru/kirillius/pf/sdn/entity/FlowConfig.java index 132055a..c97ff49 100644 --- a/src/main/java/ru/kirillius/pf/sdn/entity/PipelineConfig.java +++ b/src/main/java/ru/kirillius/pf/sdn/entity/FlowConfig.java @@ -16,7 +16,7 @@ import java.util.UUID; @NoArgsConstructor @Builder @AllArgsConstructor -public class PipelineConfig { +public class FlowConfig { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -29,7 +29,7 @@ public class PipelineConfig { @Override public boolean equals(Object o) { - if (!(o instanceof PipelineConfig that)) return false; + if (!(o instanceof FlowConfig that)) return false; return Objects.equals(id, that.id) && Objects.equals(name, that.name); } diff --git a/src/main/java/ru/kirillius/pf/sdn/repository/PipelineConfigRepository.java b/src/main/java/ru/kirillius/pf/sdn/repository/PipelineConfigRepository.java index d58bdc4..5345536 100644 --- a/src/main/java/ru/kirillius/pf/sdn/repository/PipelineConfigRepository.java +++ b/src/main/java/ru/kirillius/pf/sdn/repository/PipelineConfigRepository.java @@ -1,11 +1,11 @@ package ru.kirillius.pf.sdn.repository; import org.springframework.data.jpa.repository.JpaRepository; -import ru.kirillius.pf.sdn.entity.PipelineConfig; +import ru.kirillius.pf.sdn.entity.FlowConfig; import java.util.UUID; -public interface PipelineConfigRepository extends JpaRepository { +public interface PipelineConfigRepository extends JpaRepository { boolean existsByGuid(UUID guid); } diff --git a/src/main/java/ru/kirillius/pf/sdn/service/FlowService.java b/src/main/java/ru/kirillius/pf/sdn/service/FlowService.java index 35e9957..ec1fb4a 100644 --- a/src/main/java/ru/kirillius/pf/sdn/service/FlowService.java +++ b/src/main/java/ru/kirillius/pf/sdn/service/FlowService.java @@ -12,7 +12,7 @@ import ru.kirillius.pf.sdn.api.flow.FlowFunction; import ru.kirillius.pf.sdn.api.flow.Flow; import ru.kirillius.pf.sdn.api.flow.TriggerType; import ru.kirillius.pf.sdn.entity.ActionConfig; -import ru.kirillius.pf.sdn.entity.PipelineConfig; +import ru.kirillius.pf.sdn.entity.FlowConfig; import ru.kirillius.pf.sdn.flow.DummyFunction; import ru.kirillius.pf.sdn.repository.PipelineConfigRepository; @@ -32,7 +32,7 @@ public class FlowService { private final SubscriptionService subscriptionService; private final ExecutorService executorService; - private final Map pipelines = new ConcurrentHashMap<>(); + private final Map pipelines = new ConcurrentHashMap<>(); private final Map> functions = new ConcurrentHashMap<>(); private EventListener executedListener; private EventListener subscriptionUpdateListener; @@ -48,9 +48,9 @@ public class FlowService { pipelines.keySet().stream().filter(config -> config.getId().equals(id)).findFirst().ifPresent(this::trigger); } - public void trigger(PipelineConfig pipelineConfig) { - if (pipelines.containsKey(pipelineConfig)) { - trigger(pipelines.get(pipelineConfig)); + public void trigger(FlowConfig flowConfig) { + if (pipelines.containsKey(flowConfig)) { + trigger(pipelines.get(flowConfig)); } } @@ -69,20 +69,20 @@ public class FlowService { } - public void update(PipelineConfig pipelineConfig) { - if (configRepository.existsByGuid(pipelineConfig.getGuid())) { - load(pipelineConfig); + public void update(FlowConfig flowConfig) { + if (configRepository.existsByGuid(flowConfig.getGuid())) { + load(flowConfig); } else { - flowExecutorService.cancel(pipelines.get(pipelineConfig)); - pipelines.remove(pipelineConfig); + flowExecutorService.cancel(pipelines.get(flowConfig)); + pipelines.remove(flowConfig); } } - private void load(PipelineConfig pipelineConfig) { - if (pipelines.containsKey(pipelineConfig)) { - flowExecutorService.cancel(pipelines.get(pipelineConfig)); + private void load(FlowConfig flowConfig) { + if (pipelines.containsKey(flowConfig)) { + flowExecutorService.cancel(pipelines.get(flowConfig)); } - pipelines.put(pipelineConfig, new Flow(pipelineConfig, pipelineConfig.getActions().stream().map(this::buildAction).toList())); + pipelines.put(flowConfig, new Flow(flowConfig, flowConfig.getActions().stream().map(this::buildAction).toList())); } private FlowAction buildAction(ActionConfig config) {