alphaHeavy
diff --git a/‎changelog/README.md‎
Lines changed: 2 additions & 0 deletions b/‎changelog/README.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎driver-core/src/main/java/com/datastax/driver/core/querybuilder/Delete.java‎
Lines changed: 11 additions & 0 deletions b/‎driver-core/src/main/java/com/datastax/driver/core/querybuilder/Delete.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎driver-core/src/main/java/com/datastax/driver/core/querybuilder/Insert.java‎
Lines changed: 10 additions & 0 deletions b/‎driver-core/src/main/java/com/datastax/driver/core/querybuilder/Insert.java‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationParser.java‎
Lines changed: 2 additions & 3 deletions b/‎driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationParser.java‎
Lines changed: 2 additions & 3 deletions
@@ -19,6 +19,8 @@
 - [improvement] Use same pool implementation for protocol v2 and v3
   (JAVA-738).
 - [improvement] Support CONTAINS / CONTAINS KEY in QueryBuilder (JAVA-677)
+- [improvement] Add USING options in mapper for delete and save
+  operations (JAVA-477/JAVA-540)
 
 Merged from 2.0 branch:
 
 
@@ -136,6 +136,17 @@ public Options using(Using using) {
         return usings.and(using);
     }
 
+    /**
+     * Returns the options for this DELETE statement.
+     * <p/>
+     * Chain this with {@link Options#and(Using)} to add options.
+     *
+     * @return the options of this DELETE statement.
+     */
+    public Options using() {
+        return usings;
+    }
+
     /**
      * Sets the 'IF EXISTS' option for this DELETE statement.
      *
 
@@ -134,6 +134,16 @@ public Options using(Using using) {
         return usings.and(using);
     }
 
+    /**
+     * Returns the options for this INSERT statement.
+     * <p/>
+     * Chain this with {@link Options#and(Using)} to add options.
+     *
+     * @return the options of this INSERT statement.
+     */
+    public Options using() {
+        return usings;
+    }
     /**
      * Sets the 'IF NOT EXISTS' option for this INSERT statement.
      * <p>
 
@@ -27,7 +27,6 @@
 import com.google.common.base.Strings;
 
 import com.datastax.driver.core.ConsistencyLevel;
-import com.datastax.driver.core.ProtocolVersion;
 import com.datastax.driver.mapping.MethodMapper.EnumParamMapper;
 import com.datastax.driver.mapping.MethodMapper.NestedUDTParamMapper;
 import com.datastax.driver.mapping.MethodMapper.ParamMapper;
@@ -76,7 +75,7 @@ public static <T> EntityMapper<T> parseEntity(Class<T> entityClass, EntityMapper
             if(field.isSynthetic() || (field.getModifiers() & Modifier.STATIC) == Modifier.STATIC)
                 continue;
 
-            if (!mappingManager.supportsAliases && field.getAnnotation(Computed.class) != null)
+            if (mappingManager.isCassandraV1 && field.getAnnotation(Computed.class) != null)
                 throw new UnsupportedOperationException("Computed fields are not supported with native protocol v1");
 
             AnnotationChecks.validateAnnotations(field, "entity",
@@ -99,7 +98,7 @@ public static <T> EntityMapper<T> parseEntity(Class<T> entityClass, EntityMapper
             }
         }
 
-        AtomicInteger columnCounter = mappingManager.supportsAliases ? new AtomicInteger(0) : null;
+        AtomicInteger columnCounter = mappingManager.isCassandraV1 ? null : new AtomicInteger(0);
 
         Collections.sort(pks, fieldComparator);
         Collections.sort(ccs, fieldComparator);