TRUNK-5721: Fix ObsService.getObs error when Obs.valueComplex null

[gayanW]

Description of what I changed

When saving a complex observation with ObsService#saveObs, the ComplexObsHandler#saveObs method gets called only if complexData.getData() is non-null.

openmrs-core/api/src/main/java/org/openmrs/api/impl/ObsServiceImpl.java

Lines 245 to 253 in 4ce7f65

	Concept concept = obs.getConcept();
	if (null != concept && concept.isComplex()
	&& null != complexData && null != complexData.getData()) {
	// save or update complexData object on this obs
	// this is done before the database save so that the obs.valueComplex
	// can be filled in by the handler.
	ComplexObsHandler handler = getHandler(obs);
	if (null != handler) {
	handler.saveObs(obs);

However, it will still be saved to the database.

Then if we call ObsService#getObs for that same observation, it will throw the following exception, since the ComplexObsHandler#getObs still tries to read that non-existent file.

java.lang.NullPointerException
	at org.openmrs.obs.handler.AbstractHandler.getComplexDataFile(AbstractHandler.java:149)
	at org.openmrs.obs.handler.TextHandler.getObs(TextHandler.java:61)
	at org.openmrs.api.impl.ObsServiceImpl.getObs(ObsServiceImpl.java:270)

openmrs-core/api/src/main/java/org/openmrs/obs/handler/AbstractHandler.java

Lines 147 to 149 in 4ce7f65

	public static File getComplexDataFile(Obs obs) {
	String[] names = obs.getValueComplex().split("\\|");
	String filename = names.length < 2 ? names[0] : names[names.length - 1];

I Included a test case to reproduce the issue originally reported in TRUNK-5721

The actual code refactoring will be done, once the expected behavior is confirmed.

Issue I worked on

https://openmrs.atlassian.net/issues/TRUNK-5721

Checklist: I completed these to help reviewers :)

• My IDE is configured to follow the code style of this project.

  No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

• I have added tests to cover my changes. (If you refactored
  existing code that was well tested you do not have to add tests)

  No? -> write tests and add them to this commit git add . && git commit --amend

• I ran mvn clean package right before creating this pull request and
  added all formatting changes to my commit.

  No? -> execute above command

• All new and existing tests passed.

  No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

• My pull request is based on the latest changes of the master branch.

  No? Unsure? -> execute command git pull --rebase upstream master

[dkayiwa]

What do you mean by once the expected behaviour is known?

[gayanW]

I’d like to confirm whether we should allow, a complx observation with ComplexData#data null to be saved in the database?

If it is okay to be saved, then I could make the changes, so ObsService#getObs would allow retrieving complex observation with no data files.

[dkayiwa]

I would not find it correct to save complex data without data. 😊

[gayanW]

Ok, thank you.. I'll also make a community post, if there's more things to clarify.