Feature/add controlled property as metadata (#35)

* Update DeviceMeasurementBuilder to include metadata

An additional method was added to DeviceMeasurementBuilder to include metadata fields, adding flexibility for data inclusion in the attributes. A new "Text" key was also added to the FiwareTypes enumeration. These modifications will allow better handling of device measurements by carrying essential information about them.

* Remove metadata method from DeviceMeasurementBuilder

The metadata method that was responsible for setting the metadata fields in the DeviceMeasurementBuilder has been removed. This code change simplifies the DeviceMeasurementBuilder and removes potential redundancy as the metadata is currently not required in our use case.

* Remove metadata method from DeviceMeasurementBuilder

The metadata method that was responsible for setting the metadata fields in the DeviceMeasurementBuilder has been removed. This code change simplifies the DeviceMeasurementBuilder and removes potential redundancy as the metadata is currently not required in our use case.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.app.5gla</groupId>
     <artifactId>fiware-integration-layer</artifactId>
-    <version>9.0.0</version>
+    <version>9.1.0</version>
 
     <name>5gLa FIWARE integration layer</name>
     <url>https://github.com/vitrum-connect/5gla-fiware-integration-layer</url>

src/main/java/de/app/fivegla/fiware/api/FiwareTypes.java

@@ -12,7 +12,8 @@
 @Getter
 public enum FiwareTypes {
     GEO_POINT("geo:point"),
-    DATE_TIME("DateTime");
+    DATE_TIME("DateTime"),
+    TEXT("Text");
 
     private final String key;
 

src/main/java/de/app/fivegla/fiware/model/DeviceMeasurement.java

@@ -13,7 +13,6 @@
  */
 @Getter
 @Setter
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/de/app/fivegla/fiware/model/builder/DeviceMeasurementBuilder.java

@@ -61,16 +61,20 @@ public DeviceMeasurementBuilder withLocation(double latitude, double longitude)
      * @param dateObserved the date observed of the measurement attribute
      * @return the DeviceMeasurementBuilder instance with the updated measurement attribute
      */
-    public DeviceMeasurementBuilder withMeasurement(String name, String type, String value, Instant dateObserved) {
+    public DeviceMeasurementBuilder withMeasurement(String name, String type, String value, Instant dateObserved, String controlledProperty) {
         var attribute = new Attribute();
         attribute.setName(name);
         attribute.setType(type);
         attribute.setValue(value);
-        var metadata = new Metadata();
-        metadata.setName("dateObserved");
-        metadata.setType(FiwareTypes.DATE_TIME.getKey());
-        metadata.setValue(dateObserved.toString());
-        attribute.setMetadata(List.of(metadata));
+        var dateObservedMetadata = new Metadata();
+        dateObservedMetadata.setName("dateObservedMetadata");
+        dateObservedMetadata.setType(FiwareTypes.DATE_TIME.getKey());
+        dateObservedMetadata.setValue(dateObservedMetadata.toString());
+        var controlledPropertyMetadata = new Metadata();
+        controlledPropertyMetadata.setName("controlledProperty");
+        controlledPropertyMetadata.setType(FiwareTypes.TEXT.getKey());
+        controlledPropertyMetadata.setValue(controlledProperty);
+        attribute.setMetadata(List.of(dateObservedMetadata, controlledPropertyMetadata));
         deviceMeasurement.setMeasurement(attribute);
         return this;
     }