@@ -43,14 +43,14 @@ public <T extends Schema<X>, X> Optional<ChangedSchema> diff(
43
43
Discriminator leftDis = leftComposedSchema .getDiscriminator ();
44
44
Discriminator rightDis = rightComposedSchema .getDiscriminator ();
45
45
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 ())))) ) {
54
54
changedSchema .setOldSchema (left );
55
55
changedSchema .setNewSchema (right );
56
56
changedSchema .setDiscriminatorPropertyChanged (true );
@@ -109,7 +109,8 @@ private Map<String, String> getMapping(ComposedSchema composedSchema) {
109
109
reverseMapping .put (ref , schemaName );
110
110
}
111
111
112
- if (composedSchema .getDiscriminator () != null && composedSchema .getDiscriminator ().getMapping () != null ) {
112
+ if (composedSchema .getDiscriminator () != null
113
+ && composedSchema .getDiscriminator ().getMapping () != null ) {
113
114
for (String ref : composedSchema .getDiscriminator ().getMapping ().keySet ()) {
114
115
reverseMapping .put (composedSchema .getDiscriminator ().getMapping ().get (ref ), ref );
115
116
}
0 commit comments