You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/10/14 20:46:24 UTC
svn commit: r704607 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/command/impl/
core/src/main/java/org/apache/ftpserver/command/impl/listing/
core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/
core/src/test/java/org...
Author: ngn
Date: Tue Oct 14 11:46:23 2008
New Revision: 704607
URL: http://svn.apache.org/viewvc?rev=704607&view=rev
Log:
Fixing boolean returning methods to comform to JavaBeans convention (FTPSERVER-195). Thanks Andrea!
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java Tue Oct 14 11:46:23 2008
@@ -121,7 +121,7 @@
}
// check permission
- if (!file.hasWritePermission()) {
+ if (!file.isWritable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"APPE.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java Tue Oct 14 11:46:23 2008
@@ -83,7 +83,7 @@
// check file
fileName = file.getAbsolutePath();
- if (!file.hasDeletePermission()) {
+ if (!file.isRemovable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN,
"DELE.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java Tue Oct 14 11:46:23 2008
@@ -83,7 +83,7 @@
// check permission
fileName = file.getAbsolutePath();
- if (!file.hasWritePermission()) {
+ if (!file.isWritable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"MKD.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java Tue Oct 14 11:46:23 2008
@@ -116,7 +116,7 @@
}
// check permission
- if (!file.hasReadPermission()) {
+ if (!file.isReadable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RETR.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java Tue Oct 14 11:46:23 2008
@@ -82,7 +82,7 @@
// check permission
fileName = file.getAbsolutePath();
- if (!file.hasDeletePermission()) {
+ if (!file.isRemovable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RMD.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java Tue Oct 14 11:46:23 2008
@@ -98,7 +98,7 @@
toFileStr = toFile.getAbsolutePath();
// check permission
- if (!toFile.hasWritePermission()) {
+ if (!toFile.isWritable()) {
session
.write(LocalizedFtpReply
.translate(
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java Tue Oct 14 11:46:23 2008
@@ -113,7 +113,7 @@
fileName = file.getAbsolutePath();
// get permission
- if (!file.hasWritePermission()) {
+ if (!file.isWritable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"STOR.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java Tue Oct 14 11:46:23 2008
@@ -117,7 +117,7 @@
String fileName = file.getAbsolutePath();
// check permission
- if (!file.hasWritePermission()) {
+ if (!file.isWritable()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"STOU.permission", fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java Tue Oct 14 11:46:23 2008
@@ -91,8 +91,8 @@
Arrays.fill(permission, '-');
permission[0] = file.isDirectory() ? 'd' : '-';
- permission[1] = file.hasReadPermission() ? 'r' : '-';
- permission[2] = file.hasWritePermission() ? 'w' : '-';
+ permission[1] = file.isReadable() ? 'r' : '-';
+ permission[2] = file.isWritable() ? 'w' : '-';
return permission;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java Tue Oct 14 11:46:23 2008
@@ -71,7 +71,7 @@
}
} else if (type.equalsIgnoreCase("perm")) {
sb.append("Perm=");
- if (file.hasReadPermission()) {
+ if (file.isReadable()) {
if (file.isFile()) {
sb.append('r');
} else if (file.isDirectory()) {
@@ -79,7 +79,7 @@
sb.append('l');
}
}
- if (file.hasWritePermission()) {
+ if (file.isWritable()) {
if (file.isFile()) {
sb.append('a');
sb.append('d');
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java Tue Oct 14 11:46:23 2008
@@ -187,14 +187,14 @@
/**
* Check read permission.
*/
- public boolean hasReadPermission() {
+ public boolean isReadable() {
return file.canRead();
}
/**
* Check file write permission.
*/
- public boolean hasWritePermission() {
+ public boolean isWritable() {
LOG.debug("Checking authorization for " + getAbsolutePath());
if (user.authorize(new WriteRequest(getAbsolutePath())) == null) {
LOG.debug("Not authorized");
@@ -214,7 +214,7 @@
/**
* Has delete permission.
*/
- public boolean hasDeletePermission() {
+ public boolean isRemovable() {
// root cannot be deleted
@@ -244,7 +244,7 @@
// we check if the parent FileObject is writable.
NativeFtpFile parentObject=new NativeFtpFile(parentFullName,file.getAbsoluteFile().getParentFile(),user);
- return parentObject.hasWritePermission();
+ return parentObject.isWritable();
}
/**
@@ -252,7 +252,7 @@
*/
public boolean delete() {
boolean retVal = false;
- if (hasDeletePermission()) {
+ if (isRemovable()) {
retVal = file.delete();
}
return retVal;
@@ -263,7 +263,7 @@
*/
public boolean move(final FtpFile dest) {
boolean retVal = false;
- if (dest.hasWritePermission() && hasReadPermission()) {
+ if (dest.isWritable() && isReadable()) {
File destFile = ((NativeFtpFile) dest).file;
if (destFile.exists()) {
@@ -283,7 +283,7 @@
*/
public boolean mkdir() {
boolean retVal = false;
- if (hasWritePermission()) {
+ if (isWritable()) {
retVal = file.mkdirs();
}
return retVal;
@@ -343,7 +343,7 @@
throws IOException {
// permission check
- if (!hasWritePermission()) {
+ if (!isWritable()) {
throw new IOException("No write permission : " + file.getName());
}
@@ -368,7 +368,7 @@
public InputStream createInputStream(final long offset) throws IOException {
// permission check
- if (!hasReadPermission()) {
+ if (!isReadable()) {
throw new IOException("No read permission : " + file.getName());
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java Tue Oct 14 11:46:23 2008
@@ -94,15 +94,15 @@
return 13;
}
- public boolean hasDeletePermission() {
+ public boolean isRemovable() {
return false;
}
- public boolean hasReadPermission() {
+ public boolean isReadable() {
return true;
}
- public boolean hasWritePermission() {
+ public boolean isWritable() {
return false;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java Tue Oct 14 11:46:23 2008
@@ -90,15 +90,15 @@
return 13;
}
- public boolean hasDeletePermission() {
+ public boolean isRemovable() {
return false;
}
- public boolean hasReadPermission() {
+ public boolean isReadable() {
return true;
}
- public boolean hasWritePermission() {
+ public boolean isWritable() {
return false;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java Tue Oct 14 11:46:23 2008
@@ -86,15 +86,15 @@
return 13;
}
- public boolean hasDeletePermission() {
+ public boolean isRemovable() {
return false;
}
- public boolean hasReadPermission() {
+ public boolean isReadable() {
return true;
}
- public boolean hasWritePermission() {
+ public boolean isWritable() {
return false;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java Tue Oct 14 11:46:23 2008
@@ -164,14 +164,14 @@
NativeFtpFile fileObj=(NativeFtpFile)createFileObject(FILE2_PATH, USER);
File physicalFile=fileObj.getPhysicalFile();
// First check
- assertTrue(fileObj.hasDeletePermission());
+ assertTrue(fileObj.isRemovable());
// Now file is read only.
if (!physicalFile.setReadOnly() ){
fail("Test cannot be setup properly");
}
- assertTrue(fileObj.hasDeletePermission());
+ assertTrue(fileObj.isRemovable());
//can we actually delete this file?
assertTrue(physicalFile.delete());
}
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java?rev=704607&r1=704606&r2=704607&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java Tue Oct 14 11:46:23 2008
@@ -68,17 +68,17 @@
/**
* Has read permission?
*/
- boolean hasReadPermission();
+ boolean isReadable();
/**
* Has write permission?
*/
- boolean hasWritePermission();
+ boolean isWritable();
/**
* Has delete permission?
*/
- boolean hasDeletePermission();
+ boolean isRemovable();
/**
* Get the owner name.