GEODE-7542: Remove dependency upon JavaWorkarounds. (apache#4556)

* Moved JavaWorkarounds to a new package in geode-common module * Cleaned up ArchUnit exceptions to be package based, when possible.
10088 · Jan 6, 2020 · b32ff42 · b32ff42
1 parent 505cdc8
commit b32ff42
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 17 deletions.
diff --git a/.../geode/internal/util/JavaWorkarounds.java → .../geode/internal/lang/JavaWorkarounds.java b/.../geode/internal/util/JavaWorkarounds.java → .../geode/internal/lang/JavaWorkarounds.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package org.apache.geode.internal.util;
+package org.apache.geode.internal.lang;
 
 import java.util.Map;
 import java.util.function.Function;

diff --git a/...nectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java b/...nectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
@@ -30,7 +30,7 @@
 import org.apache.geode.connectors.jdbc.JdbcConnectorException;
 import org.apache.geode.connectors.jdbc.internal.TableMetaData.ColumnMetaData;
 import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 
 /**
  * Given a tableName this manager will determine which column should correspond to the Geode Region

diff --git a/geode-core/src/jmh/java/org/apache/geode/internal/util/ComputeIfAbsentBenchmark.java b/geode-core/src/jmh/java/org/apache/geode/internal/util/ComputeIfAbsentBenchmark.java
@@ -32,6 +32,8 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
+import org.apache.geode.internal.lang.JavaWorkarounds;
+
 
 /**
  * Test spins up threads that constantly do computeIfAbsent

diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
@@ -35,7 +35,7 @@
 import org.apache.geode.cache.query.QueryInvocationTargetException;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.internal.cache.Token;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.pdx.JSONFormatter;
 import org.apache.geode.pdx.PdxSerializationException;
 import org.apache.geode.pdx.internal.InternalPdxInstance;

diff --git a/...c/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/...c/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -70,8 +70,8 @@
 import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
 import org.apache.geode.distributed.internal.tcpserver.ConnectionWatcher;
 import org.apache.geode.distributed.internal.tcpserver.TcpSocketCreator;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.internal.serialization.Version;
-import org.apache.geode.internal.util.JavaWorkarounds;
 import org.apache.geode.logging.internal.executors.LoggingExecutors;
 import org.apache.geode.util.internal.GeodeGlossary;
 

diff --git a/.../main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/.../main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
@@ -35,7 +35,7 @@
 import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
 import org.apache.geode.distributed.internal.membership.gms.Services;
 import org.apache.geode.distributed.internal.membership.gms.locator.GMSLocator;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 
 public final class GMSEncrypt<ID extends MemberIdentifier> {
   // Parameters for the Diffie-Hellman key exchange

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupDefinition.java b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupDefinition.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import org.apache.geode.cache.DiskStore;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 
 class BackupDefinition {
 

diff --git a/...e/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionStatsManager.java b/...e/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionStatsManager.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.cache.execute.metrics;
 
-import static org.apache.geode.internal.util.JavaWorkarounds.computeIfAbsent;
+import static org.apache.geode.internal.lang.JavaWorkarounds.computeIfAbsent;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java b/...-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -45,8 +45,8 @@
 import org.apache.geode.internal.cache.TXManagerImpl;
 import org.apache.geode.internal.cache.tier.Acceptor;
 import org.apache.geode.internal.cache.tier.ServerSideHandshake;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.internal.serialization.Version;
-import org.apache.geode.internal.util.JavaWorkarounds;
 import org.apache.geode.logging.internal.executors.LoggingThread;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java
@@ -47,10 +47,10 @@
 import org.apache.geode.distributed.internal.membership.api.Membership;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.SystemTimer;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.internal.logging.CoreLoggingExecutors;
 import org.apache.geode.internal.net.BufferPool;
 import org.apache.geode.internal.net.SocketCloser;
-import org.apache.geode.internal.util.JavaWorkarounds;
 import org.apache.geode.logging.internal.executors.LoggingExecutors;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 

diff --git a/...ava/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/...ava/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
@@ -30,8 +30,6 @@
 
 import org.apache.geode.distributed.Locator;
 import org.apache.geode.distributed.internal.LocatorStats;
-import org.apache.geode.internal.inet.LocalHostUtil;
-import org.apache.geode.internal.util.JavaWorkarounds;
 
 @RunWith(ArchUnitRunner.class)
 @AnalyzeClasses(packages = "org.apache.geode.distributed.internal.membership.gms..",
@@ -94,7 +92,8 @@ public class MembershipDependenciesJUnitTest {
               .or(resideInAPackage("org.apache.geode.logging.internal.."))
               .or(resideInAPackage("org.apache.geode.logging.internal.executors.."))
               .or(resideInAPackage("org.apache.geode.distributed.internal.tcpserver.."))
-              .or(type(LocalHostUtil.class))
+              .or(resideInAPackage("org.apache.geode.internal.inet.."))
+              .or(resideInAPackage("org.apache.geode.internal.lang.."))
 
               .or(not(resideInAPackage("org.apache.geode..")))
 
@@ -107,8 +106,5 @@ public class MembershipDependenciesJUnitTest {
               // TODO: break dependencies on locator-related classes
               .or(type(Locator.class))
 
-              // TODO:
-              .or(type(JavaWorkarounds.class))
-
   );
 }
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java
@@ -78,7 +78,7 @@
 import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.util.internal.GeodeGlossary;
 

diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java
@@ -27,7 +27,7 @@
 import org.apache.lucene.document.Document;
 
 import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerUtil;
-import org.apache.geode.internal.util.JavaWorkarounds;
+import org.apache.geode.internal.lang.JavaWorkarounds;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.pdx.PdxInstance;