From beeb5e3846c8457987711491bcb58a6567870591 Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Thu, 25 Jan 2024 14:25:37 +0000 Subject: Remove Dmaap references from policy-common - updated dependencies for jakarta.* compabilities - other dependency updates for security fixes Issue-ID: POLICY-4881 Change-Id: I979d944fcd21279f618d1bcbfe12e914ba30077f Signed-off-by: rameshiyer27 --- .../event/comm/bus/internal/BusHelper.java | 95 ---------------------- 1 file changed, 95 deletions(-) delete mode 100644 policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusHelper.java (limited to 'policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusHelper.java') diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusHelper.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusHelper.java deleted file mode 100644 index 298607b5..00000000 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusHelper.java +++ /dev/null @@ -1,95 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP POLICY - * ================================================================================ - * Copyright (C) 2023 Nordix Foundation. - * ================================================================================ - * 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.endpoints.event.comm.bus.internal; - -import java.util.Properties; -import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; - -public class BusHelper { - - private BusHelper() { - /* no constructor */ - } - - /** - * Complete the properties param with common fields for both BusConsumer and BusPublisher. - * @param busTopicParams topics - * @param dme2RouteOffer route - * @param props properties - */ - public static void setCommonProperties(BusTopicParams busTopicParams, String dme2RouteOffer, Properties props) { - props.setProperty("Environment", busTopicParams.getEnvironment()); - props.setProperty("AFT_ENVIRONMENT", busTopicParams.getAftEnvironment()); - - if (busTopicParams.getPartner() != null) { - props.setProperty("Partner", busTopicParams.getPartner()); - } - if (dme2RouteOffer != null) { - props.setProperty(PolicyEndPointProperties.DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer); - } - - props.setProperty("Latitude", busTopicParams.getLatitude()); - props.setProperty("Longitude", busTopicParams.getLongitude()); - - /* These are optional, will default to these values if not set in additionalProps */ - props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", "50000"); - props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000"); - props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", "15000"); - props.setProperty("Version", "1.0"); - props.setProperty("SubContextPath", "/"); - props.setProperty("sessionstickinessrequired", "no"); - - /* These should not change */ - props.setProperty("TransportType", "DME2"); - } - - /** - * Throws exception when any of the checks are invalid. - * @param busTopicParams topics - * @param topicType topic type (sink or source) - */ - public static void validateBusTopicParams(BusTopicParams busTopicParams, String topicType) { - if (busTopicParams.isEnvironmentInvalid()) { - throw paramException(busTopicParams.getTopic(), topicType, - PolicyEndPointProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX); - } - if (busTopicParams.isAftEnvironmentInvalid()) { - throw paramException(busTopicParams.getTopic(), topicType, - PolicyEndPointProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX); - } - if (busTopicParams.isLatitudeInvalid()) { - throw paramException(busTopicParams.getTopic(), topicType, - PolicyEndPointProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX); - } - if (busTopicParams.isLongitudeInvalid()) { - throw paramException(busTopicParams.getTopic(), topicType, - PolicyEndPointProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX); - } - } - - private static IllegalArgumentException paramException(String topic, String topicType, String propertyName) { - return new IllegalArgumentException("Missing " + topicType + "." - + topic + propertyName + " property for DME2 in DMaaP"); - - } -} -- cgit 1.2.3-korg