diff options
Diffstat (limited to 'utils')
5 files changed, 11 insertions, 11 deletions
diff --git a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java b/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java index 077246bf..ffd9d052 100644 --- a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java +++ b/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -257,11 +258,11 @@ public class YamlJsonTranslator { * @return a gson element corresponding to the node */ protected JsonElement makeJson(Node node) { - if (node instanceof MappingNode) { - return makeJsonObject((MappingNode) node); + if (node instanceof MappingNode mappingNode) { + return makeJsonObject(mappingNode); - } else if (node instanceof SequenceNode) { - return makeJsonArray((SequenceNode) node); + } else if (node instanceof SequenceNode sequenceNode) { + return makeJsonArray(sequenceNode); } else { return makeJsonPrim((ScalarNode) node); diff --git a/utils/src/test/java/org/onap/policy/common/utils/coder/StandardCoderTest.java b/utils/src/test/java/org/onap/policy/common/utils/coder/StandardCoderTest.java index b4ac0395..269893e7 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/coder/StandardCoderTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/coder/StandardCoderTest.java @@ -264,7 +264,7 @@ class StandardCoderTest { } @Test - void testToJsonTree_testFromJsonJsonElementClassT() throws Exception { + void testToJsonTree_testFromJsonJsonElementClassT() { MyMap map = new MyMap(); map.props = new LinkedHashMap<>(); map.props.put("jel keyA", "jel valueA"); @@ -314,7 +314,7 @@ class StandardCoderTest { } @Test - void testStandardTypeAdapter() throws Exception { + void testStandardTypeAdapter() { String json = "{'abc':'def'}".replace('\'', '"'); StandardCoderObject sco = coder.fromJson(json, StandardCoderObject.class); assertNotNull(sco.getData()); diff --git a/utils/src/test/java/org/onap/policy/common/utils/coder/StandardYamlCoderTest.java b/utils/src/test/java/org/onap/policy/common/utils/coder/StandardYamlCoderTest.java index ff3f6efa..d504b82b 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/coder/StandardYamlCoderTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/coder/StandardYamlCoderTest.java @@ -104,7 +104,7 @@ class StandardYamlCoderTest { } @Test - void testStandardTypeAdapter() throws Exception { + void testStandardTypeAdapter() { String yaml = "abc: def\n"; StandardCoderObject sco = coder.fromJson(yaml, StandardCoderObject.class); assertNotNull(sco.getData()); diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyObjectUtilsTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyObjectUtilsTest.java index 6c5918cf..b62fd1e4 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyObjectUtilsTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyObjectUtilsTest.java @@ -146,7 +146,7 @@ class PropertyObjectUtilsTest { @Test @SuppressWarnings("unchecked") - void testCompressLists() throws IOException, CoderException { + void testCompressLists() throws CoderException { assertEquals("plain-string", PropertyObjectUtils.compressLists("plain-string").toString()); // @formatter:off diff --git a/utils/src/test/java/org/onap/policy/common/utils/security/CryptoUtilsTest.java b/utils/src/test/java/org/onap/policy/common/utils/security/CryptoUtilsTest.java index ee338376..5f8b80ea 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/security/CryptoUtilsTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/security/CryptoUtilsTest.java @@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.security.GeneralSecurityException; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +42,7 @@ class CryptoUtilsTest { private static final String ENCRYPTED_MSG = "original value : {} encrypted value: {}"; @Test - void testEncrypt() throws GeneralSecurityException { + void testEncrypt() { logger.info("testEncrypt:"); CryptoCoder cryptoUtils = new CryptoUtils(SECRET_KEY); String encryptedValue = cryptoUtils.encrypt(PASS); @@ -56,7 +55,7 @@ class CryptoUtilsTest { } @Test - void testDecrypt() throws GeneralSecurityException { + void testDecrypt() { logger.info("testDecrypt:"); CryptoCoder cryptoUtils = new CryptoUtils(SECRET_KEY); String decryptedValue = cryptoUtils.decrypt(ENCRYPTED_PASS); |