Fixed the test

dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java

@@ -156,16 +156,12 @@ public class ContainerEndpoint {
     public ResponseEntity<ContainerDto> findById(@NotNull @PathVariable("id") Long containerId)
             throws DockerClientException, ContainerNotFoundException {
         log.debug("endpoint find container, id={}", containerId);
-        final Container container = containerService.find(containerId);
-        final ContainerDto dto = containerMapper.containerToContainerDto(container);
-        final ContainerDto inspect;
+        ContainerDto dto;
         try {
-            inspect = containerService.inspect(containerId);
-            dto.setIpAddress(inspect.getIpAddress());
-            dto.setRunning(inspect.getRunning());
-            dto.setState(inspect.getState());
+            dto = containerService.inspect(containerId);
         } catch (ContainerNotRunningException e) {
             /* ignore */
+            dto = containerMapper.containerToContainerDto(containerService.find(containerId));
             dto.setRunning(false);
             dto.setState(ContainerStateDto.EXITED);
         }

dbrepo-container-service/services/src/main/java/at/tuwien/service/ContainerService.java

@@ -12,46 +12,56 @@ import java.util.List;
 public interface ContainerService {
 
     /**
-     * @param createDto
-     * @param principal
-     * @return
-     * @throws ImageNotFoundException
-     * @throws DockerClientException
-     * @throws ContainerAlreadyExistsException
-     * @throws UserNotFoundException
+     * Creates a container.
+     *
+     * @param createDto The container metadata.
+     * @param principal The principal of the creating user.
+     * @return The container object, if successful.
+     * @throws ImageNotFoundException          The image of the container was not found in the metadata database.
+     * @throws DockerClientException           The docker client was unable to perform this action.
+     * @throws ContainerAlreadyExistsException A container with this name already exists.
+     * @throws UserNotFoundException           The user creating the container was not found in the metadata database.
      */
     Container create(ContainerCreateRequestDto createDto, Principal principal) throws ImageNotFoundException,
             DockerClientException, ContainerAlreadyExistsException, UserNotFoundException;
 
     /**
-     * @param containerId
-     * @return
-     * @throws ContainerNotFoundException
-     * @throws DockerClientException
+     * Stops a container by given id from the metadata database.
+     *
+     * @param containerId The container id.
+     * @return The container object, if successful.
+     * @throws ContainerNotFoundException The container was not found in the metadata database.
+     * @throws DockerClientException      The docker client was unable to perform this action.
      */
     Container stop(Long containerId) throws ContainerNotFoundException, DockerClientException, ContainerAlreadyStoppedException;
 
     /**
-     * @param containerId
-     * @throws ContainerNotFoundException
-     * @throws DockerClientException
-     * @throws ContainerStillRunningException
+     * Removes a stopped container by given id from the metadata database.
+     *
+     * @param containerId The container id.
+     * @throws ContainerNotFoundException     The container was not found in the metadata database.
+     * @throws DockerClientException          The docker client was unable to perform this action.
+     * @throws ContainerStillRunningException The container is still running and this action cannot be performed.
      */
     void remove(Long containerId) throws ContainerNotFoundException, DockerClientException,
             ContainerStillRunningException, ContainerAlreadyRemovedException;
 
     /**
-     * @param id
-     * @return
-     * @throws ContainerNotFoundException
+     * Finds a container with a specific id from the metadata database.
+     *
+     * @param id The container id.
+     * @return The container object, if successful.
+     * @throws ContainerNotFoundException The container was not found in the metadata database.
      */
     Container find(Long id) throws ContainerNotFoundException;
 
     /**
-     * @param id
-     * @return
-     * @throws DockerClientException
-     * @throws ContainerNotRunningException
+     * Inspects a container state and resources by given id.
+     *
+     * @param id The container id.
+     * @return The container object.
+     * @throws DockerClientException        The docker client was unable to perform this action.
+     * @throws ContainerNotRunningException The docker container is not running.
      */
     ContainerDto inspect(Long id) throws DockerClientException, ContainerNotRunningException, ContainerNotFoundException;
 
@@ -63,13 +73,20 @@ public interface ContainerService {
      */
     List<Container> getAll(Integer limit);
 
+    /**
+     * Find all containers on the server.
+     *
+     * @return List of containers.
+     */
     List<com.github.dockerjava.api.model.Container> list();
 
     /**
-     * @param containerId
-     * @return
-     * @throws ContainerNotFoundException
-     * @throws DockerClientException
+     * Starts a container with given id from the metadata database.
+     *
+     * @param containerId The container id.
+     * @return The container object, if successful.
+     * @throws ContainerNotFoundException The container was not found in the metadata database.
+     * @throws DockerClientException      The docker client was unable to perform this action.
      */
     Container start(Long containerId) throws ContainerNotFoundException, DockerClientException, ContainerAlreadyRunningException;
 }

dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java

@@ -208,20 +208,19 @@ public class ContainerServiceImpl implements ContainerService {
             log.error("Failed to inspect container state: container is not running");
             throw new ContainerNotRunningException("Failed to inspect container state");
         }
-        final ContainerDto entity = ContainerDto.builder()
-                .hash(container.getHash())
-                .running(response.getState().getRunning())
-                .state(containerMapper.containerStateToContainerStateDto(response.getState()))
-                .build();
+        final ContainerDto dto = containerMapper.containerToContainerDto(container);
+        dto.setHash(container.getHash());
+        dto.setRunning(response.getState().getRunning());
+        dto.setState(containerMapper.containerStateToContainerStateDto(response.getState()));
         /* now we only support one network */
         response.getNetworkSettings()
                 .getNetworks()
                 .forEach((key, network) -> {
                     log.trace("key {} network {}", key, network);
-                    container.setIpAddress(network.getIpAddress());
+                    dto.setIpAddress(network.getIpAddress());
                 });
         log.info("Inspected container with hash {}", container.getHash());
-        return entity;
+        return dto;
     }
 
     @Override