diff options
-rw-r--r-- | dcae-analytics/dcae-analytics-model/pom.xml | 4 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-core/pom.xml | 2 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-model/pom.xml | 2 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/facade/Aai.java | 11 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/util/json/serializer/AaiSerializer.java | 68 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-web/pom.xml | 13 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-test/pom.xml | 2 | ||||
-rw-r--r-- | dcae-analytics/dcae-analytics-web/pom.xml | 19 | ||||
-rw-r--r-- | dcae-analytics/pom.xml | 2 | ||||
-rw-r--r-- | dcae-analytics/version.properties | 2 | ||||
-rw-r--r-- | eelf-logger/eelf-logger-api/pom.xml | 2 | ||||
-rw-r--r-- | eelf-logger/eelf-logger-logback-impl/pom.xml | 2 | ||||
-rw-r--r-- | eelf-logger/eelf-logger-model/pom.xml | 2 | ||||
-rw-r--r-- | eelf-logger/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 2 |
16 files changed, 108 insertions, 29 deletions
diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml index ff8382d..69f21d3 100644 --- a/dcae-analytics/dcae-analytics-model/pom.xml +++ b/dcae-analytics/dcae-analytics-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-model</artifactId> @@ -42,7 +42,7 @@ <properties> <main.basedir>${project.parent.basedir}</main.basedir> - <sdk.version>1.5.0</sdk.version> + <sdk.version>1.8.6</sdk.version> <immutable.version>2.7.1</immutable.version> </properties> diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml index f7393ac..cdc75d1 100644 --- a/dcae-analytics/dcae-analytics-tca-core/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-tca-core</artifactId> diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml index 076125d..92bd50f 100644 --- a/dcae-analytics/dcae-analytics-tca-model/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-tca-model</artifactId> diff --git a/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/facade/Aai.java b/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/facade/Aai.java index 796587b..46e71fb 100644 --- a/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/facade/Aai.java +++ b/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/facade/Aai.java @@ -1,7 +1,8 @@ /* - * ================================================================================ + * ================================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ + * Copyright (C) 2021 Samsung Electronics 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 @@ -13,22 +14,24 @@ * 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========================================================= + * ============LICENSE_END=========================================================== * */ package org.onap.dcae.analytics.tca.model.facade; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import lombok.EqualsAndHashCode; - import org.onap.dcae.analytics.model.common.BaseDynamicPropertiesProvider; +import org.onap.dcae.analytics.tca.model.util.json.serializer.AaiSerializer; /** * @author Rajiv Singla */ @Data @EqualsAndHashCode(callSuper = true) +@JsonSerialize(using = AaiSerializer.class) public class Aai extends BaseDynamicPropertiesProvider implements TcaFacadeModel { private static final long serialVersionUID = 1L; diff --git a/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/util/json/serializer/AaiSerializer.java b/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/util/json/serializer/AaiSerializer.java new file mode 100644 index 0000000..f21ea53 --- /dev/null +++ b/dcae-analytics/dcae-analytics-tca-model/src/main/java/org/onap/dcae/analytics/tca/model/util/json/serializer/AaiSerializer.java @@ -0,0 +1,68 @@ +/* + * ================================================================================== + * Copyright (C) 2021 Samsung Electronics 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.dcae.analytics.tca.model.util.json.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.onap.dcae.analytics.tca.model.facade.Aai; + +public class AaiSerializer extends StdSerializer<Aai> { + + private static final String SERVER_NAME_KEY = "vserver.vserver-name"; + private static final String VNF_NAME_KEY = "generic-vnf.vnf-name"; + + public AaiSerializer(){ + this(Aai.class); + } + + protected AaiSerializer(Class<Aai> t) { + super(t); + } + + @Override + public void serialize(Aai aai, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) + throws IOException { + + jsonGenerator.writeStartObject(); + + List<String> filters = new ArrayList<>(); + if (aai.getGenericVNFName() != null) { + serializerProvider.defaultSerializeField(VNF_NAME_KEY, aai.getGenericVNFName(), jsonGenerator); + filters.add(VNF_NAME_KEY); + } + + if (aai.getGenericServerName() != null) { + serializerProvider.defaultSerializeField(SERVER_NAME_KEY, aai.getGenericServerName(), jsonGenerator); + filters.add(SERVER_NAME_KEY); + } + + for (Map.Entry<String, Object> prop : aai.getDynamicProperties().entrySet()) { + if (!filters.contains(prop.getKey())) { + serializerProvider.defaultSerializeField(prop.getKey(), prop.getValue(), jsonGenerator); + } + } + + jsonGenerator.writeEndObject(); + } +} diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml index 7c81f4f..0a1b994 100644 --- a/dcae-analytics/dcae-analytics-tca-web/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml @@ -4,6 +4,7 @@ ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. ~ Copyright (c) 2021 Samsung Electronics. All rights reserved. ~ Copyright (c) 2021 Nokia Intellectual Property. All rights reserved. + ~ Copyright (c) 2021 Wipro Limited. ~ ================================================================================ ~ Modifications Copyright (C) 2019 IBM ~ ================================================================================ @@ -31,7 +32,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-tca-web</artifactId> @@ -42,8 +43,9 @@ <description>Contains Web related code for TCA</description> <properties> - <main.basedir>${project.parent.basedir}</main.basedir> - <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> + <main.basedir>${project.parent.basedir}</main.basedir> + <undertow-core.version>2.2.7.Final</undertow-core.version> + <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> </properties> @@ -67,7 +69,7 @@ <exclusions> <exclusion> <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> + <artifactId>undertow-core</artifactId> </exclusion> </exclusions> </dependency> @@ -123,7 +125,8 @@ <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core --> <dependency> <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> + <artifactId>undertow-core</artifactId> + <version>${undertow-core.version}</version> </dependency> </dependencies> diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml index 5102cc6..d61f9be 100644 --- a/dcae-analytics/dcae-analytics-test/pom.xml +++ b/dcae-analytics/dcae-analytics-test/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-test</artifactId> diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml index 856a8ed..5d79faf 100644 --- a/dcae-analytics/dcae-analytics-web/pom.xml +++ b/dcae-analytics/dcae-analytics-web/pom.xml @@ -4,6 +4,7 @@ ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. ~ Copyright (c) 2021 Samsung Electronics. All rights reserved. ~ Copyright (c) 2021 Nokia Intellectual Property. All rights reserved. + ~ Copyright (c) 2021 Wipro Limited. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -29,7 +30,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-web</artifactId> @@ -40,7 +41,9 @@ <description>Contains common web code for all DCAE Analytics Modules</description> <properties> - <main.basedir>${project.parent.basedir}</main.basedir> + <main.basedir>${project.parent.basedir}</main.basedir> + <undertow-core.version>2.2.7.Final</undertow-core.version> + <httpclient.version>4.5.13</httpclient.version> </properties> @@ -71,11 +74,11 @@ <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> + <artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> <exclusion> <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> + <artifactId>undertow-core</artifactId> </exclusion> </exclusions> </dependency> @@ -86,7 +89,7 @@ <exclusions> <exclusion> <groupId>io.undertow</groupId> - <artifactId>undertow-websockets-jsr</artifactId> + <artifactId>undertow-websockets-jsr</artifactId> </exclusion> </exclusions> </dependency> @@ -113,7 +116,8 @@ <!-- APACHE HTTP CLIENT --> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> </dependency> <!-- UTILITIES --> @@ -147,7 +151,8 @@ <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core --> <dependency> <groupId>io.undertow</groupId> - <artifactId>undertow-core</artifactId> + <artifactId>undertow-core</artifactId> + <version>${undertow-core.version}</version> </dependency> </dependencies> diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml index d3d924f..01f3c3d 100644 --- a/dcae-analytics/pom.xml +++ b/dcae-analytics/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>tca-gen2-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics</artifactId> diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties index b1893d0..33359df 100644 --- a/dcae-analytics/version.properties +++ b/dcae-analytics/version.properties @@ -19,7 +19,7 @@ # major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml index 00fa5cb..6ed8ddd 100644 --- a/eelf-logger/eelf-logger-api/pom.xml +++ b/eelf-logger/eelf-logger-api/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>eelf-logger-api</artifactId> diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml index 399077d..e427e9f 100644 --- a/eelf-logger/eelf-logger-logback-impl/pom.xml +++ b/eelf-logger/eelf-logger-logback-impl/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>eelf-logger-logback-impl</artifactId> diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml index 8458548..5eaff67 100644 --- a/eelf-logger/eelf-logger-model/pom.xml +++ b/eelf-logger/eelf-logger-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>eelf-logger-model</artifactId> diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml index 472a715..11ed323 100644 --- a/eelf-logger/pom.xml +++ b/eelf-logger/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>tca-gen2-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>eelf-logger</artifactId> @@ -29,7 +29,7 @@ <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>tca-gen2-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <name>dcaegen2-analytics-tca-gen2</name> <packaging>pom</packaging> diff --git a/version.properties b/version.properties index 7d6815b..fee4928 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |