GG-21442: Improve QueryEntity field conflict message. This closes apache#310.

Author: AMashenkov

modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java

@@ -47,6 +47,7 @@
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Query entity is a description of {@link org.apache.ignite.IgniteCache cache} entry (composed of key and value)
@@ -754,13 +755,10 @@ private static QueryEntity convert(QueryEntityTypeDescriptor desc) {
      * @return Type descriptor.
      */
     private static QueryEntityTypeDescriptor processKeyAndValueClasses(
-        Class<?> keyCls,
-        Class<?> valCls
+        @NotNull Class<?> keyCls,
+        @NotNull Class<?> valCls
     ) {
-        QueryEntityTypeDescriptor d = new QueryEntityTypeDescriptor();
-
-        d.keyClass(keyCls);
-        d.valueClass(valCls);
+        QueryEntityTypeDescriptor d = new QueryEntityTypeDescriptor(keyCls, valCls);
 
         processAnnotationsInClass(true, d.keyClass(), d, null);
         processAnnotationsInClass(false, d.valueClass(), d, null);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryEntityTypeDescriptor.java

@@ -29,6 +29,7 @@
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Descriptor of type.
@@ -63,14 +64,25 @@ public class QueryEntityTypeDescriptor {
     private QueryEntityIndexDescriptor fullTextIdx;
 
     /** */
-    private Class<?> keyCls;
+    private final Class<?> keyCls;
 
     /** */
-    private Class<?> valCls;
+    private final Class<?> valCls;
 
     /** */
     private boolean valTextIdx;
 
+    /**
+     * Constructor.
+     *
+     * @param keyCls QueryEntity key class.
+     * @param valCls QueryEntity value class.
+     */
+    public QueryEntityTypeDescriptor(@NotNull Class<?> keyCls, @NotNull Class<?> valCls) {
+        this.keyCls = keyCls;
+        this.valCls = valCls;
+    }
+
     /**
      * @return Indexes.
      */
@@ -138,31 +150,13 @@ public Class<?> valueClass() {
         return valCls;
     }
 
-    /**
-     * Sets value class.
-     *
-     * @param valCls Value class.
-     */
-    public void valueClass(Class<?> valCls) {
-        this.valCls = valCls;
-    }
-
     /**
      * @return Key class.
      */
     public Class<?> keyClass() {
         return keyCls;
     }
 
-    /**
-     * Set key class.
-     *
-     * @param keyCls Key class.
-     */
-    public void keyClass(Class<?> keyCls) {
-        this.keyCls = keyCls;
-    }
-
     /**
      * Adds property to the type descriptor.
      *
@@ -171,8 +165,11 @@ public void keyClass(Class<?> keyCls) {
      * @param failOnDuplicate Fail on duplicate flag.
      */
     public void addProperty(QueryEntityClassProperty prop, boolean key, boolean failOnDuplicate) {
-        if (props.put(prop.name(), prop) != null && failOnDuplicate)
-            throw new CacheException("Property with name '" + prop.name() + "' already exists.");
+        if (props.put(prop.name(), prop) != null && failOnDuplicate) {
+            throw new CacheException("Property with name '" + prop.name() + "' already exists for " +
+                (key ? "key" : "value") + ": " +
+                "QueryEntity [key=" + keyCls.getName() + ", value=" + valCls.getName() + ']');
+        }
 
         fields.put(prop.fullName(), prop.type());
 

modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/AffinityKeyNameAndValueFieldNameConflictTest.java

@@ -142,7 +142,7 @@ public void testAnnotationConfigCollision() throws Exception {
 
                 return null;
             }
-        }, CacheException.class, "Property with name 'name' already exists.");
+        }, CacheException.class, "Property with name 'name' already exists for value");
     }
 
     /**