From 0c4b27a991314cb547a5ddd08da5c3cf2a16a469 Mon Sep 17 00:00:00 2001
From: Anton <windsweptofficial@gmail.com>
Date: Thu, 3 Oct 2024 12:05:05 +0200
Subject: [PATCH 1/3] check-style fixes

---
 .../java/core/basesyntax/Hello_World.java     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/core/basesyntax/Hello_World.java b/src/main/java/core/basesyntax/Hello_World.java
index dbfc306e..c1280ab1 100644
--- a/src/main/java/core/basesyntax/Hello_World.java
+++ b/src/main/java/core/basesyntax/Hello_World.java
@@ -6,10 +6,9 @@
 import java.time.LocalDate;
 import java.util.Objects;
 
-public class Hello_World
-{
+public class Hello_World {
     private String a;
-    private int vARIaBLE;
+    private int variable;
     private int age, size;
 
 
@@ -18,26 +17,27 @@ public static void main(String[] args) {
         Cat cat = new Cat(); }
 
     private String getFromOneToTen() {
-        String result="";
+        String result = "";
 
-        for (int i=0; i<10; i++){
-            if(i%2==0)
+        for (int i = 0; i < 10; i++){
+            if(i % 2 == 0)
              result = result + i + " ";
         }
         return result;
     }
 
-    private void sayHello(String HELLO) {
-        System.out.println("Hello, Mate! I am happy to see you! This class looks weird! Your task is to fix the checkstyle in this file." +
-        " Your goal is to run `mvn clean package` and receive `BUILD SUCCESS` message");
-        System.out.println(HELLO);
+    private void sayHello(String hello) {
+        System.out.println("Hello, Mate! I am happy to see you! This class looks weird!"
+                + "Your task is to fix the checkstyle in this file."
+                + " Your goal is to run `mvn clean package` and receive `BUILD SUCCESS` message");
+        System.out.println(hello);
     }
 
     private void initializeVariables() {
         a = "Hello mates!";
         System.out.println(a);
-        vARIaBLE = LocalDate.now().getYear();
-        System.out.println("It is " + vARIaBLE + "year");
+        variable = LocalDate.now().getYear();
+        System.out.println("It is " + variable + "year");
         age = 25;
         System.out.println("I'm " + age);
         size = 42;

From 4bb8182848cee9aa4eb416fb0cd5e9bff2e8da7c Mon Sep 17 00:00:00 2001
From: Anton <windsweptofficial@gmail.com>
Date: Thu, 3 Oct 2024 12:10:24 +0200
Subject: [PATCH 2/3] check-style fixes updated

---
 src/main/java/core/basesyntax/Model/Cat.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/core/basesyntax/Model/Cat.java b/src/main/java/core/basesyntax/Model/Cat.java
index 90efa6d8..677579c2 100644
--- a/src/main/java/core/basesyntax/Model/Cat.java
+++ b/src/main/java/core/basesyntax/Model/Cat.java
@@ -7,10 +7,10 @@ public class Cat {
 
     @Override
     public String toString() {
-        return "Cat{" +
-                "age=" + age +
-                ", name='" + name + '\'' +
-                ", ownerName='" + ownerName + '\'' +
-                '}';
+        return "Cat {"
+                + "age = " + age
+                + ", name = '" + name + '\''
+                + ", ownerName = '" + ownerName + '\''
+                + '}';
     }
 }

From b9e58c65e9b9cac6dc396299521893c032f4f41f Mon Sep 17 00:00:00 2001
From: Anton <windsweptofficial@gmail.com>
Date: Thu, 3 Oct 2024 12:20:15 +0200
Subject: [PATCH 3/3] check-style fixes updated-2

---
 .../java/core/base/syntax/HelloWorld.java     | 40 ++++++++++++++++
 .../syntax}/Model/Cat.java                    |  2 +-
 src/main/java/core/base/syntax/Model/Dog.java |  4 ++
 .../java/core/basesyntax/Hello_World.java     | 46 -------------------
 src/main/java/core/basesyntax/Model/Dog.java  |  4 --
 .../syntax}/HelloWorldTest.java               |  2 +-
 6 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/core/base/syntax/HelloWorld.java
 rename src/main/java/core/{basesyntax => base/syntax}/Model/Cat.java (91%)
 create mode 100644 src/main/java/core/base/syntax/Model/Dog.java
 delete mode 100644 src/main/java/core/basesyntax/Hello_World.java
 delete mode 100644 src/main/java/core/basesyntax/Model/Dog.java
 rename src/test/java/core/{basesyntax => base/syntax}/HelloWorldTest.java (78%)

diff --git a/src/main/java/core/base/syntax/HelloWorld.java b/src/main/java/core/base/syntax/HelloWorld.java
new file mode 100644
index 00000000..da377675
--- /dev/null
+++ b/src/main/java/core/base/syntax/HelloWorld.java
@@ -0,0 +1,40 @@
+package core.base.syntax;
+
+import core.base.syntax.Model.Dog;
+import core.base.syntax.Model.Cat;
+import java.time.LocalDate;
+
+public class HelloWorld {
+    public static void main(String[] args) {
+        Dog dog = new Dog();
+        Cat cat = new Cat();
+    }
+    private String getFromOneToTen() {
+        String result = "";
+
+        for (int i = 0; i < 10; i++) {
+            if(i % 2 == 0) {
+                result = result + i + " ";
+            }
+        }
+        return result;
+    }
+    private void sayHello(String hello) {
+        System.out.println(
+                "Hello, Mate! I am happy to see you! This class looks weird!"
+                + "Your task is to fix the checkstyle in this file."
+                + " Your goal is to run `mvn clean package` and receive `BUILD SUCCESS` message"
+        );
+        System.out.println(hello);
+    }
+    private void initializeVariables() {
+        String greet = "Hello mates!";
+        System.out.println(greet);
+        int date = LocalDate.now().getYear();
+        System.out.println("It is " + date + "year");
+        int age = 25;
+        System.out.println("I'm " + age);
+        int size = 42;
+        System.out.println("The size is " + size);
+    }
+}
diff --git a/src/main/java/core/basesyntax/Model/Cat.java b/src/main/java/core/base/syntax/Model/Cat.java
similarity index 91%
rename from src/main/java/core/basesyntax/Model/Cat.java
rename to src/main/java/core/base/syntax/Model/Cat.java
index 677579c2..18553173 100644
--- a/src/main/java/core/basesyntax/Model/Cat.java
+++ b/src/main/java/core/base/syntax/Model/Cat.java
@@ -1,4 +1,4 @@
-package core.basesyntax.Model;
+package core.base.syntax.Model;
 
 public class Cat {
     private int age;
diff --git a/src/main/java/core/base/syntax/Model/Dog.java b/src/main/java/core/base/syntax/Model/Dog.java
new file mode 100644
index 00000000..62809d13
--- /dev/null
+++ b/src/main/java/core/base/syntax/Model/Dog.java
@@ -0,0 +1,4 @@
+package core.base.syntax.Model;
+
+public class Dog {
+}
diff --git a/src/main/java/core/basesyntax/Hello_World.java b/src/main/java/core/basesyntax/Hello_World.java
deleted file mode 100644
index c1280ab1..00000000
--- a/src/main/java/core/basesyntax/Hello_World.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package core.basesyntax;
-
-import core.basesyntax.Model.Dog;
-import core.basesyntax.Model.Cat;
-
-import java.time.LocalDate;
-import java.util.Objects;
-
-public class Hello_World {
-    private String a;
-    private int variable;
-    private int age, size;
-
-
-    public static void main(String[] args) {
-        Dog dog = new Dog();
-        Cat cat = new Cat(); }
-
-    private String getFromOneToTen() {
-        String result = "";
-
-        for (int i = 0; i < 10; i++){
-            if(i % 2 == 0)
-             result = result + i + " ";
-        }
-        return result;
-    }
-
-    private void sayHello(String hello) {
-        System.out.println("Hello, Mate! I am happy to see you! This class looks weird!"
-                + "Your task is to fix the checkstyle in this file."
-                + " Your goal is to run `mvn clean package` and receive `BUILD SUCCESS` message");
-        System.out.println(hello);
-    }
-
-    private void initializeVariables() {
-        a = "Hello mates!";
-        System.out.println(a);
-        variable = LocalDate.now().getYear();
-        System.out.println("It is " + variable + "year");
-        age = 25;
-        System.out.println("I'm " + age);
-        size = 42;
-        System.out.println("The size is " + size);
-    }
-}
diff --git a/src/main/java/core/basesyntax/Model/Dog.java b/src/main/java/core/basesyntax/Model/Dog.java
deleted file mode 100644
index 690360a6..00000000
--- a/src/main/java/core/basesyntax/Model/Dog.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package core.basesyntax.Model;
-
-public class Dog {
-}
diff --git a/src/test/java/core/basesyntax/HelloWorldTest.java b/src/test/java/core/base/syntax/HelloWorldTest.java
similarity index 78%
rename from src/test/java/core/basesyntax/HelloWorldTest.java
rename to src/test/java/core/base/syntax/HelloWorldTest.java
index de0838c2..c57e878b 100644
--- a/src/test/java/core/basesyntax/HelloWorldTest.java
+++ b/src/test/java/core/base/syntax/HelloWorldTest.java
@@ -1,4 +1,4 @@
-package core.basesyntax;
+package core.base.syntax;
 
 /**
  * Feel free to remove this class and create your own.