You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/04/03 14:58:01 UTC

[commons-lang] branch master updated (9abbb06 -> dd4e7bd)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git.


    from 9abbb06  Javadoc.
     new 7c60085  Better lambda.
     new 777590c  Use final.
     new dd4e7bd  Refactor commons code.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/org/apache/commons/lang3/LocaleUtils.java       |  4 ++--
 src/main/java/org/apache/commons/lang3/text/StrBuilder.java   |  3 +--
 src/main/java/org/apache/commons/lang3/text/StrTokenizer.java | 11 +++--------
 src/main/java/org/apache/commons/lang3/time/FormatCache.java  |  4 +---
 src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java  |  4 ++--
 5 files changed, 9 insertions(+), 17 deletions(-)

[commons-lang] 01/03: Better lambda.

Posted by gg...@apache.org.
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-lang.git

commit 7c60085179b9fe2298e2a53bedf605e08de78886
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Apr 3 10:57:04 2022 -0400

    Better lambda.
---
 src/main/java/org/apache/commons/lang3/time/FormatCache.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/time/FormatCache.java b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
index 92defb2..e97d982 100644
--- a/src/main/java/org/apache/commons/lang3/time/FormatCache.java
+++ b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
@@ -74,9 +74,7 @@ abstract class FormatCache<F extends Format> {
         final TimeZone actualTimeZone = TimeZones.toTimeZone(timeZone);
         final Locale actualLocale = LocaleUtils.toLocale(locale);
         final ArrayKey key = new ArrayKey(pattern, actualTimeZone, actualLocale);
-        return cInstanceCache.computeIfAbsent(key, k -> {
-            return createInstance(pattern, actualTimeZone, actualLocale);
-        });
+        return cInstanceCache.computeIfAbsent(key, k -> createInstance(pattern, actualTimeZone, actualLocale));
     }
 
     /**

[commons-lang] 03/03: Refactor commons code.

Posted by gg...@apache.org.
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-lang.git

commit dd4e7bdc7cdac31905018fc5cbd11566d19be225
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Apr 3 10:57:59 2022 -0400

    Refactor commons code.
---
 src/main/java/org/apache/commons/lang3/text/StrBuilder.java   |  3 +--
 src/main/java/org/apache/commons/lang3/text/StrTokenizer.java | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 5ed70db..6a617ac 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -892,15 +892,14 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
             buffer[size++] = 't';
             buffer[size++] = 'r';
             buffer[size++] = 'u';
-            buffer[size++] = 'e';
         } else {
             ensureCapacity(size + 5);
             buffer[size++] = 'f';
             buffer[size++] = 'a';
             buffer[size++] = 'l';
             buffer[size++] = 's';
-            buffer[size++] = 'e';
         }
+        buffer[size++] = 'e';
         return this;
     }
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
index c81732d..b4d8d72 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
@@ -759,10 +759,6 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
                     continue;
                 }
 
-                // copy regular character from inside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
-
             } else {
                 // Not in quoting mode
 
@@ -797,11 +793,10 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
                     pos += trimmedLen;
                     continue;
                 }
-
-                // copy regular character from outside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
             }
+            // copy regular character from inside quotes
+            workArea.append(srcChars[pos++]);
+            trimStart = workArea.size();
         }
 
         // return condition when end of string found

[commons-lang] 02/03: Use final.

Posted by gg...@apache.org.
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-lang.git

commit 777590c82cd36d55f0351205edff1d4e1d5d6a66
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Apr 3 10:57:31 2022 -0400

    Use final.
---
 src/main/java/org/apache/commons/lang3/LocaleUtils.java      | 4 ++--
 src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index eadb15e..43e15ee 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -101,7 +101,7 @@ public class LocaleUtils {
             return Collections.emptyList();
         }
         return cCountriesByLanguage.computeIfAbsent(languageCode, lc -> {
-            List<Locale> countries = new ArrayList<>();
+            final List<Locale> countries = new ArrayList<>();
             final List<Locale> locales = availableLocaleList();
             for (final Locale locale : locales) {
                 if (languageCode.equals(locale.getLanguage()) && !locale.getCountry().isEmpty() && locale.getVariant().isEmpty()) {
@@ -167,7 +167,7 @@ public class LocaleUtils {
         }
         return cLanguagesByCountry.computeIfAbsent(countryCode, k -> {
             final List<Locale> locales = availableLocaleList();
-            List<Locale> langs = new ArrayList<>();
+            final List<Locale> langs = new ArrayList<>();
             for (final Locale locale : locales) {
                 if (countryCode.equals(locale.getCountry()) && locale.getVariant().isEmpty()) {
                     langs.add(locale);
diff --git a/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java b/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
index 63b7b19..82e2dc1 100644
--- a/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
+++ b/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
@@ -60,14 +60,14 @@ class GmtTimeZone extends TimeZone {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
         if (!(obj instanceof GmtTimeZone)) {
             return false;
         }
-        GmtTimeZone other = (GmtTimeZone) obj;
+        final GmtTimeZone other = (GmtTimeZone) obj;
         return offset == other.offset && Objects.equals(zoneId, other.zoneId);
     }