You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/23 02:30:37 UTC
git commit: Fixes incorrect package names in scala files
Repository: incubator-usergrid
Updated Branches:
refs/heads/gatlingdev bfc4d0fce -> 6a1d84c7e
Fixes incorrect package names in scala files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6a1d84c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6a1d84c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6a1d84c7
Branch: refs/heads/gatlingdev
Commit: 6a1d84c7e1d5f6108b7e0b01512a22bf7213aaee
Parents: bfc4d0f
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Oct 22 18:30:33 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Oct 22 18:30:33 2014 -0600
----------------------------------------------------------------------
.../datagenerators/EntityDataGenerator.scala | 59 +++++++++++
.../datagenerators/FeederGenerator.scala | 102 +++++++++++++++++++
.../scenarios/ApplicationScenarios.scala | 5 +-
.../scenarios/ConnectionScenarios.scala | 4 +-
.../usergrid/scenarios/DeviceScenarios.scala | 2 +-
.../usergrid/scenarios/GeoScenarios.scala | 7 +-
.../scenarios/NotificationScenarios.scala | 2 +-
.../usergrid/scenarios/NotifierScenarios.scala | 5 +-
.../scenarios/OrganizationScenarios.scala | 7 +-
.../usergrid/scenarios/TokenScenarios.scala | 7 +-
.../usergrid/scenarios/UserScenarios.scala | 7 +-
.../org/apache/usergrid/settings/Headers.scala | 2 +-
.../org/apache/usergrid/settings/Settings.scala | 2 +-
.../org/apache/usergrid/settings/Utils.scala | 2 +-
.../simulations/GetEntitySimulation.scala | 4 +-
.../simulations/PostDevicesSimulation.scala | 4 +-
.../simulations/PostUsersSimulation.scala | 6 +-
...PushNotificationTargetDeviceSimulation.scala | 3 +
.../PushNotificationTargetUserSimulation.scala | 3 +
19 files changed, 206 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala b/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
new file mode 100755
index 0000000..4a6ef3d
--- /dev/null
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.usergrid.datagenerators
+
+ import org.apache.usergrid.settings.Utils
+
+ import scala.collection.mutable.ArrayBuffer
+
+object EntityDataGenerator {
+
+ def generateBlockUserLists(numUsers: Int): Map[String, String] = {
+
+ var blocks: ArrayBuffer[String] = new ArrayBuffer[String]
+ var blockedBy: ArrayBuffer[String] = new ArrayBuffer[String]
+
+ for (numBlock <- 1 to Utils.generateRandomInt(1, 7)) {
+ blocks += "user".concat(Utils.generateRandomInt(1, numUsers).toString)
+ }
+
+ for (numBlockedBy <- 1 to Utils.generateRandomInt(1, 7)) {
+ blockedBy += "user".concat(Utils.generateRandomInt(1, numUsers).toString)
+ }
+
+ return Map("blocks" -> blocks.toArray.mkString(","), "blockedBy" -> blockedBy.toArray.mkString(","))
+
+ }
+
+ def generateUser(userId: Int): Map[String,String] = {
+
+ return Map("username" -> "user".concat(userId.toString),
+ "profileId" -> Utils.generateRandomInt(10000, 1000000).toString,
+ "displayName" -> Utils.generateRandomInt(10000, 1000000).toString,
+ "showAge" -> Utils.generateRandomInt(0, 1).toString,
+ "ethnicity" -> Utils.generateRandomInt(1, 15).toString,
+ "relationshipStatus" -> Utils.generateRandomInt(1, 4).toString,
+ "headline" -> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+ "aboutMe" -> "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+ "age" -> Utils.generateRandomInt(18, 65).toString,
+ "height" -> Utils.generateRandomInt(48, 84).toString,
+ "weight" -> Utils.generateRandomInt(120, 350).toString,
+ "seen" -> Utils.generateRandomInt(50, 100000).toString
+ )
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala b/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
new file mode 100755
index 0000000..8bedb01
--- /dev/null
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.usergrid.datagenerators
+
+import io.gatling.core.Predef._
+ import org.apache.usergrid.settings.Utils
+ import scala.collection.mutable.ArrayBuffer
+
+object FeederGenerator {
+
+ def generateUserWithGeolocationFeeder(numUsers: Int, radius: Double, centerLatitude: Double, centerLongitude: Double): Array[Map[String, String]] = {
+ var userArray: ArrayBuffer[Map[String, String]] = new ArrayBuffer[Map[String, String]]
+ for (userCount <- 1 to numUsers) {
+ var user: Map[String, String] = EntityDataGenerator.generateUser(userCount)
+ var geolocation: Map[String, String] = Utils.generateRandomGeolocation(radius, centerLatitude, centerLongitude)
+ var blockLists: Map[String, String] = EntityDataGenerator.generateBlockUserLists(numUsers)
+
+ user = user ++ geolocation ++ blockLists
+
+ userArray += user
+ }
+ return userArray.toArray
+ }
+
+ def generateGeolocationFeeder(radius: Double, centerLatitude: Double, centerLongitude: Double): Feeder[String] = {
+
+ val geolocationFeeder = new Feeder[String] {
+
+ // always return true as this feeder can be polled infinitively
+ override def hasNext = true
+
+ override def next: Map[String, String] = {
+ var geolocation: Map[String, String] = Utils.generateRandomGeolocation(radius, centerLatitude, centerLongitude)
+ Map("latitude" -> geolocation("latitude"), "longitude" -> geolocation("longitude"))
+ }
+ }
+
+ return geolocationFeeder
+
+ }
+
+ def generateGeolocationWithQueryFeeder(radius: Double, centerLatitude: Double, centerLongitude: Double): Feeder[String] = {
+
+ val geolocationFeeder = new Feeder[String] {
+
+ // always return true as this feeder can be polled infinitively
+ override def hasNext = true
+
+ override def next: Map[String, String] = {
+ var geolocation: Map[String, String] = Utils.generateRandomGeolocation(radius, centerLatitude, centerLongitude)
+ var queryParams = Utils.generateRandomQueryString
+ Map("latitude" -> geolocation("latitude"), "longitude" -> geolocation("longitude"), "queryParams" -> queryParams)
+ }
+ }
+
+ return geolocationFeeder
+
+ }
+
+ def generateUserConnectionFeeder(numUsers: Int): Feeder[String] = {
+
+ val userIdFeeder = new Feeder[String] {
+
+ // always return true as this feeder can be polled infinitively
+ override def hasNext = true
+
+ override def next: Map[String, String] = {
+ Map("user1" -> "user".concat(Utils.generateRandomInt(1, numUsers).toString), "user2" -> "user".concat(Utils.generateRandomInt(1, numUsers).toString))
+ }
+ }
+
+ return userIdFeeder
+
+ }
+
+ def generateEntityNameFeeder(prefix: String, numEntities: Int): Array[Map[String, String]] = {
+
+ var nameArray: ArrayBuffer[Map[String, String]] = new ArrayBuffer[Map[String, String]]
+
+ for (entityCount <- 1 to numEntities) {
+ nameArray += Map("entityName" -> prefix.concat(entityCount.toString))
+ }
+
+ return nameArray.toArray
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
index f5f7901..ffc7d96 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
+ import org.apache.usergrid.settings.{Settings, Headers}
-/**
+ /**
* Performs organization registration
*
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
index ba2449f..7719883 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
@@ -27,4 +27,4 @@ object ConnectionScenarios {
.check(status.is(200))
)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
index e86bd42..232cb47 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
index 94bf0af..2954abd 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
+ import org.apache.usergrid.settings.{Utils, Settings}
-object GeoScenarios {
+ object GeoScenarios {
val getGeolocation = exec(
http("GET geolocated user")
@@ -40,4 +41,4 @@ object GeoScenarios {
.check(status.is(200))
)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
index 91d6754..b5c9529 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import java.io.File
import java.nio.file.{Paths, Files}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
index 0c2fc0c..4708523 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
-import scala.concurrent.duration._
+ import org.apache.usergrid.settings.Settings
+ import scala.concurrent.duration._
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
index 7c411b0..01a2857 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
-import scala.concurrent.duration._
+ import org.apache.usergrid.settings.{Settings, Headers}
+ import scala.concurrent.duration._
/**
* Performs organization registration
@@ -39,4 +40,4 @@ object OrganizationScenarios {
.body(StringBody("{\"organization\":\"" + Settings.org + "\",\"username\":\"${username}\",\"name\":\"${username}\",\"email\":\"${username}@apigee.com\",\"password\":\"${password}\"}"))
.check(status.is(200)))
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
index 9dff0df..3508d6f 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
-import scala.concurrent.duration._
+ import org.apache.usergrid.settings.Headers
+ import scala.concurrent.duration._
/**
* Class that will get the token and insert it into the test session.
@@ -56,4 +57,4 @@ object TokenScenarios {
.check(status.is(200))
)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
index 843bc2e..4989973 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
import io.gatling.http.Predef._
+ import org.apache.usergrid.settings.{Settings, Utils}
-object UserScenarios {
+ object UserScenarios {
val getRandomUser = exec(
http("GET user")
@@ -47,4 +48,4 @@ object UserScenarios {
.check(status.in(200 to 400))
)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/settings/Headers.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Headers.scala b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Headers.scala
index 319bdcf..9b735e5 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Headers.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Headers.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.settings
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 5588b67..13fa045 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.settings
import io.gatling.core.Predef._
import io.gatling.http.Predef._
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/settings/Utils.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Utils.scala b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Utils.scala
index 396f0b9..750f0e4 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/settings/Utils.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/settings/Utils.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- package org.apache.usergrid
+ package org.apache.usergrid.settings
import scala.util.Random
import scala.math
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
index 46d5abe..7b9df21 100644
--- a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
@@ -18,7 +18,9 @@
import io.gatling.core.Predef._
import io.gatling.http.Predef._
- import org.apache.usergrid.{UserScenarios, Settings, FeederGenerator}
+ import org.apache.usergrid.datagenerators.FeederGenerator
+ import org.apache.usergrid.scenarios.UserScenarios
+ import org.apache.usergrid.settings.Settings
import scala.concurrent.duration._
class GetEntitySimulation extends Simulation {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostDevicesSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostDevicesSimulation.scala b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostDevicesSimulation.scala
index 394144b..d7c6dd8 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostDevicesSimulation.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostDevicesSimulation.scala
@@ -18,7 +18,9 @@
import io.gatling.core.Predef._
import io.gatling.http.Predef._
- import org.apache.usergrid.{DeviceScenarios, FeederGenerator, Settings}
+ import org.apache.usergrid.datagenerators.FeederGenerator
+ import org.apache.usergrid.scenarios.DeviceScenarios
+ import org.apache.usergrid.settings.Settings
import scala.concurrent.duration._
class PostDevicesSimulation extends Simulation {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
index aef394c..cbac041 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
@@ -17,9 +17,11 @@
package org.apache.usergrid.simulations
import io.gatling.core.Predef._
-import org.apache.usergrid.{UserScenarios, FeederGenerator, Settings}
+ import org.apache.usergrid.datagenerators.FeederGenerator
+ import org.apache.usergrid.scenarios.UserScenarios
+ import org.apache.usergrid.settings.Settings
-import scala.concurrent.duration._
+ import scala.concurrent.duration._
class PostUsersSimulation extends Simulation {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetDeviceSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetDeviceSimulation.scala b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetDeviceSimulation.scala
index 2e6a2ba..731423c 100755
--- a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetDeviceSimulation.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetDeviceSimulation.scala
@@ -19,6 +19,9 @@
import io.gatling.core.Predef._
import io.gatling.http.Predef._
import org.apache.usergrid._
+ import org.apache.usergrid.datagenerators.FeederGenerator
+ import org.apache.usergrid.scenarios.{NotificationScenarios, DeviceScenarios, NotifierScenarios}
+ import org.apache.usergrid.settings.Settings
import scala.concurrent.duration._
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a1d84c7/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
index acef447..823064d 100644
--- a/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
+++ b/stack/gatling/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
@@ -19,6 +19,9 @@
import io.gatling.core.Predef._
import io.gatling.http.Predef._
import org.apache.usergrid._
+ import org.apache.usergrid.datagenerators.FeederGenerator
+ import org.apache.usergrid.scenarios.{NotificationScenarios, UserScenarios, DeviceScenarios}
+ import org.apache.usergrid.settings.Settings
import scala.concurrent.duration._
class PushNotificationTargetUserSimulation extends Simulation {