1 files changed, 7 insertions, 24 deletions

diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
index f125c134..394e73af 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
@@ -31,7 +31,6 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -168,7 +167,7 @@ public abstract class ProtocolCoderToolset {
 
     /**
      * remove coder.
-     * 
+     *
      * @param eventClass event class
      */
     public void removeCoders(String eventClass) {
@@ -206,7 +205,7 @@ public abstract class ProtocolCoderToolset {
 
     /**
      * Get group id.
-     * 
+     *
      * @return the groupId
      */
     public String getGroupId() {
@@ -215,7 +214,7 @@ public abstract class ProtocolCoderToolset {
 
     /**
      * Get artifact id.
-     * 
+     *
      * @return the artifactId
      */
     public String getArtifactId() {
@@ -224,7 +223,7 @@ public abstract class ProtocolCoderToolset {
 
     /**
      * Get custom coder.
-     * 
+     *
      * @return the customCoder
      */
     public CustomCoder getCustomCoder() {
@@ -233,7 +232,7 @@ public abstract class ProtocolCoderToolset {
 
     /**
      * Set custom coder.
-     * 
+     *
      * @param customCoder the customCoder to set.
      */
     public void setCustomCoder(CustomCoder customCoder) {
@@ -262,28 +261,14 @@ public abstract class ProtocolCoderToolset {
             throw new IllegalStateException("No coders available");
         }
 
-        if (this.coders.size() == 1) {
-            final JsonProtocolFilter filter = this.coders.get(0).getFilter();
-            if (!filter.isRules()) {
-                return this.coders.get(0);
-            }
-        }
-
-        JsonElement event;
-        try {
-            event = this.filteringParser.parse(json);
-        } catch (final Exception e) {
-            throw new UnsupportedOperationException(e);
-        }
-
         for (final CoderFilters decoder : this.coders) {
             try {
-                final boolean accepted = decoder.getFilter().accept(event);
+                boolean accepted = decoder.getFilter().accept(json);
                 if (accepted) {
                     return decoder;
                 }
             } catch (final Exception e) {
-                logger.info("{}: unexpected failure accepting {} because of {}", this, event,
+                logger.info("{}: unexpected failure accepting {} because of {}", this, json,
                         e.getMessage(), e);
                 // continue
             }
@@ -325,8 +310,6 @@ public abstract class ProtocolCoderToolset {
     }
 }
 
-
-
 /**
  * Tools used for encoding/decoding using GSON.
  */