Skip to content

Commit

Permalink
Issue checkstyle#13213: Removed //ok from magicnumber
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tahanima @romani
Tahanima authored and romani committed Feb 3, 2024
1 parent b1153c9 commit 9554a53
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 158 deletions.
104 changes: 0 additions & 104 deletions config/checkstyle-input-suppressions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,110 +252,6 @@
files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeWhitespaceInConfig.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]innerassignment[\\/]InputInnerAssignmentLambdaExpressions.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables2.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables2.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberMagicNumber3.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberMagicNumber3.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberWaiverParentToken3.java"/>
<suppress id="UnnecessaryOkComment"
files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath.java"/>
<suppress id="UnnecessaryOkComment"
Expand Down
16 changes: 8 additions & 8 deletions ...s/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberDefault1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
public class InputMagicNumberDefault1 {
public void magicMethod() {

final int INT_CONST = 101_000; // ok
final long LONG_CONST1 = 100_000L; // ok
final int INT_CONST = 101_000;
final long LONG_CONST1 = 100_000L;
final long LONG_CONST2 = 100l;
final float FLOAT_CONST1 = 1.500_0F;
final float FLOAT_CONST2 = 1.5f;
final double DOUBLE_CONST1 = 1.500_0D;
final double DOUBLE_CONST2 = 1.5d;
final double DOUBLE_CONST3 = 1.5;

int int_var1 = 1; // ok
int int_var2 = (2); // ok
long long_var1 = 0L; // ok
long long_var2 = 0l; // ok
double double_var1 = 0D; // ok
double double_var2 = 0d; // ok
int int_var1 = 1;
int int_var2 = (2);
long long_var1 = 0L;
long long_var2 = 0l;
double double_var1 = 0D;
double double_var2 = 0d;

int[] int_array = new int[2];

Expand Down
14 changes: 7 additions & 7 deletions ...l/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclaration1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ public void magicMethod() {


int int_var1 = 1;
int int_var2 = (2); // ok
int int_var2 = (2);
long long_var1 = 0L;
long long_var2 = 0l;
double double_var1 = 0D;
double double_var2 = 0d;

int[] int_array = new int[2]; // ok
int[] int_array = new int[2];

int_var1 = 1 + 2; // ok
int_var1 = 1 + 2;
int_var1 += 1;
double_var1 = 1.0 + 2.0; // ok
double_var1 = 1.0 + 2.0;

for (int i = 0; i < 2; i++); // ok
for (int i = 0; i < 2; i++);

if (1 < 2); // ok
if (1 < 2);

if (1.0 < 2.0); // ok
if (1.0 < 2.0);


int int_magic1 = 3_000; // violation
Expand Down
14 changes: 7 additions & 7 deletions ...awl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreHashCodeMethod1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ public void magicMethod() {


int int_var1 = 1;
int int_var2 = (2); // ok
int int_var2 = (2);
long long_var1 = 0L;
long long_var2 = 0l;
double double_var1 = 0D;
double double_var2 = 0d;

int[] int_array = new int[2]; // ok
int[] int_array = new int[2];

int_var1 = 1 + 2; // ok
int_var1 = 1 + 2;
int_var1 += 1;
double_var1 = 1.0 + 2.0; // ok
double_var1 = 1.0 + 2.0;

for (int i = 0; i < 2; i++); // ok
for (int i = 0; i < 2; i++);

if (1 < 2); // ok
if (1 < 2);

if (1.0 < 2.0); // ok
if (1.0 < 2.0);


int int_magic1 = 3_000; // violation
Expand Down
14 changes: 7 additions & 7 deletions ...l/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNegativeOctalHex1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ public void magicMethod() {


int int_var1 = 1;
int int_var2 = (2); // ok
int int_var2 = (2);
long long_var1 = 0L;
long long_var2 = 0l;
double double_var1 = 0D;
double double_var2 = 0d;

int[] int_array = new int[2]; // ok
int[] int_array = new int[2];

int_var1 = 1 + 2; // ok
int_var1 = 1 + 2;
int_var1 += 1;
double_var1 = 1.0 + 2.0; // ok
double_var1 = 1.0 + 2.0;

for (int i = 0; i < 2; i++); // ok
for (int i = 0; i < 2; i++);

if (1 < 2); // ok
if (1 < 2);

if (1.0 < 2.0); // ok
if (1.0 < 2.0);


int int_magic1 = 3_000; // violation
Expand Down
20 changes: 10 additions & 10 deletions ...om/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNone1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
public class InputMagicNumberIgnoreNone1 {
public void magicMethod() {

final int INT_CONST = 101_000; // ok
final long LONG_CONST1 = 100_000L; // ok
final long LONG_CONST2 = 100l; // ok
final float FLOAT_CONST1 = 1.500_0F; // ok
final float FLOAT_CONST2 = 1.5f; // ok
final double DOUBLE_CONST1 = 1.500_0D; // ok
final double DOUBLE_CONST2 = 1.5d; // ok
final double DOUBLE_CONST3 = 1.5; // ok
final int INT_CONST = 101_000;
final long LONG_CONST1 = 100_000L;
final long LONG_CONST2 = 100l;
final float FLOAT_CONST1 = 1.500_0F;
final float FLOAT_CONST2 = 1.5f;
final double DOUBLE_CONST1 = 1.500_0D;
final double DOUBLE_CONST2 = 1.5d;
final double DOUBLE_CONST3 = 1.5;


int int_var1 = 1; // violation
int int_var2 = (2); // violation
long long_var1 = 0L; // violation
long long_var2 = 0l; // violation
double double_var1 = 0D; // ok // violation
double double_var2 = 0d; // ok // violation
double double_var1 = 0D; // violation
double double_var2 = 0d; // violation

int[] int_array = new int[2]; // violation

Expand Down
14 changes: 7 additions & 7 deletions .../puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIntegersOnly1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ public void magicMethod() {


int int_var1 = 1;
int int_var2 = (2); // ok
int int_var2 = (2);
long long_var1 = 0L;
long long_var2 = 0l;
double double_var1 = 0D;
double double_var2 = 0d;

int[] int_array = new int[2]; // ok
int[] int_array = new int[2];

int_var1 = 1 + 2; // ok
int_var1 = 1 + 2;
int_var1 += 1;
double_var1 = 1.0 + 2.0; // ok
double_var1 = 1.0 + 2.0;

for (int i = 0; i < 2; i++); // ok
for (int i = 0; i < 2; i++);

if (1 < 2); // ok
if (1 < 2);

if (1.0 < 2.0); // ok
if (1.0 < 2.0);


int int_magic1 = 3_000; // violation
Expand Down
6 changes: 3 additions & 3 deletions ...puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

public class InputMagicNumberLocalVariables {
@SuppressWarnings("MagicNumber")
private int A = 8; // ok
private int A = 8;

@SuppressWarnings("MagicNumber")
void method() {
int b = 8; // ok
int b = 8;
}

void method2() {
@SuppressWarnings("MagicNumber")
int c = 8; // ok
int c = 8;
}
}
4 changes: 2 additions & 2 deletions ...uppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

public class InputMagicNumberLocalVariables2 {
@SuppressWarnings("MagicNumber")
private int A = 8; // ok
private int A = 8;

void method() {
int b = 8; // violation
}

void method2() {
@SuppressWarnings("MagicNumber")
int c = 8; // ok
int c = 8;
}
}
4 changes: 2 additions & 2 deletions ...m/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberMagicNumber3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class innerMost {
class Class {
Person c = new Person(3) {

int a = 0; // ok
int b = 9; // ok
int a = 0;
int b = 9;
double e = 0;
double c = 5.5;
float d = 12.2f;
Expand Down
2 changes: 1 addition & 1 deletion ...ycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberWaiverParentToken3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ class A {
}
}
}
@interface InputMagicNumberIntMethodAnnotation { // ok
@interface InputMagicNumberIntMethodAnnotation {
int value();
}

0 comments on commit 9554a53

Please sign in to comment.