Merge pull request #49 from BasePractice/features/checkstyle

Change

Author: Pastor

pom.xml

@@ -92,6 +92,38 @@
                     <source>${maven.compiler.source}</source>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.5.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>10.18.1</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <excludes>**/canonical/db/**/*</excludes>
+                    <configLocation>checkstyle.xml</configLocation>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <failOnViolation>true</failOnViolation>
+                    <outputFileFormat>xml</outputFileFormat>
+                    <sourceDirectories>
+                        <sourceDirectory>src/main/java</sourceDirectory>
+                        <sourceDirectory>src/test/java</sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>

students/23K0120/23K0120-p01/src/main/java/ru/mirea/practice/s23k0120/task3/Main.java

@@ -5,9 +5,9 @@ public static void main(String[] args) {
         int[] arr = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
 
         int sum = 0;
-        for (int i: arr) {
+        for (int i : arr) {
             sum += i;
         }
-        System.out.printf("Sum: %d, Arithmetic mean: %.2f", sum, (float)sum / (float)arr.length);
+        System.out.printf("Sum: %d, Arithmetic mean: %.2f", sum, (float) sum / (float) arr.length);
     }
 }

students/23K0120/23K0120-p01/src/main/java/ru/mirea/practice/s23k0120/task5/Main.java

@@ -4,7 +4,7 @@
 
 public abstract class Main {
     public static void main(String[] args) {
-        for (String arg: args) {
+        for (String arg : args) {
             System.out.printf(arg);
         }
         System.out.println(Arrays.toString(args));

students/23K0120/23K0120-p01/src/main/java/ru/mirea/practice/s23k0120/task6/Main.java

@@ -4,7 +4,7 @@ public abstract class Main {
     public static void main(String[] args) {
         float partSum = 0;
         for (int i = 1; i < 11; i++) {
-            partSum += 1/(float)i;
+            partSum += 1 / (float) i;
             System.out.printf("%d-е число гармонического ряда: ", i);
             for (int j = 1; j < i; j++) {
                 System.out.printf("1/%d + ", j);

students/23K0120/23K0120-p01/src/main/java/ru/mirea/practice/s23k0120/task7/Main.java

@@ -2,7 +2,7 @@
 
 public abstract class Main {
     public static int factorial(int n) {
-        for (int i = n-1; i > 0; i--) {
+        for (int i = n - 1; i > 0; i--) {
             n *= i;
         }
         return n;

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task1/author/Author.java

@@ -1,9 +1,9 @@
 package ru.mirea.practice.s23k0120.task1.author;
 
 public class Author {
-    private String name;
+    private final String name;
     private String email;
-    private char gender;
+    private final char gender;
 
     public Author(String name, String email, char gender) {
         this.name = name;
@@ -29,9 +29,9 @@ public char getGender() {
 
     @Override
     public String toString() {
-        return "---------Автор---------\n" +
-                "Имя: " + name + '\n' +
-                "Почта: " + email + '\n' +
-                "Пол: " + gender + "\n-----------------------";
+        return "---------Автор---------\n"
+                + "Имя: " + name + '\n'
+                + "Почта: " + email + '\n'
+                + "Пол: " + gender + "\n-----------------------";
     }
 }

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task2/ball/Ball.java

@@ -3,10 +3,12 @@
 public class Ball {
     double x = 0.0;
     double y = 0.0;
+
     public Ball(double x, double y) {
         this.x = x;
         this.y = y;
     }
+
     public Ball() {
         // Default constructor
     }
@@ -32,16 +34,13 @@ public void setXY(double x, double y) {
         this.setY(y);
     }
 
-    public void move(double xDisp, double yDisp) {
-        this.setX(this.getX() + xDisp);
-        this.setY(this.getY() + yDisp);
+    public void move(double x, double y) {
+        this.setX(this.getX() + x);
+        this.setY(this.getY() + y);
     }
 
     @Override
     public String toString() {
-        return "Ball{" +
-                "x=" + x +
-                ", y=" + y +
-                '}';
+        return "Ball{" + "x=" + x + ", y=" + y + '}';
     }
 }

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task3/circle/Circle.java

@@ -3,6 +3,7 @@
 public class Circle {
     private Point center;
     private double r;
+
     public Circle(Point center, double r) {
         this.center = center;
         this.r = r;
@@ -26,9 +27,6 @@ public void setR(double r) {
 
     @Override
     public String toString() {
-        return "\nCircle{" +
-                "center=" + center +
-                ", r=" + r +
-                "}";
+        return "\nCircle{" + "center=" + center + ", r=" + r + "}";
     }
 }

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task3/circle/Point.java

@@ -4,6 +4,7 @@
 public class Point {
     private double x = 0.0;
     private double y = 0.0;
+
     public Point() {
         // Default Constructor
     }
@@ -15,8 +16,8 @@ public Point(double x, double y) {
 
     public void setPolar(double r, double angle) {
         angle = angle * Math.PI / 180f;
-        this.x = r*Math.cos(angle);
-        this.y = r*Math.sin(angle);
+        this.x = r * Math.cos(angle);
+        this.y = r * Math.sin(angle);
     }
 
     public double getX() {
@@ -52,8 +53,8 @@ public void move(Point point) {
     public void rotate(double angle) {
         angle = angle * Math.PI / 180f;
         double xTemp = this.x;
-        this.x = this.x*Math.cos(angle) - this.y*Math.sin(angle);
-        this.y = xTemp*Math.sin(angle) + this.y*Math.cos(angle);
+        this.x = this.x * Math.cos(angle) - this.y * Math.sin(angle);
+        this.y = xTemp * Math.sin(angle) + this.y * Math.cos(angle);
     }
 
     @Override

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task3/circle/Tester.java

@@ -3,25 +3,23 @@
 import java.util.Arrays;
 
 public class Tester {
-    private Circle[] circles;
-    private int numOfObjects;
+    private final Circle[] circles;
+    private final int numOfObjects;
+
     public Tester(Circle[] circles) {
         this.circles = circles.clone();
         this.numOfObjects = this.circles.length;
     }
 
     @Override
     public String toString() {
-        return "Tester{" +
-                "circles=" + Arrays.toString(circles) +
-                ", numOfObjects=" + numOfObjects +
-                '}';
+        return "Tester{" + "circles=" + Arrays.toString(circles) + ", numOfObjects=" + numOfObjects + '}';
     }
 
     public static void main(String[] args) {
         Circle[] circles = new Circle[5];
         for (int i = 0; i < circles.length; i++) {
-            circles[i] = new Circle(new Point(i, i*2), Math.sqrt(i));
+            circles[i] = new Circle(new Point(i, i * 2), Math.sqrt(i));
         }
 
         Tester tester = new Tester(circles);