Merge pull request #36 from xenit-eu/management-platform-commits

Add commits from contentgrid-management-platform

Author: NielsCW

src/main/java/com/contentgrid/hateoas/client/hal/HalDocument.java

@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.Data;
 import lombok.NonNull;
@@ -49,25 +50,36 @@ public HalLink getSelfLink() {
         return this.getLink("self").orElseThrow();
     }
 
-    public Optional<HalLink> getLink(@NonNull String name) {
-        return Optional.ofNullable(this.links.get(name))
-                .flatMap(links -> {
-                    if (links.size() == 0) {
+    public Optional<HalLink> getLink(@NonNull String rel, @NonNull String name) {
+        return getLinks(rel).flatMap(linksForRel -> linksForRel.stream()
+                .filter(link -> Objects.equals(name, link.getName()))
+                .findFirst());
+    }
+
+    public Optional<HalLink> getLink(@NonNull String rel) {
+        return Optional.ofNullable(this.links.get(rel))
+                .flatMap(linksForRel -> {
+                    if (linksForRel.isEmpty()) {
                         return Optional.empty();
-                    } else if (links.size() == 1) {
-                        return links.stream().findFirst();
+                    } else if (linksForRel.size() == 1) {
+                        return linksForRel.stream().findFirst();
                     }
-                    throw new RuntimeException("Expected 1 link, but has %s links".formatted(links.size()));
+                    throw new RuntimeException("Expected 1 link, but has %s links".formatted(linksForRel.size()));
                 });
     }
 
-    public Optional<List<HalLink>> getLinks(@NonNull String name) {
-        return Optional.ofNullable(this.links.get(name));
+    public Optional<List<HalLink>> getLinks(@NonNull String rel) {
+        return Optional.ofNullable(this.links.get(rel));
+    }
+
+    public HalLink getRequiredLink(@NonNull String rel) {
+        return this.getLink(rel)
+                .orElseThrow(() -> new NoSuchElementException("Link with rel %s not found".formatted(rel)));
     }
 
-    public HalLink getRequiredLink(@NonNull String name) {
-        return this.getLink(name)
-                .orElseThrow(() -> new NoSuchElementException("Link with name %s not found".formatted(name)));
+    public HalLink getRequiredLink(@NonNull String rel, @NonNull String name) {
+        return this.getLink(rel, name)
+                .orElseThrow(() -> new NoSuchElementException("Link with rel %s and name %s not found".formatted(rel, name)));
     }
 
     public Optional<List<HalDocument>> getEmbedded(@NonNull String name) {

src/main/java/com/contentgrid/hateoas/client/hal/HalLink.java

@@ -1,29 +1,52 @@
 package com.contentgrid.hateoas.client.hal;
 
 import java.net.URI;
+import java.util.Map;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+import org.springframework.hateoas.UriTemplate;
+import org.springframework.lang.Nullable;
 
 @Data
-@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class HalLink {
 
     @NonNull
     String href;
 
+    @Nullable
+    String name;
+
+    boolean templated;
+
     public URI getURI() {
         return URI.create(this.href);
     }
 
+    public URI expand(Map<String, Object> variables) {
+        return UriTemplate.of(href).expand(variables);
+    }
+
     public static HalLink from(@NonNull URI uri) {
-        return new HalLink(uri.toString());
+        return from(uri, null);
+    }
+
+    public static HalLink from(@NonNull URI uri, @Nullable String name) {
+        return new HalLink(uri.toString(), name, false);
+    }
+
+    public static HalLink templated(@NonNull UriTemplate uriTemplate) {
+        return templated(uriTemplate, null);
+    }
+
+    public static HalLink templated(@NonNull UriTemplate uriTemplate, @Nullable String name) {
+        return new HalLink(uriTemplate.toString(), name, true);
     }
 
     @Override
     public String toString() {
-        return "{href=%s}".formatted(this.href);
+        return "{href=%s%s}".formatted(this.href, this.name == null ? "":", name=" + this.name);
     }
 }

src/main/java/com/contentgrid/hateoas/client/hal/HalResponse.java

@@ -2,12 +2,15 @@
 
 import java.util.Objects;
 import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
 
 public interface HalResponse {
 
     <T> ResponseEntity<T> toEntity(Class<T> bodyType);
 
+    default ResponseEntity<Void> toVoidEntity() {
+        return this.toEntity(Void.class);
+    }
+
     default ResponseEntity<HalDocument> toHalEntity() {
         return this.toEntity(HalDocument.class);
     }

src/main/java/com/contentgrid/hateoas/client/hal/forms/DefaultHalFormsClient.java

@@ -18,7 +18,7 @@
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClient.RequestBodySpec;
 import org.springframework.web.client.RestClient.RequestHeadersSpec;
@@ -49,7 +49,7 @@ public HalFormsBodyRequest requestTemplate(@NonNull HalDocument document, @NonNu
                 .contentType(contentType)
                 .accept(MediaTypes.HAL_FORMS_JSON);
 
-        return new DefaultHalFormsBodyRequest(bodySpec, template.getProperties());
+        return new DefaultHalFormsBodyRequest(bodySpec, contentType, template.getProperties());
     }
 
     public Optional<HalFormsTemplate> getTemplate(@NonNull HalDocument document, @NonNull String name) {
@@ -99,6 +99,9 @@ static class DefaultHalFormsBodyRequest implements HalFormsBodyRequest {
         @NonNull
         private final RequestBodySpec request;
 
+        @NonNull
+        private final MediaType contentType;
+
         @NonNull
         private final List<HalFormsProperty> properties;
 
@@ -118,8 +121,14 @@ public HalFormsBodyRequest properties(Function<HalFormsProperty, Object> valueFu
                 body.put(property.name, valueFunction.apply(property));
             }
 
-            request.body(body, new ParameterizedTypeReference<Map<String, Object>>(){
-            });
+            if (contentType.includes(MediaType.APPLICATION_FORM_URLENCODED) || contentType.includes(MediaType.MULTIPART_FORM_DATA)) {
+                // body must be a MultiValuedMap because the HttpMessageConverter only supports MultiValuedMap
+                request.body(MultiValueMap.fromSingleValue(body), new ParameterizedTypeReference<MultiValueMap<String, Object>>() {
+                });
+            } else {
+                request.body(body, new ParameterizedTypeReference<Map<String, Object>>() {
+                });
+            }
 
             return this;
         }