Sample submission match param annotations and null check

Author: nickpalladino

src/main/java/org/brapi/test/BrAPITestServer/controller/geno/SamplesApiController.java

@@ -52,22 +52,22 @@ public SamplesApiController(SampleService sampleService, SearchService searchSer
 	@Override
 	public ResponseEntity<SampleListResponse> samplesGet(
 			@Valid @RequestParam(value = "batchDeleteDbId", required = false) String batchDeleteDbId,
-			@RequestParam(value = "sampleDbId", required = false) String sampleDbId,
-			@RequestParam(value = "sampleName", required = false) String sampleName,
-			@RequestParam(value = "sampleGroupDbId", required = false) String sampleGroupDbId,
-			@RequestParam(value = "observationUnitDbId", required = false) String observationUnitDbId,
-			@RequestParam(value = "plateDbId", required = false) String plateDbId,
-			@RequestParam(value = "plateName", required = false) String plateName,
-			@RequestParam(value = "germplasmDbId", required = false) String germplasmDbId,
-			@RequestParam(value = "studyDbId", required = false) String studyDbId,
-			@RequestParam(value = "trialDbId", required = false) String trialDbId,
-			@RequestParam(value = "commonCropName", required = false) String commonCropName,
-			@RequestParam(value = "programDbId", required = false) String programDbId,
-			@RequestParam(value = "externalReferenceID", required = false) String externalReferenceId,
-			@RequestParam(value = "externalReferenceID", required = false) String externalReferenceID,
-			@RequestParam(value = "externalReferenceSource", required = false) String externalReferenceSource,
-			@RequestParam(value = "page", required = false) Integer page,
-			@RequestParam(value = "pageSize", required = false) Integer pageSize,
+			@Valid @RequestParam(value = "sampleDbId", required = false) String sampleDbId,
+			@Valid @RequestParam(value = "sampleName", required = false) String sampleName,
+			@Valid @RequestParam(value = "sampleGroupDbId", required = false) String sampleGroupDbId,
+			@Valid @RequestParam(value = "observationUnitDbId", required = false) String observationUnitDbId,
+			@Valid @RequestParam(value = "plateDbId", required = false) String plateDbId,
+			@Valid @RequestParam(value = "plateName", required = false) String plateName,
+			@Valid @RequestParam(value = "germplasmDbId", required = false) String germplasmDbId,
+			@Valid @RequestParam(value = "studyDbId", required = false) String studyDbId,
+			@Valid @RequestParam(value = "trialDbId", required = false) String trialDbId,
+			@Valid @RequestParam(value = "commonCropName", required = false) String commonCropName,
+			@Valid @RequestParam(value = "programDbId", required = false) String programDbId,
+			@Valid @RequestParam(value = "externalReferenceID", required = false) String externalReferenceId,
+			@Valid @RequestParam(value = "externalReferenceID", required = false) String externalReferenceID,
+			@Valid @RequestParam(value = "externalReferenceSource", required = false) String externalReferenceSource,
+			@Valid @RequestParam(value = "page", required = false) Integer page,
+			@Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
 			@RequestHeader(value = "Authorization", required = false) String authorization)
 			throws BrAPIServerException {
 

src/main/java/org/brapi/test/BrAPITestServer/service/geno/SampleService.java

@@ -258,7 +258,7 @@ private Sample convertFromEntity(SampleEntity entity) {
 		sample.setSampleBarcode(entity.getSampleBarcode());
 		sample.setSampleDbId(entity.getId().toString());
 		sample.setSampleDescription(entity.getSampleDescription());
-		sample.setSampleGroupDbId(entity.getSampleGroupDbId().toString());
+		sample.setSampleGroupDbId(entity.getSampleGroupDbId() != null ? entity.getSampleGroupDbId().toString(): null);
 		sample.setSampleName(entity.getSampleName());
 		sample.setSamplePUI(entity.getSamplePUI());
 		sample.setSampleTimestamp(DateUtility.toOffsetDateTime(entity.getSampleTimestamp()));