@@ -43,14 +43,14 @@ public <T extends Schema<X>, X> Optional<ChangedSchema> diff(
4343 Discriminator leftDis = leftComposedSchema .getDiscriminator ();
4444 Discriminator rightDis = rightComposedSchema .getDiscriminator ();
4545 if ((leftDis == null && rightDis != null )
46- || (leftDis != null && rightDis == null )
47- || (leftDis != null && rightDis != null && (
48- ( leftDis . getPropertyName () == null && rightDis . getPropertyName () != null )
49- || ( leftDis .getPropertyName () != null && rightDis .getPropertyName () = = null )
50- || (leftDis .getPropertyName () != null && rightDis .getPropertyName () != null &&
51- ! leftDis .getPropertyName (). equals ( rightDis . getPropertyName ()))
52- ))
53- ) {
46+ || (leftDis != null && rightDis == null )
47+ || (leftDis != null
48+ && rightDis != null
49+ && (( leftDis .getPropertyName () == null && rightDis .getPropertyName () ! = null )
50+ || (leftDis .getPropertyName () != null && rightDis .getPropertyName () == null )
51+ || ( leftDis .getPropertyName () != null
52+ && rightDis . getPropertyName () != null
53+ && ! leftDis . getPropertyName (). equals ( rightDis . getPropertyName ())))) ) {
5454 changedSchema .setOldSchema (left );
5555 changedSchema .setNewSchema (right );
5656 changedSchema .setDiscriminatorPropertyChanged (true );
@@ -109,7 +109,8 @@ private Map<String, String> getMapping(ComposedSchema composedSchema) {
109109 reverseMapping .put (ref , schemaName );
110110 }
111111
112- if (composedSchema .getDiscriminator () != null && composedSchema .getDiscriminator ().getMapping () != null ) {
112+ if (composedSchema .getDiscriminator () != null
113+ && composedSchema .getDiscriminator ().getMapping () != null ) {
113114 for (String ref : composedSchema .getDiscriminator ().getMapping ().keySet ()) {
114115 reverseMapping .put (composedSchema .getDiscriminator ().getMapping ().get (ref ), ref );
115116 }
0 commit comments