From: Conor Ward <conor.ward@est.tech>
Date: Mon, 1 Apr 2019 15:50:38 +0000 (+0000)
Subject: Merge "DR AAF CADI integration"
X-Git-Tag: 2.1.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=875daad0a737115702458d1850ddee87ac4cea30;hp=-c

Merge "DR AAF CADI integration"
---

875daad0a737115702458d1850ddee87ac4cea30
diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index c085ebe7,b64396bc..46c46675
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@@ -64,9 -64,9 +64,10 @@@ public class DeliveryTask implements Ru
      private String feedid;
      private String subid;
      private int attempts;
+     private boolean followRedirects;
      private String[][] hdrs;
      private String newInvocationId;
 +    private long resumeTime;
  
  
      /**
@@@ -77,11 -77,12 +78,12 @@@
       *                           the base for the file name in the spool directory and is of
       *                           the form <milliseconds since 1970>.<fqdn of initial data router node>
       */
 -    public DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
 +    DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
          this.deliveryTaskHelper = deliveryTaskHelper;
          this.pubid = pubid;
          destInfo = deliveryTaskHelper.getDestinationInfo();
          subid = destInfo.getSubId();
+         this.followRedirects = destInfo.isFollowRedirects();
          feedid = destInfo.getLogData();
          spool = destInfo.getSpool();
          String dfn = spool + "/" + pubid;
@@@ -90,7 -91,6 +92,7 @@@
          metafile = new File(mfn);
          boolean monly = destInfo.isMetaDataOnly();
          date = Long.parseLong(pubid.substring(0, pubid.indexOf('.')));
 +        resumeTime = System.currentTimeMillis();
          Vector<String[]> hdrv = new Vector<>();
  
          try (BufferedReader br = new BufferedReader(new FileReader(metafile))) {
@@@ -127,7 -127,7 +129,7 @@@
                  hdrv.add(new String[]{h, v});
              }
          } catch (Exception e) {
-             loggerDeliveryTask.error("Exception "+e.getStackTrace(),e);
+             loggerDeliveryTask.error("Exception "+ Arrays.toString(e.getStackTrace()), e);
          }
          hdrs = hdrv.toArray(new String[hdrv.size()][]);
          url = deliveryTaskHelper.getDestURL(fileid);
@@@ -167,7 -167,7 +169,7 @@@
      /**
       * Get the publish ID
       */
 -    public String getPublishId() {
 +    String getPublishId() {
          return (pubid);
      }
  
@@@ -247,7 -247,7 +249,7 @@@
              }
              deliveryTaskHelper.reportStatus(this, rc, xpubid, rmsg);
          } catch (Exception e) {
-             loggerDeliveryTask.error("Exception " + e.getStackTrace(), e);
+             loggerDeliveryTask.error("Exception " + Arrays.toString(e.getStackTrace()), e);
              deliveryTaskHelper.reportException(this, e);
          }
      }
@@@ -326,7 -326,7 +328,7 @@@
          } catch (ProtocolException pe) {
              deliveryTaskHelper.reportDeliveryExtra(this, -1L);
              // Rcvd error instead of 100-continue
-             loggerDeliveryTask.error("Exception " + pe.getStackTrace(), pe);
+             loggerDeliveryTask.error("Exception " + Arrays.toString(pe.getStackTrace()), pe);
          }
          return outputStream;
      }
@@@ -334,7 -334,7 +336,7 @@@
      /**
       * Remove meta and data files
       */
 -    public void clean() {
 +    void clean() {
          datafile.delete();
          metafile.delete();
          eelflogger.info(EelfMsgs.INVOKE, newInvocationId);
@@@ -342,24 -342,10 +344,24 @@@
          hdrs = null;
      }
  
 +    /**
 +     * Set the resume time for a delivery task.
 +     */
 +    void setResumeTime(long resumeTime) {
 +        this.resumeTime = resumeTime;
 +    }
 +
 +    /**
 +     * Get the resume time for a delivery task.
 +     */
 +    long getResumeTime() {
 +        return resumeTime;
 +    }
 +
      /**
       * Has this delivery task been cleaned?
       */
 -    public boolean isCleaned() {
 +    boolean isCleaned() {
          return (hdrs == null);
      }
  
@@@ -373,7 -359,7 +375,7 @@@
      /**
       * Get creation date as encoded in the publish ID.
       */
 -    public long getDate() {
 +    long getDate() {
          return (date);
      }
  
@@@ -387,42 -373,49 +389,49 @@@
      /**
       * Get the content type
       */
 -    public String getCType() {
 +    String getCType() {
          return (ctype);
      }
  
      /**
       * Get the method
       */
 -    public String getMethod() {
 +    String getMethod() {
          return (method);
      }
  
      /**
       * Get the file ID
       */
 -    public String getFileId() {
 +    String getFileId() {
          return (fileid);
      }
  
      /**
       * Get the number of delivery attempts
       */
 -    public int getAttempts() {
 +    int getAttempts() {
          return (attempts);
      }
  
      /**
       * Get the (space delimited list of) subscription ID for this delivery task
       */
 -    public String getSubId() {
 +    String getSubId() {
          return (subid);
      }
  
      /**
       * Get the feed ID for this delivery task
       */
 -    public String getFeedId() {
 +    String getFeedId() {
          return (feedid);
      }
+ 
+     /**
+      * Get the followRedirects for this delivery task
+      */
+     public boolean getFollowRedirects() {
+         return(followRedirects);
+     }
  }
diff --combined pom.xml
index 1609b119,3de167a2..8156d09b
--- a/pom.xml
+++ b/pom.xml
@@@ -55,6 -55,7 +55,7 @@@
          <thoughtworks.version>1.4.10</thoughtworks.version>
          <google.guava.version>26.0-jre</google.guava.version>
          <qos.logback.version>1.2.3</qos.logback.version>
+         <aaf-cadi-aaf.version>2.1.10</aaf-cadi-aaf.version>
          <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
          <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
          <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
@@@ -63,7 -64,7 +64,7 @@@
          <skip.docker.tag>true</skip.docker.tag>
          <skip.docker.push>true</skip.docker.push>
          <commons-codec.version>1.10</commons-codec.version>
 -        <sonar.coverage.exclusions>datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/*</sonar.coverage.exclusions>
 +        <sonar.exclusions>**/src/main/java/org/onap/dmaap/datarouter/reports/**</sonar.exclusions>
      </properties>
      <modules>
          <module>datarouter-prov</module>
@@@ -102,7 -103,6 +103,7 @@@
                          <exclude>**/generated-sources/**</exclude>
                          <exclude>**/yang-gen/**</exclude>
                          <exclude>**/pax/**</exclude>
 +                        <exclude>**/src/main/java/org/onap/dmaap/datarouter/reports/**</exclude>
                      </excludes>
                  </configuration>
                  <executions>