Fixed download progress event.

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

hawkbit-cache-redis/src/test/java/org/eclipse/hawkbit/cache/eventbus/EventDistributorTest.java

@@ -56,7 +56,7 @@ public class EventDistributorTest {
     @Test
     public void distributeDistributedEventSendsToRedis() {
 
-        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L);
+        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L, 200L);
         underTest.distribute(event);
 
         // origin node ID should be set by distributing the event
@@ -67,7 +67,7 @@ public class EventDistributorTest {
     @Test
     public void dontDistributeDistributedEventIfSameNode() {
         final String knownNodeId = EventDistributor.getNodeId();
-        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L);
+        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L, 200L);
         event.setNodeId(knownNodeId);
 
         // test
@@ -79,7 +79,7 @@ public class EventDistributorTest {
 
     @Test
     public void handleDistributedMessageFromRedis() {
-        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L);
+        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L, 200L);
         final String knownChannel = "someChannel";
 
         underTest.handleMessage(event, knownChannel);
@@ -90,7 +90,7 @@ public class EventDistributorTest {
 
     @Test
     public void handleDistributedMessageFilteredIfSameNodeId() {
-        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L);
+        final DownloadProgressEvent event = new DownloadProgressEvent("tenant", 123L, 10, 100L, 200L);
         final String knownChannel = "someChannel";
         event.setOriginNodeId(EventDistributor.getNodeId());
 

hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/DownloadProgressEvent.java

@@ -21,7 +21,8 @@ public class DownloadProgressEvent extends AbstractDistributedEvent {
 
     private final Long statusId;
     private final int progressPercent;
-    private final long shippedBytes;
+    private final long shippedBytesSinceLast;
+    private final long shippedBytesOverall;
 
     /**
      * Constructor.
@@ -29,40 +30,39 @@ public class DownloadProgressEvent extends AbstractDistributedEvent {
      * @param tenant
      *            the tenant for this event
      * @param statusId
-     *            of {@link Action}
+     *            of {@link ActionStatus}
      * @param progressPercent
      *            number (1-100)
+     * @param shippedBytesSinceLast
+     *            bytes since last event
+     * @param shippedBytesOverall
+     *            on the download request
      */
     public DownloadProgressEvent(final String tenant, final Long statusId, final int progressPercent,
-            final long shippedBytes) {
+            final long shippedBytesSinceLast, final long shippedBytesOverall) {
         // the revision of the DownloadProgressEvent is just equal the
         // progressPercentage due the
         // percentage is going from 0 to 100.
         super(statusId, tenant);
         this.statusId = statusId;
         this.progressPercent = progressPercent;
-        this.shippedBytes = shippedBytes;
+        this.shippedBytesSinceLast = shippedBytesSinceLast;
+        this.shippedBytesOverall = shippedBytesOverall;
     }
 
-    /**
-     * @return the statusId
-     */
     public Long getStatusId() {
         return statusId;
     }
 
-    /**
-     * @return the progressPercent
-     */
     public int getProgressPercent() {
         return progressPercent;
     }
 
-    /**
+    public long getShippedBytesSinceLast() {
-     * @return the shippedBytes
+        return shippedBytesSinceLast;
-     */
-    public long getShippedBytes() {
-        return shippedBytes;
     }
 
+    public long getShippedBytesOverall() {
+        return shippedBytesOverall;
+    }
 }

hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactStoreController.java

@@ -93,12 +93,12 @@ public class DdiArtifactStoreController implements DdiDlArtifactStoreControllerR
             // we set a download status only if we are aware of the
             // targetid, i.e. authenticated and not anonymous
             if (targetid != null && !"anonymous".equals(targetid)) {
-                final Action action = checkAndReportDownloadByTarget(
+                final ActionStatus actionStatus = checkAndReportDownloadByTarget(
                         requestResponseContextHolder.getHttpServletRequest(), targetid, artifact);
                 result = RestResourceConversionHelper.writeFileResponse(artifact,
                         requestResponseContextHolder.getHttpServletResponse(),
                         requestResponseContextHolder.getHttpServletRequest(), file, controllerManagement,
-                        action.getId());
+                        actionStatus.getId());
             } else {
                 result = RestResourceConversionHelper.writeFileResponse(artifact,
                         requestResponseContextHolder.getHttpServletResponse(),
@@ -131,7 +131,7 @@ public class DdiArtifactStoreController implements DdiDlArtifactStoreControllerR
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    private Action checkAndReportDownloadByTarget(final HttpServletRequest request, final String targetid,
+    private ActionStatus checkAndReportDownloadByTarget(final HttpServletRequest request, final String targetid,
             final LocalArtifact artifact) {
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
                 IpUtil.getClientIpFromRequest(request, securityProperties));
@@ -152,8 +152,8 @@ public class DdiArtifactStoreController implements DdiDlArtifactStoreControllerR
             actionStatus.addMessage(
                     RepositoryConstants.SERVER_MESSAGE_PREFIX + "Target downloads: " + request.getRequestURI());
         }
-        controllerManagement.addInformationalActionStatus(actionStatus);
+
-        return action;
+        return controllerManagement.addInformationalActionStatus(actionStatus);
     }
 
 }

hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java

@@ -156,8 +156,8 @@ public class DdiRootController implements DdiRootControllerRestApi {
             if (ifMatch != null && !RestResourceConversionHelper.matchesHttpHeader(ifMatch, artifact.getSha1Hash())) {
                 result = new ResponseEntity<>(HttpStatus.PRECONDITION_FAILED);
             } else {
-                final Action action = checkAndLogDownload(requestResponseContextHolder.getHttpServletRequest(), target,
+                final ActionStatus action = checkAndLogDownload(requestResponseContextHolder.getHttpServletRequest(),
-                        module);
+                        target, module);
                 result = RestResourceConversionHelper.writeFileResponse(artifact,
                         requestResponseContextHolder.getHttpServletResponse(),
                         requestResponseContextHolder.getHttpServletRequest(), file, controllerManagement,
@@ -167,7 +167,7 @@ public class DdiRootController implements DdiRootControllerRestApi {
         return result;
     }
 
-    private Action checkAndLogDownload(final HttpServletRequest request, final Target target,
+    private ActionStatus checkAndLogDownload(final HttpServletRequest request, final Target target,
             final SoftwareModule module) {
         final Action action = controllerManagement
                 .getActionForDownloadByTargetAndSoftwareModule(target.getControllerId(), module);
@@ -185,8 +185,8 @@ public class DdiRootController implements DdiRootControllerRestApi {
             statusMessage.addMessage(
                     RepositoryConstants.SERVER_MESSAGE_PREFIX + "Target downloads " + request.getRequestURI());
         }
-        controllerManagement.addInformationalActionStatus(statusMessage);
+
-        return action;
+        return controllerManagement.addInformationalActionStatus(statusMessage);
     }
 
     private static boolean checkModule(final String fileName, final SoftwareModule module) {

hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java

@@ -67,6 +67,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
 
     private volatile int downLoadProgress = 0;
     private volatile long shippedBytes = 0;
+    private volatile long shippedBytesTotal = 0;
 
     @Autowired
     private EventBus eventBus;
@@ -240,7 +241,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
     public void downloadArtifactThroughFileName() throws Exception {
         downLoadProgress = 1;
         shippedBytes = 0;
-        tenantStatsManagement.resetTrafficStatsOfTenant();
+        shippedBytesTotal = 0;
         eventBus.register(this);
         assertThat(softwareManagement.findSoftwareModulesAll(pageReq)).hasSize(0);
 
@@ -281,8 +282,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
 
         // download complete
         assertThat(downLoadProgress).isEqualTo(10);
-        assertThat(shippedBytes).isEqualTo(ARTIFACT_SIZE)
+        assertThat(shippedBytes).isEqualTo(shippedBytesTotal).isEqualTo(ARTIFACT_SIZE);
-                .isEqualTo(tenantStatsManagement.getStatsOfTenant().getOverallArtifactTrafficInBytes());
     }
 
     @Test
@@ -321,7 +321,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
     public void downloadArtifactByNameFailsIfNotAuthenticated() throws Exception {
         downLoadProgress = 1;
         shippedBytes = 0;
-        tenantStatsManagement.resetTrafficStatsOfTenant();
+        shippedBytesTotal = 0;
         eventBus.register(this);
 
         assertThat(softwareManagement.findSoftwareModulesAll(pageReq)).hasSize(0);
@@ -329,7 +329,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
         // create target
         Target target = entityFactory.generateTarget("4712");
         target = targetManagement.createTarget(target);
-        final List<Target> targets = new ArrayList();
+        final List<Target> targets = new ArrayList<>();
         targets.add(target);
 
         // create ds
@@ -337,7 +337,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
 
         // create artifact
         final byte random[] = RandomUtils.nextBytes(ARTIFACT_SIZE);
-        final Artifact artifact = artifactManagement.createLocalArtifact(new ByteArrayInputStream(random),
+        artifactManagement.createLocalArtifact(new ByteArrayInputStream(random),
                 ds.findFirstModuleByType(osType).getId(), "file1.tar.bz2", false);
 
         // download fails as artifact is not yet assigned to target
@@ -346,8 +346,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
                 .andExpect(status().isNotFound());
 
         assertThat(downLoadProgress).isEqualTo(1);
-        assertThat(shippedBytes).isEqualTo(0)
+        assertThat(shippedBytes).isEqualTo(shippedBytesTotal).isEqualTo(0L);
-                .isEqualTo(tenantStatsManagement.getStatsOfTenant().getOverallArtifactTrafficInBytes());
     }
 
     @Test
@@ -356,7 +355,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
     public void downloadArtifactByNameByNamedController() throws Exception {
         downLoadProgress = 1;
         shippedBytes = 0;
-        tenantStatsManagement.resetTrafficStatsOfTenant();
+        shippedBytesTotal = 0;
         eventBus.register(this);
 
         assertThat(softwareManagement.findSoftwareModulesAll(pageReq)).hasSize(0);
@@ -404,8 +403,7 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
 
         // download complete
         assertThat(downLoadProgress).isEqualTo(10);
-        assertThat(shippedBytes).isEqualTo(ARTIFACT_SIZE)
+        assertThat(shippedBytes).isEqualTo(shippedBytesTotal).isEqualTo(ARTIFACT_SIZE);
-                .isEqualTo(tenantStatsManagement.getStatsOfTenant().getOverallArtifactTrafficInBytes());
     }
 
     @Test
@@ -567,6 +565,8 @@ public class DdiArtifactDownloadTest extends AbstractRestIntegrationTestWithMong
     @Subscribe
     public void listen(final DownloadProgressEvent event) {
         downLoadProgress++;
-        shippedBytes += event.getShippedBytes();
+        shippedBytes += event.getShippedBytesSinceLast();
+        shippedBytesTotal = event.getShippedBytesOverall();
+
     }
 }

hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java

@@ -25,7 +25,6 @@ public class MgmtSystemTenantServiceUsage {
     private long artifacts;
     private long actions;
     private long overallArtifactVolumeInBytes;
-    private long overallArtifactTrafficInBytes;
 
     /**
      * Constructor.
@@ -36,14 +35,6 @@ public class MgmtSystemTenantServiceUsage {
         this.tenantName = tenantName;
     }
 
-    public long getOverallArtifactTrafficInBytes() {
-        return overallArtifactTrafficInBytes;
-    }
-
-    public void setOverallArtifactTrafficInBytes(final long overallArtifactTrafficInBytes) {
-        this.overallArtifactTrafficInBytes = overallArtifactTrafficInBytes;
-    }
-
     public long getTargets() {
         return targets;
     }

hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java

@@ -87,7 +87,6 @@ public class MgmtSystemManagementResource implements MgmtSystemManagementRestApi
         result.setArtifacts(tenant.getArtifacts());
         result.setOverallArtifactVolumeInBytes(tenant.getOverallArtifactVolumeInBytes());
         result.setTargets(tenant.getTargets());
-        result.setOverallArtifactTrafficInBytes(tenant.getOverallArtifactTrafficInBytes());
 
         return result;
     }

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
+     * @param shippedBytesSinceLast
-     *            since last event
+     *            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
+                + ", actions=" + actions + ", overallArtifactVolumeInBytes=" + overallArtifactVolumeInBytes + "]";
-                + ", overallArtifactTrafficInBytes=" + overallArtifactTrafficInBytes + "]";
     }
 
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java

@@ -451,8 +451,8 @@ public class JpaControllerManagement implements ControllerManagement {
     @Override
     @Modifying
     @Transactional(isolation = Isolation.READ_UNCOMMITTED)
-    public void addInformationalActionStatus(final ActionStatus statusMessage) {
+    public ActionStatus addInformationalActionStatus(final ActionStatus statusMessage) {
-        actionStatusRepository.save((JpaActionStatus) statusMessage);
+        return actionStatusRepository.save((JpaActionStatus) statusMessage);
     }
 
     @Override
@@ -469,8 +469,9 @@ public class JpaControllerManagement implements ControllerManagement {
     }
 
     @Override
-    public void downloadProgressPercent(final long statusId, final int progressPercent, final long shippedBytes) {
+    public void downloadProgressPercent(final long statusId, final int progressPercent,
-        cacheWriteNotify.downloadProgressPercent(statusId, progressPercent, shippedBytes);
+            final long shippedBytesSinceLast, final long shippedBytesOverall) {
+        cacheWriteNotify.downloadProgressPercent(statusId, progressPercent, shippedBytesSinceLast, shippedBytesOverall);
     }
 
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantStatsManagement.java

@@ -8,12 +8,8 @@
  */
 package org.eclipse.hawkbit.repository.jpa;
 
-import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
 
-import org.eclipse.hawkbit.eventbus.event.DownloadProgressEvent;
 import org.eclipse.hawkbit.repository.TenantStatsManagement;
 import org.eclipse.hawkbit.repository.report.model.TenantUsage;
 import org.eclipse.hawkbit.tenancy.TenantAware;
@@ -23,8 +19,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import com.google.common.eventbus.Subscribe;
-
 /**
  * Management service for statistics of a single tenant.
  *
@@ -44,8 +38,6 @@ public class JpaTenantStatsManagement implements TenantStatsManagement {
     @Autowired
     private TenantAware tenantAware;
 
-    private final Map<String, AtomicLong> traffic = new ConcurrentHashMap<>();
-
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_UNCOMMITTED)
     public TenantUsage getStatsOfTenant() {
@@ -64,26 +56,9 @@ public class JpaTenantStatsManagement implements TenantStatsManagement {
         }
 
         result.setActions(actionRepository.count());
-        if (traffic.containsKey(tenant)) {
-            result.setOverallArtifactTrafficInBytes(traffic.get(tenant).get());
-        }
 
         return result;
 
     }
 
-    @Override
-    public void resetTrafficStatsOfTenant() {
-        traffic.remove(tenantAware.getCurrentTenant());
-    }
-
-    @Subscribe
-    public void listen(final DownloadProgressEvent event) {
-        if (traffic.containsKey(event.getTenant())) {
-            traffic.get(event.getTenant()).addAndGet(event.getShippedBytes());
-        } else {
-            traffic.put(event.getTenant(), new AtomicLong(event.getShippedBytes()));
-        }
-    }
-
 }

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/cache/CacheWriteNotify.java

@@ -10,7 +10,6 @@ package org.eclipse.hawkbit.repository.jpa.cache;
 
 import org.eclipse.hawkbit.eventbus.event.DownloadProgressEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.RolloutGroupCreatedEvent;
-import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.ActionStatus;
 import org.eclipse.hawkbit.repository.model.Rollout;
 import org.eclipse.hawkbit.tenancy.TenantAware;
@@ -54,12 +53,15 @@ public class CacheWriteNotify {
      *            the ID of the {@link ActionStatus}
      * @param progressPercent
      *            the progress in percentage which must be between 0-100
-     * @param shippedBytes
+     * @param shippedBytesSinceLast
      *            since last event
+     * @param shippedBytesOverall
+     *            for the download request
      */
-    public void downloadProgressPercent(final long statusId, final int progressPercent, final long shippedBytes) {
+    public void downloadProgressPercent(final long statusId, final int progressPercent,
+            final long shippedBytesSinceLast, final long shippedBytesOverall) {
 
-        final Cache cache = cacheManager.getCache(Action.class.getName());
+        final Cache cache = cacheManager.getCache(ActionStatus.class.getName());
         final String cacheKey = CacheKeys.entitySpecificCacheKey(String.valueOf(statusId),
                 CacheKeys.DOWNLOAD_PROGRESS_PERCENT);
         if (progressPercent < DOWNLOAD_PROGRESS_MAX) {
@@ -71,8 +73,8 @@ public class CacheWriteNotify {
             cache.evict(cacheKey);
         }
 
-        eventBus.post(
+        eventBus.post(new DownloadProgressEvent(tenantAware.getCurrentTenant(), statusId, progressPercent,
-                new DownloadProgressEvent(tenantAware.getCurrentTenant(), statusId, progressPercent, shippedBytes));
+                shippedBytesSinceLast, shippedBytesOverall));
     }
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/cache/CacheWriteNotifyTest.java

@@ -14,7 +14,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.eclipse.hawkbit.eventbus.event.DownloadProgressEvent;
-import org.eclipse.hawkbit.repository.model.Action;
+import org.eclipse.hawkbit.repository.model.ActionStatus;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.junit.Before;
 import org.junit.Test;
@@ -61,12 +61,12 @@ public class CacheWriteNotifyTest {
         final long knownStatusId = 1;
         final int knownPercentage = 23;
 
-        when(cacheManagerMock.getCache(Action.class.getName())).thenReturn(cacheMock);
+        when(cacheManagerMock.getCache(ActionStatus.class.getName())).thenReturn(cacheMock);
         when(tenantAwareMock.getCurrentTenant()).thenReturn("default");
 
-        underTest.downloadProgressPercent(knownStatusId, knownPercentage, 100L);
+        underTest.downloadProgressPercent(knownStatusId, knownPercentage, 100L, 500L);
 
-        verify(cacheManagerMock).getCache(eq(Action.class.getName()));
+        verify(cacheManagerMock).getCache(eq(ActionStatus.class.getName()));
         verify(cacheMock).put(knownStatusId + "." + CacheKeys.DOWNLOAD_PROGRESS_PERCENT, knownPercentage);
         verify(eventBusMock).post(any(DownloadProgressEvent.class));
     }

hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RestResourceConversionHelper.java

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifact;
 import org.eclipse.hawkbit.repository.ControllerManagement;
+import org.eclipse.hawkbit.repository.model.ActionStatus;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,7 +88,7 @@ public final class RestResourceConversionHelper {
      * @param controllerManagement
      *            to write progress updates to
      * @param statusId
-     *            of the UpdateActionStatus
+     *            of the {@link ActionStatus}
      *
      * @return http code
      *
@@ -319,7 +320,8 @@ public final class RestResourceConversionHelper {
                 // every 10 percent an event
                 if (newPercent == 100 || newPercent > progressPercent + 10) {
                     progressPercent = newPercent;
-                    controllerManagement.downloadProgressPercent(statusId, progressPercent, shippedSinceLastEvent);
+                    controllerManagement.downloadProgressPercent(statusId, progressPercent, shippedSinceLastEvent,
+                            total);
                     shippedSinceLastEvent = 0;
                 }
             }