JAVA-2329: Fix mapper message to reference primary key instead of partition key

olim7t · olim7t · commit 94aa9913b03e · 2019-08-15T09:41:46.000-07:00
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGenerator.java
@@ -101,7 +101,7 @@ public Optional<MethodSpec> generate() {
               methodElement,
               processedType,
               "Wrong number of parameters: %s methods with no custom clause "
-                  + "must take either an entity instance, or the partition key components",
+                  + "must take either an entity instance, or the primary key components",
               Delete.class.getSimpleName());
       return Optional.empty();
     }
diff --git a/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGeneratorTest.java b/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGeneratorTest.java
@@ -57,7 +57,7 @@ public static Object[][] invalidSignatures() {
       },
       {
         "Wrong number of parameters: Delete methods with no custom clause "
-            + "must take either an entity instance, or the partition key components",
+            + "must take either an entity instance, or the primary key components",
         MethodSpec.methodBuilder("delete")
             .addAnnotation(Delete.class)
             .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public Optional<MethodSpec> generate() {`
`101`	`101`	`methodElement,`
`102`	`102`	`processedType,`
`103`	`103`	`"Wrong number of parameters: %s methods with no custom clause "`
`104`		`- + "must take either an entity instance, or the partition key components",`
	`104`	`+ + "must take either an entity instance, or the primary key components",`
`105`	`105`	`Delete.class.getSimpleName());`
`106`	`106`	`return Optional.empty();`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static Object[][] invalidSignatures() {`
`57`	`57`	`},`
`58`	`58`	`{`
`59`	`59`	`"Wrong number of parameters: Delete methods with no custom clause "`
`60`		`- + "must take either an entity instance, or the partition key components",`
	`60`	`+ + "must take either an entity instance, or the primary key components",`
`61`	`61`	`MethodSpec.methodBuilder("delete")`
`62`	`62`	`.addAnnotation(Delete.class)`
`63`	`63`	`.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)`