[patch] Allow to use ProxyControl in non GUI mode

0001-Allow-to-override-the-JMeterTreeModel-for-non-GUI-mo.patch (text/plain), 6.94 KB, created by Felix Schumacher on 2016-10-20 20:16:05 UTC

(hide)

Description: Allow to use ProxyControl in non GUI mode

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2016-10-20 20:16:05 UTC

Size: 6.94 KB

patch

obsolete

>From f49e763a418f230c9755056a7e935b008e6893d2 Mon Sep 17 00:00:00 2001 >From: Felix Schumacher <felix.schumacher@internetallee.de> >Date: Thu, 20 Oct 2016 22:11:36 +0200 >Subject: [PATCH] Allow to override the JMeterTreeModel for non-GUI mode > >--- > .../jmeter/protocol/http/proxy/ProxyControl.java | 51 ++++++++++++++++++---- > 1 file changed, 42 insertions(+), 9 deletions(-) > >diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java >index c9a2e10..989cba8 100644 >--- a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java >+++ b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java >@@ -301,6 +301,8 @@ public class ProxyControl extends GenericController { > > private String keyPassword; > >+ private JMeterTreeModel nonGuiTreeModel; >+ > public ProxyControl() { > setPort(DEFAULT_PORT); > setExcludeList(new HashSet<String>()); >@@ -308,6 +310,19 @@ public class ProxyControl extends GenericController { > setCaptureHttpHeaders(true); // maintain original behaviour > } > >+ /** >+ * Set a {@link JMeterTreeModel} to be used by the ProxyControl, when used >+ * in a non-GUI environment, where the {@link JMeterTreeModel} can't be >+ * acquired through {@link GuiPackage#getTreeModel()} >+ * >+ * @param treeModel >+ * the {@link JMeterTreeModel} to be used, or {@code null} when >+ * the GUI model should be used >+ */ >+ public void setNonGuiTreeModel(JMeterTreeModel treeModel) { >+ this.nonGuiTreeModel = treeModel; >+ } >+ > public void setPort(int port) { > this.setProperty(new IntegerProperty(PORT, port)); > } >@@ -475,6 +490,13 @@ public class ProxyControl extends GenericController { > return getPropertyAsString(CONTENT_TYPE_INCLUDE); > } > >+ /** >+ * @return the {@link JMeterTreeModel} used when run in non-GUI mode, or {@code null} when run in GUI mode >+ */ >+ public JMeterTreeModel getNonGuiTreeModel() { >+ return nonGuiTreeModel; >+ } >+ > public void addConfigElement(ConfigElement config) { > // NOOP > } >@@ -493,7 +515,9 @@ public class ProxyControl extends GenericController { > try { > server = new Daemon(getPort(), this); > server.start(); >- GuiPackage.getInstance().register(server); >+ if (GuiPackage.getInstance() != null) { >+ GuiPackage.getInstance().register(server); >+ } > } catch (IOException e) { > log.error("Could not create Proxy daemon", e); > throw e; >@@ -682,7 +706,9 @@ public class ProxyControl extends GenericController { > public void stopProxy() { > if (server != null) { > server.stopServer(); >- GuiPackage.getInstance().unregister(server); >+ if (GuiPackage.getInstance() != null) { >+ GuiPackage.getInstance().unregister(server); >+ } > try { > server.join(1000); // wait for server to stop > } catch (InterruptedException e) { >@@ -819,7 +845,7 @@ public class ProxyControl extends GenericController { > * @param target {@link JMeterTreeNode} > */ > private void setAuthorization(Authorization authorization, JMeterTreeNode target) { >- JMeterTreeModel jmeterTreeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel jmeterTreeModel = getJmeterTreeModel(); > List<JMeterTreeNode> authManagerNodes = jmeterTreeModel.getNodesOfType(AuthManager.class); > if (authManagerNodes.size() == 0) { > try { >@@ -835,6 +861,13 @@ public class ProxyControl extends GenericController { > } > } > >+ private JMeterTreeModel getJmeterTreeModel() { >+ if (this.nonGuiTreeModel == null) { >+ return GuiPackage.getInstance().getTreeModel(); >+ } >+ return this.nonGuiTreeModel; >+ } >+ > /** > * Helper method to add a Response Assertion > * Called from AWT Event thread >@@ -980,7 +1013,7 @@ public class ProxyControl extends GenericController { > * <code>null</code> if none was found. > */ > private JMeterTreeNode findFirstNodeOfType(Class<?> type) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel treeModel = getJmeterTreeModel(); > List<JMeterTreeNode> nodes = treeModel.getNodesOfType(type); > for (JMeterTreeNode node : nodes) { > if (node.isEnabled()) { >@@ -1046,7 +1079,7 @@ public class ProxyControl extends GenericController { > */ > // TODO - could be converted to generic class? > private Collection<?> findApplicableElements(JMeterTreeNode myTarget, Class<? extends TestElement> myClass, boolean ascending) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel treeModel = getJmeterTreeModel(); > LinkedList<TestElement> elements = new LinkedList<>(); > > // Look for elements directly within the HTTP proxy: >@@ -1104,7 +1137,7 @@ public class ProxyControl extends GenericController { > private void placeSampler(final HTTPSamplerBase sampler, final TestElement[] testElements, > JMeterTreeNode myTarget) { > try { >- final JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ final JMeterTreeModel treeModel = getJmeterTreeModel(); > > boolean firstInBatch = false; > long now = System.currentTimeMillis(); >@@ -1326,7 +1359,7 @@ public class ProxyControl extends GenericController { > * sampling event to be delivered > */ > private void notifySampleListeners(SampleEvent event) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel treeModel = getJmeterTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) { >@@ -1345,7 +1378,7 @@ public class ProxyControl extends GenericController { > * (here meaning the proxy recording) has started. > */ > private void notifyTestListenersOfStart() { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel treeModel = getJmeterTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) { >@@ -1364,7 +1397,7 @@ public class ProxyControl extends GenericController { > * (here meaning the proxy recording) has ended. > */ > private void notifyTestListenersOfEnd() { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >+ JMeterTreeModel treeModel = getJmeterTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) { >-- >2.7.4 > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]