You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/03/10 04:44:36 UTC
incubator-usergrid git commit: [USERGRID-415] Pushing changes to make
duplicate properties more readable. Also changed the logging statement to be
a debug instead of error.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-415 [created] 4cb50f6ba
[USERGRID-415] Pushing changes to make duplicate properties more readable. Also changed the logging statement to be a debug instead of error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4cb50f6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4cb50f6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4cb50f6b
Branch: refs/heads/USERGRID-415
Commit: 4cb50f6ba76dc3dc785e9c1e0a9d243c03ea3e86
Parents: d901d38
Author: GERey <gr...@apigee.com>
Authored: Mon Mar 9 20:44:32 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Mar 9 20:44:32 2015 -0700
----------------------------------------------------------------------
.../exceptions/DuplicateUniquePropertyExistsException.java | 2 +-
.../apache/usergrid/services/AbstractCollectionService.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4cb50f6b/stack/core/src/main/java/org/apache/usergrid/persistence/exceptions/DuplicateUniquePropertyExistsException.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/exceptions/DuplicateUniquePropertyExistsException.java b/stack/core/src/main/java/org/apache/usergrid/persistence/exceptions/DuplicateUniquePropertyExistsException.java
index 94c6976..1c9f4c5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/exceptions/DuplicateUniquePropertyExistsException.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/exceptions/DuplicateUniquePropertyExistsException.java
@@ -29,7 +29,7 @@ public class DuplicateUniquePropertyExistsException extends PersistenceException
public DuplicateUniquePropertyExistsException( String entityType, String propertyName, Object propertyValue ) {
- super( "Entity " + entityType + " requires that property named " + propertyName + " be unique, value of "
+ super( "Entity \"" + entityType + "\" requires that property named \"" + propertyName + "\" be unique, value of "
+ propertyValue + " exists" );
this.entityType = entityType;
this.propertyName = propertyName;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4cb50f6b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
index c3be45f..1bdd2f1 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
@@ -178,7 +178,7 @@ public class AbstractCollectionService extends AbstractService {
/*
* Level level = Level.REFS; if (isEmpty(parameters)) {
* level = Level.ALL_PROPERTIES; }
- *
+ *
* Results results = em.searchCollectionForProperty(owner,
* getCollectionName(), null, nameProperty, name, null, null, 1, level);
* EntityRef entity = results.getRef();
@@ -248,9 +248,9 @@ public class AbstractCollectionService extends AbstractService {
}
logger.debug("Limiting collection to " + Query.DEFAULT_LIMIT);
- int count = Query.DEFAULT_LIMIT;
+ int count = Query.DEFAULT_LIMIT;
- Results r = em.getCollection( context.getOwner(), context.getCollectionName(),
+ Results r = em.getCollection( context.getOwner(), context.getCollectionName(),
null, count, Level.ALL_PROPERTIES, isCollectionReversed( context ) );
importEntities( context, r );
@@ -370,7 +370,7 @@ public class AbstractCollectionService extends AbstractService {
p );
}
catch ( Exception e ) {
- logger.error( "Entity " + i + " unable to be created in collection " + context.getCollectionName(),
+ logger.debug( "Entity " + i + " unable to be created in collection " + context.getCollectionName(),
e );
i++;