Client: code refactor

Signed-off-by: Simon Bennetts <psiinon@gmail.com>

addOns/client/src/main/java/org/zaproxy/addon/client/ClientHistoryTableModel.java

@@ -24,6 +24,9 @@
 import java.util.List;
 import javax.swing.table.AbstractTableModel;
 import org.parosproxy.paros.Constant;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedEvent;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 public class ClientHistoryTableModel extends AbstractTableModel {
 

addOns/client/src/main/java/org/zaproxy/addon/client/ClientIntegrationAPI.java

@@ -28,6 +28,11 @@
 import org.parosproxy.paros.network.HttpHeader;
 import org.parosproxy.paros.network.HttpMessage;
 import org.parosproxy.paros.network.HttpRequestHeader;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
+import org.zaproxy.addon.client.internal.ClientSideDetails;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedEvent;
 import org.zaproxy.zap.extension.api.API;
 import org.zaproxy.zap.extension.api.ApiAction;
 import org.zaproxy.zap.extension.api.ApiException;

addOns/client/src/main/java/org/zaproxy/addon/client/ComponentTableModel.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import javax.swing.table.AbstractTableModel;
 import org.parosproxy.paros.Constant;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
 
 public class ComponentTableModel extends AbstractTableModel {
 

addOns/client/src/main/java/org/zaproxy/addon/client/ExtensionClientIntegration.java

@@ -48,12 +48,29 @@
 import org.parosproxy.paros.model.SiteNode;
 import org.parosproxy.paros.view.View;
 import org.zaproxy.addon.client.impl.ClientZestRecorder;
+import org.zaproxy.addon.client.internal.ClientMap;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
+import org.zaproxy.addon.client.internal.ClientSideDetails;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedEvent;
+import org.zaproxy.addon.client.internal.ReportedObject;
 import org.zaproxy.addon.client.pscan.ClientPassiveScanController;
 import org.zaproxy.addon.client.pscan.ClientPassiveScanHelper;
 import org.zaproxy.addon.client.pscan.OptionsPassiveScan;
 import org.zaproxy.addon.client.spider.ClientSpider;
 import org.zaproxy.addon.client.spider.ClientSpiderDialog;
 import org.zaproxy.addon.client.spider.PopupMenuSpider;
+import org.zaproxy.addon.client.ui.ClientDetailsPanel;
+import org.zaproxy.addon.client.ui.ClientHistoryPanel;
+import org.zaproxy.addon.client.ui.ClientMapPanel;
+import org.zaproxy.addon.client.ui.PopupMenuClientAttack;
+import org.zaproxy.addon.client.ui.PopupMenuClientCopyUrls;
+import org.zaproxy.addon.client.ui.PopupMenuClientDelete;
+import org.zaproxy.addon.client.ui.PopupMenuClientDetailsCopy;
+import org.zaproxy.addon.client.ui.PopupMenuClientHistoryCopy;
+import org.zaproxy.addon.client.ui.PopupMenuClientOpenInBrowser;
+import org.zaproxy.addon.client.ui.PopupMenuClientShowInSites;
 import org.zaproxy.addon.network.ExtensionNetwork;
 import org.zaproxy.zap.ZAP;
 import org.zaproxy.zap.eventBus.Event;
@@ -75,9 +92,9 @@ public class ExtensionClientIntegration extends ExtensionAdaptor {
 
     private static final String FIREFOX_PROFILES_INI = "profiles.ini";
 
-    protected static final String PREFIX = "client";
+    public static final String PREFIX = "client";
 
-    protected static final String RESOURCES = "resources";
+    public static final String RESOURCES = "resources";
 
     private static final Logger LOGGER = LogManager.getLogger(ExtensionClientIntegration.class);
 

addOns/client/src/main/java/org/zaproxy/addon/client/MissingUrlsThread.java

@@ -31,6 +31,8 @@
 import org.parosproxy.paros.network.HttpRequestHeader;
 import org.parosproxy.paros.network.HttpSender;
 import org.parosproxy.paros.view.View;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideDetails;
 import org.zaproxy.zap.eventBus.Event;
 import org.zaproxy.zap.model.SessionStructure;
 import org.zaproxy.zap.model.StructuralNode;

addOns/client/src/main/java/org/zaproxy/addon/client/ClientMap.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ClientMap.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -27,6 +27,7 @@
 import javax.swing.tree.TreeNode;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.zaproxy.addon.client.ClientUtils;
 import org.zaproxy.zap.ZAP;
 import org.zaproxy.zap.eventBus.Event;
 import org.zaproxy.zap.eventBus.EventPublisher;

addOns/client/src/main/java/org/zaproxy/addon/client/ClientNode.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ClientNode.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import java.util.ArrayList;
 import java.util.List;

addOns/client/src/main/java/org/zaproxy/addon/client/ClientSideComponent.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ClientSideComponent.java

@@ -17,11 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import java.util.Objects;
 import net.sf.json.JSONObject;
 import org.parosproxy.paros.Constant;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
 
 public class ClientSideComponent {
 

addOns/client/src/main/java/org/zaproxy/addon/client/ClientSideDetails.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ClientSideDetails.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import java.util.HashSet;
 import java.util.Set;

addOns/client/src/main/java/org/zaproxy/addon/client/ReportedElement.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ReportedElement.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import net.sf.json.JSONObject;
 

addOns/client/src/main/java/org/zaproxy/addon/client/ReportedEvent.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ReportedEvent.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import net.sf.json.JSONObject;
 

addOns/client/src/main/java/org/zaproxy/addon/client/ReportedObject.java → addOns/client/src/main/java/org/zaproxy/addon/client/internal/ReportedObject.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.internal;
 
 import java.util.Date;
 import net.sf.json.JSONObject;

addOns/client/src/main/java/org/zaproxy/addon/client/pscan/ClientPassiveAbstractScanRule.java

@@ -21,7 +21,7 @@
 
 import org.parosproxy.paros.core.scanner.Alert;
 import org.parosproxy.paros.core.scanner.Alert.Source;
-import org.zaproxy.addon.client.ReportedObject;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 public abstract class ClientPassiveAbstractScanRule implements ClientPassiveScanRule {
 

addOns/client/src/main/java/org/zaproxy/addon/client/pscan/ClientPassiveScanRule.java

@@ -19,7 +19,7 @@
  */
 package org.zaproxy.addon.client.pscan;
 
-import org.zaproxy.addon.client.ReportedObject;
+import org.zaproxy.addon.client.internal.ReportedObject;
 import org.zaproxy.zap.extension.alert.ExampleAlertProvider;
 
 public interface ClientPassiveScanRule extends ExampleAlertProvider {

addOns/client/src/main/java/org/zaproxy/addon/client/pscan/InformationInStorageScanRule.java

@@ -25,8 +25,8 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.core.scanner.Alert;
 import org.zaproxy.addon.client.ClientUtils;
-import org.zaproxy.addon.client.ReportedElement;
-import org.zaproxy.addon.client.ReportedObject;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 public class InformationInStorageScanRule extends ClientPassiveAbstractScanRule {
 

addOns/client/src/main/java/org/zaproxy/addon/client/pscan/JwtInStorageScanRule.java

@@ -28,8 +28,8 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.core.scanner.Alert;
 import org.zaproxy.addon.client.ClientUtils;
-import org.zaproxy.addon.client.ReportedElement;
-import org.zaproxy.addon.client.ReportedObject;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 public class JwtInStorageScanRule extends ClientPassiveAbstractScanRule {
 

addOns/client/src/main/java/org/zaproxy/addon/client/pscan/SensitiveInfoInStorageScanRule.java

@@ -28,8 +28,8 @@
 import org.parosproxy.paros.core.scanner.Alert;
 import org.parosproxy.paros.model.HistoryReference;
 import org.zaproxy.addon.client.ClientUtils;
-import org.zaproxy.addon.client.ReportedElement;
-import org.zaproxy.addon.client.ReportedObject;
+import org.zaproxy.addon.client.internal.ReportedElement;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 public class SensitiveInfoInStorageScanRule extends ClientPassiveAbstractScanRule {
 

addOns/client/src/main/java/org/zaproxy/addon/client/spider/ClientSpider.java

@@ -35,10 +35,10 @@
 import org.openqa.selenium.WebDriver;
 import org.parosproxy.paros.control.Control;
 import org.parosproxy.paros.view.View;
-import org.zaproxy.addon.client.ClientMap;
-import org.zaproxy.addon.client.ClientNode;
 import org.zaproxy.addon.client.ClientOptions;
 import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ClientMap;
+import org.zaproxy.addon.client.internal.ClientNode;
 import org.zaproxy.zap.ZAP;
 import org.zaproxy.zap.eventBus.Event;
 import org.zaproxy.zap.eventBus.EventConsumer;

addOns/client/src/main/java/org/zaproxy/addon/client/ClientDetailsPanel.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/ClientDetailsPanel.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -29,6 +29,9 @@
 import javax.swing.JScrollPane;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.AbstractPanel;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
 import org.zaproxy.zap.view.LayoutHelper;
 
 public class ClientDetailsPanel extends AbstractPanel {

addOns/client/src/main/java/org/zaproxy/addon/client/ClientHistoryPanel.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/ClientHistoryPanel.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.Component;
 import java.awt.GridBagLayout;
@@ -35,6 +35,9 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.AbstractPanel;
 import org.parosproxy.paros.view.View;
+import org.zaproxy.addon.client.ClientHistoryTableModel;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ReportedObject;
 import org.zaproxy.zap.utils.FontUtils;
 import org.zaproxy.zap.view.LayoutHelper;
 import org.zaproxy.zap.view.ZapTable;

addOns/client/src/main/java/org/zaproxy/addon/client/ClientMapPanel.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/ClientMapPanel.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.Component;
 import java.awt.GridBagConstraints;
@@ -36,6 +36,9 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.AbstractPanel;
 import org.parosproxy.paros.view.View;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ClientMap;
+import org.zaproxy.addon.client.internal.ClientNode;
 import org.zaproxy.zap.view.LayoutHelper;
 
 @SuppressWarnings("serial")

addOns/client/src/main/java/org/zaproxy/addon/client/ClientMapTreeCellRenderer.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/ClientMapTreeCellRenderer.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -26,6 +26,9 @@
 import javax.swing.JPanel;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideDetails;
 import org.zaproxy.zap.utils.DisplayUtils;
 import org.zaproxy.zap.view.OverlayIcon;
 

addOns/client/src/main/java/org/zaproxy/addon/client/ClientNodeDetailsPanel.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/ClientNodeDetailsPanel.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -33,6 +33,10 @@
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.AbstractPanel;
 import org.parosproxy.paros.view.View;
+import org.zaproxy.addon.client.ComponentTableModel;
+import org.zaproxy.addon.client.ExtensionClientIntegration;
+import org.zaproxy.addon.client.internal.ClientNode;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
 import org.zaproxy.zap.view.ZapTable;
 
 public class ClientNodeDetailsPanel extends AbstractPanel {

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientAttack.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientAttack.java

@@ -17,13 +17,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.Component;
 import java.util.List;
 import javax.swing.JTree;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.extension.ExtensionPopupMenuItem;
+import org.zaproxy.addon.client.internal.ClientNode;
 import org.zaproxy.zap.extension.ExtensionPopupMenu;
 
 public class PopupMenuClientAttack extends ExtensionPopupMenu {

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientCopyUrls.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientCopyUrls.java

@@ -17,10 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.event.ActionEvent;
 import org.parosproxy.paros.Constant;
+import org.zaproxy.addon.client.ClientUtils;
+import org.zaproxy.addon.client.internal.ClientNode;
 
 public class PopupMenuClientCopyUrls extends PopupMenuItemClient {
 

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientDelete.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientDelete.java

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.event.ActionEvent;
 import javax.swing.JOptionPane;

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientDetailsCopy.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientDetailsCopy.java

@@ -17,10 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.event.ActionEvent;
 import java.util.function.Function;
+import org.zaproxy.addon.client.ClientUtils;
+import org.zaproxy.addon.client.internal.ClientSideComponent;
 
 @SuppressWarnings("serial")
 public class PopupMenuClientDetailsCopy extends PopupMenuItemClientDetails {

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientHistoryCopy.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientHistoryCopy.java

@@ -17,10 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.event.ActionEvent;
 import java.util.function.Function;
+import org.zaproxy.addon.client.ClientUtils;
+import org.zaproxy.addon.client.internal.ReportedObject;
 
 @SuppressWarnings("serial")
 public class PopupMenuClientHistoryCopy extends PopupMenuItemClientHistory {

addOns/client/src/main/java/org/zaproxy/addon/client/PopupMenuClientOpenInBrowser.java → addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientOpenInBrowser.java

@@ -17,13 +17,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zaproxy.addon.client;
+package org.zaproxy.addon.client.ui;
 
 import java.awt.Component;
 import java.util.List;
 import javax.swing.JTree;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.control.Control;
+import org.zaproxy.addon.client.internal.ClientNode;
 import org.zaproxy.zap.extension.ExtensionPopupMenu;
 import org.zaproxy.zap.extension.selenium.Browser;
 import org.zaproxy.zap.extension.selenium.ExtensionSelenium;