Merge remote-tracking branch 'origin/master' into parse-pcap

# Conflicts:
#	src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
This commit is contained in:
serega6531
2020-04-10 22:02:55 +03:00
9 changed files with 43 additions and 46 deletions

View File

@@ -23,13 +23,14 @@ public class PatternController {
return service.findAll();
}
@DeleteMapping("/{id}")
public void deletePattern(@PathVariable int id) {
service.deleteById(id);
@PostMapping("/{id}")
public void enable(@PathVariable int id, @RequestParam boolean enabled) {
service.enable(id, enabled);
}
@PostMapping
public Pattern addPattern(@RequestBody Pattern pattern) {
pattern.setEnabled(true);
return service.save(pattern);
}