diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 4bbcdd0..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,15 +0,0 @@ -image: 941618104661.dkr.ecr.us-east-1.amazonaws.com/jmeter-plugins-build:3.2 - -build: - stage: build - tags: - - docker - except: - - master - script: - - mvn -e -X clean install - artifacts: - paths: - - target/jmeter-bzm-http2-*.jar - - target/surefire-reports - expire_in: 1 month \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 108d72e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: java -dist: trusty -jdk: openjdk8 -cache: - directories: - - "$HOME/.m2" - -before_deploy: - - mvn --batch-mode versions:set -DnewVersion=${TRAVIS_TAG:1} - - mvn clean package -DskipTests - -deploy: - provider: releases - api_key: "${HTTP_KEY}" - file_glob: true - file: target/jmeter-bzm-http2-*.jar - skip_cleanup: true - on: - tags: true - repo: Blazemeter/jmeter-http2-plugin - diff --git a/.travis/install-maven-dependency.sh b/.travis/install-maven-dependency.sh deleted file mode 100644 index c183b7d..0000000 --- a/.travis/install-maven-dependency.sh +++ /dev/null @@ -1,7 +0,0 @@ -#/bin/bash -set -ex - -if !(mvn dependency:get -Dartifact=$2:$3:$4); then - mvn com.googlecode.maven-download-plugin:download-maven-plugin:1.4.0:wget -Ddownload.url=$1 - mvn install:install-file -Dfile=target/${1##*/} -DgroupId=$2 -DartifactId=$3 -Dversion=$4 -Dpackaging=jar -fi diff --git a/README.md b/README.md index d945d78..df5f591 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,14 @@ This plugin provides an HTTP2 Sampler and a custom View Result Tree to work with HTTP/2 protocol. +--- +### *This plugin is deprecated and there will be no further support for it. Consider migrating to the [latest version](https://github.com/Blazemeter/jmeter-http2-plugin/tree/master) of the plugin.* + +By migrating you will notice not only major improvements on performance but also the improved functionalities over this legacy version, like SSL, Auth, Cookie and Cache Manager support, improved redirect functionality and better error handling among others. + +> Please note that you need to install OpenJDK version 11 as older versions won't work. +--- + ### Step to use HTTP2 Sampler As Java 8 does not have native support for HTTP/2, you will need to ensure you have alpn-boot on your system and edit `JVM_ARGS` as follows: diff --git a/pom.xml b/pom.xml index 538e589..72e0763 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.blazemeter jmeter-bzm-http2 jar - 1.6.1 + 1.6.2 HTTP/2 Sampler HTTP/2 protocol sampler diff --git a/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/HTTP2RequestGui.java b/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/HTTP2RequestGui.java index be13b6e..1621fac 100644 --- a/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/HTTP2RequestGui.java +++ b/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/HTTP2RequestGui.java @@ -6,6 +6,7 @@ import javax.swing.BorderFactory; import javax.swing.JCheckBox; import javax.swing.JComboBox; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.JTextField; @@ -19,128 +20,144 @@ public class HTTP2RequestGui extends AbstractSamplerGui { - private JCheckBox retrieveEmbeddedResources; - private HTTP2RequestPanel http2RequestPanel; - private JCheckBox useMD5; - private JLabeledTextField embeddedResourceUrlRegexFilter; - private JTextField sourceIpAddr; - private JComboBox sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList()); - - public HTTP2RequestGui() { - setLayout(new BorderLayout(0, 5)); - setBorder(makeBorder()); - - JPanel logoPanel = new JPanel(); - logoPanel.add(new BlazemeterLabsLogo()); - - http2RequestPanel = new HTTP2RequestPanel(true); - - JPanel advancedPanel = new VerticalPanel(); - advancedPanel.add(createEmbeddedRsrcPanel()); - advancedPanel.add(createSourceAddrPanel()); - advancedPanel.add(createOptionalTasksPanel()); - - JTabbedPane tabbedPane = new JTabbedPane(); - tabbedPane.add(JMeterUtils - .getResString("web_testing_basic"), http2RequestPanel); - tabbedPane.add(JMeterUtils - .getResString("web_testing_advanced"), advancedPanel); - - add(makeTitlePanel(), BorderLayout.NORTH); - add(logoPanel, BorderLayout.SOUTH); - add(tabbedPane, BorderLayout.CENTER); - } - - private JPanel createEmbeddedRsrcPanel() { - retrieveEmbeddedResources = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$ - - final JPanel embeddedRsrcPanel = new HorizontalPanel(); - embeddedRsrcPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("web_testing_retrieve_title"))); // $NON-NLS-1$ - embeddedRsrcPanel.add(retrieveEmbeddedResources); - - embeddedResourceUrlRegexFilter = new JLabeledTextField(JMeterUtils.getResString("web_testing_embedded_url_pattern"), 20); // $NON-NLS-1$ - embeddedRsrcPanel.add(embeddedResourceUrlRegexFilter); - - return embeddedRsrcPanel; - } - - private JPanel createSourceAddrPanel() { - final JPanel sourceAddrPanel = new HorizontalPanel(); - sourceAddrPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("web_testing_source_ip"))); // $NON-NLS-1$ - - sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname - sourceAddrPanel.add(sourceIpType); - - sourceIpAddr = new JTextField(); - sourceAddrPanel.add(sourceIpAddr); - return sourceAddrPanel; - } - - private JPanel createOptionalTasksPanel() { - useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$ - - final JPanel checkBoxPanel = new VerticalPanel(); - checkBoxPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("optional_tasks"))); // $NON-NLS-1$ - checkBoxPanel.add(useMD5); - return checkBoxPanel; - } - - @Override - public String getStaticLabel() { - return "HTTP2 Request"; - } - - @Override - public String getLabelResource() { - return "HTTP2 Request"; - } - - @Override - public TestElement createTestElement() { - HTTP2Request sampler = new HTTP2Request(); - modifyTestElement(sampler); - return sampler; - } - - /** - * Modifies a given TestElement to mirror the data in the gui components. - */ - @Override - public void configure(TestElement element) { - super.configure(element); - final HTTP2Request http2sampler = (HTTP2Request) element; - http2RequestPanel.configure(element); - retrieveEmbeddedResources.setSelected(http2sampler.isEmbeddedResources()); - embeddedResourceUrlRegexFilter.setText(http2sampler.getEmbeddedUrlRE()); - } - - @Override - public void modifyTestElement(TestElement sampler) { - sampler.clear(); - http2RequestPanel.modifyTestElement(sampler); - final HTTP2Request http2Sample = (HTTP2Request) sampler; - http2Sample.setEmbeddedResources(retrieveEmbeddedResources.isSelected()); - http2Sample.setEmbeddedUrlRE(embeddedResourceUrlRegexFilter.getText()); - super.configureTestElement(sampler); - } - - @Override - public Dimension getPreferredSize() { - return getMinimumSize(); - } - - @Override - public void clearGui() { - super.clearGui(); - retrieveEmbeddedResources.setSelected(false); - useMD5.setSelected(false); - embeddedResourceUrlRegexFilter.setText(""); // $NON-NLS-1$ - sourceIpAddr.setText(""); // $NON-NLS-1$ - sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname - http2RequestPanel.clear(); + private static boolean shouldShowAlert = true; + + private JCheckBox retrieveEmbeddedResources; + private HTTP2RequestPanel http2RequestPanel; + private JCheckBox useMD5; + private JLabeledTextField embeddedResourceUrlRegexFilter; + private JTextField sourceIpAddr; + private JComboBox sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList()); + + public HTTP2RequestGui() { + setLayout(new BorderLayout(0, 5)); + setBorder(makeBorder()); + + JPanel logoPanel = new JPanel(); + logoPanel.add(new BlazemeterLabsLogo()); + + http2RequestPanel = new HTTP2RequestPanel(true); + + JPanel advancedPanel = new VerticalPanel(); + advancedPanel.add(createEmbeddedRsrcPanel()); + advancedPanel.add(createSourceAddrPanel()); + advancedPanel.add(createOptionalTasksPanel()); + + JTabbedPane tabbedPane = new JTabbedPane(); + tabbedPane.add(JMeterUtils + .getResString("web_testing_basic"), http2RequestPanel); + tabbedPane.add(JMeterUtils + .getResString("web_testing_advanced"), advancedPanel); + + add(makeTitlePanel(), BorderLayout.NORTH); + add(logoPanel, BorderLayout.SOUTH); + add(tabbedPane, BorderLayout.CENTER); + } + + private JPanel createEmbeddedRsrcPanel() { + retrieveEmbeddedResources = new JCheckBox( + JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$ + + final JPanel embeddedRsrcPanel = new HorizontalPanel(); + embeddedRsrcPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("web_testing_retrieve_title"))); // $NON-NLS-1$ + embeddedRsrcPanel.add(retrieveEmbeddedResources); + + embeddedResourceUrlRegexFilter = new JLabeledTextField( + JMeterUtils.getResString("web_testing_embedded_url_pattern"), 20); // $NON-NLS-1$ + embeddedRsrcPanel.add(embeddedResourceUrlRegexFilter); + + return embeddedRsrcPanel; + } + + private JPanel createSourceAddrPanel() { + final JPanel sourceAddrPanel = new HorizontalPanel(); + sourceAddrPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("web_testing_source_ip"))); // $NON-NLS-1$ + + sourceIpType + .setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname + sourceAddrPanel.add(sourceIpType); + + sourceIpAddr = new JTextField(); + sourceAddrPanel.add(sourceIpAddr); + return sourceAddrPanel; + } + + private JPanel createOptionalTasksPanel() { + useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$ + + final JPanel checkBoxPanel = new VerticalPanel(); + checkBoxPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("optional_tasks"))); // $NON-NLS-1$ + checkBoxPanel.add(useMD5); + return checkBoxPanel; + } + + @Override + public String getStaticLabel() { + return "DEPRECATED HTTP2 Request"; + } + + @Override + public String getLabelResource() { + return "DEPRECATED HTTP2 Request"; + } + + @Override + public TestElement createTestElement() { + HTTP2Request sampler = new HTTP2Request(); + modifyTestElement(sampler); + return sampler; + } + + /** + * Modifies a given TestElement to mirror the data in the gui components. + */ + @Override + public void configure(TestElement element) { + if (shouldShowAlert) { + shouldShowAlert = false; + JOptionPane.showMessageDialog(this, + "This version is deprecated and it will no longer be supported. Please migrate to HTTP2" + + " Plugin 2.0 or greater. ", + "HTTP2 Plugin new version available", JOptionPane.WARNING_MESSAGE); } + super.configure(element); + final HTTP2Request http2sampler = (HTTP2Request) element; + http2RequestPanel.configure(element); + retrieveEmbeddedResources.setSelected(http2sampler.isEmbeddedResources()); + embeddedResourceUrlRegexFilter.setText(http2sampler.getEmbeddedUrlRE()); + } + + @Override + public void modifyTestElement(TestElement sampler) { + sampler.clear(); + http2RequestPanel.modifyTestElement(sampler); + final HTTP2Request http2Sample = (HTTP2Request) sampler; + http2Sample.setEmbeddedResources(retrieveEmbeddedResources.isSelected()); + http2Sample.setEmbeddedUrlRE(embeddedResourceUrlRegexFilter.getText()); + super.configureTestElement(sampler); + } + + @Override + public Dimension getPreferredSize() { + return getMinimumSize(); + } + + @Override + public void clearGui() { + super.clearGui(); + retrieveEmbeddedResources.setSelected(false); + useMD5.setSelected(false); + embeddedResourceUrlRegexFilter.setText(""); // $NON-NLS-1$ + sourceIpAddr.setText(""); // $NON-NLS-1$ + sourceIpType + .setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname + http2RequestPanel.clear(); + } } diff --git a/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/Http2DefaultsGui.java b/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/Http2DefaultsGui.java index 5a77d80..0070fc7 100644 --- a/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/Http2DefaultsGui.java +++ b/src/main/java/com/blazemeter/jmeter/http2/sampler/gui/Http2DefaultsGui.java @@ -18,16 +18,16 @@ package com.blazemeter.jmeter.http2.sampler.gui; +import com.blazemeter.jmeter.http2.sampler.HTTP2Request; import java.awt.BorderLayout; import java.awt.Dimension; - import javax.swing.BorderFactory; import javax.swing.JCheckBox; import javax.swing.JComboBox; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.JTextField; - import org.apache.commons.lang3.StringUtils; import org.apache.jmeter.config.ConfigTestElement; import org.apache.jmeter.config.gui.AbstractConfigGui; @@ -42,176 +42,183 @@ import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.JLabeledTextField; -import com.blazemeter.jmeter.http2.sampler.HTTP2Request; - /** * GUI for Http Request defaults */ public class Http2DefaultsGui extends AbstractConfigGui { - private static final long serialVersionUID = 241L; - - private HTTP2RequestPanel http2RequestPanel; - private JCheckBox retrieveEmbeddedResources; - private JCheckBox useMD5; - private JLabeledTextField embeddedResourceUrlRegexFilter; - private JTextField sourceIpAddr; - private JComboBox sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList()); - - public Http2DefaultsGui() { - setLayout(new BorderLayout(0, 5)); - setBorder(makeBorder()); - - http2RequestPanel = new HTTP2RequestPanel(false); - - JPanel advancedPanel = new VerticalPanel(); - advancedPanel.add(createEmbeddedRsrcPanel()); - advancedPanel.add(createSourceAddrPanel()); - advancedPanel.add(createOptionalTasksPanel()); - - JTabbedPane tabbedPane = new JTabbedPane(); - tabbedPane.add(JMeterUtils - .getResString("web_testing_basic"), http2RequestPanel); - tabbedPane.add(JMeterUtils - .getResString("web_testing_advanced"), advancedPanel); - - JPanel logoPanel = new JPanel(); - logoPanel.add(new BlazemeterLabsLogo()); - - add(makeTitlePanel(), BorderLayout.NORTH); - add(tabbedPane, BorderLayout.CENTER); - add(logoPanel, BorderLayout.SOUTH); + private static final long serialVersionUID = 241L; + + private HTTP2RequestPanel http2RequestPanel; + private JCheckBox retrieveEmbeddedResources; + private JCheckBox useMD5; + private JLabeledTextField embeddedResourceUrlRegexFilter; + private JTextField sourceIpAddr; + private JComboBox sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList()); + + public Http2DefaultsGui() { + setLayout(new BorderLayout(0, 5)); + setBorder(makeBorder()); + + http2RequestPanel = new HTTP2RequestPanel(false); + + JPanel advancedPanel = new VerticalPanel(); + advancedPanel.add(createEmbeddedRsrcPanel()); + advancedPanel.add(createSourceAddrPanel()); + advancedPanel.add(createOptionalTasksPanel()); + + JTabbedPane tabbedPane = new JTabbedPane(); + tabbedPane.add(JMeterUtils + .getResString("web_testing_basic"), http2RequestPanel); + tabbedPane.add(JMeterUtils + .getResString("web_testing_advanced"), advancedPanel); + + JPanel logoPanel = new JPanel(); + logoPanel.add(new BlazemeterLabsLogo()); + + add(makeTitlePanel(), BorderLayout.NORTH); + add(tabbedPane, BorderLayout.CENTER); + add(logoPanel, BorderLayout.SOUTH); + } + + private JPanel createEmbeddedRsrcPanel() { + // retrieve Embedded resources + retrieveEmbeddedResources = new JCheckBox( + JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$ + + final JPanel embeddedRsrcPanel = new HorizontalPanel(); + embeddedRsrcPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("web_testing_retrieve_title"))); // $NON-NLS-1$ + embeddedRsrcPanel.add(retrieveEmbeddedResources); + + embeddedResourceUrlRegexFilter = new JLabeledTextField( + JMeterUtils.getResString("web_testing_embedded_url_pattern"), 20); // $NON-NLS-1$ + embeddedRsrcPanel.add(embeddedResourceUrlRegexFilter); + + return embeddedRsrcPanel; + } + + private JPanel createSourceAddrPanel() { + final JPanel sourceAddrPanel = new HorizontalPanel(); + sourceAddrPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("web_testing_source_ip"))); // $NON-NLS-1$ + + sourceIpType + .setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname + sourceAddrPanel.add(sourceIpType); + + sourceIpAddr = new JTextField(); + sourceAddrPanel.add(sourceIpAddr); + return sourceAddrPanel; + } + + private JPanel createOptionalTasksPanel() { + // OPTIONAL TASKS + final JPanel checkBoxPanel = new VerticalPanel(); + checkBoxPanel + .setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils + .getResString("optional_tasks"))); // $NON-NLS-1$ + useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$ + checkBoxPanel.add(useMD5); + return checkBoxPanel; + } + + @Override + public String getLabelResource() { + return "DEPRECATED HTTP2 Request Defaults"; + } + + @Override + public String getStaticLabel() { + return "DEPRECATED HTTP2 Request Defaults"; + } + + /** + * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement() + */ + @Override + public TestElement createTestElement() { + ConfigTestElement config = new ConfigTestElement(); + modifyTestElement(config); + return config; + } + + /** + * Modifies a given TestElement to mirror the data in the gui components. + * + * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement) + */ + @Override + public void modifyTestElement(TestElement config) { + ConfigTestElement cfg = (ConfigTestElement) config; + ConfigTestElement el = (ConfigTestElement) http2RequestPanel.createTestElement(); + cfg.clear(); + cfg.addConfigElement(el); + super.configureTestElement(config); + if (retrieveEmbeddedResources.isSelected()) { + config.setProperty(new BooleanProperty(HTTP2Request.EMBEDDED_RESOURCES, true)); + } else { + config.removeProperty(HTTP2Request.EMBEDDED_RESOURCES); } - - private JPanel createEmbeddedRsrcPanel() { - // retrieve Embedded resources - retrieveEmbeddedResources = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$ - - final JPanel embeddedRsrcPanel = new HorizontalPanel(); - embeddedRsrcPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("web_testing_retrieve_title"))); // $NON-NLS-1$ - embeddedRsrcPanel.add(retrieveEmbeddedResources); - - embeddedResourceUrlRegexFilter = new JLabeledTextField(JMeterUtils.getResString("web_testing_embedded_url_pattern"), 20); // $NON-NLS-1$ - embeddedRsrcPanel.add(embeddedResourceUrlRegexFilter); - - return embeddedRsrcPanel; + if (useMD5.isSelected()) { + config.setProperty(new BooleanProperty(HTTP2Request.MD5, true)); + } else { + config.removeProperty(HTTP2Request.MD5); } - - private JPanel createSourceAddrPanel() { - final JPanel sourceAddrPanel = new HorizontalPanel(); - sourceAddrPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("web_testing_source_ip"))); // $NON-NLS-1$ - - sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname - sourceAddrPanel.add(sourceIpType); - - sourceIpAddr = new JTextField(); - sourceAddrPanel.add(sourceIpAddr); - return sourceAddrPanel; - } - - private JPanel createOptionalTasksPanel() { - // OPTIONAL TASKS - final JPanel checkBoxPanel = new VerticalPanel(); - checkBoxPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils - .getResString("optional_tasks"))); // $NON-NLS-1$ - useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$ - checkBoxPanel.add(useMD5); - return checkBoxPanel; - } - - @Override - public String getLabelResource() { - return "HTTP2 Request Defaults"; - } - - @Override - public String getStaticLabel() { - return "HTTP2 Request Defaults"; - } - - /** - * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement() - */ - @Override - public TestElement createTestElement() { - ConfigTestElement config = new ConfigTestElement(); - modifyTestElement(config); - return config; - } - - /** - * Modifies a given TestElement to mirror the data in the gui components. - * - * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement) - */ - @Override - public void modifyTestElement(TestElement config) { - ConfigTestElement cfg = (ConfigTestElement) config; - ConfigTestElement el = (ConfigTestElement) http2RequestPanel.createTestElement(); - cfg.clear(); - cfg.addConfigElement(el); - super.configureTestElement(config); - if (retrieveEmbeddedResources.isSelected()) { - config.setProperty(new BooleanProperty(HTTP2Request.EMBEDDED_RESOURCES, true)); - } else { - config.removeProperty(HTTP2Request.EMBEDDED_RESOURCES); - } - if (useMD5.isSelected()) { - config.setProperty(new BooleanProperty(HTTP2Request.MD5, true)); - } else { - config.removeProperty(HTTP2Request.MD5); - } - if (!StringUtils.isEmpty(embeddedResourceUrlRegexFilter.getText())) { - config.setProperty(new StringProperty(HTTP2Request.EMBEDDED_URL_REGEX, - embeddedResourceUrlRegexFilter.getText())); - } else { - config.removeProperty(HTTP2Request.EMBEDDED_URL_REGEX); - } - - if (!StringUtils.isEmpty(sourceIpAddr.getText())) { - config.setProperty(new StringProperty(HTTP2Request.IP_SOURCE, - sourceIpAddr.getText())); - config.setProperty(new IntegerProperty(HTTP2Request.IP_SOURCE_TYPE, - sourceIpType.getSelectedIndex())); - } else { - config.removeProperty(HTTP2Request.IP_SOURCE); - config.removeProperty(HTTP2Request.IP_SOURCE_TYPE); - } - } - - /** - * Implements JMeterGUIComponent.clearGui - */ - @Override - public void clearGui() { - super.clearGui(); - retrieveEmbeddedResources.setSelected(false); - useMD5.setSelected(false); - http2RequestPanel.clear(); - embeddedResourceUrlRegexFilter.setText(""); // $NON-NLS-1$ - sourceIpAddr.setText(""); // $NON-NLS-1$ - sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname - } - - @Override - public void configure(TestElement el) { - super.configure(el); - AbstractTestElement http2Sampler = (AbstractTestElement) el; - http2RequestPanel.configure(el); - retrieveEmbeddedResources.setSelected(http2Sampler.getPropertyAsBoolean(HTTP2Request.EMBEDDED_RESOURCES)); - useMD5.setSelected(http2Sampler.getPropertyAsBoolean(HTTP2Request.MD5, false)); - embeddedResourceUrlRegexFilter.setText(http2Sampler.getPropertyAsString(HTTP2Request.EMBEDDED_URL_REGEX, ""));//$NON-NLS-1$ - sourceIpAddr.setText(http2Sampler.getPropertyAsString(HTTP2Request.IP_SOURCE)); //$NON-NLS-1$ - sourceIpType.setSelectedIndex( - http2Sampler.getPropertyAsInt(HTTP2Request.IP_SOURCE_TYPE, - HTTP2Request.SOURCE_TYPE_DEFAULT)); + if (!StringUtils.isEmpty(embeddedResourceUrlRegexFilter.getText())) { + config.setProperty(new StringProperty(HTTP2Request.EMBEDDED_URL_REGEX, + embeddedResourceUrlRegexFilter.getText())); + } else { + config.removeProperty(HTTP2Request.EMBEDDED_URL_REGEX); } - @Override - public Dimension getPreferredSize() { - return getMinimumSize(); + if (!StringUtils.isEmpty(sourceIpAddr.getText())) { + config.setProperty(new StringProperty(HTTP2Request.IP_SOURCE, + sourceIpAddr.getText())); + config.setProperty(new IntegerProperty(HTTP2Request.IP_SOURCE_TYPE, + sourceIpType.getSelectedIndex())); + } else { + config.removeProperty(HTTP2Request.IP_SOURCE); + config.removeProperty(HTTP2Request.IP_SOURCE_TYPE); } + } + + /** + * Implements JMeterGUIComponent.clearGui + */ + @Override + public void clearGui() { + super.clearGui(); + retrieveEmbeddedResources.setSelected(false); + useMD5.setSelected(false); + http2RequestPanel.clear(); + embeddedResourceUrlRegexFilter.setText(""); // $NON-NLS-1$ + sourceIpAddr.setText(""); // $NON-NLS-1$ + sourceIpType + .setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname + } + + @Override + public void configure(TestElement el) { + super.configure(el); + AbstractTestElement http2Sampler = (AbstractTestElement) el; + http2RequestPanel.configure(el); + retrieveEmbeddedResources + .setSelected(http2Sampler.getPropertyAsBoolean(HTTP2Request.EMBEDDED_RESOURCES)); + useMD5.setSelected(http2Sampler.getPropertyAsBoolean(HTTP2Request.MD5, false)); + embeddedResourceUrlRegexFilter.setText( + http2Sampler.getPropertyAsString(HTTP2Request.EMBEDDED_URL_REGEX, ""));//$NON-NLS-1$ + sourceIpAddr.setText(http2Sampler.getPropertyAsString(HTTP2Request.IP_SOURCE)); //$NON-NLS-1$ + sourceIpType.setSelectedIndex( + http2Sampler.getPropertyAsInt(HTTP2Request.IP_SOURCE_TYPE, + HTTP2Request.SOURCE_TYPE_DEFAULT)); + } + + @Override + public Dimension getPreferredSize() { + return getMinimumSize(); + } } diff --git a/src/main/java/com/blazemeter/jmeter/http2/visualizers/ViewResultsFullVisualizer.java b/src/main/java/com/blazemeter/jmeter/http2/visualizers/ViewResultsFullVisualizer.java index 51e6857..4e16e0e 100644 --- a/src/main/java/com/blazemeter/jmeter/http2/visualizers/ViewResultsFullVisualizer.java +++ b/src/main/java/com/blazemeter/jmeter/http2/visualizers/ViewResultsFullVisualizer.java @@ -67,7 +67,7 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer private static final Logger LOG = LoggerFactory .getLogger(org.apache.jmeter.visualizers.ViewResultsFullVisualizer.class); - public static final String VIEW_RESULT_TREE_HTTP2_TITLE = "View Result Tree Http2"; + public static final String VIEW_RESULT_TREE_HTTP2_TITLE = "DEPRECATED View Result Tree Http2"; protected static final String COMBO_CHANGE_COMMAND = "change_combo"; private static final Border RED_BORDER = BorderFactory.createLineBorder(Color.red); private static final Border BLUE_BORDER = BorderFactory.createLineBorder(Color.blue);