You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/04/18 02:26:42 UTC
[6/8] logging-log4j2 git commit: Remove dead comment.
Remove dead comment.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ce36b376
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ce36b376
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ce36b376
Branch: refs/heads/master
Commit: ce36b37661e45c89c861108b6442eb8249ec2248
Parents: 6b9955d
Author: ggregory <gg...@apache.org>
Authored: Sun Apr 17 17:13:17 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Apr 17 17:13:17 2016 -0700
----------------------------------------------------------------------
.../log4j/core/layout/CsvLogEventLayout.java | 213 +++++++++----------
1 file changed, 106 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce36b376/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
index ef69f0f..12e0f3d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
@@ -1,107 +1,106 @@
-/*
- * 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.core.layout;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-import org.apache.commons.csv.QuoteMode;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.Node;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.status.StatusLogger;
-
-/**
- * A Comma-Separated Value (CSV) layout to log events.
- *
- * Depends on Apache Commons CSV 1.2.
- *
- * @since 2.4
- */
-@Plugin(name = "CsvLogEventLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
-public class CsvLogEventLayout extends AbstractCsvLayout {
-
- public static CsvLogEventLayout createDefaultLayout() {
- return new CsvLogEventLayout(null, Charset.forName(DEFAULT_CHARSET), CSVFormat.valueOf(DEFAULT_FORMAT), null, null);
- }
-
- public static CsvLogEventLayout createLayout(final CSVFormat format) {
- return new CsvLogEventLayout(null, Charset.forName(DEFAULT_CHARSET), format, null, null);
- }
-
- @PluginFactory
- public static CsvLogEventLayout createLayout(
- // @formatter:off
- @PluginConfiguration final Configuration config,
- @PluginAttribute(value = "format", defaultString = DEFAULT_FORMAT) final String format,
- @PluginAttribute("delimiter") final Character delimiter,
- @PluginAttribute("escape") final Character escape,
- @PluginAttribute("quote") final Character quote,
- @PluginAttribute("quoteMode") final QuoteMode quoteMode,
- @PluginAttribute("nullString") final String nullString,
- @PluginAttribute("recordSeparator") final String recordSeparator,
- @PluginAttribute(value = "charset", defaultString = DEFAULT_CHARSET) final Charset charset,
- @PluginAttribute("header") final String header,
- @PluginAttribute("footer") final String footer)
- // @formatter:on
- {
-
- final CSVFormat csvFormat = createFormat(format, delimiter, escape, quote, quoteMode, nullString, recordSeparator);
- return new CsvLogEventLayout(config, charset, csvFormat, header, footer);
- }
-
- protected CsvLogEventLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat, final String header, final String footer) {
- super(config, charset, csvFormat, header, footer);
- }
-
- @Override
- public String toSerializable(final LogEvent event) {
- final StringBuilder buffer = getStringBuilder();
- // Revisit when 1.3 is out so that we do not need to create a new
- // printer for each event.
- // No need to close the printer.
- try (final CSVPrinter printer = new CSVPrinter(buffer, getFormat())) {
- printer.print(event.getNanoTime());
- printer.print(event.getTimeMillis());
- printer.print(event.getLevel());
- printer.print(event.getThreadId());
- printer.print(event.getThreadName());
- printer.print(event.getThreadPriority());
- printer.print(event.getMessage().getFormattedMessage());
- printer.print(event.getLoggerFqcn());
- printer.print(event.getLoggerName());
- printer.print(event.getMarker());
- printer.print(event.getThrownProxy());
- printer.print(event.getSource());
- printer.print(event.getContextMap());
- printer.print(event.getContextStack());
- printer.println();
- return buffer.toString();
- } catch (final IOException e) {
- StatusLogger.getLogger().error(event.toString(), e);
- return getFormat().getCommentMarker() + " " + e;
- }
- }
-
-}
+/*
+ * 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.core.layout;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+import org.apache.commons.csv.QuoteMode;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Node;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.status.StatusLogger;
+
+/**
+ * A Comma-Separated Value (CSV) layout to log events.
+ *
+ * Depends on Apache Commons CSV 1.2.
+ *
+ * @since 2.4
+ */
+@Plugin(name = "CsvLogEventLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
+public class CsvLogEventLayout extends AbstractCsvLayout {
+
+ public static CsvLogEventLayout createDefaultLayout() {
+ return new CsvLogEventLayout(null, Charset.forName(DEFAULT_CHARSET), CSVFormat.valueOf(DEFAULT_FORMAT), null, null);
+ }
+
+ public static CsvLogEventLayout createLayout(final CSVFormat format) {
+ return new CsvLogEventLayout(null, Charset.forName(DEFAULT_CHARSET), format, null, null);
+ }
+
+ @PluginFactory
+ public static CsvLogEventLayout createLayout(
+ // @formatter:off
+ @PluginConfiguration final Configuration config,
+ @PluginAttribute(value = "format", defaultString = DEFAULT_FORMAT) final String format,
+ @PluginAttribute("delimiter") final Character delimiter,
+ @PluginAttribute("escape") final Character escape,
+ @PluginAttribute("quote") final Character quote,
+ @PluginAttribute("quoteMode") final QuoteMode quoteMode,
+ @PluginAttribute("nullString") final String nullString,
+ @PluginAttribute("recordSeparator") final String recordSeparator,
+ @PluginAttribute(value = "charset", defaultString = DEFAULT_CHARSET) final Charset charset,
+ @PluginAttribute("header") final String header,
+ @PluginAttribute("footer") final String footer)
+ // @formatter:on
+ {
+
+ final CSVFormat csvFormat = createFormat(format, delimiter, escape, quote, quoteMode, nullString, recordSeparator);
+ return new CsvLogEventLayout(config, charset, csvFormat, header, footer);
+ }
+
+ protected CsvLogEventLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat, final String header, final String footer) {
+ super(config, charset, csvFormat, header, footer);
+ }
+
+ @Override
+ public String toSerializable(final LogEvent event) {
+ final StringBuilder buffer = getStringBuilder();
+ // Revisit when 1.3 is out so that we do not need to create a new
+ // printer for each event.
+ try (final CSVPrinter printer = new CSVPrinter(buffer, getFormat())) {
+ printer.print(event.getNanoTime());
+ printer.print(event.getTimeMillis());
+ printer.print(event.getLevel());
+ printer.print(event.getThreadId());
+ printer.print(event.getThreadName());
+ printer.print(event.getThreadPriority());
+ printer.print(event.getMessage().getFormattedMessage());
+ printer.print(event.getLoggerFqcn());
+ printer.print(event.getLoggerName());
+ printer.print(event.getMarker());
+ printer.print(event.getThrownProxy());
+ printer.print(event.getSource());
+ printer.print(event.getContextMap());
+ printer.print(event.getContextStack());
+ printer.println();
+ return buffer.toString();
+ } catch (final IOException e) {
+ StatusLogger.getLogger().error(event.toString(), e);
+ return getFormat().getCommentMarker() + " " + e;
+ }
+ }
+
+}