diff options
| -rw-r--r-- | Changelog.md | 3 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rwxr-xr-x | src/main/java/org/onap/dcae/common/RestapiCallNodeUtil.java | 16 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/Changelog.md b/Changelog.md index fe86cbb..0a73d68 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.4.1] - 2023/03/15 + - [DCAEGEN2-3336] - Restconf-collector cannot be set to HTTP + ## [1.4.0] - 2023/02/1 - [DCAEGEN2-3337] - dcaegen2-collectors-restconf vulnerability updates @@ -28,7 +28,7 @@ limitations under the License. </parent> <groupId>org.onap.dcaegen2.collectors.restconf</groupId> <artifactId>restconfcollector</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>dcaegen2-collectors-restconf</name> <description>RestConfCollector</description> <properties> diff --git a/src/main/java/org/onap/dcae/common/RestapiCallNodeUtil.java b/src/main/java/org/onap/dcae/common/RestapiCallNodeUtil.java index 9566658..470df13 100755 --- a/src/main/java/org/onap/dcae/common/RestapiCallNodeUtil.java +++ b/src/main/java/org/onap/dcae/common/RestapiCallNodeUtil.java @@ -3,6 +3,7 @@ * org.onap.dcaegen2.collectors.restconf * ================================================================================ * Copyright (C) 2018-2019 Huawei. All rights reserved. + * Copyright (C) 2023 Deutsche Telekom AG. 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. @@ -43,14 +44,13 @@ public class RestapiCallNodeUtil { } public static String getUriMethod(Boolean authEnabled) { - /*@TODO: As per configuration */ -// String uri; -// if (authEnabled) { -// uri = "https://"; -// } else { -// uri = "http://"; -// } - return "https://"; + String uri; + if (authEnabled) { + uri = "https://"; + } else { + uri = "http://"; + } + return uri; } public static Parameters getParameters(Map<String, String> paramMap) throws Exception { diff --git a/version.properties b/version.properties index 9e0d73d..f352992 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=4 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |