jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1723185 - in /jmeter/trunk/src/core/org/apache/jmeter/report/processor: AbstractSampleConsumer.java CsvFileSampleSource.java SampleWriterConsumer.java
Date Tue, 05 Jan 2016 22:08:40 GMT
Author: sebb
Date: Tue Jan  5 22:08:40 2016
New Revision: 1723185

URL: http://svn.apache.org/viewvc?rev=1723185&view=rev
Log:
Constant static field names should be uppercase

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java?rev=1723185&r1=1723184&r2=1723185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java Tue
Jan  5 22:08:40 2016
@@ -40,8 +40,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractSampleConsumer extends AbstractSampleProcessor
         implements SampleConsumer, SampleProducer {
 
-    private static final Logger log = LoggerFactory
-            .getLogger(AbstractSampleConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractSampleConsumer.class);
 
     /** sample consumer name, used for logging */
     private String name;
@@ -174,7 +173,7 @@ public abstract class AbstractSampleCons
             try {
                 consumer.setSampleContext(context);
             } catch (Exception e) {
-                log.error(
+                LOG.error(
                         "produce(): Consumer failed with message :"
                                 + e.getMessage(), e);
                 throw new SampleException(e);
@@ -197,7 +196,7 @@ public abstract class AbstractSampleCons
             try {
                 consumer.setConsumedMetadata(metadata, channel);
             } catch (Exception e) {
-                log.error(
+                LOG.error(
                         "setProducedMetadata(): Consumer failed with message :"
                                 + e.getMessage(), e);
                 throw new SampleException(e);
@@ -220,7 +219,7 @@ public abstract class AbstractSampleCons
             try {
                 consumer.startConsuming();
             } catch (Exception e) {
-                log.error("startProducing(): Consumer failed with message :"
+                LOG.error("startProducing(): Consumer failed with message :"
                         + e.getMessage(), e);
                 throw new SampleException(e);
             }
@@ -234,7 +233,7 @@ public abstract class AbstractSampleCons
                 consumer.consume(s, channel);
                 producedSampleCount++;
             } catch (Exception e) {
-                log.error(
+                LOG.error(
                         "produce(): Consumer failed with message :"
                                 + e.getMessage(), e);
                 throw new SampleException(e);
@@ -248,14 +247,14 @@ public abstract class AbstractSampleCons
             try {
                 consumer.stopConsuming();
             } catch (Exception e) {
-                log.error(
+                LOG.error(
                         "stopProducing(): Consumer failed with message :"
                                 + e.getMessage(), e);
                 throw new SampleException(e);
             }
         }
-        if (log.isInfoEnabled()) {
-            log.info("stopProducing(): " + getName() + " produced "
+        if (LOG.isInfoEnabled()) {
+            LOG.info("stopProducing(): " + getName() + " produced "
                     + producedSampleCount + " samples");
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1723185&r1=1723184&r2=1723185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java Tue
Jan  5 22:08:40 2016
@@ -66,8 +66,7 @@ public class CsvFileSampleSource extends
     /** File name whose sample are being produced on the channel */
     public static final String SOURCE_FILE_ATTRIBUTE = "samplesource.file";
 
-    private static final Logger log = LoggerFactory
-            .getLogger(CsvFileSampleSource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CsvFileSampleSource.class);
 
     /** input csv files to be produced */
     private File[] inputFiles;
@@ -193,8 +192,8 @@ public class CsvFileSampleSource extends
                 producer.stopProducing();
                 csvReader.close();
             }
-            if (log.isInfoEnabled()) {
-                log.info("produce(): " + sampleCount + " samples produced in "
+            if (LOG.isInfoEnabled()) {
+                LOG.info("produce(): " + sampleCount + " samples produced in "
                         + time(now() - start) + " on channel " + i);
             }
         }
@@ -284,7 +283,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.setSampleContext(context);
                 } catch (Exception e) {
-                    log.error(
+                    LOG.error(
                             "produce(): Consumer failed with message :"
                                     + e.getMessage(), e);
                     throw new SampleException(e);
@@ -298,7 +297,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.setConsumedMetadata(metadata, channel);
                 } catch (Exception e) {
-                    log.error(
+                    LOG.error(
                             "setProducedMetadata(): Consumer failed with message :"
                                     + e.getMessage(), e);
                     throw new SampleException(e);
@@ -314,7 +313,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.setChannelAttribute(channel, key, value);
                 } catch (Exception e) {
-                    log.error(
+                    LOG.error(
                             "setChannelAttribute(): Consumer failed with message :"
                                     + e.getMessage(), e);
                     throw new SampleException(e);
@@ -328,7 +327,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.startConsuming();
                 } catch (Exception e) {
-                    log.error(
+                    LOG.error(
                             "startProducing(): Consumer failed with message :"
                                     + e.getMessage(), e);
                     throw new SampleException(e);
@@ -342,7 +341,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.consume(s, channel);
                 } catch (Exception e) {
-                    log.error(
+                    LOG.error(
                             "produce(): Consumer failed with message :"
                                     + e.getMessage(), e);
                     throw new SampleException(e);
@@ -356,7 +355,7 @@ public class CsvFileSampleSource extends
                 try {
                     consumer.stopConsuming();
                 } catch (Exception e) {
-                    log.error("stopProducing(): Consumer failed with message :"
+                    LOG.error("stopProducing(): Consumer failed with message :"
                             + e.getMessage(), e);
                     throw new SampleException(e);
                 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java?rev=1723185&r1=1723184&r2=1723185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java Tue
Jan  5 22:08:40 2016
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SampleWriterConsumer extends AbstractSampleConsumer {
 
-    private static final Logger log = LoggerFactory.getLogger(SampleWriterConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SampleWriterConsumer.class);
 
     private File outputFile;
 
@@ -89,8 +89,8 @@ public class SampleWriterConsumer extend
         if (outputFile == null) {
             File wd = getWorkingDirectory();
             wd.mkdir();
-            if (log.isInfoEnabled()) {
-                log.info("startConsuming(): No output file set, writing to work directory
:"
+            if (LOG.isInfoEnabled()) {
+                LOG.info("startConsuming(): No output file set, writing to work directory
:"
                     + wd.getAbsolutePath());
             }
             outputFile = new File(wd, "samples.csv");



Mime
View raw message