Restore version to SNAPSHOT

[clamp.git] / src / main / java / org / onap / clamp / clds / client / StringMatchPolicyDelegate.java

diff --git a/src/main/java/org/onap/clamp/clds/client/StringMatchPolicyDelegate.java b/src/main/java/org/onap/clamp/clds/client/StringMatchPolicyDelegate.java
index 90e259f..d149137 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/client/StringMatchPolicyDelegate.java
+++ b/src/main/java/org/onap/clamp/clds/client/StringMatchPolicyDelegate.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 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. 
+ * 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 
+ *
+ * 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============================================
  * ===================================================================
@@ -23,44 +23,51 @@
 
 package org.onap.clamp.clds.client;
 
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.onap.clamp.clds.client.req.StringMatchPolicyReq;
 import org.onap.clamp.clds.model.prop.ModelProperties;
+import org.onap.clamp.clds.model.prop.StringMatch;
 import org.onap.clamp.clds.model.refprop.RefProp;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.UUID;
-import java.util.logging.Logger;
-
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
 /**
  * Send String Match info to policy api.
  */
 public class StringMatchPolicyDelegate implements JavaDelegate {
-    // currently uses the java.util.logging.Logger like the Camunda engine
-    private static final Logger logger = Logger.getLogger(StringMatchPolicyDelegate.class.getName());
+    protected static final EELFLogger logger        = EELFManager.getInstance()
+            .getLogger(StringMatchPolicyDelegate.class);
+    protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
 
     @Autowired
-    private PolicyClient policyClient;
-    
+    private PolicyClient            policyClient;
+
     @Autowired
-    private RefProp refProp;
+    private RefProp                 refProp;
 
     /**
-     * Perform activity.  Send String Match info to policy api.
+     * Perform activity. Send String Match info to policy api.
      *
      * @param execution
      */
+    @Override
     public void execute(DelegateExecution execution) throws Exception {
         String stringMatchPolicyRequestUuid = UUID.randomUUID().toString();
         execution.setVariable("stringMatchPolicyRequestUuid", stringMatchPolicyRequestUuid);
 
         ModelProperties prop = ModelProperties.create(execution);
-        String policyJson = StringMatchPolicyReq.format(refProp, prop);
-        String responseMessage = policyClient.sendMicroService(policyJson, prop, stringMatchPolicyRequestUuid);
-        if (responseMessage != null) {
-            execution.setVariable("stringMatchPolicyResponseMessage", responseMessage.getBytes());
+        StringMatch stringMatch = prop.getType(StringMatch.class);
+        if (stringMatch.isFound()) {
+            String policyJson = StringMatchPolicyReq.format(refProp, prop);
+            String responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, stringMatchPolicyRequestUuid);
+            if (responseMessage != null) {
+                execution.setVariable("stringMatchPolicyResponseMessage", responseMessage.getBytes());
+            }
         }
     }