X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fmodels-sim-dmaap%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fsim%2Fdmaap%2Frest%2FCambriaMessageBodyHandler.java;h=0efab160bc11a647228ca4eb516dc39c228a3db0;hb=71be21fd5b9b52c613bb855f00a79a51e81906dd;hp=b468e34c377f0affac4eea22c8a7440470700b20;hpb=ce850be00732359bb04d8dd3666a1293dbf8f1ff;p=policy%2Fmodels.git

diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java
index b468e34c3..0efab160b 100644
--- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java
+++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java
@@ -2,7 +2,8 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Models
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,11 @@
 
 package org.onap.policy.models.sim.dmaap.rest;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Provider;
 import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.IOException;
@@ -31,11 +37,6 @@ import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.Provider;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -65,8 +66,7 @@ public class CambriaMessageBodyHandler implements MessageBodyReader<Object> {
     public List<Object> readFrom(Class<Object> type, Type genericType, Annotation[] annotations, MediaType mediaType,
                     MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
 
-        try (BufferedReader bufferedReader =
-                        new BufferedReader(new InputStreamReader(entityStream, StandardCharsets.UTF_8))) {
+        try (var bufferedReader = new BufferedReader(new InputStreamReader(entityStream, StandardCharsets.UTF_8))) {
             List<Object> messages = new LinkedList<>();
             String msg;
             while ((msg = readMessage(bufferedReader)) != null) {
@@ -137,17 +137,17 @@ public class CambriaMessageBodyHandler implements MessageBodyReader<Object> {
      * @throws IOException if an error occurs
      */
     private int readLength(Reader reader) throws IOException {
-        StringBuilder bldr = new StringBuilder(MAX_DIGITS);
+        var bldr = new StringBuilder(MAX_DIGITS);
 
         int chr;
-        for (int x = 0; x < MAX_DIGITS; ++x) {
+        for (var x = 0; x < MAX_DIGITS; ++x) {
             if ((chr = reader.read()) < 0) {
                 throw new EOFException("missing '.' in 'length' field");
             }
 
             if (chr == '.') {
                 String text = bldr.toString().trim();
-                return (text.isEmpty() ? 0 : Integer.valueOf(text));
+                return (text.isEmpty() ? 0 : Integer.parseInt(text));
             }
 
             if (!Character.isDigit(chr)) {
@@ -169,7 +169,7 @@ public class CambriaMessageBodyHandler implements MessageBodyReader<Object> {
      * @throws IOException if an error occurs
      */
     private String readString(Reader reader, int len) throws IOException {
-        char[] buf = new char[len];
+        var buf = new char[len];
         IOUtils.readFully(reader, buf);
 
         return new String(buf);