Remove NPE trap

Author: sven1103

project-management/src/main/java/life/qbic/projectmanagement/application/sample/PropertyConversion.java

@@ -20,6 +20,8 @@
  */
 public class PropertyConversion {
 
+  private PropertyConversion(){}
+
   private static final String CONDITION_VARIABLE_LEVEL_UNIT_TEMPLATE = "%s: %s %s"; // <variable name>: <value> [unit]
 
   private static final String CONDITION_VARIABLE_LEVEL_NO_UNIT_TEMPLATE = "%s: %s"; // <variable name>: <value>
@@ -72,7 +74,7 @@ public static String toString(VariableLevel variableLevel) {
     if (variableLevel.experimentalValue().unit().isPresent()) {
       return CONDITION_VARIABLE_LEVEL_UNIT_TEMPLATE.formatted(variableLevel.variableName().value(),
           variableLevel.experimentalValue().value(),
-          variableLevel.experimentalValue().unit().get());
+          variableLevel.experimentalValue().unit().orElseThrow());
     } else {
       return CONDITION_VARIABLE_LEVEL_NO_UNIT_TEMPLATE.formatted(
           variableLevel.variableName().value(), variableLevel.experimentalValue().value());

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementPresenter.java

@@ -77,13 +77,41 @@ public List<ProteomicsMeasurementEntry> expandProteomicsPools(
           .map(sample -> new SampleInformation(sample.sampleCode().code(), sample.label()))
           .orElse(new SampleInformation("", ""));
       var specificMetadata = proteomicsMeasurement.specificMetadata().stream()
-          .filter(metadata -> metadata.measuredSample().equals(sampleId)).findFirst().orElse(null);
-      expandedEntries.add(
-          convertProteomicsMeasurement(proteomicsMeasurement, sampleInfo, specificMetadata));
+          .filter(metadata -> metadata.measuredSample().equals(sampleId)).findFirst();
+      if (specificMetadata.isPresent()) {
+        expandedEntries.add(
+            convertProteomicsMeasurement(proteomicsMeasurement, sampleInfo, specificMetadata.get()));
+      } else {
+        expandedEntries.add(convertProteomicsMeasurement(proteomicsMeasurement, sampleInfo));
+      }
+
     }
     return expandedEntries;
   }
 
+  private ProteomicsMeasurementEntry convertProteomicsMeasurement(
+      ProteomicsMeasurement measurement, SampleInformation sampleInfo) {
+    return new ProteomicsMeasurementEntry(measurement.measurementCode().value(),
+        sampleInfo,
+        measurement.technicalReplicateName().orElse(""),
+        measurement.organisation().IRI(),
+        measurement.organisation().label(),
+        measurement.msDevice().getOboId().replace("_", ":"),
+        measurement.msDevice().getLabel(),
+        measurement.samplePoolGroup().orElse(""),
+        measurement.facility(),
+        "",
+        measurement.digestionEnzyme(),
+        measurement.digestionMethod(),
+        measurement.enrichmentMethod(),
+        String.valueOf(measurement.injectionVolume()),
+        measurement.lcColumn(),
+        measurement.lcmsMethod(),
+        measurement.labelType(),
+        "",
+        "");
+  }
+
   public List<NGSMeasurementEntry> expandNGSPools(NGSMeasurement ngsMeasurement) {
     List<NGSMeasurementEntry> expandedEntries = new ArrayList<>();
     for (NGSSpecificMeasurementMetadata specificMeasurementMetadata : ngsMeasurement.specificMeasurementMetadata()) {