Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java

@@ -25,13 +25,11 @@ import org.eclipse.hawkbit.repository.model.Artifact;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.rest.resource.helper.RestResourceConversionHelper;
+import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.web.bind.annotation.AuthenticationPrincipal;
@@ -55,7 +53,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping(ControllerConstants.ARTIFACTS_V1_REQUEST_MAPPING)
-public class ArtifactStoreController implements EnvironmentAware {
+public class ArtifactStoreController {
     private static final Logger LOG = LoggerFactory.getLogger(ArtifactStoreController.class);
 
     @Autowired
@@ -67,14 +65,8 @@ public class ArtifactStoreController implements EnvironmentAware {
     @Autowired
     private CacheWriteNotify cacheWriteNotify;
 
-    private static final String SP_SERVER_CONFIG_PREFIX = "hawkbit.server.";
-    private RelaxedPropertyResolver environment;
-
-    @Override
-    public void setEnvironment(final Environment environment) {
-        this.environment = new RelaxedPropertyResolver(environment, SP_SERVER_CONFIG_PREFIX);
-
-    }
+    @Autowired
+    private HawkbitSecurityProperties securityProperties;
 
     /**
      * Handles GET {@link Artifact} download request. This could be full or
@@ -138,8 +130,8 @@ public class ArtifactStoreController implements EnvironmentAware {
 
     private Action checkAndReportDownloadByTarget(final HttpServletRequest request, final String targetid,
             final LocalArtifact artifact) {
-        final Target target = controllerManagement.updateLastTargetQuery(targetid, IpUtil.getClientIpFromRequest(
-                request, environment.getProperty("security.rp.remote_ip_header", String.class, "X-Forwarded-For")));
+        final Target target = controllerManagement.updateLastTargetQuery(targetid,
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         final Action action = controllerManagement
                 .getActionForDownloadByTargetAndSoftwareModule(target.getControllerId(), artifact.getSoftwareModule());

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java

@@ -41,15 +41,13 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
 import org.eclipse.hawkbit.rest.resource.helper.RestResourceConversionHelper;
+import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -74,7 +72,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping(ControllerConstants.BASE_V1_REQUEST_MAPPING)
-public class RootController implements EnvironmentAware {
+public class RootController {
 
     private static final Logger LOG = LoggerFactory.getLogger(RootController.class);
     private static final String GIVEN_ACTION_IS_NOT_ASSIGNED_TO_GIVEN_TARGET = "given action ({}) is not assigned to given target ({}).";
@@ -99,16 +97,8 @@ public class RootController implements EnvironmentAware {
     @Autowired
     private TenantAware tenantAware;
 
-    private String requestHeader;
-
-    @Override
-    public void setEnvironment(final Environment environment) {
-        final RelaxedPropertyResolver relaxedPropertyResolver = new RelaxedPropertyResolver(environment,
-                SP_SERVER_CONFIG_PREFIX);
-
-        requestHeader = relaxedPropertyResolver.getProperty("security.rp.remote_ip_header", String.class,
-                "X-Forwarded-For");
-    }
+    @Autowired
+    private HawkbitSecurityProperties securityProperties;
 
     /**
      * Returns all artifacts of a given software module and target.
@@ -155,12 +145,13 @@ public class RootController implements EnvironmentAware {
         LOG.debug("getControllerBase({})", targetid);
 
         final Target target = controllerManagement.findOrRegisterTargetIfItDoesNotexist(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         if (target.getTargetInfo().getUpdateStatus() == TargetUpdateStatus.UNKNOWN) {
             LOG.debug("target with {} extsisted but was in status UNKNOWN -> REGISTERED)", targetid);
             controllerManagement.updateTargetStatus(target.getTargetInfo(), TargetUpdateStatus.REGISTERED,
-                    System.currentTimeMillis(), IpUtil.getClientIpFromRequest(request, requestHeader));
+                    System.currentTimeMillis(),
+                    IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
         }
 
         return new ResponseEntity<>(
@@ -195,7 +186,7 @@ public class RootController implements EnvironmentAware {
         ResponseEntity<Void> result;
 
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
         final SoftwareModule module = softwareManagement.findSoftwareModuleById(softwareModuleId);
 
         if (checkModule(fileName, module)) {
@@ -265,7 +256,8 @@ public class RootController implements EnvironmentAware {
     public ResponseEntity<Void> downloadArtifactMd5(@PathVariable final String targetid,
             @PathVariable final Long softwareModuleId, @PathVariable final String fileName,
             final HttpServletResponse response, final HttpServletRequest request) {
-        controllerManagement.updateLastTargetQuery(targetid, IpUtil.getClientIpFromRequest(request, requestHeader));
+        controllerManagement.updateLastTargetQuery(targetid,
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         final SoftwareModule module = softwareManagement.findSoftwareModuleById(softwareModuleId);
 
@@ -311,7 +303,7 @@ public class RootController implements EnvironmentAware {
         LOG.debug("getControllerBasedeploymentAction({},{})", targetid, resource);
 
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         final Action action = findActionWithExceptionIfNotFound(actionId);
         if (!action.getTarget().getId().equals(target.getId())) {
@@ -362,7 +354,7 @@ public class RootController implements EnvironmentAware {
         LOG.debug("provideBasedeploymentActionFeedback for target [{},{}]: {}", targetid, actionId, feedback);
 
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         if (!actionId.equals(feedback.getId())) {
             LOG.warn(
@@ -467,7 +459,8 @@ public class RootController implements EnvironmentAware {
             + ControllerConstants.CONFIG_DATA_ACTION, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Void> putConfigData(@Valid @RequestBody final ConfigData configData,
             @PathVariable final String targetid, final HttpServletRequest request) {
-        controllerManagement.updateLastTargetQuery(targetid, IpUtil.getClientIpFromRequest(request, requestHeader));
+        controllerManagement.updateLastTargetQuery(targetid,
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         controllerManagement.updateControllerAttributes(targetid, configData.getData());
 
@@ -493,7 +486,7 @@ public class RootController implements EnvironmentAware {
         LOG.debug("getControllerCancelAction({})", targetid);
 
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         final Action action = findActionWithExceptionIfNotFound(actionId);
         if (!action.getTarget().getId().equals(target.getId())) {
@@ -540,7 +533,7 @@ public class RootController implements EnvironmentAware {
         LOG.debug("provideCancelActionFeedback for target [{}]: {}", targetid, feedback);
 
         final Target target = controllerManagement.updateLastTargetQuery(targetid,
-                IpUtil.getClientIpFromRequest(request, requestHeader));
+                IpUtil.getClientIpFromRequest(request, securityProperties.getClients().getRemoteIpHeader()));
 
         if (!actionId.equals(feedback.getId())) {
             LOG.warn(

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/PagingUtility.java

@@ -23,11 +23,6 @@ import org.springframework.data.domain.Sort.Direction;
 /**
  * Utility class for for paged body generation.
  *
- *
- *
- *
- *
- *
  */
 public final class PagingUtility {
     /*
@@ -90,8 +85,9 @@ public final class PagingUtility {
         if (sortParam != null) {
             sorting = new Sort(SortUtility.parse(ActionFields.class, sortParam));
         } else {
-            // default sort
-            sorting = new Sort(Direction.ASC, ActionFields.ID.getFieldName());
+            // default sort is DESC in case of action to match behavior
+            // of management UI (last entry on top)
+            sorting = new Sort(Direction.DESC, ActionFields.ID.getFieldName());
         }
         return sorting;
     }
@@ -101,8 +97,9 @@ public final class PagingUtility {
         if (sortParam != null) {
             sorting = new Sort(SortUtility.parse(ActionStatusFields.class, sortParam));
         } else {
-            // default sort
-            sorting = new Sort(Direction.ASC, ActionStatusFields.ID.getFieldName());
+            // default sort is DESC in case of action status to match behavior
+            // of management UI (last entry on top)
+            sorting = new Sort(Direction.DESC, ActionStatusFields.ID.getFieldName());
         }
         return sorting;
     }

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/TargetMapper.java

@@ -297,8 +297,8 @@ final public class TargetMapper {
         final ActionStatusRest result = new ActionStatusRest();
 
         result.setMessages(actionStatus.getMessages());
-        result.setReportedAt(action.getCreatedAt());
-        result.setStatusId(action.getId());
+        result.setReportedAt(actionStatus.getCreatedAt());
+        result.setStatusId(actionStatus.getId());
         result.setType(getNameOfActionStatusType(actionStatus.getStatus()));
 
         return result;

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/TargetResource.java

@@ -235,7 +235,7 @@ public class TargetResource implements TargetRestApi {
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeActionStatusSortParam(sortParam);
 
-        final Page<ActionStatus> statusList = this.deploymentManagement.findActionStatusMessagesByActionInDescOrder(
+        final Page<ActionStatus> statusList = this.deploymentManagement.findActionStatusByAction(
                 new OffsetBasedPageRequest(sanitizedOffsetParam, sanitizedLimitParam, sorting), action, true);
 
         return new ResponseEntity<>(

hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/rest/resource/TargetResourceTest.java

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.rest.resource;
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.hasSize;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
@@ -34,6 +35,7 @@ import org.eclipse.hawkbit.TestDataUtil;
 import org.eclipse.hawkbit.WithUser;
 import org.eclipse.hawkbit.exception.SpServerError;
 import org.eclipse.hawkbit.im.authentication.SpPermission;
+import org.eclipse.hawkbit.repository.ActionFields;
 import org.eclipse.hawkbit.repository.ActionStatusFields;
 import org.eclipse.hawkbit.repository.exception.EntityAlreadyExistsException;
 import org.eclipse.hawkbit.repository.model.Action;
@@ -109,27 +111,24 @@ public class TargetResourceTest extends AbstractIntegrationTest {
                 new ActionStatus(actions.get(0), Status.FINISHED, System.currentTimeMillis(), "testmessage"),
                 actions.get(0));
 
-        final PageRequest pageRequest = new PageRequest(0, 1000, Direction.ASC, ActionStatusFields.ID.getFieldName());
+        final PageRequest pageRequest = new PageRequest(0, 1000, Direction.ASC, ActionFields.ID.getFieldName());
+        final ActionStatus status = deploymentManagement
+                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
+                .get(0).getActionStatus().stream().sorted((e1, e2) -> Long.compare(e2.getId(), e1.getId()))
+                .collect(Collectors.toList()).get(0);
 
-        // limit to 1 - first page -> standard cancel message
-        final Long reportAt = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(0).getCreatedAt();
-        final Long id = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(0).getId();
         mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
                 + RestConstants.TARGET_V1_ACTIONS + "/" + actions.get(0).getId() + "/status")
                         .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(limitSize))
-                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "ID:ASC"))
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "ID:DESC"))
                 .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print())
                 .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(3)))
                 .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(limitSize)))
                 .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(limitSize)))
-                .andExpect(jsonPath("content.[0].id", equalTo(id.intValue())))
+                .andExpect(jsonPath("content.[0].id", equalTo(status.getId().intValue())))
                 .andExpect(jsonPath("content.[0].type", equalTo("finished")))
                 .andExpect(jsonPath("content.[0].messages", hasSize(1)))
-                .andExpect(jsonPath("content.[0].reportedAt", equalTo(reportAt)))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(status.getCreatedAt().longValue())))
                 .andExpect(jsonPath("content.[1].type", equalTo("canceling")));
     }
 
@@ -839,7 +838,8 @@ public class TargetResourceTest extends AbstractIntegrationTest {
         final List<Action> actions = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId);
 
         mvc.perform(get(
-                RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/" + RestConstants.TARGET_V1_ACTIONS))
+                RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/" + RestConstants.TARGET_V1_ACTIONS)
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "ID:ASC"))
                 .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
                 .andExpect(jsonPath("content.[1].id", equalTo(actions.get(1).getId().intValue())))
                 .andExpect(jsonPath("content.[1].type", equalTo("update")))
@@ -856,6 +856,108 @@ public class TargetResourceTest extends AbstractIntegrationTest {
                 .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(2)));
     }
 
+    @Test
+    @Description("Verfies that the API returns the status list with expected content.")
+    public void getMultipleActionStatus() throws Exception {
+        final String knownTargetId = "targetId";
+        final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0);
+        // retrieve list in default descending order for actionstaus entries
+        final List<ActionStatus> actionStatus = action.getActionStatus().stream()
+                .sorted((e1, e2) -> Long.compare(e2.getId(), e1.getId())).collect(Collectors.toList());
+
+        // sort is default descending order, latest status first
+        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
+                + RestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" + RestConstants.TARGET_V1_ACTION_STATUS))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
+                .andExpect(jsonPath("content.[0].id", equalTo(actionStatus.get(0).getId().intValue())))
+                .andExpect(jsonPath("content.[0].type", equalTo("canceling")))
+                .andExpect(jsonPath("content.[0].messages", hasItem("manual cancelation requested")))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(actionStatus.get(0).getCreatedAt())))
+                .andExpect(jsonPath("content.[1].id", equalTo(actionStatus.get(1).getId().intValue())))
+                .andExpect(jsonPath("content.[1].type", equalTo("running")))
+                .andExpect(jsonPath("content.[1].reportedAt", equalTo(actionStatus.get(1).getCreatedAt())))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(2)));
+    }
+
+    @Test
+    @Description("Verfies that the API returns the status list with expected content sorted by reportedAt field.")
+    public void getMultipleActionStatusSortedByReportedAt() throws Exception {
+        final String knownTargetId = "targetId";
+        final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0);
+        final List<ActionStatus> actionStatus = action.getActionStatus().stream()
+                .sorted((e1, e2) -> Long.compare(e1.getId(), e2.getId())).collect(Collectors.toList());
+
+        // descending order
+        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
+                + RestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" + RestConstants.TARGET_V1_ACTION_STATUS)
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "REPORTEDAT:DESC"))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
+                .andExpect(jsonPath("content.[0].id", equalTo(actionStatus.get(1).getId().intValue())))
+                .andExpect(jsonPath("content.[0].type", equalTo("canceling")))
+                .andExpect(jsonPath("content.[0].messages", hasItem("manual cancelation requested")))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(actionStatus.get(1).getCreatedAt())))
+                .andExpect(jsonPath("content.[1].id", equalTo(actionStatus.get(0).getId().intValue())))
+                .andExpect(jsonPath("content.[1].type", equalTo("running")))
+                .andExpect(jsonPath("content.[1].reportedAt", equalTo(actionStatus.get(0).getCreatedAt())))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(2)));
+
+        // ascending order
+        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
+                + RestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" + RestConstants.TARGET_V1_ACTION_STATUS)
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "REPORTEDAT:ASC"))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
+                .andExpect(jsonPath("content.[1].id", equalTo(actionStatus.get(1).getId().intValue())))
+                .andExpect(jsonPath("content.[1].type", equalTo("canceling")))
+                .andExpect(jsonPath("content.[1].messages", hasItem("manual cancelation requested")))
+                .andExpect(jsonPath("content.[1].reportedAt", equalTo(actionStatus.get(1).getCreatedAt())))
+                .andExpect(jsonPath("content.[0].id", equalTo(actionStatus.get(0).getId().intValue())))
+                .andExpect(jsonPath("content.[0].type", equalTo("running")))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(actionStatus.get(0).getCreatedAt())))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(2)));
+    }
+
+    @Test
+    @Description("Verfies that the API returns the status list with expected content split into two pages.")
+    public void getMultipleActionStatusWithPagingLimitRequestParameter() throws Exception {
+        final String knownTargetId = "targetId";
+
+        final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0);
+        final List<ActionStatus> actionStatus = action.getActionStatus().stream()
+                .sorted((e1, e2) -> Long.compare(e1.getId(), e2.getId())).collect(Collectors.toList());
+
+        // Page 1
+        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
+                + RestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" + RestConstants.TARGET_V1_ACTION_STATUS)
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(1)))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
+                .andExpect(jsonPath("content.[0].id", equalTo(actionStatus.get(1).getId().intValue())))
+                .andExpect(jsonPath("content.[0].type", equalTo("canceling")))
+                .andExpect(jsonPath("content.[0].messages", hasItem("manual cancelation requested")))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(actionStatus.get(1).getCreatedAt())))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(1)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(1)));
+
+        // Page 2
+        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
+                + RestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" + RestConstants.TARGET_V1_ACTION_STATUS)
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(1))
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_OFFSET, String.valueOf(1)))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
+                .andExpect(jsonPath("content.[0].id", equalTo(actionStatus.get(0).getId().intValue())))
+                .andExpect(jsonPath("content.[0].type", equalTo("running")))
+                .andExpect(jsonPath("content.[0].reportedAt", equalTo(actionStatus.get(0).getCreatedAt())))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(2)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(1)))
+                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(1)));
+    }
+
     @Test
     public void getMultipleActionsWithPagingLimitRequestParameter() throws Exception {
         final String knownTargetId = "targetId";
@@ -864,7 +966,8 @@ public class TargetResourceTest extends AbstractIntegrationTest {
         // page 1: one entry
         mvc.perform(get(
                 RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/" + RestConstants.TARGET_V1_ACTIONS)
-                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(1)))
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(1))
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "ID:ASC"))
                 .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
                 .andExpect(jsonPath("content.[0].id", equalTo(actions.get(0).getId().intValue())))
                 .andExpect(jsonPath("content.[0].type", equalTo("cancel")))
@@ -879,7 +982,9 @@ public class TargetResourceTest extends AbstractIntegrationTest {
         mvc.perform(get(
                 RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/" + RestConstants.TARGET_V1_ACTIONS)
                         .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(1))
-                        .param(RestConstants.REQUEST_PARAMETER_PAGING_OFFSET, String.valueOf(1)))
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_OFFSET, String.valueOf(1))
+                        .param(RestConstants.REQUEST_PARAMETER_PAGING_OFFSET, String.valueOf(1))
+                        .param(RestConstants.REQUEST_PARAMETER_SORTING, "ID:ASC"))
                 .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
                 .andExpect(jsonPath("content.[0].id", equalTo(actions.get(1).getId().intValue())))
                 .andExpect(jsonPath("content.[0].type", equalTo("update")))
@@ -907,7 +1012,8 @@ public class TargetResourceTest extends AbstractIntegrationTest {
                 + "?offset=0&limit=50&sort=id:DESC";
     }
 
-    private List<Action> generateTargetWithTwoUpdatesWithOneOverride(final String knownTargetId) {
+    private List<Action> generateTargetWithTwoUpdatesWithOneOverride(final String knownTargetId)
+            throws InterruptedException {
 
         final PageRequest pageRequest = new PageRequest(0, 100, Direction.ASC, ActionStatusFields.ID.getFieldName());
 
@@ -925,6 +1031,8 @@ public class TargetResourceTest extends AbstractIntegrationTest {
         final List<Target> updatedTargets = deploymentManagement.assignDistributionSet(one, targets)
                 .getAssignedTargets();
         // 2nd update
+        // sleep 10ms to ensure that we can sort by reportedAt
+        Thread.sleep(10);
         deploymentManagement.assignDistributionSet(two, updatedTargets);
 
         // two updates, one cancelation
@@ -951,54 +1059,6 @@ public class TargetResourceTest extends AbstractIntegrationTest {
                         equalTo(generateStatusreferenceLink(knownTargetId, actions.get(1)))));
     }
 
-    @Test
-    public void getActionStatusWithMultipleResultsWithPagingLimitRequestParameter() throws Exception {
-        final int limitSize = 1;
-        final String knownTargetId = "targetId";
-        final List<Action> actions = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId);
-        actions.get(0).setStatus(Status.RUNNING);
-        controllerManagament.addUpdateActionStatus(
-                new ActionStatus(actions.get(0), Status.RUNNING, System.currentTimeMillis(), "testmessage"),
-                actions.get(0));
-
-        final PageRequest pageRequest = new PageRequest(0, 1000, Direction.ASC, ActionStatusFields.ID.getFieldName());
-
-        // limit to 1 - first page -> standard cancel message
-        Long reportAt = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(0).getCreatedAt();
-        Long id = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(0).getId();
-        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
-                + RestConstants.TARGET_V1_ACTIONS + "/" + actions.get(0).getId() + "/status")
-                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(limitSize)))
-                .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print())
-                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(3)))
-                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(limitSize)))
-                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_CONTENT, hasSize(limitSize)))
-                .andExpect(jsonPath("content.[0].id", equalTo(id.intValue())))
-                .andExpect(jsonPath("content.[0].type", equalTo("running")))
-                .andExpect(jsonPath("content.[0].messages", hasSize(1)))
-                .andExpect(jsonPath("content.[0].reportedAt", equalTo(reportAt)));
-
-        // limit to 1 - first page -> added custom message
-        reportAt = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(1).getCreatedAt();
-        id = deploymentManagement
-                .findActionsByTarget(pageRequest, targetManagement.findTargetByControllerID(knownTargetId)).getContent()
-                .get(1).getCreatedAt();
-
-        mvc.perform(get(RestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownTargetId + "/"
-                + RestConstants.TARGET_V1_ACTIONS + "/" + actions.get(0).getId() + "/status")
-                        .param(RestConstants.REQUEST_PARAMETER_PAGING_LIMIT, String.valueOf(limitSize))
-                        .param(RestConstants.REQUEST_PARAMETER_PAGING_OFFSET, String.valueOf(1)))
-                .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print())
-                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_TOTAL, equalTo(3)))
-                .andExpect(jsonPath(JSON_PATH_PAGED_LIST_SIZE, equalTo(1)));
-    }
-
     @Test
     public void assignDistributionSetToTarget() throws Exception {
 

hawkbit-rest-resource/src/test/resources/application-test.properties

@@ -24,7 +24,7 @@ hawkbit.server.database=H2
 hawkbit.server.database.env=TEST
 spring.main.show_banner=false
 
-hawkbit.server.controller.security.authentication.header=true
+hawkbit.server.ddi.security.authentication.header=true
 
 hawkbit.server.artifact.repo.upload.maxFileSize=5MB
 

hawkbit-rest-resource/src/test/resources/log4j2.xml

@@ -17,7 +17,7 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="org.eclipse.hawkbit.MockMvcResultPrinter" level="debug" />
+        <Logger name="org.eclipse.hawkbit.MockMvcResultPrinter" level="error" />
 
         <Root level="error">
             <AppenderRef ref="Console"/>