If state conversion fails use original value instead of null

[triller-telekom]

Fixes #3520
Fixes #3530
Fixes #3539

Signed-off-by: Stefan Triller stefan.triller@telekom.de

[maggu2810]

WRT to @SJKA comment about changing the as function (which should be kept as it is IMHO) I would add another option:
Create a asOrDefault method similar to the new one in e.g. Map interface (https://docs.oracle.com/javase/8/docs/api/java/util/Map.html#getOrDefault-java.lang.Object-V-)

So you could call e.g.

applyState(state.asOrDefault(HSBType.class, state));

[kaikreuzer]

@maggu2810 I would refrain from adding a asOrDefaultmethod - this would be a new public API and I do not really see a use case where this would be needed. And if there is no real use case that anyone requests, I would not want to broaden the API unnecessarily.

[kaikreuzer]

This PR changes the code to look & work the same way as it was before - so I would be fine to merge it as is.

[kaikreuzer]

@maggu2810 As this addresses 3 critical issue, I hope you are fine to merge it as is - any further changes can be done in upcoming PRs.

[maggu2810]

Didn't this PR shows that there are already three code parts that use the same logic?
As it could be implemented as a default method in the interface I don't see not a problem on adding this method to the API.
But if you don't like it I don't care but IMHO asOrDefault does make the same sense as providing an as function that return value needs to be checked.