summaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypesTest.java55
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/HttpHeader.java27
2 files changed, 60 insertions, 22 deletions
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypesTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypesTest.java
new file mode 100644
index 0000000000..0c9ce0ca2a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypesTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 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.openecomp.sdc.heat.datatypes;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.LinkedList;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DefinedHeatParameterTypesTest {
+
+ @Test
+ public void testIsValueIsFromGivenType() {
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(2, "number"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("2 KB", "number"));
+
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(true, "boolean"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("test", "string"));
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(new LinkedList<>(), "json"));
+
+ assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType("val1,val2", "comma_delimited_list"));
+ assertFalse(DefinedHeatParameterTypes.isValueIsFromGivenType("", "wrong"));
+ }
+
+ @Test
+ public void testIsNovaServerEnvValueIsFromRightType() {
+ assertTrue(DefinedHeatParameterTypes.isNovaServerEnvValueIsFromRightType("test"));
+ assertTrue(DefinedHeatParameterTypes.isNovaServerEnvValueIsFromRightType("val1,val2"));
+ }
+
+ @Test
+ public void testIsEmptyValueInEnv() {
+ assertTrue(DefinedHeatParameterTypes.isEmptyValueInEnv(null));
+ assertFalse(DefinedHeatParameterTypes.isEmptyValueInEnv(""));
+ }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/HttpHeader.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/HttpHeader.java
index 95963b504f..90672f6eaf 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/HttpHeader.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/HttpHeader.java
@@ -15,6 +15,9 @@
*/
package org.openecomp.sdc.logging.servlet;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -30,6 +33,8 @@ import java.util.function.Function;
* @author evitaliy
* @since 25 Mar 2018
*/
+@EqualsAndHashCode
+@ToString
public class HttpHeader {
private static final String NAMES_CANNOT_BE_NULL = "Names cannot be null";
@@ -75,26 +80,4 @@ public class HttpHeader {
}
return Optional.empty();
}
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- HttpHeader that = (HttpHeader) o;
- return Objects.equals(headerNames, that.headerNames);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(headerNames);
- }
-
- @Override
- public String toString() {
- return "HttpHeader{headerNames=" + headerNames + '}';
- }
}