Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.1</version>
<version>4.1.2</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>dev.learning.xapi</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.net.URI;
import java.time.Instant;
import java.util.Map;
import lombok.Builder;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
import org.springframework.web.util.UriBuilder;
Expand All @@ -22,7 +21,7 @@
* Document GET</a>
* @author Thomas Turrell-Croft
*/
@Builder
@lombok.Builder
public class GetActivityProfilesRequest implements Request {

/** The Activity id associated with these Profile documents. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import java.net.URI;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
Expand All @@ -22,7 +21,7 @@
* @author István Rátkai (Selindek)
*/
@Getter
@Builder
@lombok.Builder
public class GetActivityRequest implements Request {

@NonNull private final URI activityId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.time.Instant;
import java.util.Map;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.SneakyThrows;
Expand All @@ -27,7 +26,7 @@
* @author Thomas Turrell-Croft
*/
@Getter
@Builder
@lombok.Builder
public class GetAgentProfilesRequest implements Request {

private static final ObjectMapper objectMapper =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import dev.learning.xapi.model.Agent;
import java.util.Map;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.NonNull;
import lombok.SneakyThrows;
import org.springframework.http.HttpMethod;
Expand All @@ -26,7 +25,7 @@
* Resource</a>
* @author Thomas Turrell-Croft
*/
@Builder
@lombok.Builder
public class GetAgentsRequest implements Request {

private static final ObjectMapper objectMapper =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import java.net.URI;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
Expand All @@ -21,7 +20,7 @@
* @author Thomas Turrell-Croft
* @author István Rátkai (Selindek)
*/
@Builder
@lombok.Builder
@Getter
public class GetMoreStatementsRequest implements Request {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Getter;
import lombok.SneakyThrows;
import org.springframework.http.HttpMethod;
Expand All @@ -30,7 +29,7 @@
* Statements</a>
* @author Thomas Turrell-Croft
*/
@Builder
@lombok.Builder
@Getter
public class GetStatementsRequest implements Request {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.security.PrivateKey;
import java.util.Map;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Getter;
import org.springframework.http.HttpMethod;
import org.springframework.web.util.UriBuilder;
Expand All @@ -21,7 +20,7 @@
* Statements</a>
* @author Thomas Turrell-Croft
*/
@Builder
@lombok.Builder
@Getter
public class PostStatementRequest implements Request {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
import org.springframework.http.HttpMethod;
import org.springframework.web.util.UriBuilder;
Expand All @@ -21,7 +20,7 @@
* Statements</a>
* @author Thomas Turrell-Croft
*/
@Builder
@lombok.Builder
@Getter
public class PostStatementsRequest implements Request {

Expand Down
3 changes: 1 addition & 2 deletions xapi-model/src/main/java/dev/learning/xapi/model/About.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.net.URI;
import java.util.LinkedHashMap;
import java.util.List;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -22,7 +21,7 @@
* About</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class About {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.net.URI;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -22,7 +21,7 @@
* Account</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class Account {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.net.URI;
import java.util.function.Consumer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Value;

Expand All @@ -26,7 +25,7 @@
* Activity</a>
*/
@Value
@Builder
@lombok.Builder
@AllArgsConstructor
@EqualsAndHashCode(exclude = "definition")
public class Activity implements StatementObject, SubStatementObject {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -35,7 +34,7 @@
* Requirements</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class ActivityDefinition {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import dev.learning.xapi.model.validation.constraints.Variant;
import jakarta.validation.Valid;
import java.util.UUID;
import lombok.Builder;
import lombok.Value;
import tools.jackson.databind.node.ObjectNode;

Expand All @@ -23,7 +22,7 @@
* Activity State</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class ActivityState {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Locale;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.SneakyThrows;
import lombok.Value;
Expand All @@ -28,7 +27,7 @@
* Attachment</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
@EqualsAndHashCode(of = "sha2")
public class Attachment {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.Locale;
import java.util.UUID;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;
import tools.jackson.databind.annotation.JsonSerialize;

Expand All @@ -29,7 +28,7 @@
* Context</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class Context {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -23,7 +22,7 @@
* Context Activities</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class ContextActivities {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import jakarta.validation.constraints.NotNull;
import java.util.Locale;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Value;

Expand All @@ -21,7 +20,7 @@
* Interaction Components</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
@EqualsAndHashCode(of = "id")
public class InteractionComponent {
Expand Down
3 changes: 1 addition & 2 deletions xapi-model/src/main/java/dev/learning/xapi/model/Person.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -26,7 +25,7 @@
* Person</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
@JsonIgnoreProperties(value = {"firstName", "lastName"})
public class Person {
Expand Down
3 changes: 1 addition & 2 deletions xapi-model/src/main/java/dev/learning/xapi/model/Result.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.net.URI;
import java.util.LinkedHashMap;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -24,7 +23,7 @@
* Result</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class Result {

Expand Down
3 changes: 1 addition & 2 deletions xapi-model/src/main/java/dev/learning/xapi/model/Score.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import dev.learning.xapi.model.validation.constraints.ScaledScore;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -18,7 +17,7 @@
* Score</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_EMPTY)
public class Score {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.util.Map;
import java.util.UUID;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Value;
import lombok.With;
Expand All @@ -49,7 +48,7 @@
@ValidStatementPlatform
@ValidStatementRevision
@ValidStatementVerb
@Builder(toBuilder = true)
@lombok.Builder(toBuilder = true)
@JsonInclude(Include.NON_EMPTY)
@EqualsAndHashCode(of = {"actor", "verb", "object", "result", "context"})
public class Statement implements CoreStatement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import dev.learning.xapi.model.validation.constraints.Variant;
import jakarta.validation.constraints.NotNull;
import java.util.UUID;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -19,7 +18,7 @@
* Statement Reference</a>
*/
@Value
@Builder
@lombok.Builder
public class StatementReference implements StatementObject, SubStatementObject {

private final String objectType = "StatementRef"; // NOSONAR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import lombok.Builder;
import lombok.Value;

/**
Expand All @@ -22,7 +21,7 @@
* Statement Result</a>
*/
@Value
@Builder
@lombok.Builder
@JsonInclude(Include.NON_NULL) // Statements array could be empty
public class StatementResult {

Expand Down
Loading
Loading