diff options
author | Jim Hahn <jrh3@att.com> | 2021-02-12 10:11:53 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-02-12 12:50:11 -0500 |
commit | 6f5608e35e3b366403569b85f21d1d697b797409 (patch) | |
tree | a35129049ec2d3c08de4888d7a328f3f96a5ce52 /models-interactions/model-impl/appclcm/src/main | |
parent | b07dd8a325f55d03f4dfec511ecd096429b4c7b0 (diff) |
Use type adapters from common
Addressed the following sonar issue:
- remove duplicate code by using gson type adapters from common
Issue-ID: POLICY-2905
Change-Id: I7a832ce3e15387ed25061caec3e057f150828dad
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-impl/appclcm/src/main')
-rw-r--r-- | models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java index 54f9782f4..7dd6e46de 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * appclcm * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,55 +23,21 @@ package org.onap.policy.appclcm.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; import java.time.Instant; +import org.onap.policy.common.gson.InstantAsMillisTypeAdapter; +import org.onap.policy.common.gson.InstantTypeAdapter; public final class Serialization { public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting() - .registerTypeAdapter(Instant.class, new InstantAdapter()).create(); + .registerTypeAdapter(Instant.class, new InstantTypeAdapter()).create(); - public static final Gson gson = - new GsonBuilder().disableHtmlEscaping().registerTypeAdapter(Instant.class, new InstantAdapter()).create(); + public static final Gson gson = new GsonBuilder().disableHtmlEscaping() + .registerTypeAdapter(Instant.class, new InstantTypeAdapter()).create(); public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting() - .registerTypeAdapter(Instant.class, new InstantJunitAdapter()).create(); + .registerTypeAdapter(Instant.class, new InstantAsMillisTypeAdapter()).create(); private Serialization() { // Private constructor to prevent subclassing } - - public static class InstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> { - - @Override - public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) { - return Instant.parse(json.getAsString()); - } - - @Override - public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) { - return new JsonPrimitive(src.toString()); - } - - } - - public static class InstantJunitAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> { - - @Override - public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) { - return Instant.ofEpochMilli(json.getAsLong()); - } - - @Override - public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) { - return new JsonPrimitive(src.toEpochMilli()); - } - - } - } |