- Fixing checkstyle reported issues
- making variables private and add appropriate get/set methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/enforcer/trunk@1631136 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
index 34bc07d..57d514d 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
@@ -37,10 +37,10 @@
{
/** Array of files to check. */
- File[] files;
+ private File[] files;
/** if null file handles should be allowed. If they are allowed, it means treat it as a success. */
- boolean allowNulls = false;
+ private boolean allowNulls = false;
// check the file for the specific condition
/**
@@ -174,4 +174,24 @@
{
return true;
}
+
+ public File[] getFiles()
+ {
+ return files;
+ }
+
+ public void setFiles( File[] files )
+ {
+ this.files = files;
+ }
+
+ public boolean isAllowNulls()
+ {
+ return allowNulls;
+ }
+
+ public void setAllowNulls( boolean allowNulls )
+ {
+ this.allowNulls = allowNulls;
+ }
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
index e84eb43..e831250 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
@@ -61,13 +61,13 @@
this.log = helper.getLog();
// if the file is already defined, use that. Otherwise get the main artifact.
- if ( files.length == 0 )
+ if ( getFiles().length == 0 )
{
try
{
MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- files = new File[1];
- files[0] = project.getArtifact().getFile();
+ setFiles( new File[1]);
+ getFiles()[0] = project.getArtifact().getFile();
super.execute( helper );
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
index ad2308c..22287a4 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
@@ -42,7 +42,7 @@
File f = File.createTempFile( "enforcer", "tmp" );
f.deleteOnExit();
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
try
{
@@ -59,7 +59,7 @@
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
+ rule.setFiles( new File[] { null } );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -74,8 +74,8 @@
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
- rule.allowNulls = true;
+ rule.setFiles( new File[] { null } );
+ rule.setAllowNulls( true );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -89,8 +89,8 @@
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] {};
- assertEquals( 0, rule.files.length );
+ rule.setFiles( new File[] {} );
+ assertEquals( 0, rule.getFiles().length );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -105,9 +105,9 @@
public void testEmptyFileListAllowNull()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] {};
- assertEquals( 0, rule.files.length );
- rule.allowNulls = true;
+ rule.setFiles( new File[] {} );
+ assertEquals( 0, rule.getFiles().length );
+ rule.setAllowNulls( true );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -126,7 +126,7 @@
assertTrue( !f.exists() );
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
rule.execute( EnforcerTestUtils.getHelper() );
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
index b9842c6..b05a4fb 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
@@ -42,7 +42,7 @@
File f = File.createTempFile( "enforcer", "tmp" );
f.deleteOnExit();
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
rule.execute( EnforcerTestUtils.getHelper() );
@@ -52,7 +52,7 @@
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
+ rule.setFiles( new File[] { null } );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -67,8 +67,8 @@
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
- rule.allowNulls = true;
+ rule.setFiles( new File[] { null } );
+ rule.setAllowNulls( true );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -82,8 +82,8 @@
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] {};
- assertEquals(0,rule.files.length);
+ rule.setFiles( new File[] {} );
+ assertEquals( 0, rule.getFiles().length );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -98,9 +98,9 @@
public void testEmptyFileListAllowNull()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] {};
- assertEquals(0,rule.files.length);
- rule.allowNulls = true;
+ rule.setFiles( new File[] {} );
+ assertEquals( 0, rule.getFiles().length );
+ rule.setAllowNulls( true );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -116,8 +116,8 @@
{
File f = File.createTempFile( "enforcer", "tmp" );
f.delete();
- assertTrue(!f.exists());
- rule.files = new File[] { f };
+ assertTrue( !f.exists() );
+ rule.setFiles( new File[] { f } );
try
{
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
index bceb5e3..93996cf 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
@@ -46,7 +46,7 @@
File f = File.createTempFile( "enforcer", "tmp" );
f.deleteOnExit();
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
rule.execute( EnforcerTestUtils.getHelper() );
@@ -56,7 +56,7 @@
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
+ rule.setFiles( new File[] { null } );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -71,8 +71,8 @@
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] { null };
- rule.allowNulls = true;
+ rule.setFiles( new File[] { null } );
+ rule.setAllowNulls( true );
try
{
rule.execute( EnforcerTestUtils.getHelper() );
@@ -86,9 +86,9 @@
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
- rule.files = new File[] {};
+ rule.setFiles( new File[] {} );
- assertEquals( 0, rule.files.length );
+ assertEquals( 0, rule.getFiles().length );
MockProject project = new MockProject();
File f = File.createTempFile( "enforcer", "tmp" );
@@ -112,7 +112,7 @@
File f = File.createTempFile( "enforcer", "tmp" );
f.delete();
assertTrue( !f.exists() );
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
try
{
@@ -130,7 +130,7 @@
{
File f = File.createTempFile( "enforcer", "tmp" );
f.deleteOnExit();
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
rule.setMinsize( 10 );
try
{
@@ -163,7 +163,7 @@
System.err.println( "Error: " + e.getMessage() );
}
- rule.files = new File[] { f };
+ rule.setFiles( new File[] { f } );
rule.setMaxsize( 10 );
assertTrue( f.length() > 10 );
try
