From 3093fbede42187fb95b244eb7c6b53b18610e1ca Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 12 Sep 2019 14:25:45 -0400 Subject: Remove YamlException class After the implementation was finalized, it turned out that YamlException was no longer needed, so it has been deleted. Change-Id: Ie895fc096787f05eff36a6127b08247a7664ff8d Issue-ID: POLICY-2065 Signed-off-by: Jim Hahn --- .../policy/common/utils/coder/YamlException.java | 63 ---------------------- .../common/utils/coder/YamlExceptionTest.java | 61 --------------------- 2 files changed, 124 deletions(-) delete mode 100644 utils/src/main/java/org/onap/policy/common/utils/coder/YamlException.java delete mode 100644 utils/src/test/java/org/onap/policy/common/utils/coder/YamlExceptionTest.java diff --git a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlException.java b/utils/src/main/java/org/onap/policy/common/utils/coder/YamlException.java deleted file mode 100644 index d6591b3b..00000000 --- a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlException.java +++ /dev/null @@ -1,63 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.common.utils.coder; - -import org.yaml.snakeyaml.error.Mark; - -/** - * Runtime Exception generated by StandardYamlCoder. - */ -public class YamlException extends RuntimeException { - private static final long serialVersionUID = 1L; - - private final Mark problemMark; - - - /** - * Constructs the object. - * - * @param reason reason for the exception - * @param problemMark where the exception occurred within the input - */ - public YamlException(String reason, Mark problemMark) { - super(reason); - - this.problemMark = problemMark; - } - - /** - * Constructs the object. - * - * @param reason reason for the exception - * @param problemMark where the exception occurred within the input - * @param cause cause of the exception - */ - public YamlException(String reason, Mark problemMark, Throwable cause) { - super(reason, cause); - - this.problemMark = problemMark; - } - - @Override - public String getMessage() { - return super.getMessage() + problemMark; - } -} diff --git a/utils/src/test/java/org/onap/policy/common/utils/coder/YamlExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/coder/YamlExceptionTest.java deleted file mode 100644 index bfa6249e..00000000 --- a/utils/src/test/java/org/onap/policy/common/utils/coder/YamlExceptionTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.common.utils.coder; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertSame; - -import java.io.IOException; -import org.junit.Test; -import org.yaml.snakeyaml.error.Mark; - -public class YamlExceptionTest { - private static final char[] str = {'d', 'a', 't', 'a'}; - private static final String DATA = new String(str); - private static final String MESSAGE = "hello"; - - private static final Mark mark = new Mark("a file", 3, 5, 9, str, 0); - - @Test - public void testYamlExceptionStringMark() { - YamlException ex = new YamlException(MESSAGE, mark); - - String str = ex.getMessage(); - assertThat(str).contains(MESSAGE).contains(DATA); - - str = ex.toString(); - assertThat(str).contains(MESSAGE).contains(DATA); - } - - @Test - public void testYamlExceptionStringMarkThrowable() { - Throwable thr = new IOException("expected exception"); - YamlException ex = new YamlException(MESSAGE, mark, thr); - - assertSame(thr, ex.getCause()); - - String str = ex.getMessage(); - assertThat(str).contains(MESSAGE).contains(DATA); - - str = ex.toString(); - assertThat(str).contains(MESSAGE).contains(DATA); - } -} -- cgit 1.2.3-korg