Fixed download progress event.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java

@@ -65,11 +65,14 @@ public interface ControllerManagement {
      *            the ID of the {@link ActionStatus}
      * @param progressPercent
      *            the progress in percentage which must be between 0-100
-     * @param shippedBytes
-     *            since last event
+     * @param shippedBytesSinceLast
+     *            since the last report
+     * @param shippedBytesOverall
+     *            for the {@link ActionStatus}
      */
     @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
-    void downloadProgressPercent(long statusId, int progressPercent, long shippedBytes);
+    void downloadProgressPercent(long statusId, int progressPercent, long shippedBytesSinceLast,
+            long shippedBytesOverall);
 
     /**
      * Simple addition of a new {@link ActionStatus} entry to the {@link Action}
@@ -77,9 +80,11 @@ public interface ControllerManagement {
      * 
      * @param statusMessage
      *            to add to the action
+     * 
+     * @return create {@link ActionStatus} entity
      */
     @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
-    void addInformationalActionStatus(@NotNull ActionStatus statusMessage);
+    ActionStatus addInformationalActionStatus(@NotNull ActionStatus statusMessage);
 
     /**
      * Adds an {@link ActionStatus} entry for an update {@link Action} including

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java

@@ -29,12 +29,4 @@ public interface TenantStatsManagement {
             + SpringEvalExpressions.IS_SYSTEM_CODE)
     TenantUsage getStatsOfTenant();
 
-    /**
-     * Resets {@link TenantUsage#getOverallArtifactTrafficInBytes()} to zero.
-     * 
-     */
-    @PreAuthorize(SpringEvalExpressions.HAS_AUTH_TENANT_CONFIGURATION + SpringEvalExpressions.HAS_AUTH_OR
-            + SpringEvalExpressions.IS_SYSTEM_CODE)
-    void resetTrafficStatsOfTenant();
-
 }

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/TenantUsage.java

@@ -19,7 +19,6 @@ public class TenantUsage {
     private long artifacts;
     private long actions;
     private long overallArtifactVolumeInBytes;
-    private long overallArtifactTrafficInBytes;
 
     /**
      * Constructor.
@@ -106,28 +105,12 @@ public class TenantUsage {
         return this;
     }
 
-    /**
-     * @return the overallArtifactTrafficInBytes
-     */
-    public long getOverallArtifactTrafficInBytes() {
-        return overallArtifactTrafficInBytes;
-    }
-
-    /**
-     * @param overallArtifactTrafficInBytes
-     *            the overallArtifactTrafficInBytes to set
-     */
-    public void setOverallArtifactTrafficInBytes(final long overallArtifactTrafficInBytes) {
-        this.overallArtifactTrafficInBytes = overallArtifactTrafficInBytes;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + (int) (actions ^ (actions >>> 32));
         result = prime * result + (int) (artifacts ^ (artifacts >>> 32));
-        result = prime * result + (int) (overallArtifactTrafficInBytes ^ (overallArtifactTrafficInBytes >>> 32));
         result = prime * result + (int) (overallArtifactVolumeInBytes ^ (overallArtifactVolumeInBytes >>> 32));
         result = prime * result + (int) (targets ^ (targets >>> 32));
         result = prime * result + ((tenantName == null) ? 0 : tenantName.hashCode());
@@ -142,7 +125,7 @@ public class TenantUsage {
         if (obj == null) {
             return false;
         }
-        if (getClass() != obj.getClass()) {
+        if (!(obj instanceof TenantUsage)) {
             return false;
         }
         final TenantUsage other = (TenantUsage) obj;
@@ -152,9 +135,6 @@ public class TenantUsage {
         if (artifacts != other.artifacts) {
             return false;
         }
-        if (overallArtifactTrafficInBytes != other.overallArtifactTrafficInBytes) {
-            return false;
-        }
         if (overallArtifactVolumeInBytes != other.overallArtifactVolumeInBytes) {
             return false;
         }
@@ -174,8 +154,7 @@ public class TenantUsage {
     @Override
     public String toString() {
         return "TenantUsage [tenantName=" + tenantName + ", targets=" + targets + ", artifacts=" + artifacts
-                + ", actions=" + actions + ", overallArtifactVolumeInBytes=" + overallArtifactVolumeInBytes
-                + ", overallArtifactTrafficInBytes=" + overallArtifactTrafficInBytes + "]";
+                + ", actions=" + actions + ", overallArtifactVolumeInBytes=" + overallArtifactVolumeInBytes + "]";
     }
 
 }