package com.oransc.rappmanager.rest;
-import com.oransc.rappmanager.models.rappinstance.DeployOrder;
+import com.oransc.rappmanager.models.cache.RappCacheService;
+import com.oransc.rappmanager.models.exception.RappHandlerException;
import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.rappinstance.DeployOrder;
import com.oransc.rappmanager.models.rappinstance.RappInstance;
import com.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder;
import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
-import com.oransc.rappmanager.models.cache.RappCacheService;
import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
import com.oransc.rappmanager.service.RappService;
import java.util.Map;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@GetMapping
public ResponseEntity<Map<UUID, RappInstance>> getAllRappInstances(@PathVariable("rapp_id") String rappId) {
- return rappCacheService.getRapp(rappId).map(Rapp::getRappInstances).map(ResponseEntity::ok)
- .orElse(ResponseEntity.notFound().build());
+ return rappCacheService.getRapp(rappId).map(Rapp::getRappInstances).map(ResponseEntity::ok).orElseThrow(
+ () -> new RappHandlerException(HttpStatus.NOT_FOUND, "No instance found for rApp '" + rappId + "'."));
}
@PostMapping
rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
rapp.getRappInstances().put(rappInstance.getRappInstanceId(), rappInstance);
return ResponseEntity.ok(rappInstance);
- }).orElse(ResponseEntity.notFound().build());
+ }).orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND, "rApp '" + rappId + "' not found."));
}
@GetMapping("{rapp_instance_id}")
RappInstance rappInstance = rappPair.getLeft().getRappInstances().get(rappInstanceId);
rappInstance.setState(rappInstanceStateMachine.getRappInstanceState(rappInstanceId));
return rappInstance;
- }).map(ResponseEntity::ok).orElse(ResponseEntity.notFound().build());
+ }).map(ResponseEntity::ok).orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
+ "No instance found for rApp '" + rappId + "'."));
}
@PutMapping("{rapp_instance_id}")
.filter(deployOrder -> deployOrder.equals(DeployOrder.DEPLOY))
.map(primeOrder -> rappService.deployRappInstance(rappPair.getLeft(), rappPair.getRight()))
.orElseGet(() -> rappService.undeployRappInstance(rappPair.getLeft(), rappPair.getRight())))
- .orElse(ResponseEntity.notFound().build());
+ .orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
+ "rApp instance '" + rappInstanceId + "' not found."));
//@formatter:on
}
rappPair.getLeft().getRappInstances().get(rappInstanceId));
rappPair.getLeft().getRappInstances().remove(rappInstanceId);
return ResponseEntity.noContent().build();
- }).orElse(ResponseEntity.notFound().build());
+ }).orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
+ "rApp instance '" + rappInstanceId + "' not found."));
}
}