Remove leftover UEB configurations

Issue-ID: POLICY-4945
Change-Id: I05f7dca432ed859360e2239bba91ee5c35229697
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java
index 629ead8..0535b9d 100644 (file)
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java
@@ -3,13 +3,14 @@
  * ONAP-Logging
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 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.
@@ -73,12 +74,6 @@ public enum MessageCodes implements EELFResolvableResourceEnum {
 
     RULE_METRICS_INFO,
 
-    UEB_AUDIT_EXEC_INFO,
-
-    UEB_AUDIT_BEGIN_INFO,
-
-    UEB_AUDIT_END_INFO,
-
     UPDATE_ERROR,
 
     GENERAL_ERROR,

diff --git a/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties b/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties
index 4f2c3f6..0f9d0f8 100644 (file)
--- a/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties
+++ b/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties
@@ -3,6 +3,7 @@
 # ONAP-Logging
 # ================================================================================
 # Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2024 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -111,24 +112,6 @@ RULE_METRICS_INFO=\
              No resolution needed|\
              Generate information for Metric events
 
-UEB_AUDIT_EXEC_INFO=\
-             POLICY-511I|\
-             Service Name: {0}:Executing UEB: {1}|\
-             No resolution needed|\
-             Executing method
-
-UEB_AUDIT_BEGIN_INFO=\
-             POLICY-512I|\
-             Service Name: {0}:Entering UEB: {1}|\
-             No resolution needed|\
-             Entering method
-
-UEB_AUDIT_END_INFO=\
-             POLICY-513I|\
-             Service Name: {0}:Exiting UEB: {1}|\
-             No resolution needed|\
-             Exiting method
-
 
 
 RULE_AUDIT_START_END_INFO=\

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSink.java
index 4073f5a..ceb9255 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSink.java
@@ -24,12 +24,12 @@ package org.onap.policy.common.endpoints.event.comm.bus;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 
 /**
- * Topic Sink over Bus Infrastructure (KAFKA/UEB).
+ * Topic Sink over Bus Infrastructure (KAFKA).
  */
 public interface BusTopicSink extends ApiKeyEnabled, TopicSink {
 
     /**
-     * Sets the UEB partition key for published messages.
+     * Sets the partition key for published messages.
      *
      * @param partitionKey the partition key
      */

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSource.java
index f1af8a2..87a0682 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicSource.java
@@ -24,7 +24,7 @@ package org.onap.policy.common.endpoints.event.comm.bus;
 import org.onap.policy.common.endpoints.event.comm.TopicSource;
 
 /**
- * Generic Topic Source for UEB/KAFKA Communication Infrastructure.
+ * Generic Topic Source for Bus Communication Infrastructure.
  *
  */
 public interface BusTopicSource extends ApiKeyEnabled, TopicSource {

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
index dfdc7b3..9b72407 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
@@ -33,8 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Transport Agnostic Bus Topic Sink to carry out the core functionality to interact with a sink
- * regardless if it is UEB or Kafka.
+ * Transport Agnostic Bus Topic Sink to carry out the core functionality to interact with a sink.
  *
  */
 public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopicSink {

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/properties/PolicyEndPointProperties.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/properties/PolicyEndPointProperties.java
index 4b4bf50..4295a0a 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/properties/PolicyEndPointProperties.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/properties/PolicyEndPointProperties.java
@@ -48,11 +48,6 @@ public final class PolicyEndPointProperties {
 
     public static final String PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX = ".selfSignedCertificates";
 
-    /* UEB Properties */
-
-    public static final String PROPERTY_UEB_SOURCE_TOPICS = "ueb.source.topics";
-    public static final String PROPERTY_UEB_SINK_TOPICS = "ueb.sink.topics";
-
     public static final String PROPERTY_NOOP_SOURCE_TOPICS = "noop.source.topics";
     public static final String PROPERTY_NOOP_SINK_TOPICS = "noop.sink.topics";
 

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/UebPropertyUtils.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/UebPropertyUtils.java
deleted file mode 100644 (file)
index 8aff9f2..0000000
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/UebPropertyUtils.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP
- * ================================================================================
- * Copyright (C) 2019, 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.onap.policy.common.endpoints.utils;
-
-import com.google.re2j.Pattern;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams.TopicParamsBuilder;
-import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties;
-
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class UebPropertyUtils {
-    private static final Pattern COMMA_SPACE_PAT = Pattern.compile("\\s*,\\s*");
-
-    /**
-     * Makes a topic builder, configuring it with properties that are common to both
-     * sources and sinks.
-     *
-     * @param props properties to be used to configure the builder
-     * @param topic topic being configured
-     * @param servers target servers
-     * @return a topic builder
-     */
-    public static TopicParamsBuilder makeBuilder(PropertyUtils props, String topic, String servers) {
-
-        final List<String> serverList = new ArrayList<>(Arrays.asList(COMMA_SPACE_PAT.split(servers)));
-
-        return BusTopicParams.builder()
-                    .servers(serverList)
-                    .topic(topic)
-                    .effectiveTopic(props.getString(PolicyEndPointProperties.PROPERTY_TOPIC_EFFECTIVE_TOPIC_SUFFIX,
-                                    topic))
-                    .apiKey(props.getString(PolicyEndPointProperties.PROPERTY_TOPIC_API_KEY_SUFFIX, null))
-                    .apiSecret(props.getString(PolicyEndPointProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX, null))
-                    .consumerGroup(props.getString(
-                                    PolicyEndPointProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX, null))
-                    .consumerInstance(props.getString(
-                                    PolicyEndPointProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX, null))
-                    .managed(props.getBoolean(PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, true))
-                    .useHttps(props.getBoolean(PolicyEndPointProperties.PROPERTY_HTTP_HTTPS_SUFFIX, false))
-                    .allowSelfSignedCerts(props.getBoolean(
-                                    PolicyEndPointProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX,
-                                    false));
-    }
-}