You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/18 14:29:06 UTC
svn commit: r1731071 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http:
control/AuthManager.java parser/HTMLParser.java proxy/ProxyControl.java
sampler/HTTPAbstractImpl.java sampler/HTTPSamplerBase.java
util/ConversionUtils.java
Author: pmouawad
Date: Thu Feb 18 13:29:05 2016
New Revision: 1731071
URL: http://svn.apache.org/viewvc?rev=1731071&view=rev
Log:
Removing unnecessary modifiers
Contributed by Graham Russel Part 4
https://github.com/apache/jmeter/pull/122
#resolve #122
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java Thu Feb 18 13:29:05 2016
@@ -99,7 +99,7 @@ public class AuthManager extends ConfigT
private static final boolean STRIP_PORT = JMeterUtils.getPropDefault("kerberos.spnego.strip_port", true);
public enum Mechanism {
- BASIC_DIGEST, KERBEROS;
+ BASIC_DIGEST, KERBEROS
}
private static final class NullCredentials implements Credentials {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java Thu Feb 18 13:29:05 2016
@@ -84,11 +84,11 @@ public abstract class HTMLParser {
protected HTMLParser() {
}
- public static final HTMLParser getParser() {
+ public static HTMLParser getParser() {
return getParser(JMeterUtils.getPropDefault(PARSER_CLASSNAME, DEFAULT_PARSER));
}
- public static final HTMLParser getParser(String htmlParserClassName) {
+ public static HTMLParser getParser(String htmlParserClassName) {
// Is there a cached parser?
HTMLParser pars = parsers.get(htmlParserClassName);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Thu Feb 18 13:29:05 2016
@@ -219,7 +219,7 @@ public class ProxyControl extends Generi
// If this is defined, it is assumed to be the alias of a user-supplied certificate; overrides dynamic mode
static final String CERT_ALIAS = JMeterUtils.getProperty("proxy.cert.alias"); // $NON-NLS-1$
- public static enum KeystoreMode {
+ public enum KeystoreMode {
USER_KEYSTORE, // user-provided keystore
JMETER_KEYSTORE, // keystore generated by JMeter; single entry
DYNAMIC_KEYSTORE, // keystore generated by JMeter; dynamic entries
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java Thu Feb 18 13:29:05 2016
@@ -46,10 +46,10 @@ import org.apache.jmeter.util.JMeterUtil
* Base class for HTTP implementations used by the HTTPSamplerProxy sampler.
*/
public abstract class HTTPAbstractImpl implements Interruptible, HTTPConstantsInterface {
- private static enum CachedResourceMode {
+ private enum CachedResourceMode {
RETURN_200_CACHE(),
RETURN_NO_SAMPLE(),
- RETURN_CUSTOM_STATUS();
+ RETURN_CUSTOM_STATUS()
}
/**
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Thu Feb 18 13:29:05 2016
@@ -198,10 +198,10 @@ public abstract class HTTPSamplerBase ex
private static final boolean IGNORE_FAILED_EMBEDDED_RESOURCES =
JMeterUtils.getPropDefault("httpsampler.ignore_failed_embedded_resources", false); // $NON-NLS-1$ // default value: false
- private static final boolean IGNORE_EMBEDDED_RESOURCES_DATA =
+ private static final boolean IGNORE_EMBEDDED_RESOURCES_DATA =
JMeterUtils.getPropDefault("httpsampler.embedded_resources_use_md5", false); // $NON-NLS-1$ // default value: false
- public static enum SourceType {
+ public enum SourceType {
HOSTNAME("web_testing_source_ip_hostname"), //$NON-NLS-1$
DEVICE("web_testing_source_ip_device"), //$NON-NLS-1$
DEVICE_IPV4("web_testing_source_ip_device_ipv4"), //$NON-NLS-1$
@@ -216,7 +216,7 @@ public abstract class HTTPSamplerBase ex
private static final int SOURCE_TYPE_DEFAULT = HTTPSamplerBase.SourceType.HOSTNAME.ordinal();
// Use for ComboBox Source Address Type. Preserve order (specially with localization)
- public static final String[] getSourceTypeList() {
+ public static String[] getSourceTypeList() {
final SourceType[] types = SourceType.values();
final String[] displayStrings = new String[types.length];
for(int i = 0; i < types.length; i++) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java?rev=1731071&r1=1731070&r2=1731071&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java Thu Feb 18 13:29:05 2016
@@ -141,7 +141,7 @@ public class ConversionUtils {
* @return URI which has been encoded as necessary
* @throws URISyntaxException if parts of the url form a non valid URI
*/
- public static final URI sanitizeUrl(URL url) throws URISyntaxException {
+ public static URI sanitizeUrl(URL url) throws URISyntaxException {
try {
return url.toURI(); // Assume the URL is already encoded
} catch (URISyntaxException e) { // it's not, so encode it