From f9d611972882750e981c6e17458d453f25c94455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Fri, 21 Apr 2023 13:12:14 +0100
Subject: [PATCH 01/11] add voidStatement and getStatementIterator to
 xApiEnhancedClient

---
 .../xapi/client/XapiEnhancedClient.java       | 219 +++++++++++++++++
 .../xapi/client/XapiEnhancedClientTests.java  | 227 ++++++++++++++++++
 2 files changed, 446 insertions(+)
 create mode 100644 xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
 create mode 100644 xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java

diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
new file mode 100644
index 00000000..49bc589d
--- /dev/null
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ */
+
+package dev.learning.xapi.client;
+
+import dev.learning.xapi.model.Actor;
+import dev.learning.xapi.model.Statement;
+import dev.learning.xapi.model.StatementResult;
+import dev.learning.xapi.model.Verb;
+import java.net.URI;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.util.function.Consumer;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+/**
+ * <p>
+ * Enhanced Client for communicating with LRS or service which implements some of the xAPI
+ * communication resources.
+ * </p>
+ * It adds some convenient methods to the default {@link XapiClient}.
+ *
+ * @author István Rátkai (Selindek)
+ */
+public class XapiEnhancedClient extends XapiClient {
+
+  /**
+   * Default constructor for XapiEnhancedClient.
+   *
+   * @param builder a {@link WebClient.Builder} object. The caller must set the baseUrl and the
+   *        authorization header.
+   */
+  public XapiEnhancedClient(WebClient.Builder builder) {
+    super(builder);
+  }
+
+  /**
+   * Gets a list of Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @param request The parameters of the get statements request
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator(GetStatementsRequest request) {
+
+    return getStatements(request).map(result -> new StatementIterator(result));
+
+  }
+
+  /**
+   * Gets a list of Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @param request The parameters of the get statements request
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator(
+      Consumer<GetStatementsRequest.Builder> request) {
+
+    final var builder = GetStatementsRequest.builder();
+
+    request.accept(builder);
+
+    return getStatementIterator(builder.build());
+
+  }
+
+  /**
+   * Gets a list of Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator() {
+
+    return getStatementIterator(r -> {
+    });
+
+  }
+
+  /**
+   * <p>
+   * Voids a {@link Statement}.
+   * </p>
+   * The Actor of the voiding statement will be the same as the Actor of the target Statement.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatement The {@link Statement} to be voided
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
+    return voidStatement(targetStatement.getId(), targetStatement.getActor());
+  }
+
+  /**
+   * Voids a {@link Statement}.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatement The {@link Statement} to be voided
+   * @param actor the Actor of the voiding Statement
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement, Actor actor) {
+    return voidStatement(targetStatement.getId(), actor);
+  }
+
+  /**
+   * Voids a {@link Statement}.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatementId The id of the {@link Statement} to be voided
+   * @param actor the Actor of the voiding Statement
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(UUID targetStatementId, Actor actor) {
+    Assert.notNull(targetStatementId, "Target Statement id cannot be null");
+    Assert.notNull(actor, "Actor cannot be null");
+
+    return postStatement(r -> r
+
+        .statement(s -> s
+
+            .actor(actor)
+
+            .verb(Verb.VOIDED)
+
+            .statementReferenceObject(o -> o
+
+                .id(targetStatementId)
+
+            )
+
+        )
+
+    );
+
+  }
+
+  /**
+   * <p>
+   * StatementIterator.
+   * </p>
+   * Iterates through the Statements of the result of a
+   * {@link XapiClient#getStatements(GetStatementsRequest)}. If more Statements are available it
+   * automatically loads them from the server.
+   *
+   * @author István Rátkai (Selindek)
+   */
+  @RequiredArgsConstructor
+  public class StatementIterator implements Iterator<Statement> {
+
+    private URI more;
+    private Iterator<Statement> statements;
+
+    private StatementIterator(ResponseEntity<StatementResult> response) {
+      init(response);
+    }
+
+    private void init(ResponseEntity<StatementResult> response) {
+      final var statementResult = response.getBody();
+      more = statementResult.hasMore() ? statementResult.getMore() : null;
+      final var s = statementResult.getStatements();
+      statements = s == null ? Collections.emptyIterator() : s.iterator();
+    }
+
+    @Override
+    public boolean hasNext() {
+      return statements.hasNext() || more != null;
+    }
+
+    @Override
+    public Statement next() {
+      if (!statements.hasNext()) {
+        if (more == null) {
+          throw new NoSuchElementException();
+        }
+        init(getMoreStatements(r -> r.more(more)).block());
+      }
+      return statements.next();
+    }
+
+  }
+}
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
new file mode 100644
index 00000000..7d4beb22
--- /dev/null
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ */
+package dev.learning.xapi.client;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+import dev.learning.xapi.model.Statement;
+import dev.learning.xapi.model.Verb;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * XapiEnhancedClient Tests.
+ *
+ * @author István Rátkai (Selindek)
+ */
+@DisplayName("XapiEnhancedClient Tests")
+@SpringBootTest
+class XapiEnhancedClientTests {
+
+  @Autowired
+  private WebClient.Builder webClientBuilder;
+
+  private MockWebServer mockWebServer;
+  private XapiEnhancedClient client;
+
+  @BeforeEach
+  void setUp() throws Exception {
+    mockWebServer = new MockWebServer();
+    mockWebServer.start();
+
+    webClientBuilder.baseUrl(mockWebServer.url("").toString());
+
+    client = new XapiEnhancedClient(webClientBuilder);
+
+  }
+
+  @AfterEach
+  void tearDown() throws Exception {
+    mockWebServer.shutdown();
+  }
+
+  @Test
+  void whenGettingStatementIteratorViaMultipeResponsesThenResultIsExpected()
+      throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator Via Multipe Responses
+    final var iterator = client.getStatementIterator().block();
+
+    // Then Result Is Expected
+    assertThat(iterator.next().getId(),
+        is(UUID.fromString("c0aaea0b-252b-4d9d-b7ad-46c541572570")));
+    assertThat(iterator.next().getId(),
+        is(UUID.fromString("4ed0209a-f50f-4f57-8602-ba5f981d211a")));
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
+  @Test
+  void whenGettingStatementIteratorViaMultipeResponsesThenRequestsAreExpected()
+      throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator Via Multipe Responses
+    final var iterator = client.getStatementIterator().block();
+    iterator.next();
+    iterator.next();
+
+    // Then Requests Are Expected
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements/more/1"));
+
+  }
+
+  @Test
+  void whenGettingStatementIteratorThenRequestsAreExpected() throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    client.getStatementIterator().block();
+
+    // Then Requests Are Expected
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
+    assertThat(mockWebServer.takeRequest(1, TimeUnit.SECONDS), is(nullValue()));
+
+  }
+
+  @Test
+  void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
+      throws InterruptedException {
+
+    // Given Empty Response
+    final var body = """
+        {
+          "statements" : [
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then HasNext Is False
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
+  @Test
+  void whenVoidingStatementThenBodyIsExpected() throws InterruptedException {
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK")
+        .setBody("[\"2eb84e56-441a-492c-9d7b-f8e9ddd3e15d\"]")
+        .addHeader("Content-Type", "application/json"));
+
+    final var attemptedStatement = Statement.builder()
+
+        .id(UUID.fromString("175c9264-692f-4108-9b7d-0ba64bd59ac3"))
+
+        .agentActor(a -> a.name("A N Other").mbox("mailto:another@example.com"))
+
+        .verb(Verb.ATTEMPTED)
+
+        .activityObject(o -> o.id("https://example.com/activity/simplestatement")
+            .definition(d -> d.addName(Locale.ENGLISH, "Simple Statement")))
+
+        .build();
+
+    // When Voiding Statement
+    client.voidStatement(attemptedStatement).block();
+
+    final var recordedRequest = mockWebServer.takeRequest();
+
+    // Then Body Is Expected
+    assertThat(recordedRequest.getBody().readUtf8(), is(
+        "{\"actor\":{\"objectType\":\"Agent\",\"name\":\"A N Other\",\"mbox\":\"mailto:another@example.com\"},\"verb\":{\"id\":\"http://adlnet.gov/expapi/verbs/voided\",\"display\":{\"und\":\"voided\"}},\"object\":{\"objectType\":\"StatementRef\",\"id\":\"175c9264-692f-4108-9b7d-0ba64bd59ac3\"}}"));
+  }
+}

From 06e29450f7c260331889c456220c18bd91187f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Fri, 21 Apr 2023 13:28:55 +0100
Subject: [PATCH 02/11] more test, more coverage

---
 .../xapi/client/XapiEnhancedClient.java       |  2 +-
 .../xapi/client/XapiEnhancedClientTests.java  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
index 49bc589d..3dc93c32 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
@@ -133,7 +133,7 @@ public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
    * @return the ResponseEntity
    */
   public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement, Actor actor) {
-    return voidStatement(targetStatement.getId(), actor);
+    return voidStatement(targetStatement, actor);
   }
 
   /**
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
index 7d4beb22..699d8a6d 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
@@ -6,10 +6,12 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import dev.learning.xapi.model.Statement;
 import dev.learning.xapi.model.Verb;
 import java.util.Locale;
+import java.util.NoSuchElementException;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import okhttp3.mockwebserver.MockResponse;
@@ -195,6 +197,30 @@ void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
 
   }
 
+  @Test
+  void givenEmptyResponseWhenGettingStatementIteratorThenNextThrowsAnException()
+      throws InterruptedException {
+
+    // Given Empty Response
+    final var body = """
+        {
+          "statements" : [
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then Next Throws An Exception
+    assertThrows(NoSuchElementException.class, () -> iterator.next());
+
+  }
+
   @Test
   void whenVoidingStatementThenBodyIsExpected() throws InterruptedException {
 

From c1bff81e61db998ba072a460f3e3215bf9de1e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Fri, 21 Apr 2023 13:40:06 +0100
Subject: [PATCH 03/11] even more test, even more coverage

---
 .../xapi/client/XapiEnhancedClient.java       |  4 +--
 .../xapi/client/XapiEnhancedClientTests.java  | 26 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
index 3dc93c32..1ffaa87b 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
@@ -117,7 +117,7 @@ public Mono<StatementIterator> getStatementIterator() {
    * @return the ResponseEntity
    */
   public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
-    return voidStatement(targetStatement.getId(), targetStatement.getActor());
+    return voidStatement(targetStatement, targetStatement.getActor());
   }
 
   /**
@@ -133,7 +133,7 @@ public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
    * @return the ResponseEntity
    */
   public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement, Actor actor) {
-    return voidStatement(targetStatement, actor);
+    return voidStatement(targetStatement.getId(), actor);
   }
 
   /**
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
index 699d8a6d..3ddcd483 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
@@ -88,8 +88,10 @@ void whenGettingStatementIteratorViaMultipeResponsesThenResultIsExpected()
     final var iterator = client.getStatementIterator().block();
 
     // Then Result Is Expected
+    assertThat(iterator.hasNext(), is(true));
     assertThat(iterator.next().getId(),
         is(UUID.fromString("c0aaea0b-252b-4d9d-b7ad-46c541572570")));
+    assertThat(iterator.hasNext(), is(true));
     assertThat(iterator.next().getId(),
         is(UUID.fromString("4ed0209a-f50f-4f57-8602-ba5f981d211a")));
     assertThat(iterator.hasNext(), is(false));
@@ -174,10 +176,10 @@ void whenGettingStatementIteratorThenRequestsAreExpected() throws InterruptedExc
   }
 
   @Test
-  void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
+  void givenEmptyStatementResultWhenGettingStatementIteratorThenHasNextIsFalse()
       throws InterruptedException {
 
-    // Given Empty Response
+    // Given Empty StatementResult
     final var body = """
         {
           "statements" : [
@@ -197,6 +199,26 @@ void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
 
   }
 
+  @Test
+  void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
+      throws InterruptedException {
+
+    // Given Empty Response
+    // This response is technically invalid by the xApi specification, but we cannot trust the xApi
+    // conformance of the commercial LRSs.
+    final var body = "{}";
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then HasNext Is False
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
   @Test
   void givenEmptyResponseWhenGettingStatementIteratorThenNextThrowsAnException()
       throws InterruptedException {

From d7d0bd31c9476ed4d1ef8ae22379f509c074503d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Fri, 21 Apr 2023 16:40:59 +0100
Subject: [PATCH 04/11] stuffz

- add sample
- add documentation
- move features to xapiClient
- add toStream() method to StatementIterator
- add test for stream
---
 README.md                                     |  12 +
 samples/get-statement-iterator/pom.xml        |  22 ++
 .../GetStatementIteratorApplication.java      |  54 ++++
 .../src/main/resources/application.properties |   3 +
 samples/pom.xml                               |   1 +
 .../dev/learning/xapi/client/XapiClient.java  | 197 +++++++++++++
 .../xapi/client/XapiEnhancedClient.java       | 219 --------------
 .../learning/xapi/client/XapiClientTests.java | 266 +++++++++++++++++
 .../xapi/client/XapiEnhancedClientTests.java  | 275 ------------------
 9 files changed, 555 insertions(+), 494 deletions(-)
 create mode 100644 samples/get-statement-iterator/pom.xml
 create mode 100644 samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
 create mode 100644 samples/get-statement-iterator/src/main/resources/application.properties
 delete mode 100644 xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
 delete mode 100644 xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java

diff --git a/README.md b/README.md
index 1c5e2e73..63300719 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,18 @@ StatementResult moreStatementResult = moreResponse.getBody();
 Statement[] statements = moreStatementResult.getStatements();
 ```
 
+### Getting Statements as Iterator (and processing them as a Stream)
+
+Example:
+
+```java
+var statements = client.getStatementIterator().block();
+
+// process the first 100 Statements
+statements.toStream().limit(100).forEach(s -> {
+    // add logic here...
+  });
+```
 
 ### Posting a Statement
 
diff --git a/samples/get-statement-iterator/pom.xml b/samples/get-statement-iterator/pom.xml
new file mode 100644
index 00000000..4b3fed5d
--- /dev/null
+++ b/samples/get-statement-iterator/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>dev.learning.xapi.samples</groupId>
+    <artifactId>xapi-samples-build</artifactId>
+    <version>1.1.5-SNAPSHOT</version>
+  </parent>
+  <artifactId>get-statement-iterator</artifactId>
+  <name>Get xAPI StatementIterator Sample</name>
+  <description>Get xAPI StatementIterator</description>
+  <dependencies>
+    <dependency>
+      <groupId>dev.learning.xapi</groupId>
+      <artifactId>xapi-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dev.learning.xapi.samples</groupId>
+      <artifactId>core</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
new file mode 100644
index 00000000..67ccee59
--- /dev/null
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ */
+
+package dev.learning.xapi.samples.getstatements;
+
+import dev.learning.xapi.client.XapiClient;
+import dev.learning.xapi.model.StatementResult;
+import dev.learning.xapi.model.Verb;
+import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * Sample using xAPI client to get multiple statements as StatementIterator.
+ *
+ * @author Thomas Turrell-Croft
+ * @author István Rátkai (Selindek)
+ */
+@SpringBootApplication
+public class GetStatementIteratorApplication implements CommandLineRunner {
+
+  /**
+   * Default xAPI client. Properties are picked automatically from application.properties.
+   */
+  @Autowired
+  private XapiClient client;
+
+  public static void main(String[] args) {
+    SpringApplication.run(GetStatementIteratorApplication.class, args).close();
+  }
+
+  @Override
+  public void run(String... args) throws Exception {
+
+    // Get Statements as StatementIterator
+    var iterator = client.getStatementIterator().block();
+
+    // Print the returned statements to the console
+    iterator.toStream().forEach(s -> System.out.println(s));
+
+    // Get Statements with Verb filter as StatementIterator
+    var filteredStatements =
+        client.getStatementIterator(r -> r.verb(Verb.ATTEMPTED.getId())).block();
+
+    // Print the returned statements to the console
+    filteredStatements.toStream().forEach(s -> System.out.println(s));
+
+  }
+
+}
diff --git a/samples/get-statement-iterator/src/main/resources/application.properties b/samples/get-statement-iterator/src/main/resources/application.properties
new file mode 100644
index 00000000..de20217a
--- /dev/null
+++ b/samples/get-statement-iterator/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+xapi.client.username = admin
+xapi.client.password = password
+xapi.client.baseUrl = https://example.com/xapi/
diff --git a/samples/pom.xml b/samples/pom.xml
index 66a96cc3..e90caf89 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -35,6 +35,7 @@
     <module>core</module>
     <!-- Statements Resource -->
     <module>get-statement</module>
+    <module>get-statement-iterator</module>
     <module>get-statement-with-attachment</module>
     <module>post-statement</module>
     <module>post-signed-statement</module>
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
index 0de6facd..7f7466a3 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
@@ -6,16 +6,26 @@
 
 import dev.learning.xapi.model.About;
 import dev.learning.xapi.model.Activity;
+import dev.learning.xapi.model.Actor;
 import dev.learning.xapi.model.Person;
 import dev.learning.xapi.model.Statement;
 import dev.learning.xapi.model.StatementResult;
+import dev.learning.xapi.model.Verb;
+import java.net.URI;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
@@ -1257,4 +1267,191 @@ public Mono<ResponseEntity<About>> getAbout() {
 
   }
 
+  // Enhanced features
+
+  /**
+   * Gets a list of Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @param request The parameters of the get statements request
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator(GetStatementsRequest request) {
+
+    return getStatements(request).map(result -> new StatementIterator(result));
+
+  }
+
+  /**
+   * Gets a list of Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @param request The parameters of the get statements request
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator(
+      Consumer<GetStatementsRequest.Builder> request) {
+
+    final var builder = GetStatementsRequest.builder();
+
+    request.accept(builder);
+
+    return getStatementIterator(builder.build());
+
+  }
+
+  /**
+   * Gets all of the Statements as a {@link StatementIterator}.
+   * <p>
+   * This method loads ALL of Statements which fullfills the request filters from the LRS
+   * dynamically. (It sends additional
+   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
+   * loaded Statements were processed from the iterator.)
+   * </p>
+   *
+   * @return a {@link StatementIterator} object as a {@link Mono}.
+   */
+  public Mono<StatementIterator> getStatementIterator() {
+
+    return getStatementIterator(r -> {
+    });
+
+  }
+
+  /**
+   * <p>
+   * Voids a {@link Statement}.
+   * </p>
+   * The Actor of the voiding statement will be the same as the Actor of the target Statement.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatement The {@link Statement} to be voided
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
+    return voidStatement(targetStatement, targetStatement.getActor());
+  }
+
+  /**
+   * Voids a {@link Statement}.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatement The {@link Statement} to be voided
+   * @param actor the Actor of the voiding Statement
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement, Actor actor) {
+    return voidStatement(targetStatement.getId(), actor);
+  }
+
+  /**
+   * Voids a {@link Statement}.
+   * <p>
+   * The returned ResponseEntity contains the response headers and the Statement identifier of the
+   * generated voiding Statement.
+   * </p>
+   *
+   * @param targetStatementId The id of the {@link Statement} to be voided
+   * @param actor the Actor of the voiding Statement
+   *
+   * @return the ResponseEntity
+   */
+  public Mono<ResponseEntity<UUID>> voidStatement(UUID targetStatementId, Actor actor) {
+    Assert.notNull(targetStatementId, "Target Statement id cannot be null");
+    Assert.notNull(actor, "Actor cannot be null");
+
+    return postStatement(r -> r
+
+        .statement(s -> s
+
+            .actor(actor)
+
+            .verb(Verb.VOIDED)
+
+            .statementReferenceObject(o -> o
+
+                .id(targetStatementId)
+
+            )
+
+        )
+
+    );
+
+  }
+
+  /**
+   * <p>
+   * StatementIterator.
+   * </p>
+   * Iterates through the Statements of the result of a
+   * {@link XapiClient#getStatements(GetStatementsRequest)}. If more Statements are available it
+   * automatically loads them from the server.
+   *
+   * @author István Rátkai (Selindek)
+   */
+  @RequiredArgsConstructor
+  public class StatementIterator implements Iterator<Statement> {
+
+    private URI more;
+    private Iterator<Statement> statements;
+
+    private StatementIterator(ResponseEntity<StatementResult> response) {
+      init(response);
+    }
+
+    /**
+     * Convenient method for transforming this StatementIterator to a {@link Stream}.
+     *
+     * @return a {@link Stream} of {@link Statement}s
+     */
+    public Stream<Statement> toStream() {
+      final Iterable<Statement> iterable = () -> this;
+      return StreamSupport.stream(iterable.spliterator(), false);
+    }
+
+    private void init(ResponseEntity<StatementResult> response) {
+      final var statementResult = response.getBody();
+      more = statementResult.hasMore() ? statementResult.getMore() : null;
+      final var s = statementResult.getStatements();
+      statements = s == null ? Collections.emptyIterator() : s.iterator();
+    }
+
+    @Override
+    public boolean hasNext() {
+      return statements.hasNext() || more != null;
+    }
+
+    @Override
+    public Statement next() {
+      if (!statements.hasNext()) {
+        if (more == null) {
+          throw new NoSuchElementException();
+        }
+        init(getMoreStatements(r -> r.more(more)).block());
+      }
+      return statements.next();
+    }
+
+  }
 }
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
deleted file mode 100644
index 1ffaa87b..00000000
--- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiEnhancedClient.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
- */
-
-package dev.learning.xapi.client;
-
-import dev.learning.xapi.model.Actor;
-import dev.learning.xapi.model.Statement;
-import dev.learning.xapi.model.StatementResult;
-import dev.learning.xapi.model.Verb;
-import java.net.URI;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-import java.util.function.Consumer;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.Assert;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-/**
- * <p>
- * Enhanced Client for communicating with LRS or service which implements some of the xAPI
- * communication resources.
- * </p>
- * It adds some convenient methods to the default {@link XapiClient}.
- *
- * @author István Rátkai (Selindek)
- */
-public class XapiEnhancedClient extends XapiClient {
-
-  /**
-   * Default constructor for XapiEnhancedClient.
-   *
-   * @param builder a {@link WebClient.Builder} object. The caller must set the baseUrl and the
-   *        authorization header.
-   */
-  public XapiEnhancedClient(WebClient.Builder builder) {
-    super(builder);
-  }
-
-  /**
-   * Gets a list of Statements as a {@link StatementIterator}.
-   * <p>
-   * This method loads ALL of Statements which fullfills the request filters from the LRS
-   * dynamically. (It sends additional
-   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
-   * loaded Statements were processed from the iterator.)
-   * </p>
-   *
-   * @param request The parameters of the get statements request
-   *
-   * @return a {@link StatementIterator} object as a {@link Mono}.
-   */
-  public Mono<StatementIterator> getStatementIterator(GetStatementsRequest request) {
-
-    return getStatements(request).map(result -> new StatementIterator(result));
-
-  }
-
-  /**
-   * Gets a list of Statements as a {@link StatementIterator}.
-   * <p>
-   * This method loads ALL of Statements which fullfills the request filters from the LRS
-   * dynamically. (It sends additional
-   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
-   * loaded Statements were processed from the iterator.)
-   * </p>
-   *
-   * @param request The parameters of the get statements request
-   *
-   * @return a {@link StatementIterator} object as a {@link Mono}.
-   */
-  public Mono<StatementIterator> getStatementIterator(
-      Consumer<GetStatementsRequest.Builder> request) {
-
-    final var builder = GetStatementsRequest.builder();
-
-    request.accept(builder);
-
-    return getStatementIterator(builder.build());
-
-  }
-
-  /**
-   * Gets a list of Statements as a {@link StatementIterator}.
-   * <p>
-   * This method loads ALL of Statements which fullfills the request filters from the LRS
-   * dynamically. (It sends additional
-   * {@link XapiClient#getMoreStatements(java.util.function.Consumer)} request if all the previously
-   * loaded Statements were processed from the iterator.)
-   * </p>
-   *
-   * @return a {@link StatementIterator} object as a {@link Mono}.
-   */
-  public Mono<StatementIterator> getStatementIterator() {
-
-    return getStatementIterator(r -> {
-    });
-
-  }
-
-  /**
-   * <p>
-   * Voids a {@link Statement}.
-   * </p>
-   * The Actor of the voiding statement will be the same as the Actor of the target Statement.
-   * <p>
-   * The returned ResponseEntity contains the response headers and the Statement identifier of the
-   * generated voiding Statement.
-   * </p>
-   *
-   * @param targetStatement The {@link Statement} to be voided
-   *
-   * @return the ResponseEntity
-   */
-  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement) {
-    return voidStatement(targetStatement, targetStatement.getActor());
-  }
-
-  /**
-   * Voids a {@link Statement}.
-   * <p>
-   * The returned ResponseEntity contains the response headers and the Statement identifier of the
-   * generated voiding Statement.
-   * </p>
-   *
-   * @param targetStatement The {@link Statement} to be voided
-   * @param actor the Actor of the voiding Statement
-   *
-   * @return the ResponseEntity
-   */
-  public Mono<ResponseEntity<UUID>> voidStatement(Statement targetStatement, Actor actor) {
-    return voidStatement(targetStatement.getId(), actor);
-  }
-
-  /**
-   * Voids a {@link Statement}.
-   * <p>
-   * The returned ResponseEntity contains the response headers and the Statement identifier of the
-   * generated voiding Statement.
-   * </p>
-   *
-   * @param targetStatementId The id of the {@link Statement} to be voided
-   * @param actor the Actor of the voiding Statement
-   *
-   * @return the ResponseEntity
-   */
-  public Mono<ResponseEntity<UUID>> voidStatement(UUID targetStatementId, Actor actor) {
-    Assert.notNull(targetStatementId, "Target Statement id cannot be null");
-    Assert.notNull(actor, "Actor cannot be null");
-
-    return postStatement(r -> r
-
-        .statement(s -> s
-
-            .actor(actor)
-
-            .verb(Verb.VOIDED)
-
-            .statementReferenceObject(o -> o
-
-                .id(targetStatementId)
-
-            )
-
-        )
-
-    );
-
-  }
-
-  /**
-   * <p>
-   * StatementIterator.
-   * </p>
-   * Iterates through the Statements of the result of a
-   * {@link XapiClient#getStatements(GetStatementsRequest)}. If more Statements are available it
-   * automatically loads them from the server.
-   *
-   * @author István Rátkai (Selindek)
-   */
-  @RequiredArgsConstructor
-  public class StatementIterator implements Iterator<Statement> {
-
-    private URI more;
-    private Iterator<Statement> statements;
-
-    private StatementIterator(ResponseEntity<StatementResult> response) {
-      init(response);
-    }
-
-    private void init(ResponseEntity<StatementResult> response) {
-      final var statementResult = response.getBody();
-      more = statementResult.hasMore() ? statementResult.getMore() : null;
-      final var s = statementResult.getStatements();
-      statements = s == null ? Collections.emptyIterator() : s.iterator();
-    }
-
-    @Override
-    public boolean hasNext() {
-      return statements.hasNext() || more != null;
-    }
-
-    @Override
-    public Statement next() {
-      if (!statements.hasNext()) {
-        if (more == null) {
-          throw new NoSuchElementException();
-        }
-        init(getMoreStatements(r -> r.more(more)).block());
-      }
-      return statements.next();
-    }
-
-  }
-}
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
index dcc9ebff..fd3694c0 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
@@ -3,6 +3,7 @@
  */
 package dev.learning.xapi.client;
 
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -21,7 +22,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.NoSuchElementException;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
@@ -2243,6 +2246,269 @@ void whenGettingActivityProfilesWithoutSinceParameterThenPathIsExpected()
         is("/activities/profile?activityId=https%3A%2F%2Fexample.com%2Factivity%2F1"));
   }
 
+  @Test
+  void whenGettingStatementIteratorViaMultipeResponsesThenResultIsExpected()
+      throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator Via Multipe Responses
+    final var iterator = client.getStatementIterator().block();
+
+    // Then Result Is Expected
+    assertThat(iterator.hasNext(), is(true));
+    assertThat(iterator.next().getId(),
+        is(UUID.fromString("c0aaea0b-252b-4d9d-b7ad-46c541572570")));
+    assertThat(iterator.hasNext(), is(true));
+    assertThat(iterator.next().getId(),
+        is(UUID.fromString("4ed0209a-f50f-4f57-8602-ba5f981d211a")));
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
+  @Test
+  void whenGettingStatementIteratorViaMultipeResponsesThenRequestsAreExpected()
+      throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator Via Multipe Responses
+    final var iterator = client.getStatementIterator().block();
+    iterator.next();
+    iterator.next();
+
+    // Then Requests Are Expected
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements/more/1"));
+
+  }
+
+  @Test
+  void whenGettingStatementIteratorThenRequestsAreExpected() throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    client.getStatementIterator().block();
+
+    // Then Requests Are Expected
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
+    assertThat(mockWebServer.takeRequest(1, TimeUnit.SECONDS), is(nullValue()));
+
+  }
+
+  @Test
+  void whenGettingStatementIteratorAndProcessingItAsStreamThenRequestsAreExpected()
+      throws InterruptedException {
+    final var body1 = """
+        {
+          "statements" : [
+            {
+              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
+            },
+            {
+              "id" : "940a3f5c-1f31-47c7-82fc-5979e2786c02"
+            }
+          ],
+          "more" : "/statements/more/1"
+        }
+        """;
+    final var body2 = """
+        {
+          "statements" : [
+            {
+              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
+            }
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // And Processing it As Stream
+    iterator.toStream().limit(1).forEach(s -> {
+    });
+
+    // Then Requests Are Expected
+    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
+    assertThat(mockWebServer.takeRequest(1, TimeUnit.SECONDS), is(nullValue()));
+
+  }
+
+  @Test
+  void givenEmptyStatementResultWhenGettingStatementIteratorThenHasNextIsFalse()
+      throws InterruptedException {
+
+    // Given Empty StatementResult
+    final var body = """
+        {
+          "statements" : [
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then HasNext Is False
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
+  @Test
+  void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
+      throws InterruptedException {
+
+    // Given Empty Response
+    // This response is technically invalid by the xApi specification, but we cannot trust the xApi
+    // conformance of the commercial LRSs.
+    final var body = "{}";
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then HasNext Is False
+    assertThat(iterator.hasNext(), is(false));
+
+  }
+
+  @Test
+  void givenEmptyResponseWhenGettingStatementIteratorThenNextThrowsAnException()
+      throws InterruptedException {
+
+    // Given Empty Response
+    final var body = """
+        {
+          "statements" : [
+          ],
+          "more" : ""
+        }
+        """;
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
+        .addHeader("Content-Type", "application/json; charset=utf-8"));
+
+    // When Getting StatementIterator
+    final var iterator = client.getStatementIterator().block();
+
+    // Then Next Throws An Exception
+    assertThrows(NoSuchElementException.class, () -> iterator.next());
+
+  }
+
+  @Test
+  void whenVoidingStatementThenBodyIsExpected() throws InterruptedException {
+
+    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK")
+        .setBody("[\"2eb84e56-441a-492c-9d7b-f8e9ddd3e15d\"]")
+        .addHeader("Content-Type", "application/json"));
+
+    final var attemptedStatement = Statement.builder()
+
+        .id(UUID.fromString("175c9264-692f-4108-9b7d-0ba64bd59ac3"))
+
+        .agentActor(a -> a.name("A N Other").mbox("mailto:another@example.com"))
+
+        .verb(Verb.ATTEMPTED)
+
+        .activityObject(o -> o.id("https://example.com/activity/simplestatement")
+            .definition(d -> d.addName(Locale.ENGLISH, "Simple Statement")))
+
+        .build();
+
+    // When Voiding Statement
+    client.voidStatement(attemptedStatement).block();
+
+    final var recordedRequest = mockWebServer.takeRequest();
+
+    // Then Body Is Expected
+    assertThat(recordedRequest.getBody().readUtf8(), is(
+        "{\"actor\":{\"objectType\":\"Agent\",\"name\":\"A N Other\",\"mbox\":\"mailto:another@example.com\"},\"verb\":{\"id\":\"http://adlnet.gov/expapi/verbs/voided\",\"display\":{\"und\":\"voided\"}},\"object\":{\"objectType\":\"StatementRef\",\"id\":\"175c9264-692f-4108-9b7d-0ba64bd59ac3\"}}"));
+  }
+
   @Getter
   private static class SamplePerson {
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
deleted file mode 100644
index 3ddcd483..00000000
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiEnhancedClientTests.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
- */
-package dev.learning.xapi.client;
-
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import dev.learning.xapi.model.Statement;
-import dev.learning.xapi.model.Verb;
-import java.util.Locale;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * XapiEnhancedClient Tests.
- *
- * @author István Rátkai (Selindek)
- */
-@DisplayName("XapiEnhancedClient Tests")
-@SpringBootTest
-class XapiEnhancedClientTests {
-
-  @Autowired
-  private WebClient.Builder webClientBuilder;
-
-  private MockWebServer mockWebServer;
-  private XapiEnhancedClient client;
-
-  @BeforeEach
-  void setUp() throws Exception {
-    mockWebServer = new MockWebServer();
-    mockWebServer.start();
-
-    webClientBuilder.baseUrl(mockWebServer.url("").toString());
-
-    client = new XapiEnhancedClient(webClientBuilder);
-
-  }
-
-  @AfterEach
-  void tearDown() throws Exception {
-    mockWebServer.shutdown();
-  }
-
-  @Test
-  void whenGettingStatementIteratorViaMultipeResponsesThenResultIsExpected()
-      throws InterruptedException {
-    final var body1 = """
-        {
-          "statements" : [
-            {
-              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
-            }
-          ],
-          "more" : "/statements/more/1"
-        }
-        """;
-    final var body2 = """
-        {
-          "statements" : [
-            {
-              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
-            }
-          ],
-          "more" : ""
-        }
-        """;
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator Via Multipe Responses
-    final var iterator = client.getStatementIterator().block();
-
-    // Then Result Is Expected
-    assertThat(iterator.hasNext(), is(true));
-    assertThat(iterator.next().getId(),
-        is(UUID.fromString("c0aaea0b-252b-4d9d-b7ad-46c541572570")));
-    assertThat(iterator.hasNext(), is(true));
-    assertThat(iterator.next().getId(),
-        is(UUID.fromString("4ed0209a-f50f-4f57-8602-ba5f981d211a")));
-    assertThat(iterator.hasNext(), is(false));
-
-  }
-
-  @Test
-  void whenGettingStatementIteratorViaMultipeResponsesThenRequestsAreExpected()
-      throws InterruptedException {
-    final var body1 = """
-        {
-          "statements" : [
-            {
-              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
-            }
-          ],
-          "more" : "/statements/more/1"
-        }
-        """;
-    final var body2 = """
-        {
-          "statements" : [
-            {
-              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
-            }
-          ],
-          "more" : ""
-        }
-        """;
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator Via Multipe Responses
-    final var iterator = client.getStatementIterator().block();
-    iterator.next();
-    iterator.next();
-
-    // Then Requests Are Expected
-    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
-    assertThat(mockWebServer.takeRequest().getPath(), is("/statements/more/1"));
-
-  }
-
-  @Test
-  void whenGettingStatementIteratorThenRequestsAreExpected() throws InterruptedException {
-    final var body1 = """
-        {
-          "statements" : [
-            {
-              "id" : "c0aaea0b-252b-4d9d-b7ad-46c541572570"
-            }
-          ],
-          "more" : "/statements/more/1"
-        }
-        """;
-    final var body2 = """
-        {
-          "statements" : [
-            {
-              "id" : "4ed0209a-f50f-4f57-8602-ba5f981d211a"
-            }
-          ],
-          "more" : ""
-        }
-        """;
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body1)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body2)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator
-    client.getStatementIterator().block();
-
-    // Then Requests Are Expected
-    assertThat(mockWebServer.takeRequest().getPath(), is("/statements"));
-    assertThat(mockWebServer.takeRequest(1, TimeUnit.SECONDS), is(nullValue()));
-
-  }
-
-  @Test
-  void givenEmptyStatementResultWhenGettingStatementIteratorThenHasNextIsFalse()
-      throws InterruptedException {
-
-    // Given Empty StatementResult
-    final var body = """
-        {
-          "statements" : [
-          ],
-          "more" : ""
-        }
-        """;
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator
-    final var iterator = client.getStatementIterator().block();
-
-    // Then HasNext Is False
-    assertThat(iterator.hasNext(), is(false));
-
-  }
-
-  @Test
-  void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
-      throws InterruptedException {
-
-    // Given Empty Response
-    // This response is technically invalid by the xApi specification, but we cannot trust the xApi
-    // conformance of the commercial LRSs.
-    final var body = "{}";
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator
-    final var iterator = client.getStatementIterator().block();
-
-    // Then HasNext Is False
-    assertThat(iterator.hasNext(), is(false));
-
-  }
-
-  @Test
-  void givenEmptyResponseWhenGettingStatementIteratorThenNextThrowsAnException()
-      throws InterruptedException {
-
-    // Given Empty Response
-    final var body = """
-        {
-          "statements" : [
-          ],
-          "more" : ""
-        }
-        """;
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK").setBody(body)
-        .addHeader("Content-Type", "application/json; charset=utf-8"));
-
-    // When Getting StatementIterator
-    final var iterator = client.getStatementIterator().block();
-
-    // Then Next Throws An Exception
-    assertThrows(NoSuchElementException.class, () -> iterator.next());
-
-  }
-
-  @Test
-  void whenVoidingStatementThenBodyIsExpected() throws InterruptedException {
-
-    mockWebServer.enqueue(new MockResponse().setStatus("HTTP/1.1 200 OK")
-        .setBody("[\"2eb84e56-441a-492c-9d7b-f8e9ddd3e15d\"]")
-        .addHeader("Content-Type", "application/json"));
-
-    final var attemptedStatement = Statement.builder()
-
-        .id(UUID.fromString("175c9264-692f-4108-9b7d-0ba64bd59ac3"))
-
-        .agentActor(a -> a.name("A N Other").mbox("mailto:another@example.com"))
-
-        .verb(Verb.ATTEMPTED)
-
-        .activityObject(o -> o.id("https://example.com/activity/simplestatement")
-            .definition(d -> d.addName(Locale.ENGLISH, "Simple Statement")))
-
-        .build();
-
-    // When Voiding Statement
-    client.voidStatement(attemptedStatement).block();
-
-    final var recordedRequest = mockWebServer.takeRequest();
-
-    // Then Body Is Expected
-    assertThat(recordedRequest.getBody().readUtf8(), is(
-        "{\"actor\":{\"objectType\":\"Agent\",\"name\":\"A N Other\",\"mbox\":\"mailto:another@example.com\"},\"verb\":{\"id\":\"http://adlnet.gov/expapi/verbs/voided\",\"display\":{\"und\":\"voided\"}},\"object\":{\"objectType\":\"StatementRef\",\"id\":\"175c9264-692f-4108-9b7d-0ba64bd59ac3\"}}"));
-  }
-}

From a4f8ac90020ede6c1512b11d8b3ca1f71461d461 Mon Sep 17 00:00:00 2001
From: Thomas Turrell-Croft <thomasturrell@users.noreply.github.com>
Date: Sun, 23 Apr 2023 14:55:01 +0100
Subject: [PATCH 05/11] Update
 xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java

---
 .../src/test/java/dev/learning/xapi/client/XapiClientTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
index fd3694c0..87481359 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
@@ -2440,7 +2440,7 @@ void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
       throws InterruptedException {
 
     // Given Empty Response
-    // This response is technically invalid by the xApi specification, but we cannot trust the xApi
+    // This response is technically invalid by the xAPI specification, but we cannot assume conformance.
     // conformance of the commercial LRSs.
     final var body = "{}";
 

From b473a5fe6619f582082e5c21e2df631904a67989 Mon Sep 17 00:00:00 2001
From: Thomas Turrell-Croft <tom@berrycloud.co.uk>
Date: Mon, 24 Apr 2023 09:22:14 +0100
Subject: [PATCH 06/11] Remove unused imports

---
 .../getstatements/GetStatementIteratorApplication.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index 67ccee59..1854e2f9 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -4,16 +4,14 @@
 
 package dev.learning.xapi.samples.getstatements;
 
-import dev.learning.xapi.client.XapiClient;
-import dev.learning.xapi.model.StatementResult;
-import dev.learning.xapi.model.Verb;
-import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.http.ResponseEntity;
 
+import dev.learning.xapi.client.XapiClient;
+import dev.learning.xapi.model.Verb;
+ 
 /**
  * Sample using xAPI client to get multiple statements as StatementIterator.
  *

From fe6788e47e81fd87aeb1615dcea2da7bb77d1c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Mon, 24 Apr 2023 10:40:17 +0100
Subject: [PATCH 07/11] fixup

---
 README.md                                         | 12 ++++++++++++
 .../GetStatementIteratorApplication.java          |  4 ++--
 .../src/main/resources/application.properties     |  2 ++
 .../src/main/resources/application.properties     |  2 ++
 .../getstatements/GetStatementsApplication.java   |  5 ++---
 .../src/main/resources/application.properties     |  2 ++
 .../xapi/client/GetStatementsRequest.java         | 15 +++++++++++++++
 .../dev/learning/xapi/client/XapiClientTests.java |  5 +++--
 8 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 63300719..9d6de5ee 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,18 @@ Properties can be set using any [external configuration](https://docs.spring.io/
 
 If you need more specific customization (eg. your LRS needs specific headers, or you want to set the authorization header dynamically) you can create a custom configurer by implementing the `XapiClientConfigurer` interface.
 
+### Advanced Configuration
+
+The xAPI Java Client is basically an extension of the Spring WebClient which configures the default memory limit for buffering data in-memory to 256KB. If this limit is exceeded in any case then we will encounter DataBufferLimitException error.
+
+It could happen if you use attachments or load a lot of statements from an LRS in one requests.
+
+To increase the memory limit, use the below property in application.properties file:
+
+```
+spring.codec.max-in-memory-size=1MB
+```
+
 ### Statement Resource
 
 The xAPI Java Client allows applications to store and fetch xAPI [Statements](https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#statements).
diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index 1854e2f9..aa6ebb2a 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -35,10 +35,10 @@ public static void main(String[] args) {
   public void run(String... args) throws Exception {
 
     // Get Statements as StatementIterator
-    var iterator = client.getStatementIterator().block();
+    var statements = client.getStatementIterator().block();
 
     // Print the returned statements to the console
-    iterator.toStream().forEach(s -> System.out.println(s));
+    statements.toStream().forEach(s -> System.out.println(s));
 
     // Get Statements with Verb filter as StatementIterator
     var filteredStatements =
diff --git a/samples/get-statement-iterator/src/main/resources/application.properties b/samples/get-statement-iterator/src/main/resources/application.properties
index de20217a..379e502a 100644
--- a/samples/get-statement-iterator/src/main/resources/application.properties
+++ b/samples/get-statement-iterator/src/main/resources/application.properties
@@ -1,3 +1,5 @@
 xapi.client.username = admin
 xapi.client.password = password
 xapi.client.baseUrl = https://example.com/xapi/
+
+spring.codec.max-in-memory-size=1MB
diff --git a/samples/get-statement-with-attachment/src/main/resources/application.properties b/samples/get-statement-with-attachment/src/main/resources/application.properties
index de20217a..379e502a 100644
--- a/samples/get-statement-with-attachment/src/main/resources/application.properties
+++ b/samples/get-statement-with-attachment/src/main/resources/application.properties
@@ -1,3 +1,5 @@
 xapi.client.username = admin
 xapi.client.password = password
 xapi.client.baseUrl = https://example.com/xapi/
+
+spring.codec.max-in-memory-size=1MB
diff --git a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
index e04a6de7..48b32a49 100644
--- a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
+++ b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
@@ -7,7 +7,6 @@
 import dev.learning.xapi.client.XapiClient;
 import dev.learning.xapi.model.StatementResult;
 import dev.learning.xapi.model.Verb;
-import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -39,7 +38,7 @@ public void run(String... args) throws Exception {
     ResponseEntity<StatementResult> response = client.getStatements().block();
 
     // Print the returned statements to the console
-    Arrays.asList(response.getBody().getStatements()).forEach(s -> System.out.println(s));
+    response.getBody().getStatements().forEach(s -> System.out.println(s));
 
 
 
@@ -48,7 +47,7 @@ public void run(String... args) throws Exception {
         client.getStatements(r -> r.verb(Verb.ATTEMPTED.getId())).block();
 
     // Print the returned statements to the console
-    Arrays.asList(filteredResponse.getBody().getStatements()).forEach(s -> System.out.println(s));
+    filteredResponse.getBody().getStatements().forEach(s -> System.out.println(s));
 
   }
 
diff --git a/samples/get-statements/src/main/resources/application.properties b/samples/get-statements/src/main/resources/application.properties
index de20217a..379e502a 100644
--- a/samples/get-statements/src/main/resources/application.properties
+++ b/samples/get-statements/src/main/resources/application.properties
@@ -1,3 +1,5 @@
 xapi.client.username = admin
 xapi.client.password = password
 xapi.client.baseUrl = https://example.com/xapi/
+
+spring.codec.max-in-memory-size=1MB
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
index 4b5bd133..b8aba64a 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.learning.xapi.model.Agent;
 import dev.learning.xapi.model.StatementFormat;
+import dev.learning.xapi.model.Verb;
 import java.net.URI;
 import java.time.Instant;
 import java.util.Map;
@@ -179,6 +180,20 @@ public Builder verb(String verb) {
       return this;
     }
 
+    /**
+     * Sets the verb.
+     *
+     * @param verb The verb of the GetStatementRequest.
+     *
+     * @return This builder
+     *
+     * @see GetStatementsRequest#verb
+     */
+    public Builder verb(Verb verb) {
+      this.verb = verb.getId();
+      return this;
+    }
+
     /**
      * Sets the activity.
      *
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
index 87481359..85f4252d 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
@@ -518,7 +518,7 @@ void whenGettingStatementsWithAllParametersThenPathIsExpected() throws Interrupt
 
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"))
 
-        .verb("http://adlnet.gov/expapi/verbs/answered")
+        .verb(Verb.ANSWERED)
 
         .activity("https://example.com/activity/1")
 
@@ -2440,7 +2440,8 @@ void givenEmptyResponseWhenGettingStatementIteratorThenHasNextIsFalse()
       throws InterruptedException {
 
     // Given Empty Response
-    // This response is technically invalid by the xAPI specification, but we cannot assume conformance.
+    // This response is technically invalid by the xAPI specification, but we cannot assume
+    // conformance.
     // conformance of the commercial LRSs.
     final var body = "{}";
 

From bad9f81d4530065592ca6a9c1f568fcc26be0e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= <istvan@berrycloud.co.uk>
Date: Mon, 24 Apr 2023 10:51:02 +0100
Subject: [PATCH 08/11] fcs

---
 .../getstatements/GetStatementIteratorApplication.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index aa6ebb2a..a2650bf8 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -4,13 +4,12 @@
 
 package dev.learning.xapi.samples.getstatements;
 
+import dev.learning.xapi.client.XapiClient;
+import dev.learning.xapi.model.Verb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import dev.learning.xapi.client.XapiClient;
-import dev.learning.xapi.model.Verb;
  
 /**
  * Sample using xAPI client to get multiple statements as StatementIterator.

From 3724dca1a339baaabc943a52a955033e875f2e73 Mon Sep 17 00:00:00 2001
From: Thomas Turrell-Croft <tom@berrycloud.co.uk>
Date: Mon, 24 Apr 2023 11:38:53 +0100
Subject: [PATCH 09/11] tip

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9d6de5ee..fb3939f5 100644
--- a/README.md
+++ b/README.md
@@ -47,17 +47,19 @@ The xAPI Java Client has a Spring AutoConfiguration bean which picks up the foll
 | xapi.client.password          | Password for basic authorization header                            |
 | xapi.client.authorization     | Authorization header (has precedence over the username and password properties)    |
 
-Properties can be set using any [external configuration](https://docs.spring.io/spring-boot/docs/3.0.4/reference/htmlsingle/#features.external-config.files) method supported by Spring Boot.
+Properties can be set using any [external configuration](https://docs.spring.io/spring-boot/docs/3.0.6/reference/htmlsingle/#features.external-config.files) method supported by Spring Boot.
 
 If you need more specific customization (eg. your LRS needs specific headers, or you want to set the authorization header dynamically) you can create a custom configurer by implementing the `XapiClientConfigurer` interface.
 
 ### Advanced Configuration
 
-The xAPI Java Client is basically an extension of the Spring WebClient which configures the default memory limit for buffering data in-memory to 256KB. If this limit is exceeded in any case then we will encounter DataBufferLimitException error.
+The xAPI Java Client uses the Spring WebClient. Spring WebClient has default memory limit of 256KB for buffering data. If this limit is exceeded then a DataBufferLimitException will be thrown.
 
-It could happen if you use attachments or load a lot of statements from an LRS in one requests.
+The default memory limit of 256KB for buffering data could be exceeded if the LRS returns a large number of Statements or if the Statements contain attachments. 
 
-To increase the memory limit, use the below property in application.properties file:
+It is possible to set the memory limit for buffering data with the `spring.codec.max-in-memory-size` property.
+
+Example:
 
 ```
 spring.codec.max-in-memory-size=1MB

From 172746e222a299b0ea2dce2447d7c01790f9a1e5 Mon Sep 17 00:00:00 2001
From: Thomas Turrell-Croft <thomasturrell@users.noreply.github.com>
Date: Mon, 24 Apr 2023 11:44:31 +0100
Subject: [PATCH 10/11] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index fb3939f5..fff6be40 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,8 @@ Statement[] statements = moreStatementResult.getStatements();
 
 ### Getting Statements as Iterator (and processing them as a Stream)
 
+`getStatementIterator()` is convenient method a which combines the functionality of `getStatments()` and `getMoreStatements()`. In most cases it is preferable to use getStatementIterator() instead of `getStatments()` and `getMoreStatements()`.
+
 Example:
 
 ```java

From 02948391f35f10c34791086baedeb4959206fdab Mon Sep 17 00:00:00 2001
From: Thomas Turrell-Croft <thomasturrell@users.noreply.github.com>
Date: Mon, 24 Apr 2023 11:46:46 +0100
Subject: [PATCH 11/11] Update GetStatementIteratorApplication.java

---
 .../samples/getstatements/GetStatementIteratorApplication.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index a2650bf8..35395be4 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -41,7 +41,7 @@ public void run(String... args) throws Exception {
 
     // Get Statements with Verb filter as StatementIterator
     var filteredStatements =
-        client.getStatementIterator(r -> r.verb(Verb.ATTEMPTED.getId())).block();
+        client.getStatementIterator(r -> r.verb(Verb.ATTEMPTED)).block();
 
     // Print the returned statements to the console
     filteredStatements.toStream().forEach(s -> System.out.println(s));