Skip to content

Commit 141af9f

Browse files
authored
Merge pull request #5 from AlexSorb/fix-one
bugfix checkstyle
2 parents 8cbe333 + 72ad91d commit 141af9f

File tree

5 files changed

+18
-27
lines changed

5 files changed

+18
-27
lines changed

app/config/checkstyle/checkstyle.xml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4-
"https://checkstyle.org/dtds/configuration_1_3.dtd">
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<!--
77
@@ -72,8 +72,8 @@
7272
<!-- See https://checkstyle.org/config_sizes.html -->
7373
<module name="FileLength"/>
7474
<module name="LineLength">
75-
<property name="fileExtensions" value="java"/>
76-
<property name="max" value="120"/>
75+
<property name="fileExtensions" value="java"/>
76+
<property name="max" value="120"/>
7777
</module>
7878

7979
<!-- Checks for whitespace -->
@@ -83,10 +83,10 @@
8383
<!-- Miscellaneous other checks. -->
8484
<!-- See https://checkstyle.org/config_misc.html -->
8585
<module name="RegexpSingleline">
86-
<property name="format" value="\s+$"/>
87-
<property name="minimum" value="0"/>
88-
<property name="maximum" value="0"/>
89-
<property name="message" value="Line has trailing spaces."/>
86+
<property name="format" value="\s+$"/>
87+
<property name="minimum" value="0"/>
88+
<property name="maximum" value="0"/>
89+
<property name="message" value="Line has trailing spaces."/>
9090
</module>
9191

9292
<!-- Checks for Headers -->
@@ -164,24 +164,24 @@
164164
<module name="EmptyStatement"/>
165165
<module name="EqualsHashCode"/>
166166
<module name="HiddenField" >
167-
<property name="ignoreSetter" value="true" />
168-
<property name="ignoreConstructorParameter" value="true" />
169-
</module>
167+
<property name="ignoreSetter" value="true" />
168+
<property name="ignoreConstructorParameter" value="true" />
169+
</module>
170170
<module name="IllegalInstantiation"/>
171171
<module name="InnerAssignment"/>
172-
<!-- <module name="MagicNumber"/> -->
172+
<module name="MagicNumber"/>
173173
<module name="MissingSwitchDefault"/>
174174
<module name="MultipleVariableDeclarations"/>
175175
<module name="SimplifyBooleanExpression"/>
176176
<module name="SimplifyBooleanReturn"/>
177177

178178
<!-- Checks for class design -->
179179
<!-- See https://checkstyle.org/config_design.html -->
180-
<!-- <module name="DesignForExtension"/> -->
180+
<module name="DesignForExtension"/>
181181
<module name="FinalClass"/>
182182
<!-- <module name="HideUtilityClassConstructor"/> -->
183183
<module name="InterfaceIsType"/>
184-
<!-- <module name="VisibilityModifier"/> -->
184+
<module name="VisibilityModifier"/>
185185

186186
<!-- Miscellaneous other checks. -->
187187
<!-- See https://checkstyle.org/config_misc.html -->
@@ -191,7 +191,7 @@
191191
<module name="UpperEll"/>
192192

193193
<module name="Indentation">
194-
<property name="basicOffset" value="4"/>
194+
<property name="basicOffset" value="4"/>
195195
</module>
196196

197197
<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
@@ -201,8 +201,6 @@
201201
<property name="optional" value="true"/>
202202
</module>
203203

204-
<module name="SuppressionCommentFilter">
205-
<property name="checkFormat" value="MethodLength"/>
206-
</module>
207204
</module>
205+
208206
</module>

app/src/main/java/hexlet/code/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@Command(name = "gendiff", mixinStandardHelpOptions = true, version = "gendiff 0.9",
1414
description = "Compares two configuration files and shows a difference.")
15-
public class App implements Callable<Integer> {
15+
public final class App implements Callable<Integer> {
1616

1717
@Option(names = {"-f", "--format"}, paramLabel = "format", defaultValue = "stylish",
1818
description = "output format [default: stylish]")

app/src/main/java/hexlet/code/source/Differ.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static String generate(String filePath1, String filePath2, String format)
5454
stage = dataSecond.containsKey(key) ? ADDED : DELETED;
5555
}
5656

57-
List<Object> date = new ArrayList<>(3);
57+
List<Object> date = new ArrayList<>();
5858
date.add(stage);
5959
date.add(dataFirstValue);
6060
date.add(dataSecondValue);

app/src/main/java/hexlet/code/source/formatters/Plain.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ public static String plain(Map<String, List<Object>> differenceMap) {
3030
StringBuilder result = new StringBuilder();
3131
differenceMap.forEach((key, value) -> {
3232
String addString = "Property '" + key + "' was ";
33-
if (value.size() != 3) {
34-
throw new IllegalArgumentException("Неподходящие данные");
35-
}
3633

3734
var currentState = value.getFirst();
3835

app/src/main/java/hexlet/code/source/formatters/Stylish.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ public static String stylish(Map<String, List<Object>> differenceMap) {
1111
differenceMap.forEach((key, value) -> {
1212
String addedString = "";
1313

14-
if (value.size() != 3) {
15-
throw new IllegalArgumentException("Неподходящие данные");
16-
}
17-
1814
if (value.getFirst().equals(Differ.DELETED) || value.getFirst().equals(Differ.CHANGED)) {
1915
addedString += "- " + key + ": " + value.get(1) + "\n";
2016
}

0 commit comments

Comments
 (0)