From 591f183e8bef2350d3eb68b83b0eb032b7c86209 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Tue, 25 Oct 2022 15:41:20 +0400
Subject: [PATCH] #74 -- fix merge

---
 src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java   | 2 +-
 src/main/java/ru/ulstu/extractor/rule/service/RuleService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);
     }