diff --git a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java index 7834b45..62ef078 100644 --- a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java +++ b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java @@ -11,7 +11,7 @@ public class AddRuleForm { public AddRuleForm() { } - public AddRuleForm(Rule rule) { + public AddRuleForm(DbRule rule) { this.ruleId = rule.getId(); this.firstAntecedentId = rule.getFirstAntecedent().name(); this.secondAntecedentId = rule.getSecondAntecedent().name(); diff --git a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java index 2304435..41ae26b 100644 --- a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java +++ b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java @@ -45,7 +45,7 @@ public class RuleService { } } - public Rule findById(Integer id) { + public DbRule findById(Integer id) { return ruleRepository.getOne(id); }