Merge pull request #48 from gdgd009xcd/ARCADIUS241220

## [v1.2.4] - 2024-12-25

Author: gdgd009xcd

README.md

@@ -48,7 +48,7 @@ The add-on is built with [Gradle]: https://gradle.org/
 
 To download & build this addon, simply run:  
 
-    $ git clone https://github.com/gdgd009xcd/RequestRecorder.git  
+    $ git clone https://github.com/gdgd009xcd/RequestRecorder.git 
     $ cd RequestRecorder/  
     $ ./gradlew addOns:requestRecorderForZAP:jarZapAddOn  
 

addOns/requestRecorderForZAP/CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this add-on will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [v1.2.4] - 2024-12-25
+### Changed
+- maintenance: code was changed to prepare for new java version and ubuntu 24.04
+- maintenance: reduced noisy log message in the console.
+
 ## [v1.2.3] - 2024-12-17
 ### Changed
 - maintenance: code was changed to prepare for new java version and ubuntu 24.04

addOns/requestRecorderForZAP/requestRecorderForZAP.gradle.kts

@@ -1,6 +1,6 @@
 import org.zaproxy.gradle.addon.AddOnStatus
 
-version = "1.2.3"
+version = "1.2.4"
 description = "RequestRecorder for ZAP"
 
 tasks.withType<JavaCompile> {

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java

@@ -421,7 +421,7 @@ public void clearLastAppValueNOCOUNT() {
             int plast = parmlist.size() - 1;
             if (plast >= 0) {
                 AppValue av = parmlist.get(plast);
-                av.clearNoCount();
+                av.clearNoCountExported();
                 parmlist.set(plast, av);
             }
         }

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java

@@ -30,7 +30,7 @@
 //
 // class AppValue
 //
-public final class AppValue {
+public class AppValue {
     private static org.apache.logging.log4j.Logger LOGGER4J =
             org.apache.logging.log4j.LogManager.getLogger();
 
@@ -160,7 +160,7 @@ public AppValue() {
         resRegexPos = -1;
     }
 
-    public AppValue(String _Type, boolean _disabled, String _value) {
+    AppValue(String _Type, boolean _disabled, String _value) {
         initctype();
         setValPart(_Type);
         setEnabled(!_disabled); // NOT
@@ -221,9 +221,9 @@ public AppValue(
         setEnabled(!_disabled); // NOT
         // value = _value;
         setVal(_value);
-        setresURL(_resURL);
+        setResURL(_resURL);
         setresRegex(_resRegex);
-        setresPartType(_resPartType);
+        setResPartType(_resPartType);
         setResRegexPosFromString(_resRegexPos);
         token = _token;
         urlencode = _urlenc;
@@ -372,10 +372,14 @@ public boolean isEnabled() {
         return enabled;
     }
 
-    public void setEnabled(boolean b) {
+    private void setEnabled(boolean b) {
         enabled = b;
     }
 
+    public void setEnabledExported(boolean b) {
+        setEnabled(b);
+    }
+
     /**
      * Get ResEncodeTypes : response page content type JSON/RAW/URLENCODE..
      *
@@ -437,7 +441,7 @@ String QUOTE_PREFCOMMA(String t) {
         return "";
     }
 
-    public void setresURL(String _url) {
+    private void setResURL(String _url) {
         if (_url == null) _url = "";
         resURL = _url.trim();
         try {
@@ -448,6 +452,10 @@ public void setresURL(String _url) {
         }
     }
 
+    public void setResURLExported(String _url) {
+        setResURL(_url);
+    }
+
     public String getresURL() {
         return resURL;
     }
@@ -478,7 +486,7 @@ public void setresRegexURLencoded(String _regex) {
         setresRegex(ParmGenUtil.URLdecode(_regex, JSONFileIANACharsetName));
     }
 
-    public void setresRegex(String _regex) {
+    private void setresRegex(String _regex) {
         if (_regex == null) _regex = "";
         resRegex = _regex;
         try {
@@ -494,7 +502,7 @@ public void setresRegex(String _regex) {
      *
      * @param _regex
      */
-    public void setCondRegex(String _regex) {
+    private void setCondRegex(String _regex) {
         if (_regex == null) _regex = "";
         this.condRegex = _regex;
         try {
@@ -587,11 +595,15 @@ public void setReplaceZeroSize(boolean b) {
         this.replaceZeroSize = b;
     }
 
-    public void setresPartType(String respart) {
+    private void setResPartType(String respart) {
         if (respart == null) respart = "";
         resPartType = parseValPartType(respart);
     }
 
+    public void setResPartTypeExported(String respart) {
+        setResPartType(respart);
+    }
+
     /**
      * Get resRegexPos value
      *
@@ -615,14 +627,18 @@ public void setResRegexPos(int resRegexPos) {
      *
      * @param _resregexpos
      */
-    public void setResRegexPosFromString(String _resregexpos) {
+    private void setResRegexPosFromString(String _resregexpos) {
         this.resRegexPos = Integer.parseInt(_resregexpos);
     }
 
-    public int getTypeInt() {
+    private int getTypeInt() {
         return valparttype & C_VTYPE;
     }
 
+    public int getTypeIntExported() {
+        return getTypeInt();
+    }
+
     public void setTypeInt(int t) {
         valparttype = t;
     }
@@ -709,7 +725,11 @@ public static int parseValPartType(String _valtype) {
         return _valparttype;
     }
 
-    public boolean setValPart(String _valtype) {
+    public boolean setValPartExported(String _valtype) {
+        return setValPart(_valtype);
+    }
+
+    private boolean setValPart(String _valtype) {
         boolean noerror = false;
         valparttype = parseValPartType(_valtype);
         //
@@ -730,14 +750,22 @@ public boolean setValPart(String _valtype) {
         return noerror;
     }
 
-    void setNoCount() {
+    private void setNoCount() {
         valparttype = valparttype | C_NOCOUNT;
     }
 
-    public void clearNoCount() {
+    public void setNoCountExported() {
+        setNoCount();
+    }
+
+    private void clearNoCount() {
         valparttype = valparttype & ~C_NOCOUNT;
     }
 
+    public void clearNoCountExported() {
+        clearNoCount();
+    }
+
     public boolean isNoCount() {
         return ((valparttype & C_NOCOUNT) == C_NOCOUNT ? true : false);
     }
@@ -757,7 +785,7 @@ public boolean setURLencodedVal(String _value) {
         return noerror;
     }
 
-    void setVal(String _value) {
+    private void setVal(String _value) {
         valueregex = null;
         value = _value;
         if (value != null) {

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java

@@ -24,11 +24,16 @@
  * @author gdgd009xcd
  */
 @SuppressWarnings("serial")
-public final class LineWrapRenderer extends JTextArea implements TableCellRenderer {
+public class LineWrapRenderer extends JTextArea implements TableCellRenderer {
     private static org.apache.logging.log4j.Logger LOGGER4J =
             org.apache.logging.log4j.LogManager.getLogger();
 
-    public LineWrapRenderer() {
+    /**
+     * Constructor for the LineWrapRenderer class.<br>
+     * this constructor is package-private.<br>
+     * this means that this class can be instantiated only in this package.
+     */
+    LineWrapRenderer() {
         super();
         setLineWrap(true);
     }

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/OneThreadProcessor.java

@@ -23,7 +23,7 @@
  *
  * @author gdgd009xcd
  */
-public final class OneThreadProcessor {
+public class OneThreadProcessor {
     private static org.apache.logging.log4j.Logger LOGGER4J =
             org.apache.logging.log4j.LogManager.getLogger();
     final Level DEBUGPROCESS = Level.getLevel("DEBUGPROCESS");
@@ -41,15 +41,16 @@ public final class OneThreadProcessor {
     private Object optdata = null;
 
     /**
-     * Newly create doaction.
-     *
-     * <p>it call void startAction(ThreadManager tm, OneThreadProcessor otp)
+     * Newly create doaction.<br>
+     * this constructor is package-private.<br>
+     * this means that this class can be instantiated only in this package.<br>
+     * this calls void startAction(ThreadManager tm, OneThreadProcessor otp)
      *
      * @param tm
      * @param th
      * @param provider
      */
-    public OneThreadProcessor(ThreadManager tm, Thread th, InterfaceDoActionProvider provider) {
+    OneThreadProcessor(ThreadManager tm, Thread th, InterfaceDoActionProvider provider) {
         this.doaction = provider.getDoActionInstance();
         this.seqno = provider.getSequnceNo();
         this.th = th;

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGen.java

@@ -80,7 +80,7 @@ PRequest ParseRequest(
         LOGGER4J.debug("method[" + method + "] request[" + url + "]");
         int qpos = -1;
         String[] nvcont = null;
-        switch (av.getTypeInt()) {
+        switch (av.getTypeIntExported()) {
                 // switch(av.valparttype & AppValue.C_VTYPE){
             case AppValue.V_PATH: // path
                 // path = url
@@ -212,13 +212,13 @@ PRequest ParseRequest(
                                 LOGGER4J.trace(" Original body[" + content + "]");
                                 LOGGER4J.trace(" Modified body[" + n_content + "]");
                                 try {
-                                    _contarray.initParmGenBinUtil(
+                                    _contarray.initParmGenBinUtilExported(
                                             n_content.getBytes(
                                                     requestBodyEncode.getIANACharsetName()));
                                 } catch (UnsupportedEncodingException ex) {
                                     Logger.getLogger(ParmGen.class.getName())
                                             .log(Level.SEVERE, null, ex);
-                                    _contarray.initParmGenBinUtil(n_content.getBytes());
+                                    _contarray.initParmGenBinUtilExported(n_content.getBytes());
                                 }
                                 if (org_request != null
                                         && org_content_iso8859 != null
@@ -367,7 +367,7 @@ PRequest ParseRequest(
 
                         if (partupdt) {
                             // _contarray = n_array;
-                            _contarray.initParmGenBinUtil(n_array.getBytes());
+                            _contarray.initParmGenBinUtilExported(n_array.getBytes());
                             if (org_content_isupdated) {
                                 if (org_request != null
                                         && org_content_iso8859 != null

addOns/requestRecorderForZAP/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBinUtil.java

@@ -9,7 +9,7 @@
 //
 // ByteArray
 //
-public final class ParmGenBinUtil {
+public class ParmGenBinUtil {
 
     private ByteArrayOutputStream bstream = null;
 
@@ -21,9 +21,13 @@ public ParmGenBinUtil(byte[] bin) {
         initParmGenBinUtil(bin);
     }
 
-    public void initParmGenBinUtil(byte[] bin) {
+    private void initParmGenBinUtil(byte[] bin) {
         bstream = new ByteArrayOutputStream();
-        concat(bin);
+        concatInternal(bin);
+    }
+
+    public void initParmGenBinUtilExported(byte[] bin) {
+        initParmGenBinUtil(bin);
     }
 
     public int length() {
@@ -36,7 +40,7 @@ public int length() {
      * @param bin
      * @return
      */
-    public boolean concat(byte[] bin) {
+    private boolean concatInternal(byte[] bin) {
 
         if ((bin == null)) {
             return false;
@@ -51,6 +55,10 @@ public boolean concat(byte[] bin) {
         return true;
     }
 
+    public boolean concat(byte[] bin) {
+        return concatInternal(bin);
+    }
+
     public byte[] getBytes() {
         if (bstream == null) {
             return null;