Merge pull request #55 from Breeding-Insight/bug/BI-2663

BI-2663 - BrAPI observations/table regression with UUID change

Author: nickpalladino

src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationService.java

@@ -468,7 +468,7 @@ private List<List<String>> buildDataMatrix(Page<ObservationEntity> observations,
 			row.add(printIfNotNull(obs.getObservationTimeStamp())); // OBSERVATIONTIMESTAMP
 
 			for (ObservationVariableEntity var : variables) {
-				if (obs.getObservationVariable() != null && obs.getObservationVariable().getId().toString() == var.getId().toString()) {
+				if (obs.getObservationVariable() != null && obs.getObservationVariable().getId().equals(var.getId())) {
 					row.add(obs.getValue());
 				} else {
 					row.add("");