Skip to content

Commit e1995e0

Browse files
author
Benito Visone
authored
fix: localized content map npe (#745)
* fix: LocalizedContent npe * fix: handling errors during mapConverter
1 parent 2b18852 commit e1995e0

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

src/oneid/oneid-common/model/src/main/java/it/pagopa/oneid/common/model/converters/HashMapAttributeConverter.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package it.pagopa.oneid.common.model.converters;
22

3+
import io.quarkus.logging.Log;
34
import it.pagopa.oneid.common.model.Client.LocalizedContent;
45
import java.util.HashMap;
56
import java.util.Map;
@@ -40,7 +41,15 @@ public AttributeValue transformFrom(Map<String, Map<String, LocalizedContent>> m
4041

4142
@Override
4243
public Map<String, Map<String, LocalizedContent>> transformTo(AttributeValue attributeValue) {
43-
return mapConverter.transformTo(attributeValue);
44+
Map<String, Map<String, LocalizedContent>> map;
45+
try {
46+
map = mapConverter.transformTo(attributeValue);
47+
} catch (RuntimeException e) {
48+
Log.error("Failed to convert attribute value to map", e);
49+
map = new HashMap<>();
50+
}
51+
52+
return map;
4453
}
4554

4655
@Override

src/oneid/oneid-common/model/src/main/java/it/pagopa/oneid/common/model/converters/LocalizedContentAttributeConverter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public AttributeValue transformFrom(LocalizedContent localizedContent) {
2525
public LocalizedContent transformTo(AttributeValue attributeValue) {
2626
Map<String, AttributeValue> map = attributeValue.m();
2727
return new LocalizedContent(
28-
map.get("title").s(),
29-
map.get("description").s(),
30-
map.get("cookieUri").s(),
31-
map.get("docUri").s(),
32-
map.get("supportAddress").s()
28+
map.containsKey("title") ? map.get("title").s() : "",
29+
map.containsKey("description") ? map.get("description").s() : "",
30+
map.containsKey("cookieUri") ? map.get("cookieUri").s() : "",
31+
map.containsKey("docUri") ? map.get("docUri").s() : "",
32+
map.containsKey("supportAddress") ? map.get("supportAddress").s() : ""
3333
);
3434
}
3535

0 commit comments

Comments
 (0)