From bb017e0d4d139ada3dc8cc3e6eccc0c34e0bbb9f Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Fri, 26 Jun 2020 14:35:14 -0400
Subject: [PATCH] JRE locks live in a ...concurrent.locks package so let's put
 our lock code in our own ...concurrent.locks.

---
 .../commons/lang3/concurrent/{lock => locks}/Locks.java       | 2 +-
 .../lang3/concurrent/{lock => locks}/package-info.java        | 4 ++--
 .../java/org/apache/commons/lang3/CharSequenceUtilsTest.java  | 1 +
 .../commons/lang3/concurrent/{lock => locks}/LocksTest.java   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename src/main/java/org/apache/commons/lang3/concurrent/{lock => locks}/Locks.java (99%)
 rename src/main/java/org/apache/commons/lang3/concurrent/{lock => locks}/package-info.java (91%)
 rename src/test/java/org/apache/commons/lang3/concurrent/{lock => locks}/LocksTest.java (97%)

diff --git a/src/main/java/org/apache/commons/lang3/concurrent/lock/Locks.java b/src/main/java/org/apache/commons/lang3/concurrent/locks/Locks.java
similarity index 99%
rename from src/main/java/org/apache/commons/lang3/concurrent/lock/Locks.java
rename to src/main/java/org/apache/commons/lang3/concurrent/locks/Locks.java
index 138226ead..23d12826d 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/lock/Locks.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/locks/Locks.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.lang3.concurrent.lock;
+package org.apache.commons.lang3.concurrent.locks;
 
 import java.util.Objects;
 import java.util.concurrent.locks.StampedLock;
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/lock/package-info.java b/src/main/java/org/apache/commons/lang3/concurrent/locks/package-info.java
similarity index 91%
rename from src/main/java/org/apache/commons/lang3/concurrent/lock/package-info.java
rename to src/main/java/org/apache/commons/lang3/concurrent/locks/package-info.java
index 4b6f9b8f8..2b5fef7e0 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/lock/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/locks/package-info.java
@@ -17,8 +17,8 @@
 /**
  * <p>
  * Provides support classes for multi-threaded programming. This package is intended to be an extension to
- * {@link java.util.concurrent.lock}.
+ * {@link java.util.concurrent.locks}.
  * </p>
  * @since 3.11
  */
-package org.apache.commons.lang3.concurrent.lock;
+package org.apache.commons.lang3.concurrent.locks;
diff --git a/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
index fb9d568fa..dc0db4e88 100644
--- a/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
@@ -28,6 +28,7 @@
 import java.lang.reflect.Modifier;
 import java.util.Random;
 import java.util.stream.IntStream;
+
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/lock/LocksTest.java b/src/test/java/org/apache/commons/lang3/concurrent/locks/LocksTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/lang3/concurrent/lock/LocksTest.java
rename to src/test/java/org/apache/commons/lang3/concurrent/locks/LocksTest.java
index 2f15db40f..0f1f4730a 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/lock/LocksTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/locks/LocksTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.lang3.concurrent.lock;
+package org.apache.commons.lang3.concurrent.locks;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -24,7 +24,7 @@
 
 import java.util.function.LongConsumer;
 
-import org.apache.commons.lang3.concurrent.lock.Locks.Lock;
+import org.apache.commons.lang3.concurrent.locks.Locks.Lock;
 import org.apache.commons.lang3.function.FailableConsumer;
 import org.junit.jupiter.api.Test;