Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
Logging Log4j2
Commits
ce13c128
Commit
ce13c128
authored
8 years ago
by
Gary Gregory
Browse files
Options
Download
Email Patches
Plain Diff
Fix some generics compiler warnings.
parent
5d6d38be
GenericMapMessageSimple
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
+1
-0
...ain/java/org/apache/logging/log4j/message/MapMessage.java
log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+3
-3
.../java/org/apache/logging/log4j/core/filter/MapFilter.java
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
+0
-1
...a/org/apache/logging/log4j/flume/appender/FlumeEvent.java
with
4 additions
and
4 deletions
+4
-4
log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
+
1
-
0
View file @
ce13c128
...
...
@@ -146,6 +146,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiformatMes
* Returns the message data as an unmodifiable Map.
* @return the message data as an unmodifiable map.
*/
@SuppressWarnings
(
"unchecked"
)
public
Map
<
String
,
V
>
getData
()
{
final
TreeMap
<
String
,
V
>
result
=
new
TreeMap
<>();
// returned map must be sorted
for
(
int
i
=
0
;
i
<
data
.
size
();
i
++)
{
...
...
This diff is collapsed.
Click to expand it.
log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+
3
-
3
View file @
ce13c128
...
...
@@ -67,7 +67,7 @@ public class MapFilter extends AbstractFilter {
public
Result
filter
(
final
Logger
logger
,
final
Level
level
,
final
Marker
marker
,
final
Message
msg
,
final
Throwable
t
)
{
if
(
msg
instanceof
MapMessage
)
{
return
filter
((
MapMessage
)
msg
)
?
onMatch
:
onMismatch
;
return
filter
((
MapMessage
<?,
?>
)
msg
)
?
onMatch
:
onMismatch
;
}
return
Result
.
NEUTRAL
;
}
...
...
@@ -76,12 +76,12 @@ public class MapFilter extends AbstractFilter {
public
Result
filter
(
final
LogEvent
event
)
{
final
Message
msg
=
event
.
getMessage
();
if
(
msg
instanceof
MapMessage
)
{
return
filter
((
MapMessage
)
msg
)
?
onMatch
:
onMismatch
;
return
filter
((
MapMessage
<?,
?>
)
msg
)
?
onMatch
:
onMismatch
;
}
return
Result
.
NEUTRAL
;
}
protected
boolean
filter
(
final
MapMessage
mapMessage
)
{
protected
boolean
filter
(
final
MapMessage
<?,
?>
mapMessage
)
{
boolean
match
=
false
;
for
(
int
i
=
0
;
i
<
map
.
size
();
i
++)
{
final
String
toMatch
=
mapMessage
.
get
(
map
.
getKeyAt
(
i
));
...
...
This diff is collapsed.
Click to expand it.
log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
+
0
-
1
View file @
ce13c128
...
...
@@ -36,7 +36,6 @@ import org.apache.logging.log4j.core.util.Patterns;
import
org.apache.logging.log4j.core.util.UuidUtil
;
import
org.apache.logging.log4j.message.MapMessage
;
import
org.apache.logging.log4j.message.Message
;
import
org.apache.logging.log4j.message.StringMapMessage
;
import
org.apache.logging.log4j.message.StructuredDataId
;
import
org.apache.logging.log4j.message.StructuredDataMessage
;
import
org.apache.logging.log4j.util.ReadOnlyStringMap
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help