Rest implementation

.gitignore

@@ -7,6 +7,6 @@ target/
 *.fsps
 *.class
 .gitattributes
+data/
 
 shongo-deployment/**/*.cfg
-

pom.xml

@@ -97,6 +97,16 @@
 
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.22</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
 
         <plugins>

shongo-client-cli/src/main/perl/Shongo/ClientCli/API/AuxiliaryData.pm

@@ -0,0 +1,45 @@
+#
+# Auxiliary data for ReservationRequestAbstract
+#
+# @author Filip Karnis <[email protected]>
+#
+package Shongo::ClientCli::API::AuxiliaryData;
+use base qw(Shongo::ClientCli::API::Object);
+
+use strict;
+use warnings;
+
+use Shongo::Common;
+use Shongo::Console;
+
+#
+# Create a new instance of auxiliary data
+#
+# @static
+#
+sub new()
+{
+    my $class = shift;
+    my (%attributes) = @_;
+    my $self = Shongo::ClientCli::API::Object->new(@_);
+    bless $self, $class;
+
+    $self->set_object_class('AuxData');
+    $self->set_object_name('Auxiliary Data');
+    $self->add_attribute('tagName', {
+        'required' => 1,
+        'type' => 'string',
+    });
+    $self->add_attribute('enabled', {
+        'required' => 1,
+        'type' => 'bool',
+    });
+    $self->add_attribute('data', {
+        'required' => 0,
+        'type' => 'string',
+    });
+
+    return $self;
+}
+
+1;

shongo-client-cli/src/main/perl/Shongo/ClientCli/API/ReservationRequestAbstract.pm

@@ -13,6 +13,7 @@ use Shongo::Common;
 use Shongo::Console;
 use Shongo::ClientCli::API::ReservationRequest;
 use Shongo::ClientCli::API::ReservationRequestSet;
+use Shongo::ClientCli::API::AuxiliaryData;
 
 # Enumeration of reservation request purpose
 our $Purpose = ordered_hash(
@@ -89,6 +90,15 @@ sub new()
             'OWNED' => 'Owned'
         )
     });
+    $self->add_attribute('auxData', {
+        'type' => 'collection',
+        'item' => {
+            'title' => 'Auxiliary Data',
+            'class' => 'Shongo::ClientCli::API::AuxiliaryData',
+            'short' => 1,
+        },
+        'optional' => 1,
+    });
 
     return $self;
 }

shongo-client-cli/src/main/perl/Shongo/ClientCli/ReservationService.pm

@@ -78,7 +78,7 @@ sub populate()
         'list-reservation-requests' => {
             desc => 'List summary of all existing reservation requests',
             options => 'technology=s search=s resource=s',
-            args => '[-technology <technologies>][-search <search>][-resource <resource-id>]',
+            args => '[-technology <technologies>][-search <search>][-resource <resource-ids>]',
             method => sub {
                 my ($shell, $params, @args) = @_;
                 list_reservation_requests($params->{'options'});
@@ -251,7 +251,11 @@ sub list_reservation_requests()
         }
     }
     if ( defined($options->{'resource'}) ) {
-        $request->{'specificationResourceId'} = $options->{'resource'};
+        $request->{'specificationResourceIds'} = [];
+        foreach my $resource (split(/,/, $options->{'resource'})) {
+            $resource =~ s/(^ +)|( +$)//g;
+            push(@{$request->{'specificationResourceIds'}}, $resource);
+        }
     }
     my $application = Shongo::ClientCli->instance();
     my $response = $application->secure_hash_request('Reservation.listReservationRequests', $request);
@@ -274,7 +278,8 @@ sub list_reservation_requests()
             {'field' => 'technology',      'title' => 'Technology'},
             {'field' => 'allocationState', 'title' => 'Allocation'},
             {'field' => 'executableState', 'title' => 'Executable'},
-            {'field' => 'description',     'title' => 'Description'}
+            {'field' => 'description',     'title' => 'Description'},
+            {'field' => 'auxData',         'title' => 'Auxiliary Data'},
         ],
         'data' => []
     };
@@ -321,7 +326,8 @@ sub list_reservation_requests()
             'technology' => $technologies,
             'allocationState' => Shongo::ClientCli::API::ReservationRequest::format_state($reservation_request->{'allocationState'}),
             'executableState' => Shongo::ClientCli::API::ReservationRequest::format_state($reservation_request->{'executableState'}),
-            'description' => $reservation_request->{'description'}
+            'description' => $reservation_request->{'description'},
+            'auxData' => $reservation_request->{'auxData'},
         });
     }
     console_print_table($table);

shongo-client-cli/src/main/perl/Shongo/ClientCli/ResourceService.pm

@@ -15,6 +15,15 @@ use Shongo::ClientCli::API::Resource;
 use Shongo::ClientCli::API::DeviceResource;
 use Shongo::ClientCli::API::Alias;
 
+#
+# Tag types
+#
+our $TagType = ordered_hash(
+    'DEFAULT' => 'Default',
+    'NOTIFY_EMAIL' => 'Notify Email',
+    'RESERVATION_DATA' => 'Reservation Data',
+);
+
 #
 # Populate shell by options for management of resources.
 #
@@ -477,6 +486,19 @@ sub create_tag()
             'title' => 'Tag name',
         }
     );
+    $tag->add_attribute(
+        'type', {
+            'required' => 1,
+            'title' => 'Tag type',
+            'type' => 'enum',
+            'enum' => $Shongo::ClientCli::ResourceService::TagType,
+        }
+    );
+    $tag->add_attribute(
+        'data', {
+            'title' => 'Tag data',
+        }
+    );
 
     my $id = $tag->create($attributes, $options);
     if ( defined($id) ) {
@@ -514,13 +536,17 @@ sub list_tags()
         'columns' => [
             {'field' => 'id',           'title' => 'Identifier'},
             {'field' => 'name',         'title' => 'Name'},
+            {'field' => 'type',         'title' => 'Type'},
+            {'field' => 'data',         'title' => 'Data'},
         ],
         'data' => []
     };
-    foreach my $resource (@{$response}) {
+    foreach my $tag (@{$response}) {
         push(@{$table->{'data'}}, {
-            'id' => $resource->{'id'},
-            'name' => $resource->{'name'},
+            'id' => $tag->{'id'},
+            'name' => $tag->{'name'},
+            'type' => $tag->{'type'},
+            'data' => $tag->{'data'},
         });
     }
     console_print_table($table);

shongo-client-web/src/main/java/cz/cesnet/shongo/client/web/controllers/ResourceController.java

@@ -283,7 +283,7 @@ public Map handleReservationRequestsConfirmationData(
         Interval interval = Temporal.roundIntervalToDays(new Interval(intervalFrom, intervalTo));
         requestListRequest.setInterval(interval);
         if (resourceId != null) {
-            requestListRequest.setSpecificationResourceId(resourceId);
+            requestListRequest.setSpecificationResourceIds(new HashSet<>(Collections.singleton(resourceId)));
         } else {
             throw new TodoImplementException("list request for confirmation generaly");
         }

shongo-client-web/src/main/java/cz/cesnet/shongo/client/web/models/SpecificationType.java

@@ -4,6 +4,10 @@
 import cz.cesnet.shongo.client.web.ClientWebConfiguration;
 import cz.cesnet.shongo.client.web.support.MessageProvider;
 import cz.cesnet.shongo.controller.api.ReservationRequestSummary;
+import cz.cesnet.shongo.controller.api.Tag;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Type of specification for a reservation request.
@@ -102,15 +106,17 @@ public static SpecificationType fromReservationRequestSummary(ReservationRequest
             case USED_ROOM:
                 return PERMANENT_ROOM_CAPACITY;
             case RESOURCE:
-                String resourceTags = reservationRequestSummary.getResourceTags();
+                List<String> resourceTags = reservationRequestSummary.getResourceTags()
+                        .stream()
+                        .map(Tag::getName)
+                        .collect(Collectors.toList());
                 String parkTagName = ClientWebConfiguration.getInstance().getParkingPlaceTagName();
                 String vehicleTagName = ClientWebConfiguration.getInstance().getVehicleTagName();
-                if (resourceTags != null) {
-                    if (parkTagName != null && resourceTags.contains(parkTagName)) {
-                        return PARKING_PLACE;
-                    } else if (vehicleTagName != null && resourceTags.contains(vehicleTagName)) {
-                        return VEHICLE;
-                    }
+                if (parkTagName != null && resourceTags.contains(parkTagName)) {
+                    return PARKING_PLACE;
+                }
+                else if (vehicleTagName != null && resourceTags.contains(vehicleTagName)) {
+                    return VEHICLE;
                 }
                 return MEETING_ROOM;
             default:

shongo-common-api/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.3</version>
+            <version>2.9.9</version>
         </dependency>
         <!-- JADE is used as middle-ware for messaging -->
         <dependency>

shongo-common-api/src/main/java/cz/cesnet/shongo/api/Converter.java

@@ -1,5 +1,8 @@
 package cz.cesnet.shongo.api;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import cz.cesnet.shongo.CommonReportSet;
 import cz.cesnet.shongo.Temporal;
 import cz.cesnet.shongo.TodoImplementException;
@@ -35,6 +38,8 @@ public class Converter
 
     private static final DateTimeFormatter DATE_TIME_FORMATTER = ISODateTimeFormat.dateTimeParser();
 
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
     /**
      * Convert given {@code value} to {@link String}.
      *
@@ -64,6 +69,9 @@ else if (value instanceof Period ) {
         else if (value instanceof Interval ) {
             return convertIntervalToString((Interval) value);
         }
+        else if (value instanceof JsonNode) {
+            return convertJsonNodeToString((JsonNode) value);
+        }
         else {
             throw new TodoImplementException(value.getClass());
         }
@@ -776,6 +784,31 @@ public static <T> List<T> convertToList(Object value, Class<T> componentClass)
         return list;
     }
 
+    public static String convertJsonNodeToString(JsonNode jsonNode)
+    {
+        if (jsonNode == null) {
+            return "";
+        } else {
+            try {
+                return objectMapper.writeValueAsString(jsonNode);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static JsonNode convertToJsonNode(String value)
+    {
+        if (value.isEmpty()) {
+            return null;
+        }
+        try {
+            return objectMapper.readTree(value);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Convert given {@code value} to {@link List} value with items of any of given {@code componentClasses}.
      *

shongo-common-api/src/main/java/cz/cesnet/shongo/api/DataMap.java

@@ -1,5 +1,6 @@
 package cz.cesnet.shongo.api;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import cz.cesnet.shongo.CommonReportSet;
 import cz.cesnet.shongo.TodoImplementException;
 import org.joda.time.*;
@@ -127,6 +128,11 @@ public void set(String property, ReadablePartial readablePartial)
         setNotNull(property, Converter.convertReadablePartialToString(readablePartial));
     }
 
+    public void set(String property, JsonNode jsonNode)
+    {
+        setNotNull(property, Converter.convertJsonNodeToString(jsonNode));
+    }
+
     public void set(String property, Collection collection)
     {
         setNotNull(property, collection);
@@ -338,6 +344,11 @@ public ReadablePartial getReadablePartial(String property)
         return Converter.convertToReadablePartial(data.get(property));
     }
 
+    public JsonNode getJsonNode(String property)
+    {
+        return Converter.convertToJsonNode(getString(property));
+    }
+
     public <T> List<T> getList(String property, Class<T> componentClass)
     {
         return Converter.convertToList(data.get(property), componentClass);

shongo-common-api/src/main/java/jade/content/onto/CustomBeanOntologyBuilder.java

@@ -70,6 +70,10 @@ private static boolean isGetter(Method method)
             c = methodName.charAt(2);
         }
         else {
+            if (methodName.length() < 4) {
+                // it is too short
+                return false;
+            }
             c = methodName.charAt(3);
         }
         if (!Character.isUpperCase(c) && '_' != c) {

shongo-common-api/src/main/java/org/joda/time/format/PeriodCzechAffix.java

@@ -135,4 +135,16 @@ else if (o1.length() < o2.length()) {
         }
         return ~position;
     }
+
+    @Override
+    public String[] getAffixes()
+    {
+        return new String[] { iSingularText, iFewText, iPluralText };
+    }
+
+    @Override
+    public void finish(Set<PeriodFormatterBuilder.PeriodFieldAffix> set)
+    {
+        set.add(this);
+    }
 }

shongo-common/pom.xml

@@ -53,6 +53,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Hibernate types. Depends on hibernate version. -->
+        <!-- https://github.com/vladmihalcea/hypersistence-utils -->
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-52</artifactId>
+            <version>3.2.0</version>
+        </dependency>
 
         <!-- Used by Jade for serializing objects -->
         <dependency>

shongo-common/src/main/java/cz/cesnet/shongo/hibernate/package-info.java

@@ -11,9 +11,11 @@
         @TypeDef(name = PersistentLocalDate.NAME, typeClass = PersistentLocalDate.class),
         @TypeDef(name = PersistentPeriod.NAME, typeClass = PersistentPeriod.class),
         @TypeDef(name = PersistentInterval.NAME, typeClass = PersistentInterval.class),
-        @TypeDef(name = PersistentReadablePartial.NAME, typeClass = PersistentReadablePartial.class)
+        @TypeDef(name = PersistentReadablePartial.NAME, typeClass = PersistentReadablePartial.class),
+        @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class),
 }) package cz.cesnet.shongo.hibernate;
 
+import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;