lan #1-2

.github/workflows/checkstyle.yml

@@ -1,5 +1,5 @@
 name: reviewdog
-on: [pull_request]
+on: [ pull_request ]
 jobs:
   checkstyle:
     name: runner / checkstyle

.github/workflows/codeql-analysis.yml

@@ -26,18 +26,18 @@ jobs:
         language: [ java ]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -5,7 +5,7 @@
 # Source repository: https://github.com/actions/dependency-review-action
 # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
 name: 'Dependency Review'
-on: [pull_request]
+on: [ pull_request ]
 
 permissions:
   contents: read

.github/workflows/maven.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn clean package
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn clean package

checkstyle.xml

@@ -3,7 +3,7 @@
         "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
-<module name = "Checker">
+<module name="Checker">
     <property name="charset" value="UTF-8"/>
 
     <property name="severity" value="error"/>
@@ -17,7 +17,7 @@
     <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
     <module name="SuppressionFilter">
         <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
-                  default="checkstyle-suppressions.xml" />
+                  default="checkstyle-suppressions.xml"/>
         <property name="optional" value="true"/>
     </module>
 
@@ -217,12 +217,12 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-<!--        <module name="CustomImportOrder">-->
-<!--            <property name="sortImportsInGroupAlphabetically" value="false"/>-->
-<!--            <property name="separateLineBetweenGroups" value="false"/>-->
-<!--            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>-->
-<!--            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>-->
-<!--        </module>-->
+        <!--        <module name="CustomImportOrder">-->
+        <!--            <property name="sortImportsInGroupAlphabetically" value="false"/>-->
+        <!--            <property name="separateLineBetweenGroups" value="false"/>-->
+        <!--            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>-->
+        <!--            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>-->
+        <!--        </module>-->
         <module name="MethodParamPad">
             <property name="tokens"
                       value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
@@ -257,37 +257,37 @@
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
         <module name="NonEmptyAtclauseDescription"/>
-<!--        <module name="InvalidJavadocPosition"/>-->
-<!--        <module name="JavadocTagContinuationIndentation"/>-->
-<!--        <module name="SummaryJavadoc">-->
-<!--            <property name="forbiddenSummaryFragments"-->
-<!--                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>-->
-<!--        </module>-->
-<!--        <module name="JavadocParagraph"/>-->
+        <!--        <module name="InvalidJavadocPosition"/>-->
+        <!--        <module name="JavadocTagContinuationIndentation"/>-->
+        <!--        <module name="SummaryJavadoc">-->
+        <!--            <property name="forbiddenSummaryFragments"-->
+        <!--                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>-->
+        <!--        </module>-->
+        <!--        <module name="JavadocParagraph"/>-->
         <module name="AtclauseOrder">
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target"
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-<!--        <module name="JavadocMethod">-->
-<!--            <property name="allowMissingParamTags" value="true"/>-->
-<!--            <property name="allowMissingReturnTag" value="true"/>-->
-<!--            <property name="allowedAnnotations" value="Override, Test"/>-->
-<!--            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>-->
-<!--        </module>-->
-<!--        <module name="MissingJavadocMethod">-->
-<!--            <property name="minLineCount" value="2"/>-->
-<!--            <property name="allowedAnnotations" value="Override, Test"/>-->
-<!--            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>-->
-<!--        </module>-->
+        <!--        <module name="JavadocMethod">-->
+        <!--            <property name="allowMissingParamTags" value="true"/>-->
+        <!--            <property name="allowMissingReturnTag" value="true"/>-->
+        <!--            <property name="allowedAnnotations" value="Override, Test"/>-->
+        <!--            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>-->
+        <!--        </module>-->
+        <!--        <module name="MissingJavadocMethod">-->
+        <!--            <property name="minLineCount" value="2"/>-->
+        <!--            <property name="allowedAnnotations" value="Override, Test"/>-->
+        <!--            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>-->
+        <!--        </module>-->
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"
                      value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
-<!--        <module name="SingleLineJavadoc">-->
-<!--            <property name="ignoreInlineTags" value="false"/>-->
-<!--        </module>-->
+        <!--        <module name="SingleLineJavadoc">-->
+        <!--            <property name="ignoreInlineTags" value="false"/>-->
+        <!--        </module>-->
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>
         </module>
@@ -297,7 +297,7 @@
         <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
         <module name="SuppressionXpathFilter">
             <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
-                      default="checkstyle-xpath-suppressions.xml" />
+                      default="checkstyle-xpath-suppressions.xml"/>
             <property name="optional" value="true"/>
         </module>
 

pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.mirea.practice</groupId>
@@ -29,10 +29,11 @@
     <modules>
         <module>students/0000001</module>
         <module>students/23K0120</module>
-        <module>students/24K0458</module>
-        <module>students/23K0350</module>
         <module>students/23K0143</module>
+        <module>students/23K0365</module>
         <module>students/23K0368</module>
+        <module>students/24K0458</module>
+        <module>students/23K0350</module>
         <module>students/23K1302</module>
         <module>students/23K0346</module>
         <module>students/24K0459</module>
@@ -174,4 +175,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

students/0000001/0000001-p01/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/0000001/0000001-p02/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/0000001/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/23K0120/23K0120-p01/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/23K0120/23K0120-p02/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

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

@@ -2,8 +2,8 @@
 
 public class Author {
     private final String name;
-    private String email;
     private final char gender;
+    private String email;
 
     public Author(String name, String email, char gender) {
         this.name = name;

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

@@ -11,11 +11,6 @@ public Tester(Circle[] circles) {
         this.numOfObjects = this.circles.length;
     }
 
-    @Override
-    public String toString() {
-        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++) {
@@ -26,4 +21,9 @@ public static void main(String[] args) {
         System.out.println(tester);
     }
 
+    @Override
+    public String toString() {
+        return "Tester{" + "circles=" + Arrays.toString(circles) + ", numOfObjects=" + numOfObjects + '}';
+    }
+
 }

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task4/shop/Item.java

@@ -13,14 +13,14 @@ public String getName() {
         return this.name;
     }
 
-    public float getCost() {
-        return this.cost;
-    }
-
     public void setName(String name) {
         this.name = name;
     }
 
+    public float getCost() {
+        return this.cost;
+    }
+
     public void setCost(float cost) {
         this.cost = cost;
     }

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task5/dog/Dog.java

@@ -21,14 +21,14 @@ public float getAge() {
         return age;
     }
 
-    public float getAgeToHuman() {
-        return age * 7f;
-    }
-
     public void setAge(float age) {
         this.age = age;
     }
 
+    public float getAgeToHuman() {
+        return age * 7f;
+    }
+
     @Override
     public String toString() {
         return "Собака: " + "Кличка='" + name + '\'' + ", возраст=" + age;

students/23K0120/23K0120-p02/src/main/java/ru/mirea/practice/s23k0120/task6/circle/Circle1.java

@@ -12,14 +12,14 @@ public double getArea() {
         return Math.PI * Math.pow(this.getR(), 2);
     }
 
-    public double getCircumference() {
-        return Math.PI * this.getR() * 2f;
-    }
-
     public void setArea(double area) {
         this.setR(Math.sqrt(area / Math.PI));
     }
 
+    public double getCircumference() {
+        return Math.PI * this.getR() * 2f;
+    }
+
     public void setCircumference(double length) {
         this.setR(length / (2 * Math.PI));
     }

students/23K0120/23K0120-p03/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/23K0120/23K0120-p03/src/main/java/ru/mirea/practice/s23k0120/formatting/currencyconverter/Currency.java

@@ -9,17 +9,17 @@ public class Currency {
     private final Locale locale;
     private float value;
 
-    public static String getValueFormatted(float value, Locale locale) {
-        NumberFormat format = NumberFormat.getCurrencyInstance(locale);
-        return format.format(value);
-    }
-
     public Currency(String name, Locale locale, float value) {
         this.name = name;
         this.locale = locale;
         this.value = value;
     }
 
+    public static String getValueFormatted(float value, Locale locale) {
+        NumberFormat format = NumberFormat.getCurrencyInstance(locale);
+        return format.format(value);
+    }
+
     public String getName() {
         return name;
     }

students/23K0120/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/23K0143/23K0143-p01/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

students/23K0143/23K0143-p02/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>