Merge branch 'master' of github.com:edanuff/stack

nethi · Jan 11, 2012 · 9303611 · 9303611
2 parents 59310bc + 329d87a
commit 9303611
Show file tree

Hide file tree

Showing 19 changed files with 788 additions and 153 deletions.
diff --git a/config/src/main/resources/cassandra.yaml b/config/src/main/resources/cassandra.yaml
diff --git a/config/src/test/resources/cassandra.yaml b/config/src/test/resources/cassandra.yaml
diff --git a/core/src/main/java/org/usergrid/persistence/Schema.java b/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -50,14 +50,14 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.reflect.FieldUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.node.ObjectNode;
 import org.codehaus.jackson.smile.SmileFactory;
 import org.codehaus.jackson.type.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.type.filter.AssignableTypeFilter;
@@ -1808,7 +1808,7 @@ public static Map<String, Object> deserializeEntityProperties(
 
 		String entityType = string(columns.get(PROPERTY_TYPE));
 		if (entityType == null) {
-			logger.error("No type for entity found!", new Throwable());
+			logger.warn("deserializeEntityProperties(): No type for entity found, entity probably doesn't exist");
 			return null;
 		}
 		if (checkId && !columns.containsKey(PROPERTY_UUID)) {

diff --git a/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -976,11 +976,27 @@ public <A extends Entity> A batchCreate(Mutator<ByteBuffer> m,
 		}
 
 		if (!is_application) {
-			batchIncrementAggregateCounters(m, applicationId, null, null, null,
-					null, "application.collection." + collection_name, 1L,
-					timestamp);
-			batchIncrementAggregateCounters(m, applicationId, null, null, null,
-					null, "application.entities", 1L, timestamp);
+			/*
+			 * batchIncrementAggregateCounters(m, applicationId, null, null,
+			 * null, null, "application.collection." + collection_name, 1L,
+			 * timestamp); batchIncrementAggregateCounters(m, applicationId,
+			 * null, null, null, null, "application.entities", 1L, timestamp);
+			 */
+			try {
+				incrementAggregateCounters(null, null, null,
+						"application.collection." + collection_name, 1L);
+			} catch (Exception e) {
+				logger.error(
+						"Unable to increment counter application.collection."
+								+ collection_name, e);
+			}
+			try {
+				incrementAggregateCounters(null, null, null,
+						"application.entities", 1L);
+			} catch (Exception e) {
+				logger.error(
+						"Unable to increment counter application.entities", e);
+			}
 		}
 
 		return entity;
@@ -1107,8 +1123,8 @@ public <A extends Entity> A getEntity(UUID entityId, String entityType,
 		// }
 
 		if (results == null) {
-			logger.error("No properties found for entity " + entityId,
-					new Throwable());
+			logger.warn("getEntity(): No properties found for entity "
+					+ entityId + ", probably doesn't exist...");
 			return null;
 		}
 

diff --git a/core/src/main/java/org/usergrid/persistence/entities/Application.java b/core/src/main/java/org/usergrid/persistence/entities/Application.java
@@ -115,6 +115,9 @@ public class Application extends TypedEntity {
 			"modified", "username", "email" }, dictionariesIndexed = { "aliases" }, indexingDynamicProperties = true)
 	protected List<UUID> users;
 
+	@EntityCollection(type = "device", propertiesIndexed = {}, indexingDynamicProperties = false)
+	protected List<UUID> devices;
+
 	public Application() {
 		// id = UUIDUtils.newTimeUUID();
 	}
@@ -316,6 +319,15 @@ public void setEvents(List<UUID> events) {
 		this.events = events;
 	}
 
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<UUID> getDevices() {
+		return devices;
+	}
+
+	public void setDevices(List<UUID> devices) {
+		this.devices = devices;
+	}
+
 	@JsonSerialize(include = Inclusion.NON_NULL)
 	public Map<String, OAuthProvider> getOauthproviders() {
 		return oauthproviders;

diff --git a/core/src/main/java/org/usergrid/persistence/entities/Device.java b/core/src/main/java/org/usergrid/persistence/entities/Device.java
@@ -1,12 +1,14 @@
 package org.usergrid.persistence.entities;
 
+import java.util.List;
 import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.usergrid.persistence.TypedEntity;
+import org.usergrid.persistence.annotations.EntityCollection;
 import org.usergrid.persistence.annotations.EntityProperty;
 
 /**
@@ -20,6 +22,9 @@ public class Device extends TypedEntity {
 	@EntityProperty(indexed = true, fulltextIndexed = false, required = false, indexedInConnections = true, aliasProperty = true, unique = true, basic = true)
 	protected String name;
 
+	@EntityCollection(type = "user", propertiesIndexed = {}, linkedCollection = "devices", indexingDynamicProperties = false)
+	protected List<UUID> users;
+
 	public Device() {
 		// id = UUIDUtils.newTimeUUID();
 	}
@@ -38,4 +43,13 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<UUID> getUsers() {
+		return users;
+	}
+
+	public void setUsers(List<UUID> users) {
+		this.users = users;
+	}
+
 }
diff --git a/core/src/main/java/org/usergrid/persistence/entities/User.java b/core/src/main/java/org/usergrid/persistence/entities/User.java
@@ -88,6 +88,9 @@ public class User extends TypedEntity {
 	@EntityCollection(type = "group", linkedCollection = "users", propertiesIndexed = { "path" }, indexingDynamicProperties = true)
 	protected List<UUID> groups;
 
+	@EntityCollection(type = "device", linkedCollection = "users", propertiesIndexed = {}, indexingDynamicProperties = false)
+	protected List<UUID> devices;
+
 	@EntityCollection(type = "activity", propertiesIndexed = { "created",
 			"published", "content" }, subkeys = { "verb" }, reversed = true, sort = "published desc")
 	protected List<UUID> activities;
@@ -214,6 +217,15 @@ public void setGroups(List<UUID> groups) {
 		this.groups = groups;
 	}
 
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<UUID> getDevices() {
+		return devices;
+	}
+
+	public void setDevices(List<UUID> devices) {
+		this.devices = devices;
+	}
+
 	@JsonSerialize(include = Inclusion.NON_NULL)
 	public Set<String> getConnections() {
 		return connections;

diff --git a/core/src/main/java/org/usergrid/utils/Inflector.java b/core/src/main/java/org/usergrid/utils/Inflector.java
@@ -740,10 +740,9 @@ protected void initialize() {
 		inflect.addIrregular("sex", "sexes");
 		inflect.addIrregular("move", "moves");
 		inflect.addIrregular("stadium", "stadiums");
-		inflect.addIrregular("data", "data");
 
 		inflect.addUncountable("equipment", "information", "rice", "money",
-				"species", "series", "fish", "sheep");
+				"species", "series", "fish", "sheep", "data", "analytics");
 	}
 
 }
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<bundle.symbolicName>org.usergrid</bundle.symbolicName>
 		<bundle.namespace>org.usergrid</bundle.namespace>
-		<cassandra-javautils-version>0.7.0</cassandra-javautils-version>
-		<cassandra-version>0.8.7</cassandra-version>
-		<hector-om-version>1.1-02</hector-om-version>
-		<hector-version>0.8.0-2</hector-version>
-		<hector-test-version>0.8.0-3</hector-test-version>
+		<cassandra-javautils-version>0.7.1</cassandra-javautils-version>
+		<cassandra-version>1.0.6</cassandra-version>
+		<hector-om-version>2.0-01</hector-om-version>
+		<hector-version>1.0-2-SNAPSHOT</hector-version>
+		<hector-test-version>1.0-2-SNAPSHOT</hector-test-version>
 		<jackson-version>1.8.5</jackson-version>
 		<jersey-version>1.9.1</jersey-version>
 		<junit-version>4.8.2</junit-version>

diff --git a/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
@@ -166,7 +166,7 @@ public static List<ServiceParameter> addQueryParams(
 	}
 
 	@Path("{entityId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
-	public ServiceResource addIdParameter(@Context UriInfo ui,
+	public AbstractContextResource addIdParameter(@Context UriInfo ui,
 			@PathParam("entityId") PathSegment entityId) throws Exception {
 
 		logger.info("ServiceResource.addIdParameter");
@@ -181,7 +181,7 @@ public ServiceResource addIdParameter(@Context UriInfo ui,
 	}
 
 	@Path("{itemName}")
-	public ServiceResource addNameParameter(@Context UriInfo ui,
+	public AbstractContextResource addNameParameter(@Context UriInfo ui,
 			@PathParam("itemName") PathSegment itemName) throws Exception {
 
 		logger.info("ServiceResource.addNameParameter");

diff --git a/rest/src/main/java/org/usergrid/rest/applications/users/AbstractUserExtensionResource.java b/rest/src/main/java/org/usergrid/rest/applications/users/AbstractUserExtensionResource.java
@@ -0,0 +1,20 @@
+package org.usergrid.rest.applications.users;
+
+import org.usergrid.rest.AbstractContextResource;
+
+public abstract class AbstractUserExtensionResource extends
+		AbstractContextResource {
+
+	UserResource userResource;
+
+	public AbstractUserExtensionResource(UserResource userResource)
+			throws Exception {
+		super(userResource);
+		this.userResource = userResource;
+	}
+
+	public UserResource getUserResource() {
+		return userResource;
+	}
+
+}