This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 0754b278 Use camel case
0754b278 is described below
commit 0754b278997837457f7db0cc9acf0dd4a1369036
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Dec 10 09:34:14 2024 -0500
Use camel case
---
.../commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java | 6 +++---
.../commons/net/ftp/parser/MacOsPeterFTPEntryParser.java | 4 ++--
.../org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java | 10 +++++-----
.../org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
index 77d906f9..42d3f67a 100644
---
a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
+++
b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
@@ -50,7 +50,7 @@ public class EnterpriseUnixFTPEntryParser extends
RegexFTPFileEntryParserImpl {
+ "(\\S+)\\s*" // 13
+ "(\\S*)\\s*" // 14 user
+ "(\\d*)\\s*" // 15 group
- + "(\\d*)\\s*" // 16 filesize
+ + "(\\d*)\\s*" // 16 file size
+ MONTHS // 17 month
+ "\\s*" // TODO should the space be optional?
// TODO \\d* should be \\d? surely ? Otherwise 01111 is allowed
@@ -85,7 +85,7 @@ public class EnterpriseUnixFTPEntryParser extends
RegexFTPFileEntryParserImpl {
if (matches(entry)) {
final String usr = group(14);
final String grp = group(15);
- final String filesize = group(16);
+ final String fileSize = group(16);
final String mo = group(17);
final String da = group(18);
final String yr = group(20);
@@ -97,7 +97,7 @@ public class EnterpriseUnixFTPEntryParser extends
RegexFTPFileEntryParserImpl {
file.setUser(usr);
file.setGroup(grp);
try {
- file.setSize(Long.parseLong(filesize));
+ file.setSize(Long.parseLong(fileSize));
} catch (final NumberFormatException e) {
// intentionally do nothing
}
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
index cccd12b1..4e2b4611 100644
---
a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
+++
b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
@@ -109,7 +109,7 @@ public class MacOsPeterFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
if (matches(entry)) {
final String typeStr = group(1);
final String hardLinkCount = "0";
- final String filesize = group(20);
+ final String fileSize = group(20);
final String datestr = group(21) + " " + group(22);
String name = group(23);
final String endtoken = group(24);
@@ -171,7 +171,7 @@ public class MacOsPeterFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
file.setGroup(null);
try {
- file.setSize(Long.parseLong(filesize));
+ file.setSize(Long.parseLong(fileSize));
} catch (final NumberFormatException e) {
// intentionally do nothing
}
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
index 5134e45a..40846e19 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
@@ -291,7 +291,7 @@ public class OS400FTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
if (matches(entry)) {
final String usr = group(1);
- final String filesize = group(2);
+ final String fileSize = group(2);
String datestr = "";
if (!isNullOrEmpty(group(3)) || !isNullOrEmpty(group(4))) {
datestr = group(3) + " " + group(4);
@@ -309,12 +309,12 @@ public class OS400FTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
if (typeStr.equalsIgnoreCase("*STMF")) {
type = FTPFile.FILE_TYPE;
- if (isNullOrEmpty(filesize) || isNullOrEmpty(name)) {
+ if (isNullOrEmpty(fileSize) || isNullOrEmpty(name)) {
return null;
}
} else if (typeStr.equalsIgnoreCase("*DIR")) {
type = FTPFile.DIRECTORY_TYPE;
- if (isNullOrEmpty(filesize) || isNullOrEmpty(name)) {
+ if (isNullOrEmpty(fileSize) || isNullOrEmpty(name)) {
return null;
}
} else if (typeStr.equalsIgnoreCase("*FILE")) {
@@ -337,7 +337,7 @@ public class OS400FTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
if (isNullOrEmpty(name)) {
return null;
}
- if (!(isNullOrEmpty(filesize) && isNullOrEmpty(datestr))) {
+ if (!(isNullOrEmpty(fileSize) && isNullOrEmpty(datestr))) {
return null;
}
@@ -356,7 +356,7 @@ public class OS400FTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
file.setUser(usr);
try {
- file.setSize(Long.parseLong(filesize));
+ file.setSize(Long.parseLong(fileSize));
} catch (final NumberFormatException e) {
// intentionally do nothing
}
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 08f270bd..726d4dde 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -177,7 +177,7 @@ public class UnixFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
final String hardLinkCount = group(15);
final String usr = group(16);
final String grp = group(17);
- final String filesize = group(18);
+ final String fileSize = group(18);
final String datestr = group(19) + " " + group(20);
String name = group(21);
if (trimLeadingSpaces) {
@@ -247,7 +247,7 @@ public class UnixFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
file.setGroup(grp);
try {
- file.setSize(Long.parseLong(filesize));
+ file.setSize(Long.parseLong(fileSize));
} catch (final NumberFormatException e) {
// intentionally do nothing
}
