From 9d01acf443a11f7a0e85acca7844fa7cfa993d9a Mon Sep 17 00:00:00 2001
From: Sechkin Cholak <risetbme@gmail.com>
Date: Tue, 12 Sep 2023 16:44:37 +0300
Subject: [PATCH] Factory method and builder tasks

---
 .../designpatterns/abstractfactory/Game.java  | 40 +++++++++++++++++++
 .../designpatterns/abstractfactory/Round.java | 23 +++++++++++
 .../factories/GeographyFactory.java           | 22 ++++++++++
 .../factories/HistoryFactory.java             | 22 ++++++++++
 .../factories/MathsFactory.java               | 22 ++++++++++
 .../factories/QuestionFactory.java            | 14 +++++++
 .../GeographyMultipleChoiceQuestion.java      | 15 +++++++
 .../HistoryMultipleChoiceQuestion.java        | 17 ++++++++
 .../MathsMultipleChoiceQuestion.java          | 15 +++++++
 .../MultipleChoiceQuestion.java               |  8 ++++
 .../openquestions/GeographyOpenQuestion.java  |  9 +++++
 .../openquestions/HistoryOpenQuestion.java    | 11 +++++
 .../openquestions/MathsOpenQuestion.java      |  9 +++++
 .../openquestions/OpenQuestion.java           |  6 +++
 .../designpatterns/mail/Runner.java           |  5 +--
 .../designpatterns/mail/builders/Builder.java |  6 +--
 .../mail/builders/BuilderAttachments.java     |  4 +-
 .../mail/builders/BuilderCC.java              |  2 +-
 .../mail/builders/BuilderContent.java         |  2 +-
 .../mail/builders/BuilderSubject.java         |  2 +-
 .../mail/builders/BuilderTo.java              |  2 +-
 .../mail/builders/MailBuilder.java            |  2 +-
 22 files changed, 244 insertions(+), 14 deletions(-)
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Game.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Round.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/GeographyFactory.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/HistoryFactory.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/MathsFactory.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/QuestionFactory.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/GeographyMultipleChoiceQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/HistoryMultipleChoiceQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MathsMultipleChoiceQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MultipleChoiceQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/GeographyOpenQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/HistoryOpenQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/MathsOpenQuestion.java
 create mode 100644 design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/OpenQuestion.java

diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Game.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Game.java
new file mode 100644
index 0000000..2be5296
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Game.java
@@ -0,0 +1,40 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.factories.GeographyFactory;
+import com.ontotext.javacourse.designpatterns.abstractfactory.factories.HistoryFactory;
+import com.ontotext.javacourse.designpatterns.abstractfactory.factories.MathsFactory;
+import com.ontotext.javacourse.designpatterns.abstractfactory.factories.QuestionFactory;
+import java.security.InvalidParameterException;
+import java.util.Random;
+
+/**
+ * This is a trivia game. Each game you start has rounds and every round the player gets a multiple
+ * choice question and an open answer question on a randomly selected topic - History, Maths or
+ * Geography.
+ */
+public class Game {
+  private static final Random random = new Random();
+  private static final String[] questionTopics = new String[] {"History", "Maths", "Geography"};
+
+  /** Selects a random topic and starts the round. */
+  public void startRound() {
+    String topic = pickRandomTopic();
+    QuestionFactory factory;
+    if (topic.equals("History")) {
+      factory = new HistoryFactory();
+    } else if (topic.equals("Maths")) {
+      factory = new MathsFactory();
+    } else if (topic.equals("Geography")) {
+      factory = new GeographyFactory();
+    } else {
+      throw new InvalidParameterException("Unknown topic!");
+    }
+    Round round = new Round(factory);
+    round.start();
+  }
+
+  private String pickRandomTopic() {
+    int randomNumber = random.nextInt(3);
+    return questionTopics[randomNumber];
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Round.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Round.java
new file mode 100644
index 0000000..063b75a
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/Round.java
@@ -0,0 +1,23 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.factories.QuestionFactory;
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.OpenQuestion;
+import lombok.AllArgsConstructor;
+
+/**
+ * The round class is a part of the game. Every round one multiple choice and one open answer
+ * questions are asked.
+ */
+@AllArgsConstructor
+public class Round {
+  private QuestionFactory factory;
+
+  /** Starts the round and asks two questions both on the same randomly chosen topic. */
+  public void start() {
+    MultipleChoiceQuestion multipleChoiceQuestion = factory.createMultipleChoiceQuestion();
+    OpenQuestion openQuestion = factory.createOpenQuestion();
+    multipleChoiceQuestion.askQuestion();
+    openQuestion.writeAnswer("invalid answer");
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/GeographyFactory.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/GeographyFactory.java
new file mode 100644
index 0000000..bcfade0
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/GeographyFactory.java
@@ -0,0 +1,22 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.factories;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.GeographyMultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.GeographyOpenQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.OpenQuestion;
+
+/**
+ * The GeographyFactory class contains method that create a multiple choice geography question and
+ * an open answer geography question.
+ */
+public class GeographyFactory implements QuestionFactory {
+  @Override
+  public MultipleChoiceQuestion createMultipleChoiceQuestion() {
+    return new GeographyMultipleChoiceQuestion();
+  }
+
+  @Override
+  public OpenQuestion createOpenQuestion() {
+    return new GeographyOpenQuestion();
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/HistoryFactory.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/HistoryFactory.java
new file mode 100644
index 0000000..c8f3e30
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/HistoryFactory.java
@@ -0,0 +1,22 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.factories;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.HistoryMultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.HistoryOpenQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.OpenQuestion;
+
+/**
+ * The HistoryFactory class contains method that create a multiple choice history question and an
+ * open answer history question.
+ */
+public class HistoryFactory implements QuestionFactory {
+  @Override
+  public MultipleChoiceQuestion createMultipleChoiceQuestion() {
+    return new HistoryMultipleChoiceQuestion();
+  }
+
+  @Override
+  public OpenQuestion createOpenQuestion() {
+    return new HistoryOpenQuestion();
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/MathsFactory.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/MathsFactory.java
new file mode 100644
index 0000000..dc45b7b
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/MathsFactory.java
@@ -0,0 +1,22 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.factories;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MathsMultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.MathsOpenQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.OpenQuestion;
+
+/**
+ * The MathsFactory class contains method that create a multiple choice maths question and an open
+ * answer maths question.
+ */
+public class MathsFactory implements QuestionFactory {
+  @Override
+  public MultipleChoiceQuestion createMultipleChoiceQuestion() {
+    return new MathsMultipleChoiceQuestion();
+  }
+
+  @Override
+  public OpenQuestion createOpenQuestion() {
+    return new MathsOpenQuestion();
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/QuestionFactory.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/QuestionFactory.java
new file mode 100644
index 0000000..314708d
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/factories/QuestionFactory.java
@@ -0,0 +1,14 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.factories;
+
+import com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions.MultipleChoiceQuestion;
+import com.ontotext.javacourse.designpatterns.abstractfactory.openquestions.OpenQuestion;
+
+/**
+ * Defines a question factory that can create a multiple choice question and an open question
+ * depending on the factory type.
+ */
+public interface QuestionFactory {
+  MultipleChoiceQuestion createMultipleChoiceQuestion();
+
+  OpenQuestion createOpenQuestion();
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/GeographyMultipleChoiceQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/GeographyMultipleChoiceQuestion.java
new file mode 100644
index 0000000..a8485dc
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/GeographyMultipleChoiceQuestion.java
@@ -0,0 +1,15 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions;
+
+/** This class defines a multiple choice geography question. */
+public class GeographyMultipleChoiceQuestion implements MultipleChoiceQuestion {
+
+  @Override
+  public void askQuestion() {
+    System.out.println("Which is the capital city of Germany?");
+  }
+
+  @Override
+  public boolean checkAnswer(String answer) {
+    return answer.equalsIgnoreCase("berlin");
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/HistoryMultipleChoiceQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/HistoryMultipleChoiceQuestion.java
new file mode 100644
index 0000000..5feac45
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/HistoryMultipleChoiceQuestion.java
@@ -0,0 +1,17 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions;
+
+/**
+ * This class defines a multiple choice history question.
+ */
+public class HistoryMultipleChoiceQuestion implements MultipleChoiceQuestion {
+
+  @Override
+  public void askQuestion() {
+    System.out.println("What year did WW2 start?");
+  }
+
+  @Override
+  public boolean checkAnswer(String answer) {
+    return answer.equalsIgnoreCase("1939");
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MathsMultipleChoiceQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MathsMultipleChoiceQuestion.java
new file mode 100644
index 0000000..4ba0d71
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MathsMultipleChoiceQuestion.java
@@ -0,0 +1,15 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions;
+
+/** This class defines a multiple choice math question. */
+public class MathsMultipleChoiceQuestion implements MultipleChoiceQuestion {
+
+  @Override
+  public void askQuestion() {
+    System.out.println("What is the value of PI?");
+  }
+
+  @Override
+  public boolean checkAnswer(String answer) {
+    return answer.equalsIgnoreCase("3.14");
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MultipleChoiceQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MultipleChoiceQuestion.java
new file mode 100644
index 0000000..8765089
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/multiplechoicequestions/MultipleChoiceQuestion.java
@@ -0,0 +1,8 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.multiplechoicequestions;
+
+/** Defines a multiple choice question that can check an answer is correct. */
+public interface MultipleChoiceQuestion {
+  void askQuestion();
+
+  boolean checkAnswer(String answer);
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/GeographyOpenQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/GeographyOpenQuestion.java
new file mode 100644
index 0000000..5a80258
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/GeographyOpenQuestion.java
@@ -0,0 +1,9 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.openquestions;
+
+/** This class defines an open geography question. */
+public class GeographyOpenQuestion implements OpenQuestion {
+  @Override
+  public void writeAnswer(String answer) {
+    System.out.println(answer);
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/HistoryOpenQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/HistoryOpenQuestion.java
new file mode 100644
index 0000000..a61322f
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/HistoryOpenQuestion.java
@@ -0,0 +1,11 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.openquestions;
+
+/**
+ * This class defines an open history question.
+ */
+public class HistoryOpenQuestion implements OpenQuestion {
+  @Override
+  public void writeAnswer(String answer) {
+    System.out.println(answer);
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/MathsOpenQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/MathsOpenQuestion.java
new file mode 100644
index 0000000..98c9a29
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/MathsOpenQuestion.java
@@ -0,0 +1,9 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.openquestions;
+
+/** This class defines an open maths question. */
+public class MathsOpenQuestion implements OpenQuestion {
+  @Override
+  public void writeAnswer(String answer) {
+    System.out.println(answer);
+  }
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/OpenQuestion.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/OpenQuestion.java
new file mode 100644
index 0000000..3b22dcb
--- /dev/null
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/abstractfactory/openquestions/OpenQuestion.java
@@ -0,0 +1,6 @@
+package com.ontotext.javacourse.designpatterns.abstractfactory.openquestions;
+
+/** Defines an open question that can accept an answer. */
+public interface OpenQuestion {
+  void writeAnswer(String answer);
+}
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/Runner.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/Runner.java
index e49e78d..3e5127f 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/Runner.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/Runner.java
@@ -7,10 +7,7 @@ public class Runner {
   public static void main(String args[]) {
 
     MailBuilder builder = new MailBuilder();
-    Mail mail =
-        builder
-            .from("")
-            .build();
+    Mail mail = builder.from("").to("sdfs").build();
     System.out.println(
         mail.getFrom()
             + mail.getTo()
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/Builder.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/Builder.java
index 014dabc..8e44cbc 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/Builder.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/Builder.java
@@ -3,7 +3,7 @@
 import com.ontotext.javacourse.designpatterns.mail.MissingFieldException;
 import lombok.NoArgsConstructor;
 
-/** Defines a mail builder */
+/** Defines a mail builder. */
 @NoArgsConstructor
 public abstract class Builder {
   protected Mail mail;
@@ -13,9 +13,9 @@ protected Builder(Mail mail) {
   }
 
   /**
-   * Builds the mail object. If the get field is empty MissingFieldException is thrown.
+   * Builds the mail object. If the from field is empty MissingFieldException is thrown.
    *
-   * @return returns the constructed mail object
+   * @return the constructed mail object
    */
   public Mail build() {
     if (mail.getFrom().isEmpty()) {
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderAttachments.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderAttachments.java
index 7049aa3..7d171d3 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderAttachments.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderAttachments.java
@@ -1,13 +1,13 @@
 package com.ontotext.javacourse.designpatterns.mail.builders;
 
-/** Defines a mail builder which sets the mail attachments. */
+/** Defines a mail builder which adds the mail attachments. */
 public class BuilderAttachments extends Builder {
   protected BuilderAttachments(Mail mail) {
     super(mail);
   }
 
   /**
-   * Sets the mail attachments.
+   * Adds an attachment to the mail.
    *
    * @param attachment the mail attachment to add
    * @return a BuilderAttachments object in case the client wants to add another attachment
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderCC.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderCC.java
index f67f51f..b22bdaa 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderCC.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderCC.java
@@ -7,7 +7,7 @@ protected BuilderCC(Mail mail) {
   }
 
   /**
-   * Sets the mail cc.
+   * Sets the mail cc field.
    *
    * @param cc the cc of the mail
    * @return a BuilderAttachments object to set the mail attachments
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderContent.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderContent.java
index df56616..1ae6b1d 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderContent.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderContent.java
@@ -7,7 +7,7 @@ protected BuilderContent(Mail mail) {
   }
 
   /**
-   * Sets the mail content.
+   * Sets the mail content field.
    *
    * @param content the content of the mail
    * @return a BuilderCC object to set the cc of the mail
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderSubject.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderSubject.java
index b163b55..5cb4f03 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderSubject.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderSubject.java
@@ -7,7 +7,7 @@ protected BuilderSubject(Mail mail) {
   }
 
   /**
-   * Sets the mail subject.
+   * Sets the mail subject field.
    *
    * @param subject the subject of the mail
    * @return a BuilderContent object to set the mail content
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderTo.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderTo.java
index 3d27319..8ab177d 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderTo.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/BuilderTo.java
@@ -8,7 +8,7 @@ protected BuilderTo(Mail mail) {
   }
 
   /**
-   * Sets the mail to.
+   * Sets the mail to field.
    *
    * @param to the mail receiver
    * @return a BuilderSubject object to set the mail subject
diff --git a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/MailBuilder.java b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/MailBuilder.java
index 6a51e0b..48cfffb 100644
--- a/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/MailBuilder.java
+++ b/design-patterns/src/main/java/com/ontotext/javacourse/designpatterns/mail/builders/MailBuilder.java
@@ -7,7 +7,7 @@ public MailBuilder() {
   }
 
   /**
-   * Sets the mail from.
+   * Sets the mail from field.
    *
    * @param from the sender of the mail
    * @return BuilderTo object to set the receiver of the mail