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/13 15:07:16 UTC
svn commit: r1730210 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http: control/
modifier/ proxy/ proxy/gui/ sampler/
Author: pmouawad
Date: Sat Feb 13 14:07:15 2016
New Revision: 1730210
URL: http://svn.apache.org/viewvc?rev=1730210&view=rev
Log:
Respect naming conventions
Use java style array (vs C style)
Patch by Benoit Wiart Part 4
https://github.com/apache/jmeter/pull/115/files
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java Sat Feb 13 14:07:15 2016
@@ -89,7 +89,7 @@ public class HC3CookieHandler implements
CollectionProperty cookiesCP,
URL url,
boolean allowVariableCookie){
- org.apache.commons.httpclient.Cookie cookies[]=
+ org.apache.commons.httpclient.Cookie[] cookies =
new org.apache.commons.httpclient.Cookie[cookiesCP.size()];
int i = 0;
for (JMeterProperty jMeterProperty : cookiesCP) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java Sat Feb 13 14:07:15 2016
@@ -159,7 +159,7 @@ public class HttpMirrorServer extends Th
return except;
}
- public static void main(String args[]){
+ public static void main(String[] args){
int port = HttpMirrorControl.DEFAULT_PORT;
if (args.length > 0){
port = Integer.parseInt(args[0]);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java Sat Feb 13 14:07:15 2016
@@ -124,9 +124,9 @@ public class HttpMirrorThread implements
query=requestPath.substring(querypos+1);
}
if (query != null) {
- String params[] = query.split("&");
+ String[] params = query.split("&");
for(String param : params) {
- String parts[] = param.split("=",2);
+ String[] parts = param.split("=",2);
if (parts.length==2) {
parameters.put(parts[0], parts[1]);
} else { // allow for parameter name only
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java Sat Feb 13 14:07:15 2016
@@ -116,12 +116,12 @@ public class UserParameterXMLContentHand
}
@Override
- public void characters(char ch[], int start, int length) throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
contents.write(ch, start, length);
}
@Override
- public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
@Override
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sat Feb 13 14:07:15 2016
@@ -391,7 +391,7 @@ public class Proxy extends Thread {
if (keyStore.containsAlias(host)) {
return host;
}
- String parts[] = host.split("\\."); // get the component parts
+ String[] parts = host.split("\\."); // get the component parts
// Assume domains must have at least 2 parts, e.g. apache.org
// Replace the first part with "*"
StringBuilder sb = new StringBuilder("*"); // $NON-NLS-1$
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=1730210&r1=1730209&r2=1730210&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 Sat Feb 13 14:07:15 2016
@@ -1444,7 +1444,7 @@ public class ProxyControl extends Generi
}
private boolean isValid(String subject) {
- String parts[] = subject.split("\\.");
+ String[] parts = subject.split("\\.");
if (!parts[0].endsWith("*")) { // not a wildcard
return true;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Sat Feb 13 14:07:15 2016
@@ -286,8 +286,8 @@ public class ProxyControlGui extends Log
element.setExcludeList(excludeList);
}
- private List<String> getDataList(PowerTableModel p_model, String colName) {
- String[] dataArray = p_model.getData().getColumn(colName);
+ private List<String> getDataList(PowerTableModel pModel, String colName) {
+ String[] dataArray = pModel.getData().getColumn(colName);
List<String> list = new LinkedList<>();
for (int i = 0; i < dataArray.length; i++) {
list.add(dataArray[i]);
@@ -336,12 +336,12 @@ public class ProxyControlGui extends Log
repaint();
}
- private void populateTable(PowerTableModel p_model, PropertyIterator iter) {
- p_model.clearData();
+ private void populateTable(PowerTableModel pModel, PropertyIterator iter) {
+ pModel.clearData();
while (iter.hasNext()) {
- p_model.addRow(new Object[] { iter.next().getStringValue() });
+ pModel.addRow(new Object[] { iter.next().getStringValue() });
}
- p_model.fireTableDataChanged();
+ pModel.fireTableDataChanged();
}
/*
@@ -509,7 +509,7 @@ public class ProxyControlGui extends Log
stop.setEnabled(true);
restart.setEnabled(false);
if (ProxyControl.isDynamicMode()) {
- String details[] = model.getCertificateDetails();
+ String[] details = model.getCertificateDetails();
StringBuilder sb = new StringBuilder();
sb.append(JMeterUtils.getResString("proxy_daemon_msg_rootca_cert")) // $NON-NLS-1$
.append(SPACE).append(KeyToolUtils.ROOT_CACERT_CRT_PFX)
@@ -944,7 +944,7 @@ public class ProxyControlGui extends Log
log.debug("Reinitialization complete");
}
- private void buildNodesModel(JMeterTreeNode node, String parent_name, int level) {
+ private void buildNodesModel(JMeterTreeNode node, String parentName, int level) {
String separator = " > ";
if (node != null) {
for (int i = 0; i < node.getChildCount(); i++) {
@@ -961,7 +961,7 @@ public class ProxyControlGui extends Log
* buildNodesModel(cur, name.toString(), level); } else
*/
if (te instanceof Controller) {
- name.append(parent_name);
+ name.append(parentName);
name.append(cur.getName());
TreeNodeWrapper tnw = new TreeNodeWrapper(cur, name.toString());
targetNodesModel.addElement(tnw);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Sat Feb 13 14:07:15 2016
@@ -571,7 +571,7 @@ public class HTTPHC3Impl extends HTTPHCA
*/
protected String getResponseHeaders(HttpMethod method) {
StringBuilder headerBuf = new StringBuilder();
- org.apache.commons.httpclient.Header rh[] = method.getResponseHeaders();
+ org.apache.commons.httpclient.Header[] rh = method.getResponseHeaders();
headerBuf.append(method.getStatusLine());// header[0] is not the status line...
headerBuf.append("\n"); // $NON-NLS-1$
@@ -738,7 +738,7 @@ public class HTTPHC3Impl extends HTTPHCA
private String sendPostData(PostMethod post) throws IOException {
// Buffer to hold the post body, except file content
StringBuilder postedBody = new StringBuilder(1000);
- HTTPFileArg files[] = getHTTPFiles();
+ HTTPFileArg[] files = getHTTPFiles();
// Check if we should do a multipart/form-data or an
// application/x-www-form-urlencoded post request
if(getUseMultipartForPost()) {
@@ -979,7 +979,7 @@ public class HTTPHC3Impl extends HTTPHCA
// This allows the user to specify his own content-type for a POST request
Header contentTypeHeader = put.getRequestHeader(HTTPConstants.HEADER_CONTENT_TYPE);
boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.getValue() != null && contentTypeHeader.getValue().length() > 0;
- HTTPFileArg files[] = getHTTPFiles();
+ HTTPFileArg[] files = getHTTPFiles();
// If there are no arguments, we can send a file as the body of the request
@@ -1095,7 +1095,7 @@ public class HTTPHC3Impl extends HTTPHCA
*/
protected void saveConnectionCookies(HttpMethod method, URL u, CookieManager cookieManager) {
if (cookieManager != null) {
- Header hdr[] = method.getResponseHeaders(HTTPConstants.HEADER_SET_COOKIE);
+ Header[] hdr = method.getResponseHeaders(HTTPConstants.HEADER_SET_COOKIE);
for (Header responseHeader : hdr) {
cookieManager.addCookieFromHeader(responseHeader.getValue(), u);
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Sat Feb 13 14:07:15 2016
@@ -1288,7 +1288,7 @@ public class HTTPHC4Impl extends HTTPHCA
StringBuilder entityBody = new StringBuilder(1000);
boolean hasEntityBody = false;
- final HTTPFileArg files[] = getHTTPFiles();
+ final HTTPFileArg[] files = getHTTPFiles();
// Allow the mimetype of the file to control the content type
// This is not obvious in GUI if you are not uploading any files,
// but just sending the content of nameless parameters
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java Sat Feb 13 14:07:15 2016
@@ -92,7 +92,7 @@ public class HttpClientDefaultParameters
@Override
public void setVersion(String name, String value) {
- String parts[] = value.split("\\.");
+ String[] parts = value.split("\\.");
if (parts.length != 2){
throw new IllegalArgumentException("Version must have form m.n");
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java Sat Feb 13 14:07:15 2016
@@ -91,7 +91,7 @@ public class PostWriter {
// Buffer to hold the post body, except file content
StringBuilder postedBody = new StringBuilder(1000);
- HTTPFileArg files[] = sampler.getHTTPFiles();
+ HTTPFileArg[] files = sampler.getHTTPFiles();
String contentEncoding = sampler.getContentEncoding();
if(contentEncoding == null || contentEncoding.length() == 0) {
@@ -175,7 +175,7 @@ public class PostWriter {
contentEncoding = ENCODING;
}
long contentLength = 0L;
- HTTPFileArg files[] = sampler.getHTTPFiles();
+ HTTPFileArg[] files = sampler.getHTTPFiles();
// Check if we should do a multipart/form-data or an
// application/x-www-form-urlencoded post request
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java?rev=1730210&r1=1730209&r2=1730210&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java Sat Feb 13 14:07:15 2016
@@ -56,7 +56,7 @@ public class PutWriter extends PostWrite
String contentTypeHeader = connection.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE);
boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.length() > 0;
- HTTPFileArg files[] = sampler.getHTTPFiles();
+ HTTPFileArg[] files = sampler.getHTTPFiles();
// If there are no arguments, we can send a file as the body of the request
if(sampler.getArguments() != null && sampler.getArguments().getArgumentCount() == 0 && sampler.getSendFileAsPostBody()) {