Merge tag 'release-1.3.0' into develop

release-1.3.0

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.sadtech.autoresponder</groupId>
     <artifactId>autoresponder</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.0-RELEASE</version>
     <packaging>jar</packaging>
     <build>
         <plugins>

src/main/java/org/sadtech/autoresponder/entity/Unit.java

@@ -16,8 +16,9 @@ public abstract class Unit {
         matchThreshold = 10;
     }
 
-    public Unit(Set<String> keyWords, Integer matchThreshold, Integer priority, Boolean level, List<Unit> nextUnits) {
+    public Unit(Set<String> keyWords, Pattern pattern, Integer matchThreshold, Integer priority, List<Unit> nextUnits) {
         this.keyWords = keyWords;
+        this.pattern = pattern;
         this.matchThreshold = matchThreshold;
         this.priority = priority;
         this.nextUnits = nextUnits;
@@ -83,6 +84,7 @@ public abstract class Unit {
         if (o == null || getClass() != o.getClass()) return false;
         Unit unit = (Unit) o;
         return Objects.equals(keyWords, unit.keyWords) &&
+                Objects.equals(pattern, unit.pattern) &&
                 Objects.equals(matchThreshold, unit.matchThreshold) &&
                 Objects.equals(priority, unit.priority) &&
                 Objects.equals(nextUnits, unit.nextUnits);
@@ -90,7 +92,6 @@ public abstract class Unit {
 
     @Override
     public int hashCode() {
-        return Objects.hash(keyWords, matchThreshold, priority, nextUnits);
+        return Objects.hash(keyWords, pattern, matchThreshold, priority, nextUnits);
     }
-
 }

src/main/java/org/sadtech/autoresponder/submodule/insertwords/InsertWords.java

@@ -1,33 +0,0 @@
-//package org.sadtech.autoresponder.submodule.insertwords;
-//
-//import lombok.Getter;
-//import lombok.Setter;
-//
-//import java.util.List;
-//import java.util.regex.Matcher;
-//import java.util.regex.Pattern;
-//
-//public class InsertWords {
-//
-//    @Setter
-//    private String inText;
-//    @Getter
-//    private String outText;
-//
-//    public void insert(List<String> words) {
-//        Pattern pattern = Pattern.compile("\\{(\\d+)}"); // Задаем шаблон
-//        Matcher m = pattern.matcher(inText);             // Инициализация Matcher
-//        StringBuffer result = new StringBuffer();   // Буфер для конечного значения
-//        while (m.find()) {                          // Проверка на совпадение
-//            if (Integer.parseInt(m.group(1)) < words.size()) {
-//                m.appendReplacement(result, words.get(Integer.parseInt(m.group(1)))); // Подставляем значение из HashMap
-//            } else {
-//                m.appendReplacement(result, m.group(0));
-//            }
-//        }
-//        m.appendTail(result);        // Добавить остаток строки
-//        outText = result.toString();
-//    }
-//
-//}
-