Merge of new rebased code

[appc.git] / appc-event-listener / appc-event-listener-bundle / src / main / java / org / openecomp / appc / listener / ListenerProperties.java

diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
index c6c374e..2ff76b3 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/ListenerProperties.java
@@ -156,43 +156,6 @@ public class ListenerProperties {
         return String.format("%s", prefix);
     }
 
-    /**
-     * The message service types that are available. Choices are DMaaP and DMaaP.
-     *
-     * @since Apr 25, 2016
-     * @version $Id$
-     */
-    public enum MessageService {
-        DMaaP("dmaap");
-
-        private String val;
-
-        private MessageService(String val) {
-            this.val = val;
-        }
-
-        public String getValue() {
-            return val;
-        }
-
-        /**
-         * Tries to match a string to a MessageService. If no match is found, returns the default (DMaaP)
-         * 
-         * @param input
-         *            the string to try and match
-         * @return A MessasgeService
-         */
-        public static MessageService parse(String input) {
-            if (input != null) {
-                for (MessageService ms : MessageService.values()) {
-                    if (ms.getValue().equals(input.toLowerCase())) {
-                        return ms;
-                    }
-                }
-            }
-            return MessageService.DMaaP; // Default
-        }
-    }
 
     /**
      * Set of common properties that will be used by most systems. Primarily relating to DMaaP and ThreadPools