From 1413223a5835c4feef5598070a64b2e93a4924c9 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Mon, 16 Mar 2020 23:54:09 +0100
Subject: [PATCH] Fix AuthenticationProviderConfiguration
 marshaling/unmarshaling for deep nested options and the title attributes

---
 .../providers/AuthenticationProviderConfiguration.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderConfiguration.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderConfiguration.java
index f9eb3392b45..e63f05645fe 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderConfiguration.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderConfiguration.java
@@ -57,7 +57,6 @@ public class AuthenticationProviderConfiguration implements java.io.Serializable
     private Map<Locale,String> description;
     
     @Lob
-    @JsonUnwrapped
     @JsonProperty("options")
     @Convert(converter = AuthenticationProviderOptions.AuthenticationProviderOptionsConverter.class)
     private AuthenticationProviderOptions options;
@@ -97,6 +96,7 @@ public void parseTitle(JsonNode node) {
      * @param locale The locale to lookup the title.
      * @return An optional string, being empty if not found and no default.
      */
+    @JsonIgnore
     public Optional<String> getTitle(Locale locale) {
         return Optional.ofNullable(title.getOrDefault(locale, title.get(BundleUtil.getDefaultLocale())));
     }
@@ -106,6 +106,7 @@ public Optional<String> getTitle(Locale locale) {
      * @param locale The locale to lookup the title as string tag, following IETF BCP 47, e.g. 'en' or 'en-US'.
      * @return An optional string, being empty if not found and no default.
      */
+    @JsonIgnore
     public Optional<String> getTitle(String locale) {
         Locale lookup = LocaleUtils.toLocale(locale);
         return getTitle(lookup);
@@ -115,6 +116,7 @@ public Optional<String> getTitle(String locale) {
      * Receive title string using system default locale
      * @return An optional string, being empty if not found and no default.
      */
+    @JsonIgnore
     public Optional<String> getTitle() {
         return getTitle(BundleUtil.getDefaultLocale());
     }