Commit dc0a6320 authored by Matija Obreza's avatar Matija Obreza

Merge branch 'related-to-genesys-server-428' into 'master'

Fix JsonSidConverter

See merge request genesys-pgr/application-blocks!47
parents 3aadc3dd 4a2ef158
...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.util.StdConverter; ...@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;
/** /**
* The JsonSidConverter converts SID IDs to SID names. * The JsonSidConverter converts SID IDs to SID names.
*/ */
public class JsonSidConverter extends StdConverter<Long, Object> { public class JsonSidConverter extends StdConverter<Long, String> {
private static SidProvider SID_PROVIDER; private static SidProvider SID_PROVIDER;
...@@ -41,12 +41,12 @@ public class JsonSidConverter extends StdConverter<Long, Object> { ...@@ -41,12 +41,12 @@ public class JsonSidConverter extends StdConverter<Long, Object> {
* Convert SID ID to SID name using SID_PROVIDER (when available) * Convert SID ID to SID name using SID_PROVIDER (when available)
*/ */
@Override @Override
public Object convert(Long value) { public String convert(Long value) {
if (value == null) { if (value == null) {
return null; return null;
} else { } else {
if (SID_PROVIDER == null) { if (SID_PROVIDER == null) {
return value; return Long.toString(value);
} else { } else {
return SID_PROVIDER.getSidName(value); return SID_PROVIDER.getSidName(value);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment