WIP: add HTTPSampler.responseProcessing enum instead of useMd5 boolean

Author: vlsi

src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java

@@ -32,7 +32,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.EnumUtils;
+import org.apache.jorphan.gui.LocalizableEnum;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
@@ -70,20 +70,20 @@
 public class CSVDataSet extends ConfigTestElement
     implements TestBean, LoopIterationListener, NoConfigMerge {
 
-    public enum ShareMode {
+    public enum ShareMode implements LocalizableEnum {
         ALL("shareMode.all"),
         GROUP("shareMode.group"),
         THREAD("shareMode.thread");
 
-        private final String value;
+        private final String propertyName;
 
-        ShareMode(String value) {
-            this.value = value;
+        ShareMode(String propertyName) {
+            this.propertyName = propertyName;
         }
 
         @Override
-        public String toString() {
-            return value;
+        public String getResourceKey() {
+            return propertyName;
         }
     }
 

src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java

@@ -32,6 +32,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.IdentityKey;
+import org.apache.jorphan.gui.LocalizableEnum;
 import org.apache.jorphan.util.EnumUtils;
 import org.apiguardian.api.API;
 
@@ -71,7 +72,7 @@ private static class ThroughputInfo{
     /**
      * This enum defines the calculation modes used by the ConstantThroughputTimer.
      */
-    public enum Mode {
+    public enum Mode implements LocalizableEnum {
         ThisThreadOnly("calcMode.1"), // NOSONAR Keep naming for compatibility
         AllActiveThreads("calcMode.2"), // NOSONAR Keep naming for compatibility
         AllActiveThreadsInCurrentThreadGroup("calcMode.3"), // NOSONAR Keep naming for compatibility
@@ -89,6 +90,11 @@ public enum Mode {
         public String toString() {
             return propertyName;
         }
+
+        @Override
+        public String getResourceKey() {
+            return propertyName;
+        }
     }
 
     /**
@@ -163,7 +169,7 @@ public Mode getMode() {
     @Deprecated
     @SuppressWarnings("EnumOrdinal")
     public void setCalcMode(int mode) {
-        setMode(EnumUtils.values(Mode.class).get(mode));
+        setMode(EnumUtils.getEnumValues(Mode.class).get(mode));
     }
 
     @SuppressWarnings("EnumOrdinal")

src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java

@@ -1681,13 +1681,13 @@ public void setTestLogicalAction(TestLogicalAction testLogicalAction) {
     }
 
     /**
-     * Sets the response data and its compression encoding.
+     * Sets the response data and its contentEncoding.
      * @param data The response data
-     * @param encoding The content encoding (e.g. gzip, deflate)
+     * @param contentEncoding The content contentEncoding (e.g. gzip, deflate)
      */
-    public void setResponseData(byte[] data, String encoding) {
+    public void setResponseData(byte[] data, String contentEncoding) {
         responseData = data == null ? EMPTY_BA : data;
-        contentEncoding = encoding;
+        this.contentEncoding = contentEncoding;
         responseDataAsString = null;
     }
 }

src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java

@@ -31,6 +31,7 @@
 import javax.swing.JList;
 
 import org.apache.jmeter.gui.ClearGui;
+import org.apache.jorphan.gui.LocalizableEnum;
 import org.apache.jorphan.util.EnumUtils;
 
 /**
@@ -41,34 +42,32 @@
  * The provided GUI is a combo box with an option for each value in the enum.
  * <p>
  */
-class EnumEditor extends PropertyEditorSupport implements ClearGui {
+class EnumEditor<T extends Enum<?> & LocalizableEnum> extends PropertyEditorSupport implements ClearGui {
+    private final JComboBox<T> combo;
 
-    private final JComboBox<Enum<?>> combo;
+    private final T defaultValue;
 
-    private final Enum<?> defaultValue;
-
-    public EnumEditor(final PropertyDescriptor descriptor, final Class<? extends Enum<?>> enumClazz, final ResourceBundle rb) {
-        DefaultComboBoxModel<Enum<?>> model = new DefaultComboBoxModel<>();
+    public EnumEditor(final PropertyDescriptor descriptor, final Class<T> enumClass, final ResourceBundle rb) {
+        DefaultComboBoxModel<T> model = new DefaultComboBoxModel<>();
         combo = new JComboBox<>(model);
         combo.setEditable(false);
         combo.setRenderer(
                 new DefaultListCellRenderer() {
                     @Override
                     public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                         JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-                        Enum<?> enumValue = (Enum<?>) value;
-                        label.setText(rb.getString(EnumUtils.getStringValue(enumValue)));
+                        label.setText(rb.getString(enumClass.cast(value).getResourceKey()));
                         return label;
                     }
                 }
         );
-        List<? extends Enum<?>> values = EnumUtils.values(enumClazz);
-        for(Enum<?> e : values) {
+        List<T> values = EnumUtils.getEnumValues(enumClass);
+        for (T e : values) {
             model.addElement(e);
         }
         Object def = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
         if (def instanceof Enum<?> enumValue) {
-            defaultValue = enumValue;
+            defaultValue = enumClass.cast(enumValue);
         } else if (def instanceof Integer index) {
             defaultValue = values.get(index);
         } else {
@@ -99,25 +98,24 @@ public void setValue(Object value) {
         } else if (value instanceof Integer integer) {
             combo.setSelectedIndex(integer);
         } else if (value instanceof String string) {
-            ComboBoxModel<Enum<?>> model = combo.getModel();
-            for (int i = 0; i < model.getSize(); i++) {
-                Enum<?> element = model.getElementAt(i);
-                if (EnumUtils.getStringValue(element).equals(string)) {
-                    combo.setSelectedItem(element);
-                    return;
-                }
-            }
+            setAsText(string);
         }
     }
 
     @Override
     public void setAsText(String value) {
-        throw new UnsupportedOperationException("Not supported yet. Use enum value rather than text, got " + value);
+        ComboBoxModel<T> model = combo.getModel();
+        for (int i = 0; i < model.getSize(); i++) {
+            T element = model.getElementAt(i);
+            if (value.equals(element.getResourceKey())) {
+                combo.setSelectedItem(element);
+                return;
+            }
+        }
     }
 
     @Override
     public void clearGui() {
         combo.setSelectedItem(defaultValue);
     }
-
 }

src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java

@@ -43,14 +43,14 @@
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
 
-import org.apache.jmeter.JMeter;
 import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.testbeans.TestBeanHelper;
 import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.LocalizableEnum;
 import org.apache.jorphan.util.EnumUtils;
 import org.apiguardian.api.API;
 import org.jspecify.annotations.Nullable;
@@ -338,9 +338,9 @@ public GenericTestBeanCustomizer(){
      * @return a StringProperty containing the normalized enum value, or null if the property is invalid or unrecognized
      */
     @API(status = API.Status.INTERNAL, since = "6.0.0")
-    public static <T extends Enum<?>> @Nullable JMeterProperty normalizeEnumProperty(
+    public static <T extends Enum<?> & LocalizableEnum> @Nullable JMeterProperty normalizeEnumProperty(
             Class<?> klass, Class<T> enumKlass, JMeterProperty property) {
-        List<T> values = EnumUtils.values(enumKlass);
+        List<T> values = EnumUtils.getEnumValues(enumKlass);
         T value;
         if (property instanceof IntegerProperty intProperty) {
             int index = intProperty.getIntValue();
@@ -362,26 +362,26 @@ public GenericTestBeanCustomizer(){
                 return null;
             }
             value = normalizeEnumStringValue(stringValue, klass, enumKlass);
-            if (stringValue.equals(EnumUtils.getStringValue(value))) {
+            if (stringValue.equals(value.getResourceKey())) {
                 // If the input property was good enough, keep it
                 return property;
             }
         } else {
             return null;
         }
-        return new StringProperty(property.getName(), EnumUtils.getStringValue(value));
+        return new StringProperty(property.getName(), value.getResourceKey());
     }
 
     @API(status = API.Status.INTERNAL, since = "6.0.0")
-    public static <T extends Enum<?>> T normalizeEnumStringValue(String value, Class<?> klass, Class<T> enumKlass) {
+    public static <T extends Enum<?> & LocalizableEnum> T normalizeEnumStringValue(String value, Class<?> klass, Class<T> enumKlass) {
         T enumValue = EnumUtils.valueOf(enumKlass, value);
         if (enumValue != null) {
             return enumValue;
         }
-        return normalizeEnumStringValue(value, klass, EnumUtils.values(enumKlass));
+        return normalizeEnumStringValue(value, klass, EnumUtils.getEnumValues(enumKlass));
     }
 
-    private static <T extends Enum<?>> T normalizeEnumStringValue(String value, Class<?> klass, List<T> values) {
+    private static <T extends Enum<?> & LocalizableEnum> T normalizeEnumStringValue(String value, Class<?> klass, List<T> values) {
         // Fallback: the value might be localized, thus check the current and root locales
         String bundleName = null;
         try {
@@ -408,9 +408,9 @@ private static <T extends Enum<?>> T normalizeEnumStringValue(String value, Clas
         return findEnumValue(value, rootBundle, values);
     }
 
-    private static <T extends Enum<?>> @Nullable T findEnumValue(String stringValue, ResourceBundle rb, List<T> values) {
+    private static <T extends Enum<?> & LocalizableEnum> @Nullable T findEnumValue(String stringValue, ResourceBundle rb, List<T> values) {
         for (T enumValue : values) {
-            if (stringValue.equals(rb.getObject(enumValue.toString()))) {
+            if (stringValue.equals(rb.getObject(enumValue.getResourceKey()))) {
                 log.debug("Converted {} to {} using Locale: {}", stringValue, enumValue, rb.getLocale());
                 return enumValue;
             }

src/core/src/main/kotlin/org/apache/jmeter/gui/JComboBoxStringBinding.kt

@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+import javax.swing.JComboBox
+
+/**
+ * Simple binding for a string-based combo box to a test element property.
+ *
+ * This binding is for non-enum combo boxes where the combo box items are
+ * plain strings that should be stored as-is in the property (e.g., httpImplementation).
+ *
+ * For enum-based combo boxes with localization, use [JEnumPropertyEditor] instead.
+ *
+ * Example usage:
+ * ```java
+ * private final JComboBox<String> implementation = new JComboBox<>(
+ *     new String[] {"httpclient4", "java", ""}
+ * );
+ *
+ * bindingGroup.add(new JComboBoxStringBinding(
+ *     implementation,
+ *     schema.getImplementation()
+ * ));
+ * ```
+ *
+ * @property comboBox the JComboBox component to bind
+ * @property property the string property descriptor
+ * @since 6.0.0
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public class JComboBoxStringBinding(
+    private val comboBox: JComboBox<String>,
+    private val property: StringPropertyDescriptor<*>
+) : Binding {
+
+    /**
+     * Updates the test element with the currently selected value from the combo box.
+     *
+     * If the selected value is null or blank and there's no default value,
+     * the property is removed from the element.
+     */
+    override fun updateElement(testElement: TestElement) {
+        val selectedValue = comboBox.selectedItem as? String
+
+        if (selectedValue.isNullOrBlank() && property.defaultValue.isNullOrBlank()) {
+            // Remove property if empty and no default
+            testElement.removeProperty(property.name)
+        } else {
+            testElement.set(property, selectedValue ?: "")
+        }
+    }
+
+    /**
+     * Updates the combo box selection based on the value stored in the test element.
+     *
+     * If the property value is not found in the combo box items, sets it anyway
+     * (useful for editable combo boxes).
+     */
+    override fun updateUi(testElement: TestElement) {
+        val value = testElement[property] ?: property.defaultValue ?: ""
+        comboBox.selectedItem = value
+    }
+}