Clean up JSONDataTreeCandidateFormatter constants

Eliminate a static block and inline a single-use literal.

JIRA: NETCONF-1102
Change-Id: Ie2f8d7d99eb1825391a3214e20747de9e6f75794
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/JSONDataTreeCandidateFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/JSONDataTreeCandidateFormatter.java
index 1bcdd3763ba4a6ef2e6c9895321d3191fd632c11..8af360c0b1061e04e74d3444605388c69da45795 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/JSONDataTreeCandidateFormatter.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/JSONDataTreeCandidateFormatter.java
@@ -24,15 +24,9 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public final class JSONDataTreeCandidateFormatter extends DataTreeCandidateFormatter {
-    private static final @NonNull String NOTIFICATION_NAME = "ietf-restconf:notification";
-
-    private static final @NonNull String DATA_CHANGED_NOTIFICATION_NAME;
     private static final @NonNull String DATA_CHANGED_EVENT_NAME = DataChangeEvent.QNAME.getLocalName();
-
-    static {
-        final var salRemoteName = $YangModuleInfoImpl.getInstance().getName().getLocalName();
-        DATA_CHANGED_NOTIFICATION_NAME = salRemoteName + ":" + DataChangedNotification.QNAME.getLocalName();
-    }
+    private static final @NonNull String DATA_CHANGED_NOTIFICATION_NAME =
+        $YangModuleInfoImpl.getInstance().getName().getLocalName() + ":" + DataChangedNotification.QNAME.getLocalName();
 
     private final JSONCodecFactorySupplier codecSupplier;
 
@@ -72,7 +66,7 @@ public final class JSONDataTreeCandidateFormatter extends DataTreeCandidateForma
             boolean nonEmpty = false;
             try (var jsonWriter = new JsonWriter(writer)) {
                 jsonWriter.beginObject()
-                    .name(NOTIFICATION_NAME).beginObject()
+                    .name("ietf-restconf:notification").beginObject()
                         .name("event-time").value(toRFC3339(now))
                         .name(DATA_CHANGED_NOTIFICATION_NAME).beginObject()
                             .name(DATA_CHANGED_EVENT_NAME).beginArray();