Skip to content
This repository has been archived by the owner on May 14, 2021. It is now read-only.

Commit

Permalink
FIXING Netflix#95, skip row key when mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz mack committed Nov 12, 2012
1 parent ba551d0 commit f9ba004
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/main/java/com/netflix/astyanax/mapping/Mapping.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
******************************************************************************/
package com.netflix.astyanax.mapping;

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
Expand All @@ -24,13 +31,6 @@
import com.netflix.astyanax.model.Row;
import com.netflix.astyanax.model.Rows;

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

/**
* <p>
* Utility for doing object/relational mapping between bean-like instances and
Expand Down Expand Up @@ -312,7 +312,7 @@ private <ID extends Annotation, COLUMN extends Annotation> String mapField(
mappingName = annotationSet.getColumnName(field, columnAnnotation);
}

if (mappingName != null) {
if (mappingName != null && !isKey.get()) {
Preconditions.checkArgument(
!usedNames.contains(mappingName.toLowerCase()), mappingName
+ " has already been used for this column family");
Expand Down

0 comments on commit f9ba004

Please sign in to comment.