[jmeter] 06/06: Other minor cleanups

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit da4857c1f985f8edd48eefde3b28e010c4da6f93
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:31:48 2019 +0100

    Other minor cleanups
    
    Part of #479 on github
---
 .../java/org/apache/jmeter/extractor/XPath2Extractor.java    |  4 +---
 .../main/java/org/apache/jorphan/logging/LoggingManager.java |  2 +-
 .../java/org/apache/jmeter/protocol/java/test/SleepTest.java | 12 ++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
index 577409b..c9572fa 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
 
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.processor.PostProcessor;
@@ -221,11 +220,10 @@ public class XPath2Extractor
      * @param matchNumber int Match Number
      * @param responseData String that contains the entire Document
      * @throws SaxonApiException
-     * @throws XMLStreamException
      * @throws FactoryConfigurationError
      */
     private void getValuesForXPath(String query, List<String> matchStrings, int matchNumber, String responseData)
-            throws SaxonApiException, XMLStreamException, FactoryConfigurationError {
+            throws SaxonApiException, FactoryConfigurationError {
         XPathUtil.putValuesForXPathInListUsingSaxon(responseData, query, matchStrings, getFragment(), matchNumber, getNamespaces());
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java b/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
index 7b5dc84..7ba2c56 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
@@ -91,7 +91,7 @@ public final class LoggingManager {
     }
 
     /**
-     * @deprecated
+     * @deprecated since 3.2, use SLF4J for logging
      */
     @Deprecated
     private static final String PACKAGE_PREFIX = "org.apache."; //$NON_NLS-1$
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
index f0d4547..50ef9c9 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
@@ -53,15 +53,11 @@ public class SleepTest extends AbstractJavaSamplerClient implements Serializable
 
     private static final long serialVersionUID = 240L;
 
-    /**
-     * The default value of the SleepTime parameter, in milliseconds.
-     */
-    public static final long DEFAULT_SLEEP_TIME = 1000;
+    /** The default value of the SleepTime parameter, in milliseconds. */
+    private static final long DEFAULT_SLEEP_TIME = 1000;
 
-    /**
-     * The default value of the SleepMask parameter.
-     */
-    public static final long DEFAULT_SLEEP_MASK = 0x3ff;
+    /** The default value of the SleepMask parameter. */
+    private static final long DEFAULT_SLEEP_MASK = 0x3ff;
 
     /** The base number of milliseconds to sleep during each sample. */
     private long sleepTime;