You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/22 13:54:40 UTC
logging-log4j2 git commit: LOG4J2-1349 removed interface
MutableContextDataSupplier (moved method to ThreadContextMap2)
Repository: logging-log4j2
Updated Branches:
refs/heads/master d676967bd -> 0f3a45668
LOG4J2-1349 removed interface MutableContextDataSupplier (moved method to ThreadContextMap2)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0f3a4566
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0f3a4566
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0f3a4566
Branch: refs/heads/master
Commit: 0f3a45668d968635f24f8cdf8768f0dce8a2c8b7
Parents: d676967
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 22 22:54:16 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 22 22:54:16 2016 +0900
----------------------------------------------------------------------
.../CopyOnWriteSortedArrayThreadContextMap.java | 5 ++-
.../GarbageFreeSortedArrayThreadContextMap.java | 5 ++-
.../log4j/spi/MutableContextDataSupplier.java | 37 --------------------
.../logging/log4j/spi/ThreadContextMap2.java | 10 +++++-
4 files changed, 13 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f3a4566/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 6bb13c1..25746eb 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.logging.log4j.util.SortedStringArrayMap;
import org.apache.logging.log4j.util.PropertiesUtil;
+import org.apache.logging.log4j.util.SortedStringArrayMap;
/**
* {@code SortedStringArrayMap}-based implementation of the {@code ThreadContextMap} interface that creates a copy of
@@ -32,8 +32,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
*
* @since 2.7
*/
-class CopyOnWriteSortedArrayThreadContextMap implements ThreadContextMap, ThreadContextMap2, CopyOnWrite,
- MutableContextDataSupplier {
+class CopyOnWriteSortedArrayThreadContextMap implements ThreadContextMap2, CopyOnWrite {
/**
* Property name ({@value} ) for selecting {@code InheritableThreadLocal} (value "true") or plain
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f3a4566/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
index 7aaeae8..72482cf 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.logging.log4j.util.SortedStringArrayMap;
import org.apache.logging.log4j.util.PropertiesUtil;
+import org.apache.logging.log4j.util.SortedStringArrayMap;
/**
* {@code SortedStringArrayMap}-based implementation of the {@code ThreadContextMap} interface that attempts not to
@@ -32,8 +32,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
* </p>
* @since 2.7
*/
-class GarbageFreeSortedArrayThreadContextMap implements ThreadContextMap, ThreadContextMap2,
- MutableContextDataSupplier {
+class GarbageFreeSortedArrayThreadContextMap implements ThreadContextMap2 {
/**
* Property name ({@value} ) for selecting {@code InheritableThreadLocal} (value "true") or plain
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f3a4566/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableContextDataSupplier.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableContextDataSupplier.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableContextDataSupplier.java
deleted file mode 100644
index 3f242ed..0000000
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableContextDataSupplier.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.spi;
-
-/**
- * Interface for objects that know how to provide a {@code MutableContextData} object.
- * <p>
- * This interface offers no guarantee that the returned context data is actually mutable; it may have been
- * {@linkplain MutableContextData#freeze() frozen}, making the data structure read-only.
- * </p>
- *
- * @since 2.7
- */
-public interface MutableContextDataSupplier {
-
- /**
- * Returns the {@code MutableContextData}. Note that the returned context data may not be mutable; it may have been
- * {@linkplain MutableContextData#freeze() frozen}, making the data structure read-only.
- *
- * @return the {@code MutableContextData}
- */
- MutableContextData getMutableContextData();
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f3a4566/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
index 6f831c3..7d1a520 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
@@ -25,7 +25,7 @@ import java.util.Map;
* @see ThreadContextMap
* @since 2.7
*/
-public interface ThreadContextMap2 extends ThreadContextMap, MutableContextDataSupplier {
+public interface ThreadContextMap2 extends ThreadContextMap {
/**
* Puts all given context map entries into the current thread's
@@ -37,4 +37,12 @@ public interface ThreadContextMap2 extends ThreadContextMap, MutableContextDataS
* @since 2.7
*/
void putAll(final Map<String, String> map);
+
+ /**
+ * Returns the {@code MutableContextData}. Note that the returned context data may not be mutable; it may have been
+ * {@linkplain MutableContextData#freeze() frozen}, making the data structure read-only.
+ *
+ * @return the {@code MutableContextData}
+ */
+ MutableContextData getMutableContextData();
}