Follow up work on SchemaDiff to makes it DEPRECATION added or removed (graphql-java#1736)

bbakerman · web-flow · commit bef3ac2fd52f · 2020-01-14T17:39:47.000+11:00
diff --git a/src/main/java/graphql/schema/diff/DiffCategory.java b/src/main/java/graphql/schema/diff/DiffCategory.java
@@ -28,7 +28,11 @@ public enum DiffCategory {
      */
     DIFFERENT,
     /**
-     * The new API has deprecated something or removed something deprecated from the old API
+     * The new API has newly deprecated something
      */
-    DEPRECATED
+    DEPRECATION_ADDED,
+    /**
+     * The new API has removed something previously deprecated in the old API
+     */
+    DEPRECATION_REMOVED,
 }
diff --git a/src/main/java/graphql/schema/diff/SchemaDiff.java b/src/main/java/graphql/schema/diff/SchemaDiff.java
@@ -378,7 +378,7 @@ private void checkInputFields(DiffCtx ctx, TypeDefinition old, List<InputValueDe
                 DiffCategory category;
                 String message;
                 if (isDeprecated(oldField)) {
-                    category = DiffCategory.DEPRECATED;
+                    category = DiffCategory.DEPRECATION_REMOVED;
                     message = "The new API has removed a deprecated field '%s'";
                 } else {
                     category = DiffCategory.MISSING;
@@ -444,7 +444,7 @@ private void checkEnumType(DiffCtx ctx, EnumTypeDefinition oldDef, EnumTypeDefin
                 DiffCategory category;
                 String message;
                 if (isDeprecated(oldEnum)) {
-                    category = DiffCategory.DEPRECATED;
+                    category = DiffCategory.DEPRECATION_REMOVED;
                     message = "The new API has removed a deprecated enum value '%s'";
                 } else {
                     category = DiffCategory.MISSING;
@@ -474,7 +474,7 @@ private void checkEnumType(DiffCtx ctx, EnumTypeDefinition oldDef, EnumTypeDefin
                         .build());
             } else if (isDeprecated(newDefinitionMap.get(enumName))) {
                 ctx.report(DiffEvent.apiDanger()
-                        .category(DiffCategory.DEPRECATED)
+                        .category(DiffCategory.DEPRECATION_ADDED)
                         .typeName(oldDef.getName())
                         .typeKind(getTypeKind(oldDef))
                         .components(enumName)
@@ -546,7 +546,7 @@ private void checkFieldRemovals(
                 DiffCategory category;
                 String message;
                 if (isDeprecated(entry.getValue())) {
-                    category = DiffCategory.DEPRECATED;
+                    category = DiffCategory.DEPRECATION_REMOVED;
                     message = "The new API has removed a deprecated field '%s'";
                 } else {
                     category = DiffCategory.MISSING;
@@ -592,7 +592,7 @@ private void checkFieldAdditions(
                         .build());
             } else if (!isDeprecated(oldField) && isDeprecated(entry.getValue())) {
                 ctx.report(DiffEvent.apiDanger()
-                        .category(DiffCategory.DEPRECATED)
+                        .category(DiffCategory.DEPRECATION_ADDED)
                         .typeName(newDef.getName())
                         .typeKind(getTypeKind(newDef))
                         .fieldName(fieldName)
diff --git a/src/test/groovy/graphql/schema/diff/SchemaDiffTest.groovy b/src/test/groovy/graphql/schema/diff/SchemaDiffTest.groovy
@@ -489,7 +489,7 @@ class SchemaDiffTest extends Specification {
         reporter.dangerCount == 13
         reporter.breakageCount == 0
         reporter.dangers.every {
-            it.getCategory() == DiffCategory.DEPRECATED
+            it.getCategory() == DiffCategory.DEPRECATION_ADDED
         }
 
     }
@@ -507,7 +507,7 @@ class SchemaDiffTest extends Specification {
         reporter.dangerCount == 0
         reporter.breakageCount == 11
         reporter.breakages.every {
-            it.getCategory() == DiffCategory.DEPRECATED
+            it.getCategory() == DiffCategory.DEPRECATION_REMOVED
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ class SchemaDiffTest extends Specification {`
`489`	`489`	`reporter.dangerCount == 13`
`490`	`490`	`reporter.breakageCount == 0`
`491`	`491`	`reporter.dangers.every {`
`492`		`- it.getCategory() == DiffCategory.DEPRECATED`
	`492`	`+ it.getCategory() == DiffCategory.DEPRECATION_ADDED`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`}`
`@@ -507,7 +507,7 @@ class SchemaDiffTest extends Specification {`
`507`	`507`	`reporter.dangerCount == 0`
`508`	`508`	`reporter.breakageCount == 11`
`509`	`509`	`reporter.breakages.every {`
`510`		`- it.getCategory() == DiffCategory.DEPRECATED`
	`510`	`+ it.getCategory() == DiffCategory.DEPRECATION_REMOVED`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`