geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [05/38] incubator-geode git commit: GEODE-1934: Removing spring-core dependencies from geode-core
Date Tue, 04 Oct 2016 17:03:11 GMT
GEODE-1934: Removing spring-core dependencies from geode-core

Remving the spring-core usage in geode-core classes that are not cli or
web related. The CLI and web code needs to be split into separate
projects. The rest of the geode-core should not depend on spring-core.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/71eb6bfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/71eb6bfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/71eb6bfb

Branch: refs/heads/feature/e2e-testing
Commit: 71eb6bfbc429e7cc226671c99f682ec4fb31115d
Parents: 4f34424
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Fri Sep 23 16:40:15 2016 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Fri Sep 23 16:40:15 2016 -0700

----------------------------------------------------------------------
 .../geode/internal/net/SSLConfigurationFactory.java       |  2 +-
 .../java/org/apache/geode/internal/net/SocketCreator.java |  2 +-
 .../internal/configuration/domain/XmlEntity.java          | 10 +++++-----
 .../org/apache/geode/pdx/internal/PdxInstanceImpl.java    |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
index 4bea22b..4261248 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.springframework.util.StringUtils;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.admin.SSLConfig;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index bc1e896..50a3095 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -73,8 +73,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509ExtendedKeyManager;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.springframework.util.StringUtils;
 
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.SystemConnectException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 47f032e..cde1607 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -32,8 +32,8 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.xpath.XPathExpressionException;
 
+import org.apache.geode.internal.Assert;
 import org.apache.logging.log4j.Logger;
-import org.springframework.util.Assert;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
@@ -155,10 +155,10 @@ public class XmlEntity implements DataSerializable {
    * @since GemFire 8.1
    */
   private final void init() {
-    Assert.hasLength(type, "Type cannot be empty");
-    Assert.hasLength(prefix, "Prefix cannot be empty");
-    Assert.hasLength(namespace, "Namespace cannot be empty");
-    Assert.notNull(attributes, "Attributes cannot be null");
+    Assert.assertTrue(!StringUtils.isBlank(type));
+    Assert.assertTrue(!StringUtils.isBlank(prefix));
+    Assert.assertTrue(!StringUtils.isBlank(namespace));
+    Assert.assertTrue(attributes != null);
 
     if (null == xmlDefinition) {
       xmlDefinition = loadXmlDefinition();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
index 10a11d2..b91f47a 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
@@ -30,10 +30,10 @@ import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.springframework.util.StringUtils;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.geode.InternalGemFireException;
 import org.apache.geode.distributed.internal.DMStats;
 import org.apache.geode.internal.ClassPathLoader;
@@ -221,7 +221,7 @@ public class PdxInstanceImpl extends PdxReaderImpl implements PdxInstance,
Senda
         //introspect the JSON, does the @type meta-data exist.
         String className = extractTypeMetaData();
         
-        if(StringUtils.hasText(className)) {
+        if(StringUtils.isNotBlank(className)) {
           try {
             String JSON = JSONFormatter.toJSON(this);
             ObjectMapper objMapper = USE_STATIC_MAPPER? mapper : createObjectMapper();


Mime
View raw message