0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Включение и выключение паттернов вместо удаления

Browse Source
This commit is contained in:
serega6531
2020-03-16 23:32:31 +03:00
parent bcbe983704
commit 41bb8d2b63
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/serega6531/packmate/controller/PatternController.java
View File

@@ -23,9 +23,9 @@ public class PatternController {
return service.findAll(); return service.findAll();
} }
@DeleteMapping("/{id}") @PostMapping("/{id}")
public void deletePattern(@PathVariable int id) { public void enable(@PathVariable int id, @RequestParam boolean enabled) {
service.deleteById(id); service.enable(id, enabled);
} }
@PostMapping @PostMapping

2
src/main/java/ru/serega6531/packmate/model/Pattern.java
View File

@@ -28,6 +28,8 @@ public class Pattern {
@GeneratedValue(generator = "pattern_generator") @GeneratedValue(generator = "pattern_generator")
private int id; private int id;
private boolean enabled;
private String name; private String name;
private String value; private String value;

2
src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
View File

@@ -1,5 +1,5 @@
package ru.serega6531.packmate.model.enums; package ru.serega6531.packmate.model.enums;
public enum SubscriptionMessageType { public enum SubscriptionMessageType {
SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, DELETE_PATTERN, NEW_STREAM SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, ENABLE_PATTERN, DISABLE_PATTERN, NEW_STREAM
} }

22
src/main/java/ru/serega6531/packmate/service/PatternService.java
View File

@@ -3,10 +3,8 @@ package ru.serega6531.packmate.service;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.serega6531.packmate.model.FoundPattern; import ru.serega6531.packmate.model.FoundPattern;
import ru.serega6531.packmate.model.Pattern; import ru.serega6531.packmate.model.Pattern;
import ru.serega6531.packmate.model.Stream;
import ru.serega6531.packmate.model.enums.PatternDirectionType; import ru.serega6531.packmate.model.enums.PatternDirectionType;
import ru.serega6531.packmate.model.enums.PatternSearchType; import ru.serega6531.packmate.model.enums.PatternSearchType;
import ru.serega6531.packmate.model.enums.SubscriptionMessageType; import ru.serega6531.packmate.model.enums.SubscriptionMessageType;
@@ -52,23 +50,19 @@ public class PatternService {
return new PatternMatcher(bytes, list).findMatches(); return new PatternMatcher(bytes, list).findMatches();
} }
@Transactional public void enable(int id, boolean enabled) {
public void deleteById(int id) {
final Optional<Pattern> optional = repository.findById(id); final Optional<Pattern> optional = repository.findById(id);
if (optional.isPresent()) { if (optional.isPresent()) {
final Pattern pattern = optional.get(); final Pattern pattern = optional.get();
log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue()); pattern.setEnabled(enabled);
for (Stream stream : pattern.getMatchedStreams()) { if(enabled) {
stream.getFoundPatterns().remove(pattern); log.info("Включен паттерн {} со значением {}", pattern.getName(), pattern.getValue());
stream.getPackets().forEach(p -> subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.ENABLE_PATTERN, id));
p.getMatches().removeIf(m -> } else {
m.getPatternId() == pattern.getId())); log.info("Выключен паттерн {} со значением {}", pattern.getName(), pattern.getValue());
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DISABLE_PATTERN, id));
} }
patterns.remove(id);
repository.delete(pattern);
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DELETE_PATTERN, id));
} }
} }