experimentPaginationHelper) {
+ final HttpHeader httpHeader) {
this.authorizedExperimentGetter = authorizedExperimentGetter;
this.pages = pages;
this.experiments = experiments;
this.authorization = authorization;
this.priorities = priorities;
this.httpHeader = httpHeader;
- this.experimentPaginationHelper = experimentPaginationHelper;
}
/**
@@ -96,11 +106,11 @@ public Response getApplications(@HeaderParam(AUTHORIZATION)
/**
* Returns metadata for the specified experiment.
- *
+ *
* Does not return metadata for a deleted experiment.
*
- * @param applicationName the application name
- * @param experimentLabel the experiment label
+ * @param applicationName the application name
+ * @param experimentLabel the experiment label
* @param authorizationHeader the authorization headers
* @return Response object
*/
@@ -129,20 +139,12 @@ public Response getExperiment(@PathParam("applicationName")
/**
* Returns metadata for all experiments within an application.
- *
+ *
* Does not return metadata for a deleted or terminated experiment.
*
- * This endpoint is paginated.
- *
- * @param applicationName the application name
+ * @param applicationName the application name
* @param authorizationHeader the authentication headers
- * @param page the page which should be returned, defaults to 1
- * @param perPage the number of log entries per page, defaults to 10. -1 to get all values.
- * @param sort the sorting rules
- * @param filter the filter rules
- * @param timezoneOffset the time zone offset from UTC
- * @return a response containing a map with a list with {@code 0} to {@code perPage} experiments,
- * if that many are on the page, and a count of how many experiments match the filter criteria.
+ * @return a response containing a list with experiments
*/
@GET
@Path("/{applicationName}/experiments")
@@ -156,45 +158,16 @@ public Response getExperiments(@PathParam("applicationName")
@HeaderParam(AUTHORIZATION)
@ApiParam(value = EXAMPLE_AUTHORIZATION_HEADER, required = true)
- final String authorizationHeader,
-
- @QueryParam("page")
- @DefaultValue(DEFAULT_PAGE)
- @ApiParam(name = "page", defaultValue = DEFAULT_PAGE, value = DOC_PAGE)
- final int page,
-
- @QueryParam("per_page")
- @DefaultValue(DEFAULT_PER_PAGE)
- @ApiParam(name = "per_page", defaultValue = DEFAULT_PER_PAGE, value = DOC_PER_PAGE)
- final int perPage,
-
- @QueryParam("filter")
- @DefaultValue("")
- @ApiParam(name = "filter", defaultValue = DEFAULT_FILTER, value = DOC_FILTER)
- final String filter,
-
- @QueryParam("sort")
- @DefaultValue("")
- @ApiParam(name = "sort", defaultValue = DEFAULT_SORT, value = DOC_SORT)
- final String sort,
-
- @QueryParam("timezone")
- @DefaultValue(DEFAULT_TIMEZONE)
- @ApiParam(name = "timezone", defaultValue = DEFAULT_TIMEZONE, value = DOC_TIMEZONE)
- final String timezoneOffset) {
- List experimentList = authorizedExperimentGetter.getAuthorizedExperimentsByName(authorizationHeader,
- applicationName);
-
- Map response = experimentPaginationHelper.paginate("experiments", experimentList, filter, timezoneOffset, sort, page, perPage);
-
- return httpHeader.headers().entity(response).build();
+ final String authorizationHeader
+ ) {
+ return httpHeader.headers().entity(authorizedExperimentGetter.getAuthorizedExperimentsByName(authorizationHeader, applicationName)).build();
}
/**
* Creates a rank ordered priority list
*
- * @param applicationName the application name
- * @param experimentIDList the list of experiment ids
+ * @param applicationName the application name
+ * @param experimentIDList the list of experiment ids
* @param authorizationHeader the authorization headers
* @return Response object
*/
@@ -224,7 +197,7 @@ public Response createPriorities(@PathParam("applicationName")
* Returns the full, ordered priority list for an application
* along with experiment meta-data and associated priority
*
- * @param applicationName the application name
+ * @param applicationName the application name
* @param authorizationHeader the authorization headers
* @return Response object
*/
@@ -233,7 +206,7 @@ public Response createPriorities(@PathParam("applicationName")
@Produces(APPLICATION_JSON)
@ApiOperation(value = "Get the priority list for an application",
notes = "The returned priority list is rank ordered.")
- // response = ??, //todo: update with proper object
+ // response = ??, //todo: update with proper object
@Timed
public Response getPriorities(@PathParam("applicationName")
@ApiParam(value = "Application Name")
@@ -252,8 +225,8 @@ public Response getPriorities(@PathParam("applicationName")
/**
* Returns the set of pages associated with the application.
*
- * @param applicationName the application name
- * @param authorizationHeader the authorization headers
+ * @param applicationName the application name
+ * @param authorizationHeader the authorization headers
* @return Response object
*/
@GET
@@ -279,9 +252,9 @@ public Response getPagesForApplication(@PathParam("applicationName")
/**
* Get the experiment information(id and allowNewAssignment) for the associated experiments for a page
*
- * @param applicationName the application name
- * @param pageName the page name
- * @param authorizationHeader the authorization headers
+ * @param applicationName the application name
+ * @param pageName the page name
+ * @param authorizationHeader the authorization headers
* @return Response object
*/
@GET
@@ -312,8 +285,8 @@ public Response getExperiments(@PathParam("applicationName")
/**
* Returns the set of pages with their associated experiments for an application.
*
- * @param applicationName the application name
- * @param authorizationHeader the authorization headers
+ * @param applicationName the application name
+ * @param authorizationHeader the authorization headers
* @return Response object
*/
@GET
@@ -322,12 +295,12 @@ public Response getExperiments(@PathParam("applicationName")
@ApiOperation(value = "Get the set of pages associated with an application.")
@Timed
public Response getPageAndExperimentsForApplication(@PathParam("applicationName")
- @ApiParam(value = "Application Name")
- final Application.Name applicationName,
+ @ApiParam(value = "Application Name")
+ final Application.Name applicationName,
- @HeaderParam(AUTHORIZATION)
- @ApiParam(value = EXAMPLE_AUTHORIZATION_HEADER, required = true)
- final String authorizationHeader) {
+ @HeaderParam(AUTHORIZATION)
+ @ApiParam(value = EXAMPLE_AUTHORIZATION_HEADER, required = true)
+ final String authorizationHeader) {
authorization.checkUserPermissions(authorization.getUser(authorizationHeader), applicationName, READ);
Map> pageExperimentListMap = pages.getPageAndExperimentList(applicationName);
diff --git a/modules/api/src/main/resources/api.properties b/modules/api/src/main/resources/api.properties
index 1ef0167f2..37de9afc5 100644
--- a/modules/api/src/main/resources/api.properties
+++ b/modules/api/src/main/resources/api.properties
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
-application.id:${application.name}-${timestamp}
+application.id:${application.name}-${scmBranch}-${buildNumber}-${timestamp}
default.time.zone:${default.time.zone}
-default.time.format:${default.time.format}
\ No newline at end of file
+default.time.format:${default.time.format}
diff --git a/modules/api/src/test/java/com/intuit/wasabi/api/ApplicationsResourceTest.java b/modules/api/src/test/java/com/intuit/wasabi/api/ApplicationsResourceTest.java
index c4b3d9509..f1202883e 100644
--- a/modules/api/src/test/java/com/intuit/wasabi/api/ApplicationsResourceTest.java
+++ b/modules/api/src/test/java/com/intuit/wasabi/api/ApplicationsResourceTest.java
@@ -15,17 +15,18 @@
*******************************************************************************/
package com.intuit.wasabi.api;
-import com.intuit.wasabi.api.pagination.PaginationHelper;
-import com.intuit.wasabi.api.pagination.comparators.impl.ExperimentComparator;
-import com.intuit.wasabi.api.pagination.filters.impl.ExperimentFilter;
import com.intuit.wasabi.authenticationobjects.UserInfo;
import com.intuit.wasabi.authorization.Authorization;
import com.intuit.wasabi.exceptions.AuthenticationException;
import com.intuit.wasabi.experiment.Experiments;
import com.intuit.wasabi.experiment.Pages;
import com.intuit.wasabi.experiment.Priorities;
-import com.intuit.wasabi.experimentobjects.*;
-import io.codearte.catchexception.shade.mockito.Mockito;
+import com.intuit.wasabi.experimentobjects.Application;
+import com.intuit.wasabi.experimentobjects.Experiment;
+import com.intuit.wasabi.experimentobjects.ExperimentIDList;
+import com.intuit.wasabi.experimentobjects.Page;
+import com.intuit.wasabi.experimentobjects.PageExperiment;
+import com.intuit.wasabi.experimentobjects.PrioritizedExperimentList;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +38,6 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,7 +49,11 @@
import static org.hamcrest.collection.IsMapContaining.hasEntry;
import static org.hamcrest.core.Is.is;
import static org.mockito.Matchers.anyCollection;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class ApplicationsResourceTest {
@@ -98,14 +102,10 @@ public class ApplicationsResourceTest {
private ArgumentCaptor>> pageExperimentsCaptor;
private ApplicationsResource applicationsResource;
- private PaginationHelper experimentPaginationHelper = new PaginationHelper<>(
- new ExperimentFilter(),
- new ExperimentComparator());
-
@Before
public void setup() {
applicationsResource = new ApplicationsResource(authorizedExperimentGetter, experiments, authorization, priorities,
- pages, httpHeader, experimentPaginationHelper);
+ pages, httpHeader);
}
@Test
@@ -174,7 +174,7 @@ public void getExperiments() throws Exception {
doReturn(responseBuilder).when(responseBuilder).entity(anyCollection());
doReturn(response).when(responseBuilder).build();
- applicationsResource.getExperiments(applicationName, "foo", 0, -1, "", "", "");
+ applicationsResource.getExperiments(applicationName, "foo");
verify(authorizedExperimentGetter).getAuthorizedExperimentsByName("foo", applicationName);
verify(httpHeader).headers();
diff --git a/modules/assignment-objects/pom.xml b/modules/assignment-objects/pom.xml
index f573e589c..344ae25b9 100644
--- a/modules/assignment-objects/pom.xml
+++ b/modules/assignment-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/assignment/pom.xml b/modules/assignment/pom.xml
index ab0fc6ad1..dae3877b3 100644
--- a/modules/assignment/pom.xml
+++ b/modules/assignment/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/assignment/src/main/java/com/intuit/wasabi/assignment/Assignments.java b/modules/assignment/src/main/java/com/intuit/wasabi/assignment/Assignments.java
index d768c92c5..6223a121d 100644
--- a/modules/assignment/src/main/java/com/intuit/wasabi/assignment/Assignments.java
+++ b/modules/assignment/src/main/java/com/intuit/wasabi/assignment/Assignments.java
@@ -83,32 +83,6 @@ Assignment getAssignment(User.ID userID, Application.Name appLabel,
Experiment.Label experimentLabel, Context context, boolean createAssignment, boolean ignoreSamplingPercent,
SegmentationProfile segmentationProfile, HttpHeaders headers);
- /**
- * Return an existing assignment for a user, or potentially create a new
- * assignment if the user is assignable to this experiment. Includes a Page.Name to identify the page through which
- * the assignment was delivered.
- *
- * @param userID the {@link com.intuit.wasabi.assignmentobjects.User.ID} of the person we want the assignment for
- * @param applicationName the {@link com.intuit.wasabi.experimentobjects.Application.Name} the app we want the assignment for
- * @param label the {@link com.intuit.wasabi.experimentobjects.Experiment.Label} the experiment
- * @param context the {@link Context} of the assignment call
- * @param createAssignment true when a new Assignment should be created
- * @param ignoreSamplingPercent true if we want to have an assignment independent of the sampling rate
- * @param segmentationProfile the {@link SegmentationProfile} to be used for the assignment
- * @param headers the {@link HttpHeaders} that can be used by the segmentation
- * @param pageName the {@link com.intuit.wasabi.experimentobjects.Page.Name} the page name for the assignment
- * @param experiment the {@link Experiment} we want the assignment for
- * @param bucketList list of Buckets of this Experiment
- * @param userAssignments the already existing assignments
- * @param exclusives the experiments that are excluded from the assignment
- * @return a brand new or old {@link Assignment}
- */
- Assignment getAssignment(User.ID userID, Application.Name applicationName, Experiment.Label label, Context context,
- boolean createAssignment, boolean ignoreSamplingPercent, SegmentationProfile segmentationProfile,
- HttpHeaders headers, Page.Name pageName, Experiment experiment, BucketList bucketList,
- Table userAssignments,
- Map> exclusives);
-
/**
* Insert/update a user assignment for this experiment.
*
diff --git a/modules/assignment/src/main/java/com/intuit/wasabi/assignment/impl/AssignmentsImpl.java b/modules/assignment/src/main/java/com/intuit/wasabi/assignment/impl/AssignmentsImpl.java
index fd4c6081e..0d82ff4d9 100644
--- a/modules/assignment/src/main/java/com/intuit/wasabi/assignment/impl/AssignmentsImpl.java
+++ b/modules/assignment/src/main/java/com/intuit/wasabi/assignment/impl/AssignmentsImpl.java
@@ -220,7 +220,7 @@ public Assignment getSingleAssignment(User.ID userID, Application.Name applicati
}
Assignment assignment = assignmentsRepository.getAssignment(experimentID, userID, context);
- if (assignment == null) {
+ if (assignment == null || assignment.isBucketEmpty()) {
if (createAssignment) {
if (experiment.getState() == Experiment.State.PAUSED) {
return nullAssignment(userID, applicationName, experimentID,
@@ -321,8 +321,7 @@ private Map> getExclusivesList(Experiment.ID
* assignment if the user is assignable to this experiment. Includes a Page.Name to identify the page through which
* the assignment was delivered.
*/
- @Override
- public Assignment getAssignment(User.ID userID, Application.Name applicationName, Experiment.Label experimentLabel,
+ protected Assignment getAssignment(User.ID userID, Application.Name applicationName, Experiment.Label experimentLabel,
Context context, boolean createAssignment, boolean ignoreSamplingPercent,
SegmentationProfile segmentationProfile, HttpHeaders headers, Page.Name pageName,
Experiment experiment, BucketList bucketList,
@@ -357,8 +356,9 @@ public Assignment getAssignment(User.ID userID, Application.Name applicationName
Assignment.Status.EXPERIMENT_EXPIRED);
}
+ // FIXME - Code duplication with getSingleAssignment
Assignment assignment = getAssignment(experimentID, userID, context, userAssignments, bucketList);
- if (assignment == null) {
+ if (assignment == null || assignment.isBucketEmpty()) {
if (createAssignment) {
if (experiment.getState() == Experiment.State.PAUSED) {
return nullAssignment(userID, applicationName, experimentID, Assignment.Status.EXPERIMENT_PAUSED);
diff --git a/modules/auditlog-objects/pom.xml b/modules/auditlog-objects/pom.xml
index 1ec1d942f..9a7e96d9d 100644
--- a/modules/auditlog-objects/pom.xml
+++ b/modules/auditlog-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/auditlog/pom.xml b/modules/auditlog/pom.xml
index a19c55039..fe56edbe7 100644
--- a/modules/auditlog/pom.xml
+++ b/modules/auditlog/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogEntryEnvelope.java b/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogEntryEnvelope.java
index f38beb6d6..ceddb0e80 100644
--- a/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogEntryEnvelope.java
+++ b/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogEntryEnvelope.java
@@ -17,6 +17,9 @@
import com.intuit.wasabi.auditlogobjects.AuditLogEntry;
import com.intuit.wasabi.repository.AuditLogRepository;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
/**
* The AuditLogEntryEnvelope wraps AuditLogEntry to be sent to cassandra.
@@ -28,6 +31,7 @@
*/
private final AuditLogEntry entry;
private final AuditLogRepository repository;
+ private Logger LOGGER = getLogger(AuditLogEntryEnvelope.class);
/**
* Wraps {@code entry} into this envelope.
@@ -45,6 +49,10 @@ public AuditLogEntryEnvelope(final AuditLogEntry entry, final AuditLogRepository
*/
@Override
public void run() {
+ LOGGER.debug("storing auditLogEntry: {}", entry);
+
repository.storeEntry(entry);
+
+ LOGGER.debug("stored auditLogEntry: {}", entry);
}
-}
+}
\ No newline at end of file
diff --git a/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogListenerImpl.java b/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogListenerImpl.java
index 8500c9b2c..4aa29d5f6 100644
--- a/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogListenerImpl.java
+++ b/modules/auditlog/src/main/java/com/intuit/wasabi/auditlog/impl/AuditLogListenerImpl.java
@@ -23,11 +23,17 @@
import com.intuit.wasabi.eventlog.EventLogListener;
import com.intuit.wasabi.eventlog.events.EventLogEvent;
import com.intuit.wasabi.repository.AuditLogRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import static com.intuit.wasabi.auditlogobjects.AuditLogEntryFactory.createFromEvent;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* The AuditLogListener subscribes to events which should be logged for the user interface.
*/
@@ -36,6 +42,7 @@ public class AuditLogListenerImpl implements EventLogListener {
/** Executes the {@link AuditLogEntryEnvelope}s. */
private final ThreadPoolExecutor threadPoolExecutor;
private final AuditLogRepository repository;
+ private Logger LOGGER = getLogger(AuditLogListenerImpl.class);
/**
* Initializes the audit log.
@@ -53,7 +60,8 @@ public AuditLogListenerImpl(final EventLog eventLog,
this.repository = repository;
eventLog.register(this);
- threadPoolExecutor = new ThreadPoolExecutor(threadPoolSizeCore, threadPoolSizeMax, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue());
+ threadPoolExecutor = new ThreadPoolExecutor(threadPoolSizeCore, threadPoolSizeMax, 0L, MILLISECONDS,
+ new LinkedBlockingQueue());
}
/**
@@ -63,16 +71,12 @@ public AuditLogListenerImpl(final EventLog eventLog,
*/
@Override
public void postEvent(EventLogEvent event) {
- threadPoolExecutor.submit(createAuditLogEntryEnvelope(event));
- }
+ AuditLogEntryEnvelope auditLogEntryEnvelope = new AuditLogEntryEnvelope(createFromEvent(event), repository);
- /**
- * Creates an {@link AuditLogEntryEnvelope} for the specified event.
- * @param event the event
- * @return an {@link AuditLogEntry} wrapped into an envelope
- */
- private AuditLogEntryEnvelope createAuditLogEntryEnvelope(EventLogEvent event) {
- return new AuditLogEntryEnvelope(AuditLogEntryFactory.createFromEvent(event), repository);
- }
+ LOGGER.debug("posting auditLogEntryEnvelope: {}", auditLogEntryEnvelope);
+
+ threadPoolExecutor.submit(auditLogEntryEnvelope);
-}
+ LOGGER.debug("posted auditLogEntryEnvelope: {}", auditLogEntryEnvelope);
+ }
+}
\ No newline at end of file
diff --git a/modules/authentication-objects/pom.xml b/modules/authentication-objects/pom.xml
index 1c664e724..0d14d6a0b 100644
--- a/modules/authentication-objects/pom.xml
+++ b/modules/authentication-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/authentication/pom.xml b/modules/authentication/pom.xml
index 8d438dbb1..bf1c8e567 100644
--- a/modules/authentication/pom.xml
+++ b/modules/authentication/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/authorization-objects/pom.xml b/modules/authorization-objects/pom.xml
index 26db8c9bf..c3ab80e62 100644
--- a/modules/authorization-objects/pom.xml
+++ b/modules/authorization-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/authorization/pom.xml b/modules/authorization/pom.xml
index d8ab75274..1bf5e92ac 100644
--- a/modules/authorization/pom.xml
+++ b/modules/authorization/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/cassandra/pom.xml b/modules/cassandra/pom.xml
index fb149744a..504b10764 100644
--- a/modules/cassandra/pom.xml
+++ b/modules/cassandra/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/database/pom.xml b/modules/database/pom.xml
index 6ec23644c..4719e32e2 100644
--- a/modules/database/pom.xml
+++ b/modules/database/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/database/src/main/resources/database.properties b/modules/database/src/main/resources/database.properties
index d89259662..c0ffeb52d 100644
--- a/modules/database/src/main/resources/database.properties
+++ b/modules/database/src/main/resources/database.properties
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
-database.url.host=${mysql.host}
-database.url.port=${mysql.port}
-database.url.dbname=${mysql.dbName}
-database.url.args=${mysql.Args}
+database.url.host:${mysql.host}
+database.url.port:${mysql.port}
+database.url.dbname:${mysql.dbName}
+database.url.args:${mysql.Args}
database.user:readwrite
database.password:readwrite
database.pool.partitions:1
diff --git a/modules/email/pom.xml b/modules/email/pom.xml
index b0a1910f7..3c62276d4 100644
--- a/modules/email/pom.xml
+++ b/modules/email/pom.xml
@@ -21,7 +21,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/email/src/test/java/com/intuit/wasabi/email/EmailModuleTest.java b/modules/email/src/test/java/com/intuit/wasabi/email/EmailModuleTest.java
index 95218a3c0..84af7bada 100644
--- a/modules/email/src/test/java/com/intuit/wasabi/email/EmailModuleTest.java
+++ b/modules/email/src/test/java/com/intuit/wasabi/email/EmailModuleTest.java
@@ -20,9 +20,7 @@
import com.google.inject.Injector;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
public class EmailModuleTest {
diff --git a/modules/event-objects/pom.xml b/modules/event-objects/pom.xml
index 4efb8e3b6..5459713d2 100644
--- a/modules/event-objects/pom.xml
+++ b/modules/event-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/event/pom.xml b/modules/event/pom.xml
index bc09fa78f..ca62dd2ff 100644
--- a/modules/event/pom.xml
+++ b/modules/event/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/eventlog/pom.xml b/modules/eventlog/pom.xml
index 7d5fcebc1..056504a00 100644
--- a/modules/eventlog/pom.xml
+++ b/modules/eventlog/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/EventLogListener.java b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/EventLogListener.java
index e86fb249d..f631c746b 100644
--- a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/EventLogListener.java
+++ b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/EventLogListener.java
@@ -31,4 +31,4 @@ public interface EventLogListener {
* @param event the event which occurred.
*/
void postEvent(EventLogEvent event);
-}
+}
\ No newline at end of file
diff --git a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogEventEnvelope.java b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogEventEnvelope.java
index 70e89e864..74163d91e 100644
--- a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogEventEnvelope.java
+++ b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogEventEnvelope.java
@@ -17,6 +17,10 @@
import com.intuit.wasabi.eventlog.EventLogListener;
import com.intuit.wasabi.eventlog.events.EventLogEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.slf4j.LoggerFactory.getLogger;
/**
* Wraps a {@link Runnable} around an {@link EventLogEvent} and an {@link EventLogListener} (the recipient) who is
@@ -26,9 +30,9 @@
/** The recipient of the event. */
private final EventLogListener recipient;
-
/** The event. */
private final EventLogEvent event;
+ private Logger LOGGER = getLogger(EventLogEventEnvelope.class);
/**
* Creates an envelope containing an event for the recipient.
@@ -49,7 +53,10 @@ public EventLogEventEnvelope(final EventLogEvent event, final EventLogListener r
*/
@Override
public void run() {
+ LOGGER.debug("posting event: {}", event);
+
recipient.postEvent(event);
- }
-}
+ LOGGER.debug("posted event: {}", event);
+ }
+}
\ No newline at end of file
diff --git a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogImpl.java b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogImpl.java
index 4e1fa8cea..5cb9e5556 100644
--- a/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogImpl.java
+++ b/modules/eventlog/src/main/java/com/intuit/wasabi/eventlog/impl/EventLogImpl.java
@@ -22,10 +22,21 @@
import com.intuit.wasabi.eventlog.events.EventLogEvent;
import org.slf4j.Logger;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
import static java.lang.Class.forName;
+import static java.lang.Thread.currentThread;
+import static java.lang.Thread.sleep;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.slf4j.LoggerFactory.getLogger;
@@ -36,10 +47,6 @@
public class EventLogImpl implements EventLog {
private static final Logger LOGGER = getLogger(EventLogImpl.class);
- /**
- * Executes the {@link EventLogEventEnvelope}s.
- */
- private final ThreadPoolExecutor eventPostThreadPoolExecutor;
/**
* The listener subscriptions.
*/
@@ -48,6 +55,10 @@ public class EventLogImpl implements EventLog {
* the event Deque
*/
/*test*/ final Deque eventDeque;
+ /**
+ * Executes the {@link EventLogEventEnvelope}s.
+ */
+ private final ThreadPoolExecutor eventPostThreadPoolExecutor;
/**
* Creates the event pool executor. Should be called by Guice.
@@ -61,7 +72,8 @@ public EventLogImpl(@Named("eventlog.threadpoolsize.core") int threadPoolSizeCor
listeners = new ConcurrentHashMap<>();
eventDeque = new ConcurrentLinkedDeque<>();
- eventPostThreadPoolExecutor = new ThreadPoolExecutor(threadPoolSizeCore, threadPoolSizeMax, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue());
+ eventPostThreadPoolExecutor = new ThreadPoolExecutor(threadPoolSizeCore, threadPoolSizeMax, 0L, MILLISECONDS,
+ new LinkedBlockingQueue());
}
/**
@@ -69,7 +81,7 @@ public EventLogImpl(@Named("eventlog.threadpoolsize.core") int threadPoolSizeCor
*/
@Override
public void register(EventLogListener listener) {
- this.register(listener, Collections.emptyList());
+ register(listener, emptyList());
}
/**
@@ -77,10 +89,7 @@ public void register(EventLogListener listener) {
*/
@Override
public void register(EventLogListener listener, List> events) {
- if (events.isEmpty()) {
- events = Collections.singletonList(EventLogEvent.class);
- }
- listeners.put(listener, events);
+ listeners.put(listener, events.isEmpty() ? singletonList(EventLogEvent.class) : events);
}
/**
@@ -91,20 +100,23 @@ public void register(EventLogListener listener, List> eventList = new ArrayList<>(events.length);
+
for (String event : events) {
Class eventLogClass;
try {
eventLogClass = (Class) forName(event);
} catch (ClassNotFoundException e) {
- LOGGER.debug("Event class " + event + " not found, trying " + packagePrefix + event + " !", e);
+ LOGGER.debug("Event class: {} not found, trying: {} ", event, packagePrefix + event, e);
+
eventLogClass = (Class) forName(packagePrefix + event);
}
+
eventList.add(eventLogClass);
}
- this.register(listener, eventList);
+
+ register(listener, eventList);
}
/**
@@ -113,9 +125,11 @@ public void register(EventLogListener listener, String... events)
@Override
public void postEvent(EventLogEvent event) {
if (event == null) {
- LOGGER.warn("null-Event skipped.");
+ LOGGER.warn("skipping null EventLogEvent");
+
return;
}
+
eventDeque.offerLast(event);
}
@@ -128,9 +142,9 @@ public void postEvent(EventLogEvent event) {
*/
private boolean isSubscribed(EventLogListener listener, EventLogEvent event) {
List> subscriptions = listeners.get(listener);
-
// class and super classes
Class eventClass = event.getClass();
+
while (!eventClass.equals(Object.class)) {
if (subscriptions.contains(eventClass)) {
return true;
@@ -142,6 +156,7 @@ private boolean isSubscribed(EventLogListener listener, EventLogEvent event) {
return true;
}
}
+
eventClass = eventClass.getSuperclass();
}
@@ -154,12 +169,12 @@ private boolean isSubscribed(EventLogListener listener, EventLogEvent event) {
@Override
public void run() {
try {
- while (!Thread.currentThread().isInterrupted() && Thread.currentThread().isAlive()) {
+ while (!currentThread().isInterrupted() && currentThread().isAlive()) {
if (!eventDeque.isEmpty()) {
prepareEnvelope(eventDeque.pollFirst());
} else {
try {
- Thread.sleep(500);
+ sleep(500);
} catch (InterruptedException e) {
LOGGER.warn("Interrupted while sleeping.", e);
}
@@ -167,6 +182,7 @@ public void run() {
}
} finally {
LOGGER.info("Shutting down event system, posting remaining events -- new events will not be processed.");
+
if (!eventDeque.isEmpty()) {
eventDeque.forEach(this::prepareEnvelope);
eventDeque.clear();
@@ -180,13 +196,27 @@ public void run() {
* @param event the vent to prepare
*/
/*test*/ void prepareEnvelope(final EventLogEvent event) {
- if (event == null) {
- return;
- }
- for (EventLogListener eventLogListener : listeners.keySet()) {
- if (isSubscribed(eventLogListener, event)) {
- eventPostThreadPoolExecutor.submit(new EventLogEventEnvelope(event, eventLogListener));
+ LOGGER.debug("preparing event: {}", event);
+
+ if (event != null) {
+ LOGGER.debug("preparing event is not null");
+
+ for (EventLogListener eventLogListener : listeners.keySet()) {
+ boolean isEventSubscribed = isSubscribed(eventLogListener, event);
+
+ LOGGER.debug("preparing event {}, is subscribed: {}, with eventLogListener: {}", isEventSubscribed,
+ event, eventLogListener);
+
+ if (isEventSubscribed) {
+ LOGGER.debug("preparing subscribed event {}, with eventLogListener", event, eventLogListener);
+
+ eventPostThreadPoolExecutor.submit(new EventLogEventEnvelope(event, eventLogListener));
+
+ LOGGER.debug("prepared subscribed event {}, with eventLogListener", event, eventLogListener);
+ }
}
}
+
+ LOGGER.debug("prepared event: {}", event);
}
-}
+}
\ No newline at end of file
diff --git a/modules/eventlog/src/test/java/com/intuit/wasabi/eventlog/impl/EventLogImplTest.java b/modules/eventlog/src/test/java/com/intuit/wasabi/eventlog/impl/EventLogImplTest.java
index a22fefd9c..5c43cfb54 100644
--- a/modules/eventlog/src/test/java/com/intuit/wasabi/eventlog/impl/EventLogImplTest.java
+++ b/modules/eventlog/src/test/java/com/intuit/wasabi/eventlog/impl/EventLogImplTest.java
@@ -19,6 +19,7 @@
import com.intuit.wasabi.eventlog.events.EventLogEvent;
import com.intuit.wasabi.eventlog.events.SimpleEvent;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
@@ -90,7 +91,9 @@ public void testRegisterStringFail() throws Exception {
}
@Test
+ @Ignore
public void testPostEvent() throws Exception {
+ // FIXME: this test still relies on threads, we need to polish it
EventLogListener eventLogListener = Mockito.mock(EventLogListener.class);
EventLogImpl eventLog = new EventLogImpl(2, 4);
eventLog.register(eventLogListener, Collections.singletonList(SimpleEvent.class));
@@ -133,9 +136,10 @@ public void testPostEventNull() throws Exception {
Assert.assertFalse("Deque contains null.", eventLog.eventDeque.contains(null));
}
+ @Ignore
@Test
public void testRunFinally() throws Exception {
- // FIXME: this test still relies on threads, we might need to polish it
+ // FIXME: this test still relies on threads, we need to polish it
EventLogImpl eventLog = new EventLogImpl(1, 1);
EventLogEvent eventLogEvent = Mockito.mock(EventLogEvent.class);
diff --git a/modules/exceptions/pom.xml b/modules/exceptions/pom.xml
index 923e740d5..1e7825c7e 100644
--- a/modules/exceptions/pom.xml
+++ b/modules/exceptions/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/experiment-objects/pom.xml b/modules/experiment-objects/pom.xml
index b736fd8cc..0b25bcf33 100644
--- a/modules/experiment-objects/pom.xml
+++ b/modules/experiment-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Bucket.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Bucket.java
index 89eb382bf..65c56f23f 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Bucket.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Bucket.java
@@ -28,7 +28,9 @@
import com.google.common.base.Preconditions;
import com.intuit.wasabi.experimentobjects.exceptions.InvalidIdentifierException;
import com.netflix.astyanax.model.ColumnList;
+
import io.swagger.annotations.ApiModelProperty;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -36,13 +38,12 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import static java.util.Arrays.asList;
-
/**
* An experiment bucket
*/
@@ -186,9 +187,9 @@ public boolean isStateTransitionValid(State desiredState) {
}
public enum State {
-
OPEN, CLOSED, EMPTY;
+ //TODO: this is a work in progress
public enum BucketStateTransition {
OPEN(State.OPEN, State.CLOSED, State.EMPTY),
@@ -206,11 +207,11 @@ public enum BucketStateTransition {
}
}
}
- //TODO: remove state from enum
+ //TODO: remove state from enum - this is a work in progress
private final transient List allowedStateTransitions;
BucketStateTransition(State... allowedTransitions) {
- this.allowedStateTransitions = asList(allowedTransitions);
+ this.allowedStateTransitions = Arrays.asList(allowedTransitions);
}
private List getAllowedStateTransitions() {
@@ -308,7 +309,6 @@ public static class Label {
private String label;
private Label(String label) {
- super();
this.label = Preconditions.checkNotNull(label);
if (label.trim().isEmpty()) {
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Context.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Context.java
index 7f7cf6306..9811071ba 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Context.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Context.java
@@ -31,7 +31,6 @@ public class Context {
private String ctx = "PROD"; //default value for context
private Context(String ctx) {
- super();
this.ctx=Preconditions.checkNotNull(ctx);
if (ctx.trim().isEmpty()) {
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Experiment.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Experiment.java
index d68fb9d0d..937240a1f 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Experiment.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Experiment.java
@@ -737,7 +737,6 @@ public static class Label {
private String label;
private Label(String label) {
- super();
this.label = Preconditions.checkNotNull(label);
if (!label.matches("^[_\\-$A-Za-z][_\\-$A-Za-z0-9]*")) {
throw new InvalidIdentifierException("Experiment label \"" +
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/ExperimentPage.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/ExperimentPage.java
index 32623bca1..b8865b3a3 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/ExperimentPage.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/ExperimentPage.java
@@ -16,6 +16,7 @@
package com.intuit.wasabi.experimentobjects;
import io.swagger.annotations.ApiModelProperty;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -83,12 +84,7 @@ public String toString() {
}
@Override
- public ExperimentPage clone() {
- try {
+ public ExperimentPage clone() throws CloneNotSupportedException {
return (ExperimentPage) super.clone();
- } catch (CloneNotSupportedException e) {
- // Should never happen
- throw new RuntimeException(e);
- }
}
}
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/NewExperiment.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/NewExperiment.java
index 9f8e727b8..9ccf2e517 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/NewExperiment.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/NewExperiment.java
@@ -28,7 +28,7 @@
* Specification of a new experiment
*/
@ApiModel(description = "Subset of Experiment used to create a new experiment.")
-public final class NewExperiment implements ExperimentBase {
+public class NewExperiment implements ExperimentBase {
// Note, if adding a member variable, be sure to update the builder's
// copy contructor
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Page.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Page.java
index 6861be151..152402f45 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Page.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/Page.java
@@ -99,7 +99,6 @@ public static class Name {
private final String inner_name;
private Name(String name) {
- super();
this.inner_name = Preconditions.checkNotNull(name);
if (name.trim().isEmpty()) {
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PageExperiment.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PageExperiment.java
index ff1ac5463..292a8f9bf 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PageExperiment.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PageExperiment.java
@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -39,7 +40,6 @@ public static class Builder{
private PageExperiment instance;
public Builder(Experiment.ID experimentID, Experiment.Label label, boolean allowNewAssignment){
- super();
instance = new PageExperiment();
instance.id = experimentID;
instance.label = label;
@@ -96,13 +96,8 @@ public String toString() {
}
@Override
- public PageExperiment clone() {
- try {
+ public PageExperiment clone() throws CloneNotSupportedException {
return (PageExperiment) super.clone();
- } catch (CloneNotSupportedException e) {
- // Should never happen
- throw new RuntimeException(e);
- }
}
}
diff --git a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PrioritizedExperiment.java b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PrioritizedExperiment.java
index 19d38c66b..7d1ebd2dc 100644
--- a/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PrioritizedExperiment.java
+++ b/modules/experiment-objects/src/main/java/com/intuit/wasabi/experimentobjects/PrioritizedExperiment.java
@@ -17,7 +17,9 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Preconditions;
+
import io.swagger.annotations.ApiModelProperty;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -290,13 +292,8 @@ public String toString() {
}
@Override
- public PrioritizedExperiment clone() {
- try {
+ public PrioritizedExperiment clone() throws CloneNotSupportedException {
return (PrioritizedExperiment) super.clone();
- } catch (CloneNotSupportedException e) {
- // Should never happen
- throw new RuntimeException(e);
- }
}
/**
diff --git a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/BucketListTest.java b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/BucketListTest.java
index 7eb013d5a..7f2784007 100644
--- a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/BucketListTest.java
+++ b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/BucketListTest.java
@@ -1,3 +1,18 @@
+/*******************************************************************************
+ * Copyright 2016 Intuit
+ *
+ * Licensed 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 com.intuit.wasabi.experimentobjects;
import static org.junit.Assert.*;
diff --git a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PageExperimentTest.java b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PageExperimentTest.java
index 763b23809..a0e805d38 100644
--- a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PageExperimentTest.java
+++ b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PageExperimentTest.java
@@ -80,7 +80,7 @@ public void testEquals(){
}
@Test
- public void testClone(){
+ public void testClone() throws Exception{
PageExperiment pClone = pe.clone();
assertEquals(pClone, pe);
}
diff --git a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PrioritizedExperimentTest.java b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PrioritizedExperimentTest.java
index 60a1b0bc3..cd95ca4d7 100644
--- a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PrioritizedExperimentTest.java
+++ b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/PrioritizedExperimentTest.java
@@ -108,7 +108,7 @@ public void testBuilderMethods(){
}
@Test
- public void testClone(){
+ public void testClone() throws Exception{
assertEquals(prioExp,prioExp.clone());
}
diff --git a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidExperimentStateTransitionExceptionTest.java b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidExperimentStateTransitionExceptionTest.java
index 0c6a91b0d..c084fe609 100644
--- a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidExperimentStateTransitionExceptionTest.java
+++ b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidExperimentStateTransitionExceptionTest.java
@@ -1,3 +1,18 @@
+/*******************************************************************************
+ * Copyright 2016 Intuit
+ *
+ * Licensed 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 com.intuit.wasabi.experimentobjects.exceptions;
import org.hamcrest.core.Is;
diff --git a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidIdentifierExceptionTest.java b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidIdentifierExceptionTest.java
index a193911a7..9ce4da3ba 100644
--- a/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidIdentifierExceptionTest.java
+++ b/modules/experiment-objects/src/test/java/com/intuit/wasabi/experimentobjects/exceptions/InvalidIdentifierExceptionTest.java
@@ -1,3 +1,18 @@
+/*******************************************************************************
+ * Copyright 2016 Intuit
+ *
+ * Licensed 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 com.intuit.wasabi.experimentobjects.exceptions;
import org.hamcrest.core.Is;
diff --git a/modules/experiment/pom.xml b/modules/experiment/pom.xml
index 2be12ca7c..6054372f9 100644
--- a/modules/experiment/pom.xml
+++ b/modules/experiment/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/experiment/src/main/java/com/intuit/wasabi/experiment/impl/ExperimentsImpl.java b/modules/experiment/src/main/java/com/intuit/wasabi/experiment/impl/ExperimentsImpl.java
index f592b4380..89e424953 100644
--- a/modules/experiment/src/main/java/com/intuit/wasabi/experiment/impl/ExperimentsImpl.java
+++ b/modules/experiment/src/main/java/com/intuit/wasabi/experiment/impl/ExperimentsImpl.java
@@ -357,7 +357,7 @@ public boolean buildUpdatedExperiment(Experiment experiment, Experiment updates,
if (updates.getHypothesisIsCorrect() != null && !updates.getHypothesisIsCorrect().equals(experiment.getHypothesisIsCorrect())) {
builder.withHypothesisIsCorrect(updates.getHypothesisIsCorrect());
requiresUpdate = true;
- changeData = new ExperimentAuditInfo("hypothesisiscorrect", experiment.getHypothesisIsCorrect(), updates.getHypothesisIsCorrect());
+ changeData = new ExperimentAuditInfo("hypothesis_is_correct", experiment.getHypothesisIsCorrect(), updates.getHypothesisIsCorrect());
changeList.add(changeData);
}
if (updates.getResults() != null && !updates.getResults().equals(experiment.getResults())) {
diff --git a/modules/export/pom.xml b/modules/export/pom.xml
index f54ddfdfa..34b984a50 100644
--- a/modules/export/pom.xml
+++ b/modules/export/pom.xml
@@ -23,7 +23,7 @@
wasabi
com.intuit.wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/feedback-objects/pom.xml b/modules/feedback-objects/pom.xml
index a8a58c7b4..b221d9037 100644
--- a/modules/feedback-objects/pom.xml
+++ b/modules/feedback-objects/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/feedback/pom.xml b/modules/feedback/pom.xml
index 008cc7871..d060e735f 100644
--- a/modules/feedback/pom.xml
+++ b/modules/feedback/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/functional-test/pom.xml b/modules/functional-test/pom.xml
index ea6580108..f7573363c 100755
--- a/modules/functional-test/pom.xml
+++ b/modules/functional-test/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/library/TestBase.java b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/library/TestBase.java
index 671774e54..abd3b1724 100644
--- a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/library/TestBase.java
+++ b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/library/TestBase.java
@@ -17,25 +17,62 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.intuit.wasabi.tests.library.util.*;
+import com.intuit.wasabi.tests.library.util.Constants;
+import com.intuit.wasabi.tests.library.util.RetryAnalyzer;
+import com.intuit.wasabi.tests.library.util.RetryListener;
+import com.intuit.wasabi.tests.library.util.RetryTest;
+import com.intuit.wasabi.tests.library.util.TestUtils;
import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy;
import com.intuit.wasabi.tests.library.util.serialstrategies.SerializationStrategy;
-import com.intuit.wasabi.tests.model.*;
-import com.intuit.wasabi.tests.model.analytics.*;
-import com.intuit.wasabi.tests.model.factory.*;
+import com.intuit.wasabi.tests.model.APIUser;
+import com.intuit.wasabi.tests.model.AccessToken;
+import com.intuit.wasabi.tests.model.Application;
+import com.intuit.wasabi.tests.model.Assignment;
+import com.intuit.wasabi.tests.model.Bucket;
+import com.intuit.wasabi.tests.model.Event;
+import com.intuit.wasabi.tests.model.Experiment;
+import com.intuit.wasabi.tests.model.Page;
+import com.intuit.wasabi.tests.model.User;
+import com.intuit.wasabi.tests.model.UserFeedback;
+import com.intuit.wasabi.tests.model.analytics.AnalyticsParameters;
+import com.intuit.wasabi.tests.model.analytics.ExperimentCounts;
+import com.intuit.wasabi.tests.model.analytics.ExperimentCumulativeCounts;
+import com.intuit.wasabi.tests.model.analytics.ExperimentCumulativeStatistics;
+import com.intuit.wasabi.tests.model.analytics.ExperimentStatistics;
+import com.intuit.wasabi.tests.model.factory.APIUserFactory;
+import com.intuit.wasabi.tests.model.factory.AccessTokenFactory;
+import com.intuit.wasabi.tests.model.factory.AssignmentFactory;
+import com.intuit.wasabi.tests.model.factory.BucketFactory;
+import com.intuit.wasabi.tests.model.factory.EventFactory;
+import com.intuit.wasabi.tests.model.factory.ExperimentFactory;
+import com.intuit.wasabi.tests.model.factory.PageFactory;
+import com.intuit.wasabi.tests.model.factory.UserFeedbackFactory;
import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.path.json.exception.JsonPathException;
import com.jayway.restassured.response.Response;
import org.apache.http.HttpStatus;
import org.slf4j.Logger;
import org.testng.Assert;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Listeners;
import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import static org.slf4j.LoggerFactory.getLogger;
@@ -44,7 +81,7 @@
/**
* A TestBase for new test sets.
*/
-@Listeners({ RetryListener.class })
+@Listeners({RetryListener.class})
public class TestBase extends ServiceTestBase {
private static final Logger LOGGER = getLogger(TestBase.class);
@@ -73,7 +110,7 @@ private void init() {
* Will be called before any tests of a class are invoked.
* Creates an APIServerConnector and tries to ping the service.
*
- * @param configFile the configuration file
+ * @param configFile the configuration file
* @throws IOException if the configfile can not be read.
*/
@BeforeClass
@@ -97,11 +134,11 @@ protected void beforeClassTestWrapper(@Optional(Constants.DEFAULT_CONFIG_FILE) S
private void loadProperties(String configFile) throws IOException {
try {
Properties properties = new Properties();
- properties.load( new BufferedReader(
- new InputStreamReader(
- this.getClass().getClassLoader().getResourceAsStream(configFile)
+ properties.load(new BufferedReader(
+ new InputStreamReader(
+ this.getClass().getClassLoader().getResourceAsStream(configFile)
+ )
)
- )
);
appProperties = properties;
LOGGER.debug("Properties loaded: " + appProperties.toString());
@@ -119,9 +156,9 @@ private void loadProperties(String configFile) throws IOException {
// setPropertyFromSystemProperty ("user.name","user-name");
// setPropertyFromSystemProperty ("user.password","password");
- setPropertyFromSystemProperty ("user-name","user-name");
- setPropertyFromSystemProperty ("password","password");
- setPropertyFromSystemProperty ("user-lastname","user-lastname");
+ setPropertyFromSystemProperty("user-name", "user-name");
+ setPropertyFromSystemProperty("password", "password");
+ setPropertyFromSystemProperty("user-lastname", "user-lastname");
setPropertyFromSystemProperty("validTokenPattern", "validTokenPattern");
setPropertyFromSystemProperty("user-email", "user-email");
@@ -140,7 +177,6 @@ protected void afterClassTestWrapper() {
/**
* Creates an APIServerConnector.
- *
*/
private void createAPIServerConnector() {
LOGGER.info("Creating APIServerConnector");
@@ -164,7 +200,7 @@ private void createAPIServerConnector() {
* {@code sysPropKey}.
* If the system property is null or the empty string no action is done.
*
- * @param sysPropKey the system property key
+ * @param sysPropKey the system property key
* @param internalPropKey the appProperty key
*/
protected void setPropertyFromSystemProperty(String sysPropKey, String internalPropKey) {
@@ -176,7 +212,6 @@ protected void setPropertyFromSystemProperty(String sysPropKey, String internalP
}
-
///////////////////
// ping Endpoint //
///////////////////
@@ -184,7 +219,7 @@ protected void setPropertyFromSystemProperty(String sysPropKey, String internalP
/**
* Pings the API server and asserts that all components in the received message
* are healthy, thus the system running.
- *
+ *
* This will be run as a test to be able to use this as a dependency.
*/
@Test(sequential = true, retryAnalyzer = RetryAnalyzer.class, groups = {"ping"})
@@ -207,7 +242,7 @@ public void assertPingAPIServer(int expectedStatus) {
* Pings the API server and asserts that all components in the received message
* are healthy, thus the system running.
*
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
*/
public void assertPingAPIServer(int expectedStatus, APIServerConnector apiServerConnector) {
@@ -253,7 +288,7 @@ public Response getPing(int expectedStatus) {
* Sends a GET request to ping the Server.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -265,7 +300,6 @@ public Response getPing(int expectedStatus, APIServerConnector apiServerConnecto
}
-
//////////////////////////
// experiments Endpoint //
//////////////////////////
@@ -273,7 +307,7 @@ public Response getPing(int expectedStatus, APIServerConnector apiServerConnecto
/**
* Sends a POST request to create an experiment.
* The response must contain {@link HttpStatus#SC_CREATED}.
- *
+ *
* Sets createNewApplication to {@code true}.
*
* @param experiment the experiment to POST
@@ -286,10 +320,10 @@ public Experiment postExperiment(Experiment experiment) {
/**
* Sends a POST request to create an experiment.
* The response must contain {@link HttpStatus#SC_CREATED}.
- *
+ *
* Sets createNewApplication to {@code true}.
*
- * @param experiment the experiment to POST
+ * @param experiment the experiment to POST
* @param createNewApplication allow to create a new application
* @return the new experiment
*/
@@ -300,10 +334,10 @@ public Experiment postExperiment(Experiment experiment, boolean createNewApplica
/**
* Sends a POST request to create an experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Sets createNewApplication to {@code true}.
*
- * @param experiment the experiment to POST
+ * @param experiment the experiment to POST
* @param expectedStatus the expected HTTP status code
* @return the new experiment
*/
@@ -315,9 +349,9 @@ public Experiment postExperiment(Experiment experiment, int expectedStatus) {
* Sends a POST request to create an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment to POST
+ * @param experiment the experiment to POST
* @param createNewApplication allow to create a new application
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return the new experiment
*/
public Experiment postExperiment(Experiment experiment, boolean createNewApplication, int expectedStatus) {
@@ -327,11 +361,11 @@ public Experiment postExperiment(Experiment experiment, boolean createNewApplica
/**
* Sends a POST request to create an experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Sets createNewApplication to {@code true}.
*
- * @param experiment the experiment to POST
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment to POST
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the new experiment
*/
@@ -343,14 +377,14 @@ public Experiment postExperiment(Experiment experiment, int expectedStatus, APIS
* Sends a POST request to create an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment to POST
+ * @param experiment the experiment to POST
* @param createNewApplication allow to create a new application
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return the new experiment
*/
public Experiment postExperiment(Experiment experiment, boolean createNewApplication, int expectedStatus, APIServerConnector apiServerConnector) {
- response = apiServerConnector.doPost("experiments?createNewApplication=" + createNewApplication, experiment==null?null:experiment.toJSONString());
+ response = apiServerConnector.doPost("experiments?createNewApplication=" + createNewApplication, experiment == null ? null : experiment.toJSONString());
// FIXME: jwtodd
assertReturnCode(response, response.getStatusCode() == 500 ? 500 : expectedStatus);
return ExperimentFactory.createFromJSONString(response.jsonPath().prettify());
@@ -359,9 +393,9 @@ public Experiment postExperiment(Experiment experiment, boolean createNewApplica
/**
* Sends a PUT request to update the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Excludes the experiment creation and modification times.
- *
+ *
* If this call was used to delete an experiment (by changing the state to DELETED) it will return a new, empty
* experiment.
*
@@ -375,13 +409,13 @@ public Experiment putExperiment(Experiment experiment) {
/**
* Sends a PUT request to update the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Excludes the experiment creation and modification times.
- *
+ *
* If this call was used to delete an experiment (by changing the state to DELETED) it will return a new, empty
* experiment.
*
- * @param experiment the experiment to PUT
+ * @param experiment the experiment to PUT
* @param expectedStatus the expected HTTP status code
* @return the new changed experiment
*/
@@ -392,14 +426,14 @@ public Experiment putExperiment(Experiment experiment, int expectedStatus) {
/**
* Sends a PUT request to update the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Always excludes the experiment creation and modification times.
- *
+ *
* If this call was used to delete an experiment (by changing the state to DELETED) it will return a new, empty
* experiment.
*
- * @param experiment the experiment to PUT
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment to PUT
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the new changed experiment
*/
@@ -428,12 +462,20 @@ public Experiment putExperiment(Experiment experiment, int expectedStatus, APISe
response = apiServerConnector.doPut("experiments/" + experiment.id, experiment.toJSONString());
switch (caseModification) {
- case "WHITELIST_REMOVED": experiment.getSerializationStrategy().add("modificationTime"); break;
- case "BLACKLIST_ADDED": experiment.getSerializationStrategy().remove("modificationTime"); break;
+ case "WHITELIST_REMOVED":
+ experiment.getSerializationStrategy().add("modificationTime");
+ break;
+ case "BLACKLIST_ADDED":
+ experiment.getSerializationStrategy().remove("modificationTime");
+ break;
}
switch (caseCreation) {
- case "WHITELIST_REMOVED": experiment.getSerializationStrategy().add("creationTime"); break;
- case "BLACKLIST_ADDED": experiment.getSerializationStrategy().remove("creationTIme"); break;
+ case "WHITELIST_REMOVED":
+ experiment.getSerializationStrategy().add("creationTime");
+ break;
+ case "BLACKLIST_ADDED":
+ experiment.getSerializationStrategy().remove("creationTIme");
+ break;
}
assertReturnCode(response, expectedStatus);
if (expectedStatus == HttpStatus.SC_NO_CONTENT) {
@@ -467,7 +509,7 @@ public List getExperiments(int expectedStatus) {
* Sends a GET request to get all experiments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of experiments
*/
@@ -486,7 +528,7 @@ public List getExperiments(int expectedStatus, APIServerConnector ap
/**
* Sends a GET request to get an experiment with the supplied ID.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Asserts that the experiment has an ID.
*
* @param experiment an experiment with an ID
@@ -499,10 +541,10 @@ public Experiment getExperiment(Experiment experiment) {
/**
* Sends a GET request to get an experiment with the supplied ID.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Asserts that the experiment has an ID.
*
- * @param experiment an experiment with an ID
+ * @param experiment an experiment with an ID
* @param expectedStatus the expected HTTP status code
* @return a new experiment instance constructed from the response
*/
@@ -513,11 +555,11 @@ public Experiment getExperiment(Experiment experiment, int expectedStatus) {
/**
* Sends a GET request to get an experiment with the supplied ID.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Asserts that the experiment has an ID.
*
- * @param experiment an experiment with an ID
- * @param expectedStatus the expected HTTP status code
+ * @param experiment an experiment with an ID
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a new experiment instance constructed from the response
*/
@@ -531,7 +573,7 @@ public Experiment getExperiment(Experiment experiment, int expectedStatus, APISe
/**
* Sends a DELETE request for the experiment with the experiment's ID.
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
- *
+ *
* Asserts that the experiment has an ID.
*
* @param experiment an experiment with an ID
@@ -542,16 +584,16 @@ public Response deleteExperiment(Experiment experiment) {
}
public void deleteExperiments(List experiments) {
- for (Experiment exp : experiments) {
- deleteExperiment(exp);
- }
+ for (Experiment exp : experiments) {
+ deleteExperiment(exp);
+ }
}
/**
* Sends a DELETE request for the experiment with the experiment's ID.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment an experiment with an ID
+ * @param experiment an experiment with an ID
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -563,8 +605,8 @@ public Response deleteExperiment(Experiment experiment, int expectedStatus) {
* Sends a DELETE request for the experiment with the experiment's ID.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment an experiment with an ID
- * @param expectedStatus the expected HTTP status code
+ * @param experiment an experiment with an ID
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -576,7 +618,6 @@ public Response deleteExperiment(Experiment experiment, int expectedStatus, APIS
}
-
///////////////////////////////////////
// experiments//buckets endpoint //
///////////////////////////////////////
@@ -596,7 +637,7 @@ public Bucket postBucket(Bucket bucket) {
* Sends a POST request to create a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the new bucket
+ * @param bucket the new bucket
* @param expectedStatus the expected HTTP status code
* @return the retrieved bucket
*/
@@ -608,8 +649,8 @@ public Bucket postBucket(Bucket bucket, int expectedStatus) {
* Sends a POST request to create a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the new bucket
- * @param expectedStatus the expected HTTP status code
+ * @param bucket the new bucket
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the retrieved bucket
*/
@@ -636,7 +677,7 @@ public List postBuckets(List buckets) {
* Sends multiple POST requests to create multiple buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets a list of new buckets
+ * @param buckets a list of new buckets
* @param expectedStatus the expected HTTP status code
* @return a list of retrieved buckets
*/
@@ -648,15 +689,15 @@ public List postBuckets(List buckets, int expectedStatus) {
* Sends multiple POST requests to create multiple buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets a list of new buckets
- * @param expectedStatus the expected HTTP status code
+ * @param buckets a list of new buckets
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of retrieved buckets
*/
public List postBuckets(List buckets, int expectedStatus, APIServerConnector apiServerConnector) {
List newBuckets = new ArrayList<>(buckets.size());
for (Bucket bucket : buckets) {
- newBuckets.add(postBucket(bucket, expectedStatus, apiServerConnector));
+ newBuckets.add(postBucket(bucket, expectedStatus, apiServerConnector));
}
return newBuckets;
}
@@ -676,7 +717,7 @@ public Bucket putBucket(Bucket bucket) {
* Sends a PUT request to update a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket to update
+ * @param bucket the bucket to update
* @param expectedStatus the expected HTTP status code
* @return the retrieved bucket
*/
@@ -688,8 +729,8 @@ public Bucket putBucket(Bucket bucket, int expectedStatus) {
* Sends a PUT request to update a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket to update
- * @param expectedStatus the expected HTTP status code
+ * @param bucket the bucket to update
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the retrieved bucket
*/
@@ -717,7 +758,7 @@ public List putBuckets(List buckets) {
* Sends a PUT request to update a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to update
+ * @param buckets the buckets to update
* @param expectedStatus the expected HTTP status code
* @return the retrieved buckets
*/
@@ -729,8 +770,8 @@ public List putBuckets(List buckets, int expectedStatus) {
* Sends a PUT request to update a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to update
- * @param expectedStatus the expected HTTP status code
+ * @param buckets the buckets to update
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the retrieved buckets
*/
@@ -745,7 +786,7 @@ public List putBuckets(List buckets, int expectedStatus, APIServ
/**
* Sends a PUT request to update the state of a bucket.
* The responses must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Uses the bucket's state.
*
* @param bucket the buckets to update
@@ -760,7 +801,7 @@ public Bucket putBucketState(Bucket bucket) {
* The responses must contain {@link HttpStatus#SC_OK}.
*
* @param bucket the buckets to update
- * @param state the new state
+ * @param state the new state
* @return the bucket returned by the response
*/
public Bucket putBucketState(Bucket bucket, String state) {
@@ -771,8 +812,8 @@ public Bucket putBucketState(Bucket bucket, String state) {
* Sends a PUT request to update the state of a bucket.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param bucket the buckets to update
- * @param state the new state
+ * @param bucket the buckets to update
+ * @param state the new state
* @param expectedStatus the expected HTTP status code
* @return the bucket returned by the response
*/
@@ -784,9 +825,9 @@ public Bucket putBucketState(Bucket bucket, String state, int expectedStatus) {
* Sends a PUT request to update the state of a bucket.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param bucket the buckets to update
- * @param state the new state
- * @param expectedStatus the expected HTTP status code
+ * @param bucket the buckets to update
+ * @param state the new state
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the bucket returned by the response
*/
@@ -815,7 +856,7 @@ public List putBucketsStates(List buckets) {
* Sends a PUT request to update the states of a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to update
+ * @param buckets the buckets to update
* @param expectedStatus the expected HTTP status code
* @return a list retrieved buckets
*/
@@ -827,8 +868,8 @@ public List putBucketsStates(List buckets, int expectedStatus) {
* Sends a PUT request to update the states of a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to update
- * @param expectedStatus the expected HTTP status code
+ * @param buckets the buckets to update
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list retrieved buckets
*/
@@ -846,7 +887,7 @@ public List putBucketsStates(List buckets, int expectedStatus, A
* All states are set to the same supplied value.
*
* @param buckets the buckets to update
- * @param state the states to be set, one for all buckets
+ * @param state the states to be set, one for all buckets
* @return a list retrieved buckets
*/
public List putBucketsState(List buckets, String state) {
@@ -858,9 +899,9 @@ public List putBucketsState(List buckets, String state) {
* The responses must contain HTTP {@code expectedStatus}.
* All states are set to the same supplied value.
*
- * @param buckets the buckets to update
- * @param state the states to be set, one for all buckets
- * @param expectedStatus the expected http status code
+ * @param buckets the buckets to update
+ * @param state the states to be set, one for all buckets
+ * @param expectedStatus the expected http status code
* @return a list retrieved buckets
*/
public List putBucketsState(List buckets, String state, int expectedStatus) {
@@ -873,7 +914,7 @@ public List putBucketsState(List buckets, String state, int expe
* Sends a PUT request to update the states of a list of buckets.
* The responses must contain {@link HttpStatus#SC_OK}.
*
- * @param buckets the buckets to update
+ * @param buckets the buckets to update
* @param bucketStates the states to be set, one for each bucket
* @return a list retrieved buckets
*/
@@ -886,8 +927,8 @@ public List putBucketsStates(List buckets, List bucketSt
* The responses must contain HTTP {@code expectedStatus}.
* All states are set to the same value.
*
- * @param buckets the buckets to update
- * @param bucketStates the states to be set, one for each bucket
+ * @param buckets the buckets to update
+ * @param bucketStates the states to be set, one for each bucket
* @param expectedStatus the expected HTTP status code
* @return a list retrieved buckets
*/
@@ -900,9 +941,9 @@ public List putBucketsStates(List buckets, List bucketSt
* The responses must contain HTTP {@code expectedStatus}.
* All states are set to the same value.
*
- * @param buckets the buckets to update
- * @param bucketStates the states to be set, one for each bucket
- * @param expectedStatus the expected HTTP status code
+ * @param buckets the buckets to update
+ * @param bucketStates the states to be set, one for each bucket
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list retrieved buckets
*/
@@ -931,7 +972,7 @@ public Response deleteBucket(Bucket bucket) {
* Sends a DELETE request for a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket to delete
+ * @param bucket the bucket to delete
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -943,8 +984,8 @@ public Response deleteBucket(Bucket bucket, int expectedStatus) {
* Sends a DELETE request for a bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket to delete
- * @param expectedStatus the expected HTTP status code
+ * @param bucket the bucket to delete
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -972,7 +1013,7 @@ public Response deleteBuckets(List buckets) {
* Sends DELETE requests for a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to delete
+ * @param buckets the buckets to delete
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -984,8 +1025,8 @@ public Response deleteBuckets(List buckets, int expectedStatus) {
* Sends DELETE requests for a list of buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the buckets to delete
- * @param expectedStatus the expected HTTP status code
+ * @param buckets the buckets to delete
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1011,7 +1052,7 @@ public List getBuckets(Experiment experiment) {
* Sends a GET request to retrieve the buckets of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment providing the id
+ * @param experiment the experiment providing the id
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -1023,8 +1064,8 @@ public List getBuckets(Experiment experiment, int expectedStatus) {
* Sends a GET request to retrieve the buckets of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment providing the id
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment providing the id
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1056,7 +1097,7 @@ public Bucket getBucket(Bucket bucket) {
* Sends a GET request to retrieve the specified bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket providing a label and an experiment id
+ * @param bucket the bucket providing a label and an experiment id
* @param expectedStatus the expected HTTP status code
* @return the bucket
*/
@@ -1068,8 +1109,8 @@ public Bucket getBucket(Bucket bucket, int expectedStatus) {
* Sends a GET request to retrieve the specified bucket.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param bucket the bucket providing a label and an experiment id
- * @param expectedStatus the expected HTTP status code
+ * @param bucket the bucket providing a label and an experiment id
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the bucket
*/
@@ -1097,7 +1138,7 @@ public List getBuckets(List buckets) {
* Sends GET requests to retrieve the specified buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the reference bucket list
+ * @param buckets the reference bucket list
* @param expectedStatus the expected HTTP status code
* @return the new bucket list
*/
@@ -1109,8 +1150,8 @@ public List getBuckets(List buckets, int expectedStatus) {
* Sends GET requests to retrieve the specified buckets.
* The responses must contain HTTP {@code expectedStatus}.
*
- * @param buckets the reference bucket list
- * @param expectedStatus the expected HTTP status code
+ * @param buckets the reference bucket list
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the new bucket list
*/
@@ -1123,7 +1164,6 @@ public List getBuckets(List buckets, int expectedStatus, APIServ
}
-
//////////////////////////////////////
// experiments//events Endpoint //
//////////////////////////////////////
@@ -1147,7 +1187,7 @@ public List getEvents(Experiment experiment) {
* Note that the GET request is limited to the most recent 75 events.
* For more events, see {@link #postEvents(Experiment, int)} which is more flexible.
*
- * @param experiment the reference experiment
+ * @param experiment the reference experiment
* @param expectedStatus the expected HTTP status code
* @return the event list
*/
@@ -1161,8 +1201,8 @@ public List getEvents(Experiment experiment, int expectedStatus) {
* Note that the GET request is limited to the most recent 75 events.
* For more events, see {@link #postEvents(Experiment, int, APIServerConnector)} which is more flexible.
*
- * @param experiment the reference experiment
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the event list
*/
@@ -1198,7 +1238,7 @@ public List postEvents(Experiment experiment) {
* Sends a POST request to retrieve the events of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the reference experiment
+ * @param experiment the reference experiment
* @param expectedStatus the expected HTTP status code
* @return the event list
*/
@@ -1211,8 +1251,8 @@ public List postEvents(Experiment experiment, int expectedStatus) {
* Sends a POST request to retrieve the events of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the reference experiment
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the event list
*/
@@ -1223,17 +1263,17 @@ public List postEvents(Experiment experiment, int expectedStatus, APIServ
/**
* Sends a POST request to retrieve the events of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* The parameter keys should be some of
* {@code fromTime, toTime, confidenceLevel, effectSize, actions, singleShot, metric, mode} and
* {@code context}. For more information see
* {@link #postEvents(Experiment, String, String, double, double, ArrayList, boolean, String, String, String, int, APIServerConnector)}.
- *
+ *
* Invalid keys are removed from the parameters map.
*
- * @param experiment the reference experiment
- * @param parameters the parameters for the request body
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param parameters the parameters for the request body
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the event list
*/
@@ -1244,16 +1284,16 @@ public List postEvents(Experiment experiment, Map paramet
/**
* Sends a POST request to retrieve the events of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* The parameter keys should be some of
* {@code fromTime, toTime, confidenceLevel, effectSize, actions, singleShot, metric, mode} and
* {@code context}. For more information see
* {@link #postEvents(Experiment, String, String, double, double, ArrayList, boolean, String, String, String, int, APIServerConnector)}.
*
- * @param experiment the reference experiment
- * @param parameters the parameters for the request body, can be null
- * @param keepInvalidKeys if true, invalid keys are also transmitted; ignored if parameters == null
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param parameters the parameters for the request body, can be null
+ * @param keepInvalidKeys if true, invalid keys are also transmitted; ignored if parameters == null
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the event list
*/
@@ -1275,7 +1315,7 @@ public List postEvents(Experiment experiment, Map paramet
keyMapping.put("singleShot", "BOOLEAN");
for (String key : parameters.keySet()) {
- switch (keyMapping.get(key) == null? "INVALID" : keyMapping.get(key)) {
+ switch (keyMapping.get(key) == null ? "INVALID" : keyMapping.get(key)) {
case "DOUBLE":
if (!(parameters.get(key) instanceof Double) || (parameters.get(key)).equals(Double.NaN)) {
parameters.remove(key);
@@ -1331,45 +1371,45 @@ public List postEvents(Experiment experiment, Map paramet
/**
* Sends a POST request to retrieve the events of the specified experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* The parameters {@code fromTime, toTime, confidenceLevel, effectSize, actions, singleShot, metric, mode} and
* {@code context} are optional. If they are {@code null} (Strings) or {@link Double#NaN} (doubles),
* they will be ignored (note that {@code singleShot} is {@code boolean}, it will be ignored if false).
- *
+ *
* Legal values are:
- *
+ *
*
- * - {@code fromTime}
- * - {@code null} or String, see {@link TestUtils#getTimeString(Calendar)}
- * - {@code toTime}
- * - {@code null} or String, see {@link TestUtils#getTimeString(Calendar)}
- * - {@code confidenceLevel}
- * - {@code 0 < confidenceLevel < 1}
- * - {@code effectSize}
- * - {@code -1 ≤ effectSize ≤ 1}
- * - {@code actions}
- * - {@code null} or an empty list or Action identifiers, will be ignored on {@code null} and empty
- * - {@code singleShot}
- * - {@code true/false}, ignored on {@code false}
- * - {@code metric}
- * - {@code NORMAL_APPROX} or {@code NORMAL_APPROX_SYM}
- * - {@code mode}
- * - {@code PRODUCTION} or {@code TEST}, should not be used according to swagger
- * - {@code context}
- * - any value, ignored on {@code null}
+ * - {@code fromTime}
+ * - {@code null} or String, see {@link TestUtils#getTimeString(Calendar)}
+ * - {@code toTime}
+ * - {@code null} or String, see {@link TestUtils#getTimeString(Calendar)}
+ * - {@code confidenceLevel}
+ * - {@code 0 < confidenceLevel < 1}
+ * - {@code effectSize}
+ * - {@code -1 ≤ effectSize ≤ 1}
+ * - {@code actions}
+ * - {@code null} or an empty list or Action identifiers, will be ignored on {@code null} and empty
+ * - {@code singleShot}
+ * - {@code true/false}, ignored on {@code false}
+ * - {@code metric}
+ * - {@code NORMAL_APPROX} or {@code NORMAL_APPROX_SYM}
+ * - {@code mode}
+ * - {@code PRODUCTION} or {@code TEST}, should not be used according to swagger
+ * - {@code context}
+ * - any value, ignored on {@code null}
*
*
- * @param experiment the reference experiment
- * @param fromTime the start time
- * @param toTime the end time
- * @param confidenceLevel the confidence level
- * @param effectSize the effect size
- * @param actions the actions to be fetched
- * @param singleShot single shot value
- * @param metric the metric to be used
- * @param mode the mode
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param fromTime the start time
+ * @param toTime the end time
+ * @param confidenceLevel the confidence level
+ * @param effectSize the effect size
+ * @param actions the actions to be fetched
+ * @param singleShot single shot value
+ * @param metric the metric to be used
+ * @param mode the mode
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the event list
*/
@@ -1388,7 +1428,6 @@ public List postEvents(Experiment experiment, String fromTime, String toT
}
-
//////////////////////////////////////////
// experiments//exclusions Endpoint //
//////////////////////////////////////////
@@ -1397,7 +1436,7 @@ public List postEvents(Experiment experiment, String fromTime, String toT
* Sends a POST request to mutually exclude experiments from each other.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
- * @param experiment the reference experiment
+ * @param experiment the reference experiment
* @param excludedExperiments the list of mutual exclusive elements
* @return the response
*/
@@ -1409,9 +1448,9 @@ public Response postExclusions(Experiment experiment, List excludedE
* Sends a POST request to mutually exclude experiments from each other.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the reference experiment
+ * @param experiment the reference experiment
* @param excludedExperiments the list of mutual exclusive elements
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return the response
*/
public Response postExclusions(Experiment experiment, List excludedExperiments, int expectedStatus) {
@@ -1421,16 +1460,16 @@ public Response postExclusions(Experiment experiment, List excludedE
/**
* Sends a POST request to mutually exclude experiments from the reference experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Lets assume you would pass experiment 1 as the experiment and 2 and 3 as excluded experiments.
* Then 1 and 2 would be mutually exclusive as well as 1 and 3, however 2 and 3 would not.
- *
+ *
* To making all experiments mutual exclusive with each other please use {@link #postExclusions(List)}.
*
- * @param experiment the reference experiment
+ * @param experiment the reference experiment
* @param excludedExperiments the list of mutual exclusive elements
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return the response
*/
public Response postExclusions(Experiment experiment, List excludedExperiments, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -1448,7 +1487,7 @@ public Response postExclusions(Experiment experiment, List excludedE
/**
* Sends a POST request to mutually exclude experiments from each other.
* The response must contain {@link HttpStatus#SC_CREATED}.
- *
+ *
* Note that only the last response is returned, but all are checked.
*
* @param excludedExperiments the list of mutual exclusive elements
@@ -1461,11 +1500,11 @@ public Response postExclusions(List excludedExperiments) {
/**
* Sends a POST request to mutually exclude experiments from each other.
* The response must contain {@link HttpStatus#SC_CREATED}.
- *
+ *
* Note that only the last response is returned, but all are checked.
*
* @param excludedExperiments the list of mutual exclusive elements
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return the response
*/
public Response postExclusions(List excludedExperiments, int expectedStatus) {
@@ -1475,12 +1514,12 @@ public Response postExclusions(List excludedExperiments, int expecte
/**
* Sends a POST request to mutually exclude experiments from each other.
* The response must contain {@link HttpStatus#SC_CREATED}.
- *
+ *
* Note that only the last response is returned, but all are checked.
*
* @param excludedExperiments the list of mutual exclusive elements
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return the response
*/
public Response postExclusions(List excludedExperiments, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -1507,7 +1546,7 @@ public List getExclusions(Experiment experiment) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the reference experiment
- * @param showAll sets the showAll parameter, default: true
+ * @param showAll sets the showAll parameter, default: true
* @return a list of experiments mutually exclusive to the supplied one
*/
public List getExclusions(Experiment experiment, boolean showAll) {
@@ -1519,8 +1558,8 @@ public List getExclusions(Experiment experiment, boolean showAll) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the reference experiment
- * @param showAll sets the showAll parameter, default: true
- * @param exclusive sets the excluse parameter, default: true
+ * @param showAll sets the showAll parameter, default: true
+ * @param exclusive sets the excluse parameter, default: true
* @return a list of experiments mutually exclusive to the supplied one
*/
public List getExclusions(Experiment experiment, boolean showAll, boolean exclusive) {
@@ -1531,9 +1570,9 @@ public List getExclusions(Experiment experiment, boolean showAll, bo
* Sends a GET request to retrieve experiments mutually excluded from the supplied experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the reference experiment
- * @param showAll sets the showAll parameter, default: true
- * @param exclusive sets the excluse parameter, default: true
+ * @param experiment the reference experiment
+ * @param showAll sets the showAll parameter, default: true
+ * @param exclusive sets the excluse parameter, default: true
* @param expectedStatus the expected HTTP status code
* @return a list of experiments mutually exclusive to the supplied one
*/
@@ -1545,10 +1584,10 @@ public List getExclusions(Experiment experiment, boolean showAll, bo
* Sends a GET request to retrieve experiments mutually excluded from the supplied experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the reference experiment
- * @param showAll sets the showAll parameter, default: true
- * @param exclusive sets the excluse parameter, default: true
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the reference experiment
+ * @param showAll sets the showAll parameter, default: true
+ * @param exclusive sets the excluse parameter, default: true
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of experiments mutually exclusive to the supplied one
*/
@@ -1578,7 +1617,7 @@ public List getExclusions(Experiment experiment, boolean showAll, bo
* Sends a DELETE request to remove the mutual exclusion of two experiments.
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
- * @param experiment one experiment
+ * @param experiment one experiment
* @param experimentOther another experiment
* @return the response
*/
@@ -1590,9 +1629,9 @@ public Response deleteExclusion(Experiment experiment, Experiment experimentOthe
* Sends a DELETE request to remove the mutual exclusion of two experiments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment one experiment
+ * @param experiment one experiment
* @param experimentOther another experiment
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return the response
*/
public Response deleteExclusion(Experiment experiment, Experiment experimentOther, int expectedStatus) {
@@ -1603,9 +1642,9 @@ public Response deleteExclusion(Experiment experiment, Experiment experimentOthe
* Sends a DELETE request to remove the mutual exclusion of two experiments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment one experiment
- * @param experimentOther another experiment
- * @param expectedStatus the expected HTTP status code
+ * @param experiment one experiment
+ * @param experimentOther another experiment
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1617,7 +1656,6 @@ public Response deleteExclusion(Experiment experiment, Experiment experimentOthe
}
-
////////////////////////////////////////
// experiments//priority Endpoint //
////////////////////////////////////////
@@ -1627,7 +1665,7 @@ public Response deleteExclusion(Experiment experiment, Experiment experimentOthe
* The response must contain {@link HttpStatus#SC_CREATED}.
*
* @param experiment the experiment
- * @param priority the experiment priority
+ * @param priority the experiment priority
* @return the response
*/
public Response postExperimentPriority(Experiment experiment, int priority) {
@@ -1638,8 +1676,8 @@ public Response postExperimentPriority(Experiment experiment, int priority) {
* Sends a POST request to set the experiment's priority.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param priority the experiment priority
+ * @param experiment the experiment
+ * @param priority the experiment priority
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -1651,9 +1689,9 @@ public Response postExperimentPriority(Experiment experiment, int priority, int
* Sends a POST request to set the experiment's priority.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param priority the experiment priority
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param priority the experiment priority
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1665,7 +1703,6 @@ public Response postExperimentPriority(Experiment experiment, int priority, int
}
-
///////////////////////////////////////////
// experiments//assignments Endpoint //
///////////////////////////////////////////
@@ -1685,7 +1722,7 @@ public List getAssignments(Experiment experiment) {
* Sends a GET request to retrieve the experiment's assignments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
+ * @param experiment the experiment
* @param expectedStatus the expected HTTP status code
* @return a list of assignments
*/
@@ -1698,7 +1735,7 @@ public List getAssignments(Experiment experiment, int expectedStatus
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param context the experiment context (can be null)
+ * @param context the experiment context (can be null)
* @return a list of assignments
*/
public List getAssignments(Experiment experiment, String context) {
@@ -1709,8 +1746,8 @@ public List getAssignments(Experiment experiment, String context) {
* Sends a GET request to retrieve the experiment's assignments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the experiment context (can be null)
+ * @param experiment the experiment
+ * @param context the experiment context (can be null)
* @param expectedStatus the expected HTTP status code
* @return a list of assignments
*/
@@ -1722,9 +1759,9 @@ public List getAssignments(Experiment experiment, String context, in
* Sends a GET request to retrieve the experiment's assignments.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the experiment context (can be null)
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the experiment context (can be null)
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of assignments
*/
@@ -1736,7 +1773,7 @@ public List getAssignments(Experiment experiment, String context, in
response = apiServerConnector.doGet(uri, context);
assertReturnCode(response, expectedStatus);
String jsonArray = TestUtils.csvToJsonArray(response.body().asString(), Constants.TAB);
- String[] elements = jsonArray.substring(2, jsonArray.length()-2).split("\\},\\{");
+ String[] elements = jsonArray.substring(2, jsonArray.length() - 2).split("\\},\\{");
List assignments = new ArrayList<>();
for (String json : elements) {
assignments.add(simpleGson.fromJson("{" + json + "}", Assignment.class));
@@ -1745,7 +1782,6 @@ public List getAssignments(Experiment experiment, String context, in
}
-
/////////////////////////////////////
// experiments//pages Endpoint //
/////////////////////////////////////
@@ -1764,7 +1800,7 @@ public List getPages(Experiment experiment) {
* Sends a GET request to retrieve the pages the experiment is assigned to.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
+ * @param experiment the experiment
* @param expectedStatus the expected HTTP status code
* @return a list of pages
*/
@@ -1776,8 +1812,8 @@ public List getPages(Experiment experiment, int expectedStatus) {
* Sends a GET request to retrieve the pages the experiment is assigned to.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of pages
*/
@@ -1799,7 +1835,7 @@ public List getPages(Experiment experiment, int expectedStatus, APIServerC
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
* @param experiment the experiment
- * @param page the page
+ * @param page the page
* @return the response
*/
public Response postPages(Experiment experiment, Page page) {
@@ -1810,8 +1846,8 @@ public Response postPages(Experiment experiment, Page page) {
* Sends a POST request to add an experiment to a page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param page the page
+ * @param experiment the experiment
+ * @param page the page
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -1823,9 +1859,9 @@ public Response postPages(Experiment experiment, Page page, int expectedStatus)
* Sends a POST request to add an experiment to a page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param page the page
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param page the page
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1838,7 +1874,7 @@ public Response postPages(Experiment experiment, Page page, int expectedStatus,
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
* @param experiment the experiment
- * @param pages the pages
+ * @param pages the pages
* @return the response
*/
public Response postPages(Experiment experiment, List pages) {
@@ -1849,8 +1885,8 @@ public Response postPages(Experiment experiment, List pages) {
* Sends a POST request to add an experiment to several pages.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param pages the pages
+ * @param experiment the experiment
+ * @param pages the pages
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -1862,9 +1898,9 @@ public Response postPages(Experiment experiment, List pages, int expectedS
* Sends a POST request to add an experiment to several pages.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param pages the pages
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param pages the pages
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1880,7 +1916,7 @@ public Response postPages(Experiment experiment, List pages, int expectedS
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
* @param experiment the experiment
- * @param page the page
+ * @param page the page
* @return the response
*/
public Response deletePages(Experiment experiment, Page page) {
@@ -1891,8 +1927,8 @@ public Response deletePages(Experiment experiment, Page page) {
* Sends a DELETE request to delete an experiment from a page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param page the page
+ * @param experiment the experiment
+ * @param page the page
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -1904,9 +1940,9 @@ public Response deletePages(Experiment experiment, Page page, int expectedStatus
* Sends a DELETE request to delete an experiment from a page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param page the page
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param page the page
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -1918,7 +1954,6 @@ public Response deletePages(Experiment experiment, Page page, int expectedStatus
}
-
//////////////////////////////////////////////////////////////////
// experiments/applications//pages/ endpoint //
//////////////////////////////////////////////////////////////////
@@ -1928,7 +1963,7 @@ public Response deletePages(Experiment experiment, Page page, int expectedStatus
* The response must contain HTTP {@link HttpStatus#SC_OK}.
*
* @param application the application
- * @param page the page
+ * @param page the page
* @return a list of pages
*/
public List getPages(Application application, Page page) {
@@ -1939,8 +1974,8 @@ public List getPages(Application application, Page page) {
* Sends a GET request to retrieve pages assigned to the experiments of this application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param page the page
+ * @param application the application
+ * @param page the page
* @param expectedStatus the expected HTTP status code
* @return a list of pages
*/
@@ -1952,9 +1987,9 @@ public List getPages(Application application, Page page, int expectedStatu
* Sends a GET request to retrieve pages assigned to the experiments of this application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param page the page
- * @param expectedStatus the expected HTTP status code
+ * @param application the application
+ * @param page the page
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of pages
*/
@@ -1972,7 +2007,6 @@ public List getPages(Application application, Page page, int expectedStatu
}
-
//////////////////////////
// assignments Endpoint //
//////////////////////////
@@ -1982,7 +2016,7 @@ public List getPages(Application application, Page page, int expectedStatu
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param user the user
+ * @param user the user
* @return an assignment
*/
public Assignment getAssignment(Experiment experiment, User user) {
@@ -1994,8 +2028,8 @@ public Assignment getAssignment(Experiment experiment, User user) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param user the user
- * @param context the context
+ * @param user the user
+ * @param context the context
* @return an assignment
*/
public Assignment getAssignment(Experiment experiment, User user, String context) {
@@ -2006,9 +2040,9 @@ public Assignment getAssignment(Experiment experiment, User user, String context
* Sends a GET request to get the assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
* @param createAssignment gets the new assignment allowance status
* @return an assignment
*/
@@ -2020,10 +2054,10 @@ public Assignment getAssignment(Experiment experiment, User user, String context
* Sends a GET request to get the assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored
* @return an assignment
*/
@@ -2035,12 +2069,12 @@ public Assignment getAssignment(Experiment experiment, User user, String context
* Sends a GET request to get the assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return an assignment
*/
public Assignment getAssignment(Experiment experiment, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus) {
@@ -2051,13 +2085,13 @@ public Assignment getAssignment(Experiment experiment, User user, String context
* Sends a GET request to get the assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return an assignment
*/
public Assignment getAssignment(Experiment experiment, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -2086,7 +2120,7 @@ public Assignment getAssignment(Experiment experiment, User user, String context
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param user the user
+ * @param user the user
* @return an assignment
*/
public Assignment postAssignment(Experiment experiment, User user) {
@@ -2098,8 +2132,8 @@ public Assignment postAssignment(Experiment experiment, User user) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param user the user
- * @param context the context
+ * @param user the user
+ * @param context the context
* @return an assignment
*/
public Assignment postAssignment(Experiment experiment, User user, String context) {
@@ -2110,9 +2144,9 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
* Sends a POST request to get the assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
* @param createAssignment gets the new assignment allowance status, default: true
* @return an assignment
*/
@@ -2124,10 +2158,10 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
* Sends a POST request to get the assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status, default: true
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status, default: true
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored, default: false
* @return an assignment
*/
@@ -2139,12 +2173,12 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
* Sends a POST request to get the assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status, default: true
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status, default: true
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored, default: false
- * @param profile a key-value map for the user profile
+ * @param profile a key-value map for the user profile
* @return an assignment
*/
public Assignment postAssignment(Experiment experiment, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, Map profile) {
@@ -2155,13 +2189,13 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
* Sends a POST request to get the assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status, default: true
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status, default: true
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored, default: false
- * @param profile a key-value map for the user profile
- * @param expectedStatus the expected HTTP status code
+ * @param profile a key-value map for the user profile
+ * @param expectedStatus the expected HTTP status code
* @return an assignment
*/
public Assignment postAssignment(Experiment experiment, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, Map profile, int expectedStatus) {
@@ -2172,14 +2206,14 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
* Sends a POST request to get the assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param user the user
- * @param context the context
- * @param createAssignment gets the new assignment allowance status, default: true
+ * @param experiment the experiment
+ * @param user the user
+ * @param context the context
+ * @param createAssignment gets the new assignment allowance status, default: true
* @param ignoreSamplingPercent indicates whether sampling percentages shall be ignored, default: false
- * @param profile a key-value map for the user profile
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param profile a key-value map for the user profile
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return an assignment
*/
public Assignment postAssignment(Experiment experiment, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, Map profile, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -2205,22 +2239,21 @@ public Assignment postAssignment(Experiment experiment, User user, String contex
}
-
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, set the boolean flag of
* this method to true.
*
- * @param experiment the experiment
- * @param assignment the assignment to be changed
- * @param user the user
+ * @param experiment the experiment
+ * @param assignment the assignment to be changed
+ * @param user the user
* @param useAssignmentContext determines whether the assignments context shall be used as a parameter for the
* request
* @return a new assignment reflecting the update
@@ -2232,21 +2265,21 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, set the boolean flag of
* this method to true.
*
- * @param experiment the experiment
- * @param assignment the assignment to be changed
- * @param user the user
+ * @param experiment the experiment
+ * @param assignment the assignment to be changed
+ * @param user the user
* @param useAssignmentContext determines whether the assignments context shall be used as a parameter for the
* request
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @return a new assignment reflecting the update
*/
public Assignment putAssignment(Experiment experiment, Assignment assignment, User user, boolean useAssignmentContext, int expectedStatus) {
@@ -2256,22 +2289,22 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, set the boolean flag of
* this method to true.
*
- * @param experiment the experiment
- * @param assignment the assignment to be changed
- * @param user the user
+ * @param experiment the experiment
+ * @param assignment the assignment to be changed
+ * @param user the user
* @param useAssignmentContext determines whether the assignments context shall be used as a parameter for the
* request
- * @param expectedStatus the expected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the expected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return a new assignment reflecting the update
*/
public Assignment putAssignment(Experiment experiment, Assignment assignment, User user, boolean useAssignmentContext, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -2281,41 +2314,42 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, use
* {@link #putAssignment(Experiment, Assignment, User, boolean, int, APIServerConnector)} or any of its derivatives
* with the fourth parameter set to {@code true}. Alternatively supply the context yourself.
*
* @param experiment the experiment
* @param assignment the assignment to be changed
- * @param user the user
+ * @param user the user
* @return a new assignment reflecting the update
*/
public Assignment putAssignment(Experiment experiment, Assignment assignment, User user) {
return putAssignment(experiment, assignment, user, null);
}
+
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, use
* {@link #putAssignment(Experiment, Assignment, User, boolean, int, APIServerConnector)} or any of its derivatives
* with the fourth parameter set to {@code true}. Alternatively supply the context yourself.
*
* @param experiment the experiment
* @param assignment the assignment to be changed
- * @param user the user
- * @param context the context
+ * @param user the user
+ * @param context the context
* @return a new assignment reflecting the update
*/
public Assignment putAssignment(Experiment experiment, Assignment assignment, User user, String context) {
@@ -2325,20 +2359,20 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, use
* {@link #putAssignment(Experiment, Assignment, User, boolean, int, APIServerConnector)} or any of its derivatives
* with the fourth parameter set to {@code true}. Alternatively supply the context yourself.
*
- * @param experiment the experiment
- * @param assignment the assignment to be changed
- * @param user the user
- * @param context the context
+ * @param experiment the experiment
+ * @param assignment the assignment to be changed
+ * @param user the user
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return a new assignment reflecting the update
*/
@@ -2349,21 +2383,21 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
/**
* Sends a PUT request to update an assignment of the user for the experiment.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Ignores {@link Assignment#payload}, {@link Assignment#context} (see below for notes), {@link Assignment#cache},
* {@link Assignment#experimentLabel}, and {@link Assignment#status}. If the current
* {@link Assignment#serializationStrategy} excludes {@link Assignment#assignment} and/or
* {@link Assignment#overwrite} the respective field is excluded as well.
- *
+ *
* Note on {@link Assignment#context}: To implicitly include the context as a parameter, use
* {@link #putAssignment(Experiment, Assignment, User, boolean, int, APIServerConnector)} or any of its derivatives
* with the fourth parameter set to {@code true}. Alternatively supply the context yourself.
*
- * @param experiment the experiment
- * @param assignment the assignment to be changed
- * @param user the user
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param assignment the assignment to be changed
+ * @param user the user
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a new assignment reflecting the update
*/
@@ -2393,7 +2427,7 @@ public Assignment putAssignment(Experiment experiment, Assignment assignment, Us
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param application the application
- * @param user the user
+ * @param user the user
* @param experiments the experiments to assign the user to
* @return the created assignments, can be 0
*/
@@ -2406,9 +2440,9 @@ public List postAssignments(Application application, User user, List
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param application the application
- * @param user the user
+ * @param user the user
* @param experiments the experiments to assign the user to
- * @param context the context for the assignments
+ * @param context the context for the assignments
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, User user, List experiments, String context) {
@@ -2420,10 +2454,10 @@ public List postAssignments(Application application, User user, List
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param application the application
- * @param user the user
+ * @param user the user
* @param experiments the experiments to assign the user to
- * @param context the context for the assignments
- * @param create if true the assignments are created
+ * @param context the context for the assignments
+ * @param create if true the assignments are created
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, User user, List experiments, String context, boolean create) {
@@ -2434,11 +2468,11 @@ public List postAssignments(Application application, User user, List
* Sends a POST request to assign the user to the experiments of the application if {@code create} is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param experiments the experiments to assign the user to
- * @param context the context for the assignments
- * @param create if true the assignments are created
+ * @param application the application
+ * @param user the user
+ * @param experiments the experiments to assign the user to
+ * @param context the context for the assignments
+ * @param create if true the assignments are created
* @param expectedStatus the exptected HTTP status code
* @return the created assignments, can be 0
*/
@@ -2450,12 +2484,12 @@ public List postAssignments(Application application, User user, List
* Sends a POST request to assign the user to the experiments of the application if {@code create} is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param experiments the experiments to assign the user to
- * @param context the context for the assignments
- * @param create if true the assignments are created
- * @param expectedStatus the exptected HTTP status code
+ * @param application the application
+ * @param user the user
+ * @param experiments the experiments to assign the user to
+ * @param context the context for the assignments
+ * @param create if true the assignments are created
+ * @param expectedStatus the exptected HTTP status code
* @param apiServerConnector the server connector to use
* @return the created assignments, can be 0
*/
@@ -2484,7 +2518,7 @@ public List postAssignments(Application application, User user, List
List assignments = new ArrayList<>(assignmentMappings.size());
for (Map assignmentMapping : assignmentMappings) {
assignments.add(AssignmentFactory.createFromJSONString(
- simpleGson.toJson(assignmentMapping)
+ simpleGson.toJson(assignmentMapping)
)
);
}
@@ -2497,8 +2531,8 @@ public List postAssignments(Application application, User user, List
* The response must contain HTTP {@code expectedStatus}.
*
* @param application the application
- * @param user the user
- * @param page the page
+ * @param user the user
+ * @param page the page
* @return the created assignments, can be 0
*/
public List getAssignments(Application application, Page page, User user) {
@@ -2511,9 +2545,9 @@ public List getAssignments(Application application, Page page, User
* The response must contain HTTP {@code expectedStatus}.
*
* @param application the application
- * @param user the user
- * @param page the page
- * @param context the context for the assignments, default: null
+ * @param user the user
+ * @param page the page
+ * @param context the context for the assignments, default: null
* @return the created assignments, can be 0
*/
public List getAssignments(Application application, Page page, User user, String context) {
@@ -2525,10 +2559,10 @@ public List getAssignments(Application application, Page page, User
* is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param context the context for the assignments, default: null
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param context the context for the assignments, default: null
* @param createAssignment if true the assignments are created, default: true
* @return the created assignments, can be 0
*/
@@ -2541,11 +2575,11 @@ public List getAssignments(Application application, Page page, User
* is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
* @return the created assignments, can be 0
*/
@@ -2558,13 +2592,13 @@ public List getAssignments(Application application, Page page, User
* is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
- * @param expectedStatus the exptected HTTP status code
+ * @param expectedStatus the exptected HTTP status code
* @return the created assignments, can be 0
*/
public List getAssignments(Application application, Page page, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus) {
@@ -2576,14 +2610,14 @@ public List getAssignments(Application application, Page page, User
* is true.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
- * @param expectedStatus the exptected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the exptected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return the created assignments, can be 0
*/
public List getAssignments(Application application, Page page, User user, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -2607,19 +2641,20 @@ public List getAssignments(Application application, Page page, User
List assignments = new ArrayList<>(assignmentMappings.size());
for (Map assignmentMapping : assignmentMappings) {
assignments.add(AssignmentFactory.createFromJSONString(
- simpleGson.toJson(assignmentMapping)
+ simpleGson.toJson(assignmentMapping)
)
);
}
return assignments;
}
+
/**
* Sends a POST request to assign a user to experiments of the specified page.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
* @param application the application
- * @param user the user
- * @param page the page
+ * @param user the user
+ * @param page the page
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, Page page, User user) {
@@ -2631,9 +2666,9 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
- * @param application the application
- * @param user the user
- * @param page the page
+ * @param application the application
+ * @param user the user
+ * @param page the page
* @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
* @return the created assignments, can be 0
*/
@@ -2646,11 +2681,11 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
- * @param application the application
- * @param user the user
- * @param page the page
+ * @param application the application
+ * @param user the user
+ * @param page the page
* @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
- * @param context the context for the assignments, default: null
+ * @param context the context for the assignments, default: null
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, Page page, User user, Map segmentationProfile, String context) {
@@ -2662,12 +2697,12 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
- * @param application the application
- * @param user the user
- * @param page the page
+ * @param application the application
+ * @param user the user
+ * @param page the page
* @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, Page page, User user, Map segmentationProfile, String context, boolean createAssignment) {
@@ -2679,12 +2714,12 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain {@link HttpStatus#SC_CREATED}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
* @return the created assignments, can be 0
*/
@@ -2697,14 +2732,14 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
- * @param expectedStatus the exptected HTTP status code
+ * @param expectedStatus the exptected HTTP status code
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, Page page, User user, Map segmentationProfile, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus) {
@@ -2716,15 +2751,15 @@ public List postAssignments(Application application, Page page, User
* given in the {@code segmentationProfile}.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param user the user
- * @param page the page
- * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
- * @param context the context for the assignments, default: null
- * @param createAssignment if true the assignments are created, default: true
+ * @param application the application
+ * @param user the user
+ * @param page the page
+ * @param segmentationProfile the segmantation profile, will be wrapped into the correct JSON object
+ * @param context the context for the assignments, default: null
+ * @param createAssignment if true the assignments are created, default: true
* @param ignoreSamplingPercent ignores the sampling percentage, default: false
- * @param expectedStatus the exptected HTTP status code
- * @param apiServerConnector the server connector to use
+ * @param expectedStatus the exptected HTTP status code
+ * @param apiServerConnector the server connector to use
* @return the created assignments, can be 0
*/
public List postAssignments(Application application, Page page, User user, Map segmentationProfile, String context, boolean createAssignment, boolean ignoreSamplingPercent, int expectedStatus, APIServerConnector apiServerConnector) {
@@ -2755,7 +2790,7 @@ public List postAssignments(Application application, Page page, User
List assignments = new ArrayList<>(assignmentMappings.size());
for (Map assignmentMapping : assignmentMappings) {
assignments.add(AssignmentFactory.createFromJSONString(
- simpleGson.toJson(assignmentMapping)
+ simpleGson.toJson(assignmentMapping)
)
);
}
@@ -2763,7 +2798,6 @@ public List postAssignments(Application application, Page page, User
}
-
/////////////////////
// events Endpoint //
/////////////////////
@@ -2772,9 +2806,9 @@ public List postAssignments(Application application, Page page, User
* Sends a POST request to send a single event for a specific user for an experiment.
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
- * @param event the event list to send
+ * @param event the event list to send
* @param experiment the experiment
- * @param user the user
+ * @param user the user
* @return the response
*/
public Response postEvent(Event event, Experiment experiment, User user) {
@@ -2785,9 +2819,9 @@ public Response postEvent(Event event, Experiment experiment, User user) {
* Sends a POST request to send a single event for a specific user for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param event the event list to send
- * @param experiment the experiment
- * @param user the user
+ * @param event the event list to send
+ * @param experiment the experiment
+ * @param user the user
* @param expectedStatus the expected HTTP status code
* @return the response
*/
@@ -2799,9 +2833,9 @@ public Response postEvent(Event event, Experiment experiment, User user, int exp
* Sends a POST request to send a list of events for a specific user for an experiment.
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
*
- * @param events the event list to send
+ * @param events the event list to send
* @param experiment the experiment
- * @param user the user
+ * @param user the user
* @return the response
*/
public Response postEvents(List events, Experiment experiment, User user) {
@@ -2812,11 +2846,11 @@ public Response postEvents(List events, Experiment experiment, User user)
* Sends a POST request to send a list of events for a specific user for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param events the event list to send
- * @param experiment the experiment
- * @param user the user
+ * @param events the event list to send
+ * @param experiment the experiment
+ * @param user the user
* @param expectedStatus the expected HTTP status code
- * @return the response
+ * @return the response
*/
public Response postEvents(List events, Experiment experiment, User user, int expectedStatus) {
return postEvents(events, experiment, user, expectedStatus, apiServerConnector);
@@ -2826,10 +2860,10 @@ public Response postEvents(List events, Experiment experiment, User user,
* Sends a POST request to send a list of events for a specific user for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param events the event list to send
- * @param experiment the experiment
- * @param user the user
- * @param expectedStatus the expected HTTP status code
+ * @param events the event list to send
+ * @param experiment the experiment
+ * @param user the user
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -2845,7 +2879,6 @@ public Response postEvents(List events, Experiment experiment, User user,
}
-
//////////////////////////////////////
// applications// endpoint //
//////////////////////////////////////
@@ -2855,7 +2888,7 @@ public Response postEvents(List events, Experiment experiment, User user,
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param application the application
- * @param experiment the experiment to supply the id
+ * @param experiment the experiment to supply the id
* @return an experiment
*/
public Experiment getApplicationExperiment(Application application, Experiment experiment) {
@@ -2866,8 +2899,8 @@ public Experiment getApplicationExperiment(Application application, Experiment e
* Sends a GET request to retrieve an experiment for an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param experiment the experiment to supply the id
+ * @param application the application
+ * @param experiment the experiment to supply the id
* @param expectedStatus the expected HTTP status code
* @return an experiment
*/
@@ -2879,9 +2912,9 @@ public Experiment getApplicationExperiment(Application application, Experiment e
* Sends a GET request to retrieve an experiment for an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application
- * @param experiment the experiment to supply the id
- * @param expectedStatus the expected HTTP status code
+ * @param application the application
+ * @param experiment the experiment to supply the id
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return an experiment
*/
@@ -2907,7 +2940,7 @@ public List getApplicationExperiments(Application application) {
* Sends a GET request to retrieve the experiments for an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
+ * @param application the application for which the experiments are
* @param expectedStatus the expected HTTP status code
* @return a list of experiments
*/
@@ -2919,8 +2952,8 @@ public List getApplicationExperiments(Application application, int e
* Sends a GET request to retrieve the experiments for an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
- * @param expectedStatus the expected HTTP status code
+ * @param application the application for which the experiments are
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of experiments
*/
@@ -2929,7 +2962,7 @@ public List getApplicationExperiments(Application application, int e
response = apiServerConnector.doGet(uri);
assertReturnCode(response, expectedStatus);
@SuppressWarnings("unchecked")
- List> jsonStrings = (List>) response.jsonPath().getMap("").get("experiments");
+ List> jsonStrings = response.jsonPath().getList("");
List expList = new ArrayList<>(jsonStrings.size());
for (Map jsonMap : jsonStrings) {
String jsonString = simpleGson.toJson(jsonMap);
@@ -2954,8 +2987,8 @@ public Response putApplicationPriorities(Application application, List getApplicationPriorities(Application application) {
* Sends a GET request to receive a list of experiments ordered by their priority.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
+ * @param application the application for which the experiments are
* @param expectedStatus the expected HTTP status code
* @return a list of experiments, ordered by priority
*/
@@ -3012,8 +3045,8 @@ public List getApplicationPriorities(Application application, int ex
* Sends a GET request to receive a list of experiments ordered by their priority.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
- * @param expectedStatus the expected HTTP status code
+ * @param application the application for which the experiments are
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of experiments, ordered by priority
*/
@@ -3045,7 +3078,7 @@ public List getApplicationPages(Application application) {
* Sends a GET request to receive a list of pages associated with an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
+ * @param application the application for which the experiments are
* @param expectedStatus the expected HTTP status code
* @return a list of pages
*/
@@ -3057,8 +3090,8 @@ public List getApplicationPages(Application application, int expectedStatu
* Sends a GET request to receive a list of pages associated with an application.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
- * @param expectedStatus the expected HTTP status code
+ * @param application the application for which the experiments are
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of pages
*/
@@ -3081,7 +3114,7 @@ public List getApplicationPages(Application application, int expectedStatu
* The response must contain HTTP {@link HttpStatus#SC_OK}.
*
* @param application the application for which the experiments are
- * @param page the experiment page
+ * @param page the experiment page
* @return a list of experiments
*/
public List getExperimentsByApplicationPage(Application application, Page page) {
@@ -3092,8 +3125,8 @@ public List getExperimentsByApplicationPage(Application application,
* Sends a GET request to receive a list of experiments for an application and page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
- * @param page the experiment page
+ * @param application the application for which the experiments are
+ * @param page the experiment page
* @param expectedStatus the expected HTTP status code
* @return a list of experiments
*/
@@ -3105,9 +3138,9 @@ public List getExperimentsByApplicationPage(Application application,
* Sends a GET request to receive a list of experiments for an application and page.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param application the application for which the experiments are
- * @param page the experiment page
- * @param expectedStatus the expected HTTP status code
+ * @param application the application for which the experiments are
+ * @param page the experiment page
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of experiments
*/
@@ -3125,7 +3158,6 @@ public List getExperimentsByApplicationPage(Application application,
}
-
////////////////////////
// analytics endpoint //
////////////////////////
@@ -3146,8 +3178,8 @@ public ExperimentCounts postExperimentCounts(Experiment experiment, AnalyticsPar
* Sends a POST request to receive counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
* @param expectedStatus the expected HTTP status code
* @return the experiment counts
*/
@@ -3159,9 +3191,9 @@ public ExperimentCounts postExperimentCounts(Experiment experiment, AnalyticsPar
* Sends a POST request to receive counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the experiment counts
*/
@@ -3190,7 +3222,7 @@ public ExperimentCounts getExperimentCounts(Experiment experiment) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param context the context
+ * @param context the context
* @return the experiment counts
*/
public ExperimentCounts getExperimentCounts(Experiment experiment, String context) {
@@ -3201,8 +3233,8 @@ public ExperimentCounts getExperimentCounts(Experiment experiment, String contex
* Sends a GET request to receive counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
+ * @param experiment the experiment
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return the experiment counts
*/
@@ -3214,9 +3246,9 @@ public ExperimentCounts getExperimentCounts(Experiment experiment, String contex
* Sends a GET request to receive counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the experiment counts
*/
@@ -3248,8 +3280,8 @@ public ExperimentCumulativeCounts postExperimentCumulativeCounts(Experiment expe
* Sends a POST request to receive cumulative experiments counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3261,9 +3293,9 @@ public ExperimentCumulativeCounts postExperimentCumulativeCounts(Experiment expe
* Sends a POST request to receive cumulative experiments counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3292,7 +3324,7 @@ public ExperimentCumulativeCounts getExperimentCumulativeCounts(Experiment exper
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param context the context
+ * @param context the context
* @return the cumulative experiment counts
*/
public ExperimentCumulativeCounts getExperimentCumulativeCounts(Experiment experiment, String context) {
@@ -3303,8 +3335,8 @@ public ExperimentCumulativeCounts getExperimentCumulativeCounts(Experiment exper
* Sends a GET request to receive cumulative experiments counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
+ * @param experiment the experiment
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3316,9 +3348,9 @@ public ExperimentCumulativeCounts getExperimentCumulativeCounts(Experiment exper
* Sends a GET request to receive cumulative experiments counts for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3350,8 +3382,8 @@ public ExperimentStatistics postStatistics(Experiment experiment, AnalyticsParam
* Sends a POST request to receive statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3363,9 +3395,9 @@ public ExperimentStatistics postStatistics(Experiment experiment, AnalyticsParam
* Sends a POST request to receive statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3394,7 +3426,7 @@ public ExperimentStatistics getStatistics(Experiment experiment) {
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param context the context
+ * @param context the context
* @return the cumulative experiment counts
*/
public ExperimentStatistics getStatistics(Experiment experiment, String context) {
@@ -3405,8 +3437,8 @@ public ExperimentStatistics getStatistics(Experiment experiment, String context)
* Sends a GET request to receive statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
+ * @param experiment the experiment
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3418,9 +3450,9 @@ public ExperimentStatistics getStatistics(Experiment experiment, String context,
* Sends a GET request to receive statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3452,8 +3484,8 @@ public ExperimentCumulativeStatistics postDailyStatistics(Experiment experiment,
* Sends a POST request to receive daily statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3465,9 +3497,9 @@ public ExperimentCumulativeStatistics postDailyStatistics(Experiment experiment,
* Sends a POST request to receive daily statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param parameters the parameters for the request body
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param parameters the parameters for the request body
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3496,7 +3528,7 @@ public ExperimentCumulativeStatistics getDailyStatistics(Experiment experiment)
* The response must contain {@link HttpStatus#SC_OK}.
*
* @param experiment the experiment
- * @param context the context
+ * @param context the context
* @return the cumulative experiment counts
*/
public ExperimentCumulativeStatistics getDailyStatistics(Experiment experiment, String context) {
@@ -3507,8 +3539,8 @@ public ExperimentCumulativeStatistics getDailyStatistics(Experiment experiment,
* Sends a GET request to receive daily statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
+ * @param experiment the experiment
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3520,9 +3552,9 @@ public ExperimentCumulativeStatistics getDailyStatistics(Experiment experiment,
* Sends a GET request to receive daily statistics for an experiment.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param experiment the experiment
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3541,7 +3573,7 @@ public ExperimentCumulativeStatistics getDailyStatistics(Experiment experiment,
/**
* Sends a GET request to receive assignment statistics.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Uses the experiment's applicationName and experimentLabel.
*
* @param experiment the experiment
@@ -3554,11 +3586,11 @@ public String getAssignmentSummary(Experiment experiment) {
/**
* Sends a GET request to receive assignment statistics.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* Uses the experiment's applicationName and experimentLabel.
*
* @param experiment the experiment
- * @param context the context
+ * @param context the context
* @return the cumulative experiment counts
*/
public String getAssignmentSummary(Experiment experiment, String context) {
@@ -3568,11 +3600,11 @@ public String getAssignmentSummary(Experiment experiment, String context) {
/**
* Sends a GET request to receive assignment statistics.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Uses the experiment's applicationName and experimentLabel.
*
- * @param experiment the experiment
- * @param context the context
+ * @param experiment the experiment
+ * @param context the context
* @param expectedStatus the expected HTTP status code
* @return the cumulative experiment counts
*/
@@ -3584,12 +3616,12 @@ public String getAssignmentSummary(Experiment experiment, String context, int ex
* TODO: just returns a JSON String as of now...
* Sends a GET request to receive assignment statistics.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* Uses the experiment's applicationName and experimentLabel.
*
- * @param experiment the experiment
- * @param context the context
- * @param expectedStatus the expected HTTP status code
+ * @param experiment the experiment
+ * @param context the context
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the cumulative experiment counts
*/
@@ -3606,7 +3638,6 @@ public String getAssignmentSummary(Experiment experiment, String context, int ex
}
-
/////////////////////
// CUSTOM requests //
/////////////////////
@@ -3615,10 +3646,10 @@ public String getAssignmentSummary(Experiment experiment, String context, int ex
* Sends a POST request to receive a response.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
- * @param uriParameters a map of uri parameters
- * @param requestBody the request body, if json needed transform first.
- * @param expectedStatus the expected HTTP status code
+ * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
+ * @param uriParameters a map of uri parameters
+ * @param requestBody the request body, if json needed transform first.
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -3640,10 +3671,10 @@ public Response doPost(String uri, Map uriParameters, Object req
* Sends a GET request to receive a response.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
- * @param uriParameters a map of uri parameters
- * @param requestBody the request body, if json needed transform first.
- * @param expectedStatus the expected HTTP status code
+ * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
+ * @param uriParameters a map of uri parameters
+ * @param requestBody the request body, if json needed transform first.
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -3665,10 +3696,10 @@ public Response doGet(String uri, Map uriParameters, Object requ
* Sends a DELETE request to receive a response.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
- * @param uriParameters a map of uri parameters
- * @param requestBody the request body, if json needed transform first.
- * @param expectedStatus the expected HTTP status code
+ * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
+ * @param uriParameters a map of uri parameters
+ * @param requestBody the request body, if json needed transform first.
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -3690,10 +3721,10 @@ public Response doDelete(String uri, Map uriParameters, Object r
* Sends a PUT request to receive a response.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
- * @param uriParameters a map of uri parameters
- * @param requestBody the request body, if json needed transform first.
- * @param expectedStatus the expected HTTP status code
+ * @param uri the endpoint uri (without the base path, for example without /api/v1/), starting without /
+ * @param uriParameters a map of uri parameters
+ * @param requestBody the request body, if json needed transform first.
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return the response
*/
@@ -3719,13 +3750,13 @@ public Response doPut(String uri, Map uriParameters, Object requ
* Sends a POST request to create an user feedback.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param userFeedback the userFeedback to POST
- * @param expectedStatus the expected HTTP status code
+ * @param userFeedback the userFeedback to POST
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return response The response of a request made by REST Assured
*/
public Response postFeedback(UserFeedback userFeedback, int expectedStatus, APIServerConnector apiServerConnector) {
- response = apiServerConnector.doPost("feedback", userFeedback==null?null:userFeedback.toJSONString());
+ response = apiServerConnector.doPost("feedback", userFeedback == null ? null : userFeedback.toJSONString());
assertReturnCode(response, expectedStatus);
return response;
}
@@ -3734,7 +3765,7 @@ public Response postFeedback(UserFeedback userFeedback, int expectedStatus, APIS
* Sends a GET request to get all feedbacks.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
* @return a list of user feedbacks
*/
@@ -3753,16 +3784,16 @@ public List getFeedbacks(int expectedStatus, APIServerConnector ap
/**
* Sends a GET request to get feedbacks by username.
- *
+ *
* The response must contain HTTP {@code expectedStatus}.
*
- * @param expectedStatus the expected HTTP status code
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the server connector to use
- * @param username user name
+ * @param username user name
* @return a list of user feedbacks
*/
public List getFeedbacksByUsername(int expectedStatus, APIServerConnector apiServerConnector, String username) {
- response = apiServerConnector.doGet("feedback/users/"+username);
+ response = apiServerConnector.doGet("feedback/users/" + username);
assertReturnCode(response, expectedStatus);
List> jsonStrings = response.jsonPath().getList("feedbackList");
@@ -3785,7 +3816,7 @@ public List getFeedbacksByUsername(int expectedStatus, APIServerCo
/**
* Sends a POST request to get a login token.
* The response must contain HTTP {@link HttpStatus#SC_OK}.
- *
+ *
* Uses the default APIServerConnector's user credentials and
* requests a {@code grant_type} of "client_credentials".
* It always copies the APIServerConnector before setting any additional fields.
@@ -3799,12 +3830,12 @@ public AccessToken postLogin() {
/**
* Sends a POST request to get a login token.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* If the apiUser is null, it uses the default APIServerConnector's
* user credentials and requests a {@code grant_type} of "client_credentials".
* Otherwise it uses a copied APIServerConnector and sets the user credentials
* according to apiUser.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
* @param apiUser the APIUser
@@ -3817,18 +3848,18 @@ public AccessToken postLogin(APIUser apiUser) {
/**
* Sends a POST request to get a login token.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* If the apiUser is null, it uses the default APIServerConnector's
* user credentials.
* Otherwise it uses a copied APIServerConnector and sets the user credentials
* according to apiUser.
- *
+ *
* Requests the specified {@code grant_type}. (Default is
* "client_credentials"). If null, no grant_type is requested.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param apiUser the APIUser
+ * @param apiUser the APIUser
* @param grant_type the requested grant_type
* @return the token
*/
@@ -3839,19 +3870,19 @@ public AccessToken postLogin(APIUser apiUser, String grant_type) {
/**
* Sends a POST request to get a login token.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* If the apiUser is null, it uses the default APIServerConnector's
* user credentials.
* Otherwise it uses a copied APIServerConnector and sets the user credentials
* according to apiUser.
- *
+ *
* Requests the specified {@code grant_type}. (Default is
* "client_credentials"). If null, no grant_type is requested.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param apiUser the APIUser
- * @param grant_type the requested grant_type
+ * @param apiUser the APIUser
+ * @param grant_type the requested grant_type
* @param expectedStatus the expected status code
* @return the token
*/
@@ -3862,20 +3893,20 @@ public AccessToken postLogin(APIUser apiUser, String grant_type, int expectedSta
/**
* Sends a POST request to get a login token.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* If the apiUser is null, it uses the provided APIServerConnector's
* user credentials.
* Otherwise it copies the supplied APIServerConnector and sets the user credentials
* according to apiUser.
- *
+ *
* Requests the specified {@code grant_type}. (Default is
* "client_credentials"). If null, no grant_type is requested.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param apiUser the APIUser
- * @param grant_type the requested grant_type
- * @param expectedStatus the expected status code
+ * @param apiUser the APIUser
+ * @param grant_type the requested grant_type
+ * @param expectedStatus the expected status code
* @param apiServerConnector the api server connector
* @return the token
*/
@@ -3913,7 +3944,7 @@ public APIUser getUserExists(APIUser apiUser) {
* given {@link APIUser#email}.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param apiUser the email provider
+ * @param apiUser the email provider
* @param expectedStatus the expected HTTP status code
* @return the complete APIUser
*/
@@ -3926,8 +3957,8 @@ public APIUser getUserExists(APIUser apiUser, int expectedStatus) {
* given {@link APIUser#email}.
* The response must contain HTTP {@code expectedStatus}.
*
- * @param apiUser the email provider
- * @param expectedStatus the expected HTTP status code
+ * @param apiUser the email provider
+ * @param expectedStatus the expected HTTP status code
* @param apiServerConnector the api server connector
* @return the complete APIUser
*/
@@ -3945,7 +3976,7 @@ public APIUser getUserExists(APIUser apiUser, int expectedStatus, APIServerConne
/**
* Sends a GET request to verify an access token.
* The response must contain {@link HttpStatus#SC_OK}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
* @param accessToken the access token to verify
@@ -3958,10 +3989,10 @@ public AccessToken getVerifyToken(AccessToken accessToken) {
/**
* Sends a GET request to verify an access token.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param accessToken the access token to verify
+ * @param accessToken the access token to verify
* @param expectedStatus the expected HTTP status
* @return a copy of the token returned from the server
*/
@@ -3972,11 +4003,11 @@ public AccessToken getVerifyToken(AccessToken accessToken, int expectedStatus) {
/**
* Sends a GET request to verify an access token.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param accessToken the access token to verify
- * @param expectedStatus the expected HTTP status
+ * @param accessToken the access token to verify
+ * @param expectedStatus the expected HTTP status
* @param apiServerConnector the server connector
* @return a copy of the token returned from the server
*/
@@ -3993,7 +4024,7 @@ public AccessToken getVerifyToken(AccessToken accessToken, int expectedStatus, A
/**
* Sends a GET request to logout.
* The response must contain {@link HttpStatus#SC_NO_CONTENT}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
* @param token the access token to invalidate
@@ -4006,10 +4037,10 @@ public Response getLogout(AccessToken token) {
/**
* Sends a GET request to logout.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param token the access token to invalidate
+ * @param token the access token to invalidate
* @param expectedStatus the expected status code
* @return the response
*/
@@ -4020,11 +4051,11 @@ public Response getLogout(AccessToken token, int expectedStatus) {
/**
* Sends a GET request to logout.
* The response must contain HTTP {@code expectedStatus}.
- *
+ *
* It always copies the APIServerConnector before setting any additional fields.
*
- * @param token the access token to invalidate
- * @param expectedStatus the expected status code
+ * @param token the access token to invalidate
+ * @param expectedStatus the expected status code
* @param apiServerConnector the api server connector
* @return the response
*/
diff --git a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentTest.java b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentTest.java
new file mode 100644
index 000000000..0765059e2
--- /dev/null
+++ b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentTest.java
@@ -0,0 +1,98 @@
+package com.intuit.wasabi.tests.service;
+/*******************************************************************************
+ * Copyright 2016 Intuit
+ *
+ * Licensed 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.
+ *******************************************************************************/
+
+import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItems;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.intuit.wasabi.tests.library.TestBase;
+import com.intuit.wasabi.tests.library.util.Constants;
+import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy;
+import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameInclusionStrategy;
+import com.intuit.wasabi.tests.model.Assignment;
+import com.intuit.wasabi.tests.model.Bucket;
+import com.intuit.wasabi.tests.model.Experiment;
+import com.intuit.wasabi.tests.model.User;
+import com.intuit.wasabi.tests.model.factory.AssignmentFactory;
+import com.intuit.wasabi.tests.model.factory.BucketFactory;
+import com.intuit.wasabi.tests.model.factory.ExperimentFactory;
+import com.intuit.wasabi.tests.model.factory.UserFactory;
+
+/**
+ * A test to check if user can be assigned if the previous assignment bucket is empty
+ */
+public class EmptyBucketGetUserAssignmentTest extends TestBase {
+
+ private Experiment experiment;
+ private List buckets = new ArrayList<>();
+ private User specialUser2 = UserFactory.createUser("Special2ForBucketTest");
+
+ /**
+ * Initializes a default experiment.
+ */
+ public EmptyBucketGetUserAssignmentTest() {
+ setResponseLogLengthLimit(1000);
+
+ experiment = ExperimentFactory.createExperiment();
+
+ DefaultNameExclusionStrategy experimentComparisonStrategy = new DefaultNameExclusionStrategy("creationTime", "modificationTime", "ruleJson");
+ experiment.setSerializationStrategy(experimentComparisonStrategy);
+
+ }
+
+ @Test(dependsOnGroups = {"ping"})
+ public void t_GetUserAssignmentEmptyBucket() {
+ Experiment exp = postExperiment(experiment);
+ Assert.assertNotNull(exp.creationTime, "Experiment creation failed (No creationTime).");
+ Assert.assertNotNull(exp.modificationTime, "Experiment creation failed (No modificationTime).");
+ Assert.assertNotNull(exp.state, "Experiment creation failed (No state).");
+ experiment.update(exp);
+ buckets = BucketFactory.createBuckets(experiment, 3);
+ postBuckets(buckets);
+
+ experiment.state = Constants.EXPERIMENT_STATE_RUNNING;
+ Experiment exp2 = putExperiment(experiment);
+ assertEqualModelItems(exp2, experiment);
+ experiment.update(exp);
+
+ // special user 2 assigned to bucket 0
+ Assignment assignment = AssignmentFactory.createAssignment()
+ .setAssignment(buckets.get(0).label)
+ .setExperimentLabel(experiment.label)
+ .setOverwrite(true);
+ Assignment putAssignmentFor2 = putAssignment(experiment, assignment, specialUser2);
+ assertEqualModelItems(putAssignmentFor2, assignment, new DefaultNameInclusionStrategy("assignment"));
+
+ // Empty bucket to which use is assigned
+ List emptyBucket = new ArrayList<>();
+ emptyBucket.add(buckets.get(0));
+ putBucketsState(emptyBucket, Constants.BUCKET_STATE_EMPTY);
+
+ // Get assignment after emptying bucket
+ Assignment getAssignmentAfterEmpty = getAssignment(experiment, specialUser2);
+
+ Assignment assignmentForSpecialAfterReassignment = getAssignment(experiment, specialUser2);
+
+ assertEqualModelItems(assignmentForSpecialAfterReassignment, getAssignmentAfterEmpty, new DefaultNameInclusionStrategy("assignment"));
+ }
+}
diff --git a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentToEmptyBucketTest.java b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentToEmptyBucketTest.java
new file mode 100644
index 000000000..53f3c67dd
--- /dev/null
+++ b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/EmptyBucketGetUserAssignmentToEmptyBucketTest.java
@@ -0,0 +1,85 @@
+package com.intuit.wasabi.tests.service;
+
+import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItems;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.http.HttpStatus;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.intuit.wasabi.tests.library.TestBase;
+import com.intuit.wasabi.tests.library.util.Constants;
+import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy;
+import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameInclusionStrategy;
+import com.intuit.wasabi.tests.model.Assignment;
+import com.intuit.wasabi.tests.model.Bucket;
+import com.intuit.wasabi.tests.model.Experiment;
+import com.intuit.wasabi.tests.model.User;
+import com.intuit.wasabi.tests.model.factory.AssignmentFactory;
+import com.intuit.wasabi.tests.model.factory.BucketFactory;
+import com.intuit.wasabi.tests.model.factory.ExperimentFactory;
+import com.intuit.wasabi.tests.model.factory.UserFactory;
+
+/**
+ * A test to check if user can be assigned if the previous assignment bucket is empty
+ */
+public class EmptyBucketGetUserAssignmentToEmptyBucketTest extends TestBase {
+
+ private Experiment experiment;
+ private List buckets = new ArrayList<>();
+ private User specialUser = UserFactory.createUser("SpecialForBucketTest");
+
+ /**
+ * Initializes a default experiment.
+ */
+ public EmptyBucketGetUserAssignmentToEmptyBucketTest() {
+ setResponseLogLengthLimit(1000);
+
+ experiment = ExperimentFactory.createExperiment();
+
+ DefaultNameExclusionStrategy experimentComparisonStrategy = new DefaultNameExclusionStrategy("creationTime", "modificationTime", "ruleJson");
+ experiment.setSerializationStrategy(experimentComparisonStrategy);
+
+ }
+
+ /**
+ * Test scenario where user is being reassigned from empty bucket to another empty bucket
+ */
+ @Test(dependsOnGroups = {"ping"})
+ public void t_AddUserToExperimentWith2BucketsAndEmptyBucketBothAndReassignToAnotherEmptyBucket() {
+ Experiment exp = postExperiment(experiment);
+ Assert.assertNotNull(exp.creationTime, "Experiment creation failed.");
+ Assert.assertNotNull(exp.modificationTime, "Experiment creation failed (No modificationTime).");
+ Assert.assertNotNull(exp.state, "Experiment creation failed (No state).");
+ experiment.update(exp);
+ buckets = BucketFactory.createBuckets(experiment, 2);
+ postBuckets(buckets);
+
+ experiment.state = Constants.EXPERIMENT_STATE_RUNNING;
+ Experiment exp2 = putExperiment(experiment);
+ assertEqualModelItems(exp2, experiment);
+ experiment.update(exp);
+
+ // Assign special user to bucket 0
+ Assignment assignment = AssignmentFactory.createAssignment()
+ .setAssignment(buckets.get(0).label)
+ .setExperimentLabel(experiment.label)
+ .setOverwrite(true);
+ Assignment putAssignment = putAssignment(experiment, assignment, specialUser);
+ assertEqualModelItems(putAssignment, assignment, new DefaultNameInclusionStrategy("assignment"));
+
+ // Empty both buckets
+ List emptyBucket = new ArrayList<>();
+ emptyBucket.add(buckets.get(0));
+ emptyBucket.add(buckets.get(1));
+ putBucketsState(emptyBucket, Constants.BUCKET_STATE_EMPTY);
+
+ // There should be no bucket available for user
+ Assignment getAssignmentAfterAllEmptyBuckets = getAssignment(experiment, specialUser);
+ Assert.assertEquals(getAssignmentAfterAllEmptyBuckets.status, Constants.NO_OPEN_BUCKETS);
+ }
+}
diff --git a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/PaginationTest.java b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/PaginationTest.java
index ed0eb4f26..063035013 100644
--- a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/PaginationTest.java
+++ b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/PaginationTest.java
@@ -17,6 +17,7 @@
import com.intuit.wasabi.tests.library.TestBase;
import com.intuit.wasabi.tests.library.util.ModelAssert;
+import com.intuit.wasabi.tests.library.util.RetryTest;
import com.intuit.wasabi.tests.library.util.TestUtils;
import com.intuit.wasabi.tests.model.Experiment;
import com.intuit.wasabi.tests.model.factory.ExperimentFactory;
diff --git a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/SmokeTest.java b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/SmokeTest.java
index 0245b5227..92a5fe205 100644
--- a/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/SmokeTest.java
+++ b/modules/functional-test/src/main/java/com/intuit/wasabi/tests/service/SmokeTest.java
@@ -22,15 +22,35 @@
import com.intuit.wasabi.tests.library.util.RetryTest;
import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameExclusionStrategy;
import com.intuit.wasabi.tests.library.util.serialstrategies.DefaultNameInclusionStrategy;
-import com.intuit.wasabi.tests.model.*;
-import com.intuit.wasabi.tests.model.analytics.*;
-import com.intuit.wasabi.tests.model.factory.*;
+import com.intuit.wasabi.tests.model.Assignment;
+import com.intuit.wasabi.tests.model.Bucket;
+import com.intuit.wasabi.tests.model.Event;
+import com.intuit.wasabi.tests.model.Experiment;
+import com.intuit.wasabi.tests.model.Page;
+import com.intuit.wasabi.tests.model.User;
+import com.intuit.wasabi.tests.model.analytics.BucketStatistics;
+import com.intuit.wasabi.tests.model.analytics.Counts;
+import com.intuit.wasabi.tests.model.analytics.DailyStatistics;
+import com.intuit.wasabi.tests.model.analytics.ExperimentBasicStatistics;
+import com.intuit.wasabi.tests.model.analytics.ExperimentCumulativeStatistics;
+import com.intuit.wasabi.tests.model.analytics.ExperimentStatistics;
+import com.intuit.wasabi.tests.model.factory.ApplicationFactory;
+import com.intuit.wasabi.tests.model.factory.AssignmentFactory;
+import com.intuit.wasabi.tests.model.factory.BucketFactory;
+import com.intuit.wasabi.tests.model.factory.EventFactory;
+import com.intuit.wasabi.tests.model.factory.ExperimentFactory;
+import com.intuit.wasabi.tests.model.factory.UserFactory;
import org.apache.http.HttpStatus;
import org.slf4j.Logger;
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItems;
import static com.intuit.wasabi.tests.library.util.ModelAssert.assertEqualModelItemsNoOrder;
@@ -163,7 +183,7 @@ public void t_retrieveRunningExperiment() {
/**
* Assigns users to buckets.
*/
- @Test(dependsOnMethods = {"t_startExperiment"})
+ @Test(dependsOnMethods = {"t_retrieveRunningExperiment"})
@RetryTest(maxTries = 3, warmup = 1500)
public void t_assignUsersToBuckets() {
for (User user : users) {
@@ -236,7 +256,7 @@ public void t_setUserAssignments() {
assignments.clear();
for (int i = 0; i < users.size(); ++i) {
Assignment assignment = AssignmentFactory.createAssignment()
- .setAssignment(buckets.get(i%buckets.size()).label)
+ .setAssignment(buckets.get(i % buckets.size()).label)
.setExperimentLabel(experiment.label)
.setOverwrite(true);
Assignment putAssignment = putAssignment(experiment, assignment, users.get(i));
@@ -251,21 +271,21 @@ public void t_setUserAssignments() {
@Test(dependsOnMethods = {"t_setUserAssignments"})
public void t_submitEvents() {
for (int i = 0; i < users.size(); ++i) {
- Event[] events = new Event[impressionsFactorPerUser * (i+1)];
+ Event[] events = new Event[impressionsFactorPerUser * (i + 1)];
Arrays.fill(events, EventFactory.createEvent());
- postEvents(Arrays.asList(events), experiment, users.get(i),HttpStatus.SC_CREATED);
+ postEvents(Arrays.asList(events), experiment, users.get(i), HttpStatus.SC_CREATED);
// store the number of impressions for easier calculations later
- userImpressions.put(users.get(i), impressionsFactorPerUser * (i+1));
+ userImpressions.put(users.get(i), impressionsFactorPerUser * (i + 1));
}
- postEvent(EventFactory.createAction(), experiment, specialUser,HttpStatus.SC_CREATED);
+ postEvent(EventFactory.createAction(), experiment, specialUser, HttpStatus.SC_CREATED);
postEvent(EventFactory.createAction().setName("Action2"), experiment, users.get(1), HttpStatus.SC_CREATED);
}
/**
* Retrieve all events and count them.
*/
- @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class )
+ @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class)
@RetryTest(maxTries = 3, warmup = 2000)
public void t_retrieveEvents() {
int expectedEventCount = 2; // 2 actions + for all users (userIndex + 1) * 5 IMPRESSIONs
@@ -285,7 +305,7 @@ public void t_retrieveEvents() {
continue;
}
if (event.name.equals(action2.name)) {
- assertEqualModelItems(event, action2, new DefaultNameExclusionStrategy("timestamp", "payload","userId"));
+ assertEqualModelItems(event, action2, new DefaultNameExclusionStrategy("timestamp", "payload", "userId"));
actionCount++;
}
}
@@ -295,19 +315,19 @@ public void t_retrieveEvents() {
/**
* Asserts the daily summaries. The same as t_dailySummaryOfDerivedStatistics, but for another endpoint.
*/
- @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class )
- @RetryTest(maxTries = 3, warmup = 2000)
+ @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class)
+ @RetryTest(maxTries = 3, warmup = 2500)
public void t_dailySummary() {
ExperimentCumulativeStatistics dailies = getDailyStatistics(experiment);
List filteredStatistics =
new ModelUtil().filterList(dailies.days,
- new ModelUtil.Filter() {
- @Override
- public boolean filter(DailyStatistics daily) {
- return daily.perDay.impressionCounts.eventCount > 0;
- }
- });
+ new ModelUtil.Filter() {
+ @Override
+ public boolean filter(DailyStatistics daily) {
+ return daily.perDay.impressionCounts.eventCount > 0;
+ }
+ });
Assert.assertEquals(filteredStatistics.size(), 1, "Only one day should have more than 0 impressions.");
@@ -366,7 +386,7 @@ public boolean filter(DailyStatistics daily) {
/**
* Checks if there are sufficient data (which shouldn't be there).
*/
- @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class )
+ @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class)
@RetryTest(maxTries = 3, warmup = 2000)
public void t_summaryWithDerivedStatistics() {
ExperimentStatistics statistics = getStatistics(experiment);
@@ -376,7 +396,7 @@ public void t_summaryWithDerivedStatistics() {
/**
* Asserts the daily summaries. The same as t_dailySummary, but for another endpoint.
*/
- @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class )
+ @Test(dependsOnMethods = {"t_submitEvents"}, retryAnalyzer = RetryAnalyzer.class)
@RetryTest(maxTries = 3, warmup = 2000)
public void t_dailySummaryOfDerivedStatistics() {
ExperimentCumulativeStatistics dailies = getDailyStatistics(experiment);
@@ -449,7 +469,7 @@ public boolean filter(DailyStatistics daily) {
/**
* closes the buckets
*/
- @Test(dependsOnMethods = { "t_dailySummary", "t_retrieveEvents", "t_summaryWithDerivedStatistics", "t_dailySummaryOfDerivedStatistics" }, retryAnalyzer = RetryAnalyzer.class)
+ @Test(dependsOnMethods = {"t_dailySummary", "t_retrieveEvents", "t_summaryWithDerivedStatistics", "t_dailySummaryOfDerivedStatistics"}, retryAnalyzer = RetryAnalyzer.class)
@RetryTest(warmup = 2000, maxTries = 3)
public void t_closeBuckets() {
for (Bucket bucket : buckets) {
@@ -547,7 +567,7 @@ public void t_getPages() {
assertEqualModelItemsNoOrder(retrievedPages, pages);
}
- @Test(dependsOnMethods = { "t_getPages", "t_retrieveExperimentAssignments", "t_emptyBucket" })
+ @Test(dependsOnMethods = {"t_getPages", "t_retrieveExperimentAssignments", "t_emptyBucket"})
public void t_pauseExperiments() {
Experiment terminated = putExperiment(experiment.setState(Constants.EXPERIMENT_STATE_PAUSED));
assertEqualModelItems(terminated, experiment);
diff --git a/modules/functional-test/src/main/resources/config.properties b/modules/functional-test/src/main/resources/config.properties
index 4bbbaa953..8c583e863 100644
--- a/modules/functional-test/src/main/resources/config.properties
+++ b/modules/functional-test/src/main/resources/config.properties
@@ -67,6 +67,6 @@ password=admin
validTokenPattern=^1/V1-[0-9]+-[a-zA-Z0-9]{22}/[0-9]{10}/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}Z/[a-zA-Z0-9\\._@-]+/[a-f0-9]{40}$
user-email=admin@example.com
user-lastname=Admin
-database.url=jdbc:mysql://localhost/wasabi
+database.url=jdbc:mysql://${mysql.host}/wasabi
database.username=readwrite
database.password=readwrite
diff --git a/modules/functional-test/testng_integrationTests.xml b/modules/functional-test/testng_integrationTests.xml
index 1b785d1d4..6e2485601 100644
--- a/modules/functional-test/testng_integrationTests.xml
+++ b/modules/functional-test/testng_integrationTests.xml
@@ -37,6 +37,8 @@
+
+
diff --git a/modules/main/pom.xml b/modules/main/pom.xml
index 18b8600a9..a2a50891b 100644
--- a/modules/main/pom.xml
+++ b/modules/main/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
@@ -82,7 +82,7 @@
test
- -javaagent:/usr/local/lib/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${LOG_DIR}/jacoco-it.exec,append=false
+ -javaagent:/usr/local/lib/org.jacoco.agent-0.7.2.201409121644-runtime.jar=destfile=${LOG_DIR}/jacoco-it.exec,append=false
true
diff --git a/modules/main/src/main/resources/logback.xml b/modules/main/src/main/resources/logback.xml
index 7b03fdbc4..9818c3055 100644
--- a/modules/main/src/main/resources/logback.xml
+++ b/modules/main/src/main/resources/logback.xml
@@ -102,13 +102,6 @@
-->
-
-
diff --git a/modules/repository/pom.xml b/modules/repository/pom.xml
index ef1114ed5..e248a8b4a 100644
--- a/modules/repository/pom.xml
+++ b/modules/repository/pom.xml
@@ -20,7 +20,7 @@
com.intuit.wasabi
wasabi
- 1.0.20160902232623-SNAPSHOT
+ 1.0.20161102190559-SNAPSHOT
../../pom.xml
diff --git a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraAuditLogRepository.java b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraAuditLogRepository.java
index 6077d022b..f012536ad 100644
--- a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraAuditLogRepository.java
+++ b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraAuditLogRepository.java
@@ -39,11 +39,9 @@
import org.slf4j.Logger;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import static java.util.Optional.ofNullable;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -56,7 +54,8 @@ public class CassandraAuditLogRepository implements AuditLogRepository {
private final ExperimentsKeyspace keyspace;
@Inject
- public CassandraAuditLogRepository(@ExperimentDriver CassandraDriver driver, ExperimentsKeyspace keyspace) throws IOException, ConnectionException {
+ public CassandraAuditLogRepository(@ExperimentDriver CassandraDriver driver, ExperimentsKeyspace keyspace)
+ throws IOException, ConnectionException {
this.driver = driver;
this.keyspace = keyspace;
}
@@ -69,8 +68,8 @@ public CassandraAuditLogRepository(@ExperimentDriver CassandraDriver driver, Exp
@Override
public List getCompleteAuditLogEntryList() {
String cql = "SELECT * FROM auditlog;";
- Rows rows = cqlSelectAll(cql);
- return readAuditLogEntryList(null, rows);
+
+ return readAuditLogEntryList(null, cqlSelectAll(cql));
}
/**
@@ -82,8 +81,8 @@ public List getCompleteAuditLogEntryList() {
@Override
public List getCompleteAuditLogEntryList(int limit) {
String cql = "SELECT * FROM auditlog LIMIT " + limit + ";";
- Rows rows = cqlSelectAll(cql);
- return readAuditLogEntryList(null, rows);
+
+ return readAuditLogEntryList(null, cqlSelectAll(cql));
}
/**
@@ -95,8 +94,8 @@ public List getCompleteAuditLogEntryList(int limit) {
@Override
public List getAuditLogEntryList(Application.Name applicationName) {
String cql = "SELECT * FROM auditlog WHERE application_name = ?;";
- Rows rows = cqlWithApplication(cql, applicationName);
- return readAuditLogEntryList(applicationName, rows);
+
+ return readAuditLogEntryList(applicationName, cqlWithApplication(cql, applicationName));
}
/**
@@ -109,8 +108,8 @@ public List getAuditLogEntryList(Application.Name applicationName
@Override
public List getAuditLogEntryList(Application.Name applicationName, int limit) {
String cql = "SELECT * FROM auditlog WHERE application_name = ? LIMIT " + limit + ";";
- Rows rows = cqlWithApplication(cql, applicationName);
- return readAuditLogEntryList(applicationName, rows);
+
+ return readAuditLogEntryList(applicationName, cqlWithApplication(cql, applicationName));
}
/**
@@ -121,8 +120,8 @@ public List getAuditLogEntryList(Application.Name applicationName
@Override
public List getGlobalAuditLogEntryList() {
String cql = "SELECT * FROM auditlog WHERE application_name = ?;";
- Rows rows = cqlWithApplication(cql, AuditLogRepository.GLOBAL_ENTRY_APPLICATION);
- return readAuditLogEntryList(AuditLogRepository.GLOBAL_ENTRY_APPLICATION, rows);
+
+ return readAuditLogEntryList(GLOBAL_ENTRY_APPLICATION, cqlWithApplication(cql, GLOBAL_ENTRY_APPLICATION));
}
/**
@@ -134,8 +133,8 @@ public List getGlobalAuditLogEntryList() {
@Override
public List getGlobalAuditLogEntryList(int limit) {
String cql = "SELECT * FROM auditlog WHERE application_name = ? LIMIT " + limit + ";";
- Rows rows = cqlWithApplication(cql, AuditLogRepository.GLOBAL_ENTRY_APPLICATION);
- return readAuditLogEntryList(AuditLogRepository.GLOBAL_ENTRY_APPLICATION, rows);
+
+ return readAuditLogEntryList(GLOBAL_ENTRY_APPLICATION, cqlWithApplication(cql, GLOBAL_ENTRY_APPLICATION));
}
/**
@@ -145,28 +144,37 @@ public List getGlobalAuditLogEntryList(int limit) {
* @param entry the entry to store
* @return true on success
* @throws RepositoryException if the required entry values {@link AuditLogEntry#getAction()},
- * {@link AuditLogEntry#getUser()}, {@link AuditLogEntry#getTime()} or the entry itself are null.
+ * {@link AuditLogEntry#getUser()}, {@link AuditLogEntry#getTime()} or the entry itself are null.
*/
@Override
public boolean storeEntry(AuditLogEntry entry) {
+ LOGGER.debug("storing auditLogEntry: {}", entry);
+
if (entry == null || entry.getAction() == null || entry.getUser() == null || entry.getTime() == null) {
- throw new RepositoryException("Can not insert AuditLogEntry " + entry + " into database, required values are null.");
+ LOGGER.debug("unable to store null auditLogEntry: {}", entry);
+
+ throw new RepositoryException("Can not insert AuditLogEntry: {}" + entry +
+ " into database, required values are null.");
}
+
String cql = "INSERT INTO auditlog ( event_id, application_name, time, action, "
+ "user_firstname, user_lastname, user_email, user_username, user_userid, "
+ "experiment_id, experiment_label, bucket_label, "
+ "changed_property, property_before, property_after )"
+ " VALUES ( uuid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );";
-
- PreparedCqlQuery cqlQuery = driver.getKeyspace().prepareQuery(keyspace.auditlogCF()).withCql(cql).asPreparedStatement()
- .withByteBufferValue(entry.getApplicationName() == null ? AuditLogRepository.GLOBAL_ENTRY_APPLICATION : entry.getApplicationName(), ApplicationNameSerializer.get())
+ PreparedCqlQuery cqlQuery = driver.getKeyspace()
+ .prepareQuery(keyspace.auditlogCF())
+ .withCql(cql).asPreparedStatement()
+ .withByteBufferValue(entry.getApplicationName() == null ?
+ GLOBAL_ENTRY_APPLICATION : entry.getApplicationName(),
+ ApplicationNameSerializer.get())
.withByteBufferValue(entry.getTime().getTime(), DateSerializer.get())
.withStringValue(entry.getAction().toString())
- .withStringValue(entry.getUser().getFirstName() != null ? entry.getUser().getFirstName() : "")
- .withStringValue(entry.getUser().getLastName() != null ? entry.getUser().getLastName() : "")
- .withStringValue(entry.getUser().getEmail() != null ? entry.getUser().getEmail() : "")
+ .withStringValue(ofNullable(entry.getUser().getFirstName()).orElse(""))
+ .withStringValue(ofNullable(entry.getUser().getLastName()).orElse(""))
+ .withStringValue(ofNullable(entry.getUser().getEmail()).orElse(""))
.withByteBufferValue(entry.getUser().getUsername(), UsernameSerializer.get())
- .withStringValue(entry.getUser().getUserId() != null ? entry.getUser().getUserId() : "");
+ .withStringValue(ofNullable(entry.getUser().getUserId()).orElse(""));
if (entry.getExperimentId() != null) {
cqlQuery.withByteBufferValue(entry.getExperimentId(), ExperimentIDSerializer.get());
@@ -186,27 +194,35 @@ public boolean storeEntry(AuditLogEntry entry) {
cqlQuery.withStringValue("");
}
- cqlQuery.withStringValue(entry.getChangedProperty() != null ? entry.getChangedProperty() : "")
- .withStringValue(entry.getBefore() != null ? entry.getBefore() : "")
- .withStringValue(entry.getAfter() != null ? entry.getAfter() : "");
+ cqlQuery.withStringValue(ofNullable(entry.getChangedProperty()).orElse(""))
+ .withStringValue(ofNullable(entry.getBefore()).orElse(""))
+ .withStringValue(ofNullable(entry.getAfter()).orElse(""));
+
+ boolean status = false;
try {
+ LOGGER.debug("storing auditLogEntry: {}, with cqlQuery: {}", entry, cqlQuery);
+
cqlQuery.execute();
- } catch (ConnectionException e) {
- LOGGER.error("Could not write AuditLogEntry " + entry + " to database. Record is lost!", e);
- return false;
+ status = true;
+
+ LOGGER.debug("stored auditLogEntry: {}, with cqlQuery: {}", entry, cqlQuery);
+ } catch (ConnectionException ce) {
+ LOGGER.error("Could not write AuditLogEntry: {}, to the database cause: {}. Record is lost!", entry,
+ ce.getMessage(), ce);
}
- return true;
- }
+ LOGGER.debug("stored auditLogEntry: {}, status: {}", entry, status);
+
+ return status;
+ }
/**
* Allows cql select or update queries which have only an ApplicationName as a prepared value.
*
- * @param cql the query
+ * @param cql the query
* @param applicationName the application to put in
* @return the resulting rows.
- *
* @throws RepositoryException if an {@link ConnectionException} occurs.
*/
/*test*/ Rows cqlWithApplication(String cql, Application.Name applicationName) {
@@ -232,7 +248,6 @@ public boolean storeEntry(AuditLogEntry entry) {
*
* @param cql the query
* @return the resulting rows.
- *
* @throws RepositoryException if an {@link ConnectionException} occurs.
*/
/*test*/ Rows cqlSelectAll(String cql) {
@@ -256,7 +271,7 @@ public boolean storeEntry(AuditLogEntry entry) {
* If the rowKey is null, the key will be read from the query.
*
* @param rowKey the key used to query cassandra
- * @param rows the rows object
+ * @param rows the rows object
* @return a list of AuditLogEntries
*/
/*test*/ List readAuditLogEntryList(Application.Name rowKey, Rows rows) {
@@ -274,7 +289,7 @@ public boolean storeEntry(AuditLogEntry entry) {
* Reads an AuditLogEntry from a ColumnList.
*
* @param applicationName the application name / row key
- * @param columnList the columnList
+ * @param columnList the columnList
* @return the auditLogEntry
*/
/*test*/ AuditLogEntry readAuditLogEntry(Application.Name applicationName, ColumnList columnList) {
@@ -283,7 +298,7 @@ public boolean storeEntry(AuditLogEntry entry) {
}
try {
/// application name
- Application.Name appName = AuditLogRepository.GLOBAL_ENTRY_APPLICATION.equals(applicationName) ? null : applicationName;
+ Application.Name appName = GLOBAL_ENTRY_APPLICATION.equals(applicationName) ? null : applicationName;
// deserialize time
Calendar time = null;
@@ -302,7 +317,7 @@ public boolean storeEntry(AuditLogEntry entry) {
UserInfo user = null;
if (!StringUtils.isBlank(username) || !StringUtils.isBlank(userid)) {
user = (username != null ? UserInfo.from(UserInfo.Username.valueOf(username))
- : UserInfo.from(UserInfo.Username.valueOf(userid)))
+ : UserInfo.from(UserInfo.Username.valueOf(userid)))
.withFirstName(StringUtils.isBlank(firstname) ? null : firstname)
.withLastName(StringUtils.isBlank(lastname) ? null : lastname)
.withUserId(StringUtils.isBlank(userid) ? null : userid)
diff --git a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperiment.java b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperiment.java
index 69c8e3f8a..219442f30 100644
--- a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperiment.java
+++ b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperiment.java
@@ -46,7 +46,7 @@ public CassandraExperiment(ColumnList columns) {
super.setDescription(
columns.getStringValue("description", null));
super.setHypothesisIsCorrect(
- columns.getStringValue("hypothesisiscorrect", null));
+ columns.getStringValue("hypothesis_is_correct", null));
super.setResults(
columns.getStringValue("results", null));
super.setRule(
diff --git a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperimentRepository.java b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperimentRepository.java
index 72c9709c9..604a85f78 100644
--- a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperimentRepository.java
+++ b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/cassandra/CassandraExperimentRepository.java
@@ -236,7 +236,7 @@ public Experiment.ID createExperiment(NewExperiment newExperiment)
// clobbered. In practice, this should never happen, but...
// TODO: Implement a transactional recipe
final String CQL = "insert into experiment " +
- "(id, description, hypothesisiscorrect, results, rule, sample_percent, start_time, end_time, " +
+ "(id, description, hypothesis_is_correct, results, rule, sample_percent, start_time, end_time, " +
" state, label, app_name, created, modified, is_personalized, model_name, model_version," +
" is_rapid_experiment, user_cap, creatorid) " +
"values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
@@ -465,7 +465,7 @@ public Experiment updateExperiment(Experiment experiment)
validator.validateExperiment(experiment);
final String CQL = "update experiment " +
- "set description = ?, hypothesisiscorrect = ?, results = ?, rule = ?, sample_percent = ?, " +
+ "set description = ?, hypothesis_is_correct = ?, results = ?, rule = ?, sample_percent = ?, " +
"start_time = ?, end_time = ?, " +
"state=?, label=?, app_name=?, modified=? , is_personalized=?, model_name=?, model_version=?," +
" is_rapid_experiment=?, user_cap=?" +
diff --git a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/database/DatabaseAnalytics.java b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/database/DatabaseAnalytics.java
index fb6fd6cf3..a2d2df50a 100644
--- a/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/database/DatabaseAnalytics.java
+++ b/modules/repository/src/main/java/com/intuit/wasabi/repository/impl/database/DatabaseAnalytics.java
@@ -29,10 +29,13 @@
import com.intuit.wasabi.experimentobjects.Experiment;
import com.intuit.wasabi.repository.AnalyticsRepository;
import com.intuit.wasabi.repository.RepositoryException;
+import org.slf4j.Logger;
import java.sql.Timestamp;
import java.util.*;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Database analytics impl of analytics repo
*
@@ -40,7 +43,7 @@
*/
public class DatabaseAnalytics implements AnalyticsRepository {
- private TransactionFactory transactionFactory;
+ private static Logger LOGGER = getLogger(DatabaseAnalytics.class);
private Transaction transaction;
/**
@@ -50,19 +53,28 @@ public class DatabaseAnalytics implements AnalyticsRepository {
* @param flyway Flyway
*/
@Inject
- public DatabaseAnalytics(TransactionFactory transactionFactory, Flyway flyway,
- final @Named("mysql.mutagen.root.resource.path") String mutagenRootResourcePath) {
+ public DatabaseAnalytics(final TransactionFactory transactionFactory, final Flyway flyway,
+ final @Named("mysql.mutagen.root.resource.path") String mutagenRootResourcePath) {
super();
- this.transactionFactory = transactionFactory;
- this.transaction = transactionFactory.newTransaction();
- initialize(flyway, mutagenRootResourcePath);
+ LOGGER.debug("instantiating {}", DatabaseAnalytics.class.getCanonicalName());
+
+ transaction = transactionFactory.newTransaction();
+
+ initialize(transactionFactory, flyway, mutagenRootResourcePath);
+
+ LOGGER.debug("instantiated {}", DatabaseAnalytics.class.getCanonicalName());
}
- void initialize(Flyway flyway, String mutagenRootResourcePath) {
+ void initialize(final TransactionFactory transactionFactory, final Flyway flyway,
+ final String mutagenRootResourcePath) {
+ LOGGER.debug("initializing database with {}", mutagenRootResourcePath);
+
flyway.setLocations(mutagenRootResourcePath);
flyway.setDataSource(transactionFactory.getDataSource());
flyway.migrate();
+
+ LOGGER.debug("initialized database with {}", mutagenRootResourcePath);
}
/*
@@ -110,19 +122,19 @@ public List