geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [1/2] incubator-geode git commit: Add javadocs and comments about source and GEODE mods
Date Mon, 09 May 2016 23:52:19 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-951 3fe55d4ad -> 93c797eb7


Add javadocs and comments about source and GEODE mods


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

Branch: refs/heads/feature/GEODE-951
Commit: c4643eeb706ad3db8343de0dc182be17c154f023
Parents: 3fe55d4
Author: Kirk Lund <klund@apache.org>
Authored: Mon May 9 16:48:37 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Mon May 9 16:48:37 2016 -0700

----------------------------------------------------------------------
 .../log4j/message/GemFireParameterizedMessage.java    | 14 ++++++++------
 .../message/GemFireParameterizedMessageFactory.java   | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4643eeb/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessage.java
b/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessage.java
index d638a8c..f124016 100755
--- a/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessage.java
+++ b/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessage.java
@@ -16,7 +16,6 @@
  */
 package com.gemstone.org.apache.logging.log4j.message;
 
-
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,10 +32,13 @@ import com.gemstone.gemfire.internal.cache.EntriesSet;
 /**
  * Handles messages that consist of a format string containing '{}' to represent each replaceable
token, and
  * the parameters.
- * <p>
+ * <p/>
  * This class was originally written for <a href="http://lilithapp.com/">Lilith</a>
by Joern Huxhorn where it is
  * licensed under the LGPL. It has been relicensed here with his permission providing that
this attribution remain.
- * </p>
+ * <p/>
+ * Copied into Geode from org.apache.logging.log4j.message.ParameterizedMessage (http://logging.apache.org/log4j/2.x/license.html)
+ * <p/>
+ * Geode changes include changing class name and package. Additional changes are commented
with "// GEODE: note"
  */
 public class GemFireParameterizedMessage implements Message {
 
@@ -449,7 +451,7 @@ public class GemFireParameterizedMessage implements Message {
               }
               //str.append(Arrays.deepToString((Object[]) o));
           }
-      } else if (o instanceof Map && !(o instanceof Region)) {
+      } else if (o instanceof Map && !(o instanceof Region)) { // GEODE: do NOT use
Map handling if instanceof Geode Region
           // special handling of container Map
           final String id = identityToString(o);
           if (dejaVu.contains(id)) {
@@ -474,7 +476,7 @@ public class GemFireParameterizedMessage implements Message {
               }
               str.append('}');
           }
-      } else if (o instanceof Collection && !(o instanceof EntriesSet)) {
+      } else if (o instanceof Collection && !(o instanceof EntriesSet)) { // GEODE:
do NOT use Colleciton handling if instanceof Geode EntriesSet
           // special handling of container Collection
           final String id = identityToString(o);
           if (dejaVu.contains(id)) {
@@ -549,6 +551,6 @@ public class GemFireParameterizedMessage implements Message {
   @Override
   public String toString() {
       return "GemFireParameterizedMessage[messagePattern=" + messagePattern + ", stringArgs="
+
-          Arrays.toString(stringArgs) + ", throwable=" + throwable + ']';
+          Arrays.toString(stringArgs) + ", throwable=" + throwable + ']'; // GEODE: adjust
toString to GemFireParameterizedMessage
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4643eeb/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessageFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessageFactory.java
b/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessageFactory.java
index f113aa6..a888f19 100755
--- a/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessageFactory.java
+++ b/geode-core/src/main/java/com/gemstone/org/apache/logging/log4j/message/GemFireParameterizedMessageFactory.java
@@ -23,12 +23,14 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
 
 /**
  * Enables use of <code>{}</code> parameter markers in message strings.
- * <p>
+ * <p/>
  * Creates {@link ParameterizedMessage} instances for {@link #newMessage(String, Object...)}.
- * </p>
- * <p>
+ * <p/>
  * This class is immutable.
- * </p>
+ * <p/>
+ * Copied into Geode from org.apache.logging.log4j.message.ParameterizedMessageFactory (http://logging.apache.org/log4j/2.x/license.html)
+ * <p/>
+ * Geode changes include changing class name and package. Additional changes are commented
with "// GEODE: note"
  */
 public final class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
 
@@ -49,6 +51,6 @@ public final class GemFireParameterizedMessageFactory extends AbstractMessageFac
      */
     @Override
     public Message newMessage(final String message, final Object... params) {
-        return new GemFireParameterizedMessage(message, params);
+        return new GemFireParameterizedMessage(message, params); // GEODE: change to construct
GemFireParameterizedMessage
     }
 }


Mime
View raw message