Merge pull request #19 from Blazemeter/DEPRECATE_VERSION

Deprecate this version and add a warning message to update to new version
Blazemeter · Dec 21, 2021 · 5392fa5 · 5392fa5
2 parents bff399f + c2dbf89
commit 5392fa5
Show file tree

Hide file tree

Showing 8 changed files with 319 additions and 330 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/.travis/install-maven-dependency.sh b/.travis/install-maven-dependency.sh
diff --git 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
@@ -7,7 +7,7 @@
     <groupId>com.blazemeter</groupId>
     <artifactId>jmeter-bzm-http2</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <name>HTTP/2 Sampler</name>
     <description>HTTP/2 protocol sampler</description>
     <licenses>

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
@@ -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<String> 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<String> 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();
+  }
 
 }