Use adapter for beam mode

Author: graduta

src/alice/dip/LhcInfoObj.java

@@ -317,19 +317,6 @@ public String getBeamMode() {
 		return last.value;
 	}
 
-	/**
-	 * Get the beam mode as a key suitable for enum conversion usage in protobuf
-	 * @return Beam mode string with spaces replaced by underscores, or "UNKNOWN" if beam mode is null
-	 */
-	public String getBeamModeAsKey() {
-		String bm = getBeamMode();
-		if (bm == null) {
-			return "UNKNOWN";
-		}
-		bm = bm.replace(" ", "_");
-		return bm;
-	}
-
 	public String getStableBeamStartStr() {
 
 		long t = getStableBeamStart();

src/alice/dip/adapters/BeamModeProtoAdapter.java

@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+package alice.dip.adapters;
+
+import alice.dip.enums.BeamModeEnum;
+
+/**
+ * Adapter class to convert between string representations of beam modes and the BeamModeEnum.
+ */
+public class BeamModeProtoAdapter {
+
+  /**
+   * Returns the enum constant matching the given string, or UNKNOWN if not found.
+   * Accepts both space and underscore separated names, case-insensitive.
+   * @param beamMode The beam mode string to convert.
+   * @return The corresponding BeamModeEnum constant, or UNKNOWN if not recognized.
+   */
+  public static BeamModeEnum fromStringToEnum(String beamMode) {
+    if (beamMode == null || beamMode.trim().isEmpty()) {
+      return BeamModeEnum.UNKNOWN;
+    }
+    for (BeamModeEnum value : BeamModeEnum.values()) {
+      if (value.label.equalsIgnoreCase(beamMode)) {
+        return value;
+      }
+    }
+    return BeamModeEnum.UNKNOWN;
+  }
+}

src/alice/dip/enums/BeamModeEnum.java

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+package alice.dip.enums;
+
+/**
+ * Java enum matching the BeamMode values from DIP service and common.proto
+ * @enum BeamModeEnum
+ */
+public enum BeamModeEnum {
+  UNKNOWN("UNKNOWN"),
+  SETUP("SETUP"),
+  ABORT("ABORT"),
+  INJECTION_PROBE_BEAM("INJECTION PROBE BEAM"),
+  INJECTION_SETUP_BEAM("INJECTION SETUP BEAM"),
+  INJECTION_PHYSICS_BEAM("INJECTION PHYSICS BEAM"),
+  PREPARE_RAMP("PREPARE RAMP"),
+  RAMP("RAMP"),
+  FLAT_TOP("FLAT TOP"),
+  SQUEEZE("SQUEEZE"),
+  ADJUST("ADJUST"),
+  STABLE_BEAMS("STABLE BEAMS"),
+  LOST_BEAMS("LOST BEAMS"),
+  UNSTABLE_BEAMS("UNSTABLE BEAMS"),
+  BEAM_DUMP_WARNING("BEAM DUMP WARNING"),
+  BEAM_DUMP("BEAM DUMP"),
+  RAMP_DOWN("RAMP DOWN"),
+  CYCLING("CYCLING"),
+  RECOVERY("RECOVERY"),
+  INJECT_AND_DUMP("INJECT AND DUMP"),
+  CIRCULATE_AND_DUMP("CIRCULATE AND DUMP"),
+  NO_BEAM("NO BEAM");
+
+  public final String label;
+
+  private BeamModeEnum(String label) {
+      this.label = label;
+  }
+}

src/alice/dip/kafka/BeamModeEventsKafkaProducer.java

@@ -16,10 +16,12 @@
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.serialization.IntegerSerializer;
 
+import alice.dip.adapters.BeamModeProtoAdapter;
 import alice.dip.AliDip2BK;
-import alice.dip.LhcInfoObj;
+import alice.dip.enums.BeamModeEnum;
 import alice.dip.kafka.dto.Common;
 import alice.dip.kafka.dto.Events;
+import alice.dip.LhcInfoObj;
 
 /**
  * Kafka producer for LHC Beam Mode events, serialized using Protocol Buffers.
@@ -44,12 +46,15 @@ public BeamModeEventsKafkaProducer(String bootstrapServers) {
      * @param timestamp - event timestamp at which the beam mode change event was received from DIP
      */
     public void sendEvent(Integer fillNumber, LhcInfoObj fill, long timestamp) {
+        String beamModeStr = fill.getBeamMode();
+        BeamModeEnum beamMode = BeamModeProtoAdapter.fromStringToEnum(beamModeStr);
+
         Common.BeamInfo beamInfo = Common.BeamInfo.newBuilder()
             .setStableBeamsStart(fill.getStableBeamStart())
             .setStableBeamsEnd(fill.getStableBeamStop())
             .setFillNumber(fill.fillNo)
             .setFillingSchemeName(fill.LHCFillingSchemeName)
-            .setBeamMode(Common.BeamMode.valueOf(fill.getBeamModeAsKey()))
+            .setBeamMode(Common.BeamMode.valueOf(beamMode.label))
             .setBeamType(fill.beamType)
             .build();