X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=restapi-call-node%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fccsdk%2Fsli%2Fplugins%2Frestapicall%2FRetryPolicy.java;h=8d5143be373c8b21f1f25f611bd10f4de0849c22;hb=HEAD;hp=69334a969ea562df8aa9ab6a5256855dda60a6d7;hpb=0c7f2223a42ae9f1a9ac8954e9b9194e929b72f6;p=ccsdk%2Fsli%2Fplugins.git

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
index 69334a96..8d5143be 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  * 			reserved.
+ * 	Modifications Copyright © 2018 IBM
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,37 +24,41 @@ package org.onap.ccsdk.sli.plugins.restapicall;
 
 public class RetryPolicy {
     private String[] hostnames;
-    private Integer maximumRetries;  
+    private Integer maximumRetries;
+    private int position;
+    private int retryCount;
+
+    public RetryPolicy(String[] hostnames, Integer maximumRetries) {
+    this.hostnames = hostnames;
+    this.maximumRetries = maximumRetries;
+    this.position = 0;
+    this.retryCount = 0;
+
+    }
 
     public Integer getMaximumRetries() {
-        return maximumRetries;
+    return maximumRetries;
     }
-    
-    public String getNextHostName(String uri) throws RetryException {
-        Integer position = null;
-
-        for (int i = 0; i < hostnames.length; i++) {
-            if (uri.contains(hostnames[i])) {
-                position = i;
-                break;
-            }
-        }
-
-        if(position == null){
-            throw new RetryException("No match found for the provided uri[" + uri + "] so the next host name could not be retreived");
-        }
-        position++;
-
-        if (position > hostnames.length - 1) {
-            position = 0;
-        }
-        return hostnames[position];
+
+    public int getRetryCount() {
+    return retryCount;
     }
 
-    public RetryPolicy(String[] hostnames, Integer maximumRetries){
-        this.hostnames = hostnames;
-        this.maximumRetries = maximumRetries;
+    public Boolean shouldRetry() {
+    return retryCount < maximumRetries + 1;
+    }
+
+    public String getRetryMessage() {
+    return retryCount + " retry attempts were made out of " + maximumRetries + " maximum retry attempts.";
     }
     
+    public String getNextHostName() throws RetryException {
+    retryCount++;
+    position++;
+    if (position > hostnames.length - 1) {
+        position = 0;
+    }
+    return hostnames[position];
+    }
 
 }