killbill-uncached

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTag.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTag.java
index 0ab1bfd..44a3f3d 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTag.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTag.java
@@ -55,7 +55,7 @@ public class TestTag extends TestJaxrsBase {
 
         for (final TagDefinition tagDefinition : tagDefinitions) {
             try {
-                killBillClient.createTagDefinition(tagDefinition, createdBy, reason, comment);
+                killBillClient.createTagDefinition(tagDefinition, requestOptions);
                 fail();
             } catch (final KillBillClientException e) {
             }
@@ -68,7 +68,7 @@ public class TestTag extends TestJaxrsBase {
     public void testTagDefinitionOk() throws Exception {
         final TagDefinition input = new TagDefinition(null, false, "blue", "relaxing color", ImmutableList.<ObjectType>of());
 
-        final TagDefinition objFromJson = killBillClient.createTagDefinition(input, createdBy, reason, comment);
+        final TagDefinition objFromJson = killBillClient.createTagDefinition(input, requestOptions);
         assertNotNull(objFromJson);
         assertEquals(objFromJson.getName(), input.getName());
         assertEquals(objFromJson.getDescription(), input.getDescription());
@@ -76,7 +76,7 @@ public class TestTag extends TestJaxrsBase {
 
     @Test(groups = "slow", description = "Can create and delete TagDefinitions")
     public void testMultipleTagDefinitionOk() throws Exception {
-        List<TagDefinition> objFromJson = killBillClient.getTagDefinitions();
+        List<TagDefinition> objFromJson = killBillClient.getTagDefinitions(requestOptions);
         final int sizeSystemTag = objFromJson.isEmpty() ? 0 : objFromJson.size();
 
         for (final TagDefinition cur : objFromJson) {
@@ -84,24 +84,24 @@ public class TestTag extends TestJaxrsBase {
         }
 
         final TagDefinition inputBlue = new TagDefinition(null, false, "blue", "relaxing color", ImmutableList.<ObjectType>of());
-        killBillClient.createTagDefinition(inputBlue, createdBy, reason, comment);
+        killBillClient.createTagDefinition(inputBlue, requestOptions);
 
         final TagDefinition inputRed = new TagDefinition(null, false, "red", "hot color", ImmutableList.<ObjectType>of());
-        killBillClient.createTagDefinition(inputRed, createdBy, reason, comment);
+        killBillClient.createTagDefinition(inputRed, requestOptions);
 
         final TagDefinition inputYellow = new TagDefinition(null, false, "yellow", "vibrant color", ImmutableList.<ObjectType>of());
-        killBillClient.createTagDefinition(inputYellow, createdBy, reason, comment);
+        killBillClient.createTagDefinition(inputYellow, requestOptions);
 
         final TagDefinition inputGreen = new TagDefinition(null, false, "green", "super relaxing color", ImmutableList.<ObjectType>of());
-        killBillClient.createTagDefinition(inputGreen, createdBy, reason, comment);
+        killBillClient.createTagDefinition(inputGreen, requestOptions);
 
-        objFromJson = killBillClient.getTagDefinitions();
+        objFromJson = killBillClient.getTagDefinitions(requestOptions);
         assertNotNull(objFromJson);
         assertEquals(objFromJson.size(), 4 + sizeSystemTag);
 
-        killBillClient.deleteTagDefinition(objFromJson.get(0).getId(), createdBy, reason, comment);
+        killBillClient.deleteTagDefinition(objFromJson.get(0).getId(), requestOptions);
 
-        objFromJson = killBillClient.getTagDefinitions();
+        objFromJson = killBillClient.getTagDefinitions(requestOptions);
         assertNotNull(objFromJson);
         assertEquals(objFromJson.size(), 3 + sizeSystemTag);
     }
@@ -119,22 +119,22 @@ public class TestTag extends TestJaxrsBase {
                                                                 ProductCategory.BASE, BillingPeriod.MONTHLY, true);
 
         for (final ControlTagType controlTagType : ControlTagType.values()) {
-            killBillClient.createAccountTag(account.getAccountId(), controlTagType.getId(), createdBy, reason, comment);
+            killBillClient.createAccountTag(account.getAccountId(), controlTagType.getId(), requestOptions);
         }
 
         final TagDefinition bundleTagDefInput = new TagDefinition(null, false, "bundletagdef", "nothing special", ImmutableList.<ObjectType>of());
-        final TagDefinition bundleTagDef = killBillClient.createTagDefinition(bundleTagDefInput, createdBy, reason, comment);
+        final TagDefinition bundleTagDef = killBillClient.createTagDefinition(bundleTagDefInput, requestOptions);
 
-        killBillClient.createBundleTag(subscriptionJson.getBundleId(), bundleTagDef.getId(), createdBy, reason, comment);
+        killBillClient.createBundleTag(subscriptionJson.getBundleId(), bundleTagDef.getId(), requestOptions);
 
-        final Tags allBundleTags = killBillClient.getBundleTags(subscriptionJson.getBundleId(), AuditLevel.FULL);
+        final Tags allBundleTags = killBillClient.getBundleTags(subscriptionJson.getBundleId(), AuditLevel.FULL, requestOptions);
         Assert.assertEquals(allBundleTags.size(), 1);
 
-        final Tags allAccountTags = killBillClient.getAllAccountTags(account.getAccountId(), null, AuditLevel.FULL);
+        final Tags allAccountTags = killBillClient.getAllAccountTags(account.getAccountId(), null, AuditLevel.FULL, requestOptions);
         Assert.assertEquals(allAccountTags.size(), ControlTagType.values().length + 1);
 
 
-        final Tags allBundleTagsForAccount = killBillClient.getAllAccountTags(account.getAccountId(), ObjectType.BUNDLE.name(), AuditLevel.FULL);
+        final Tags allBundleTagsForAccount = killBillClient.getAllAccountTags(account.getAccountId(), ObjectType.BUNDLE.name(), AuditLevel.FULL, requestOptions);
         Assert.assertEquals(allBundleTagsForAccount.size(), 1);
     }
 
@@ -143,15 +143,15 @@ public class TestTag extends TestJaxrsBase {
     public void testSystemTagsPagination() throws Exception {
         final Account account = createAccount();
         for (final ControlTagType controlTagType : ControlTagType.values()) {
-            killBillClient.createAccountTag(account.getAccountId(), controlTagType.getId(), createdBy, reason, comment);
+            killBillClient.createAccountTag(account.getAccountId(), controlTagType.getId(), requestOptions);
         }
 
-        final Tags allTags = killBillClient.getTags();
+        final Tags allTags = killBillClient.getTags(requestOptions);
         Assert.assertEquals(allTags.size(), ControlTagType.values().length);
 
         for (final ControlTagType controlTagType : ControlTagType.values()) {
-            Assert.assertEquals(killBillClient.searchTags(controlTagType.toString()).size(), 1);
-            Assert.assertEquals(killBillClient.searchTags(controlTagType.getDescription()).size(), 1);
+            Assert.assertEquals(killBillClient.searchTags(controlTagType.toString(), requestOptions).size(), 1);
+            Assert.assertEquals(killBillClient.searchTags(controlTagType.getDescription(), requestOptions).size(), 1);
         }
     }
 
@@ -173,14 +173,14 @@ public class TestTag extends TestJaxrsBase {
         final Account account = createAccount();
         for (int i = 0; i < 5; i++) {
             final TagDefinition tagDefinition = new TagDefinition(null, false, UUID.randomUUID().toString().substring(0, 5), UUID.randomUUID().toString(), ImmutableList.<ObjectType>of(ObjectType.ACCOUNT));
-            final UUID tagDefinitionId = killBillClient.createTagDefinition(tagDefinition, createdBy, reason, comment).getId();
-            killBillClient.createAccountTag(account.getAccountId(), tagDefinitionId, createdBy, reason, comment);
+            final UUID tagDefinitionId = killBillClient.createTagDefinition(tagDefinition, requestOptions).getId();
+            killBillClient.createAccountTag(account.getAccountId(), tagDefinitionId, requestOptions);
         }
 
-        final Tags allTags = killBillClient.getTags();
+        final Tags allTags = killBillClient.getTags(requestOptions);
         Assert.assertEquals(allTags.size(), 5);
 
-        Tags page = killBillClient.getTags(0L, 1L);
+        Tags page = killBillClient.getTags(0L, 1L, requestOptions);
         for (int i = 0; i < 5; i++) {
             Assert.assertNotNull(page);
             Assert.assertEquals(page.size(), 1);
@@ -194,11 +194,11 @@ public class TestTag extends TestJaxrsBase {
             doSearchTag(tag.getTagId().toString(), tag);
             doSearchTag(tag.getTagDefinitionName(), tag);
 
-            final TagDefinition tagDefinition = killBillClient.getTagDefinition(tag.getTagDefinitionId());
+            final TagDefinition tagDefinition = killBillClient.getTagDefinition(tag.getTagDefinitionId(), requestOptions);
             doSearchTag(tagDefinition.getDescription(), tag);
         }
 
-        final Tags tags = killBillClient.searchTags(ObjectType.ACCOUNT.toString());
+        final Tags tags = killBillClient.searchTags(ObjectType.ACCOUNT.toString(), requestOptions);
         Assert.assertEquals(tags.size(), 5);
         Assert.assertEquals(tags.getPaginationCurrentOffset(), 0);
         Assert.assertEquals(tags.getPaginationTotalNbRecords(), 5);
@@ -206,7 +206,7 @@ public class TestTag extends TestJaxrsBase {
     }
 
     private void doSearchTag(final String searchKey, @Nullable final Tag expectedTag) throws KillBillClientException {
-        final Tags tags = killBillClient.searchTags(searchKey);
+        final Tags tags = killBillClient.searchTags(searchKey, requestOptions);
         if (expectedTag == null) {
             Assert.assertTrue(tags.isEmpty());
             Assert.assertEquals(tags.getPaginationCurrentOffset(), 0);