Compare commits
2 Commits
6291466df0
...
e824feb8a2
Author | SHA1 | Date | |
---|---|---|---|
e824feb8a2 | |||
26ea70f80c |
@ -6,11 +6,15 @@ import java.util.List;
|
|||||||
import org.bson.types.ObjectId;
|
import org.bson.types.ObjectId;
|
||||||
import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode;
|
import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
|
|
||||||
|
import jakarta.annotation.Nullable;
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
|
|
||||||
@ApiGenerationMode
|
@ApiGenerationMode
|
||||||
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class RestErrorResponse {
|
public class RestErrorResponse {
|
||||||
public ObjectId oid = new ObjectId();
|
public ObjectId oid = new ObjectId();
|
||||||
@NotNull
|
@NotNull
|
||||||
@ -28,6 +32,7 @@ public class RestErrorResponse {
|
|||||||
@Column(length = 0)
|
@Column(length = 0)
|
||||||
final public String statusMessage;
|
final public String statusMessage;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
final public List<RestInputError> inputError;
|
final public List<RestInputError> inputError;
|
||||||
|
|
||||||
public RestErrorResponse(final Response.Status status, final String time, final String error, final String message,
|
public RestErrorResponse(final Response.Status status, final String time, final String error, final String message,
|
||||||
|
@ -3,10 +3,13 @@ package org.kar.archidata.catcher;
|
|||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.validation.Path;
|
import jakarta.validation.Path;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class RestInputError {
|
public class RestInputError {
|
||||||
private static Pattern PATTERN = Pattern.compile("^([^.]+)\\.([^.]+)(\\.(.*))?");
|
private static Pattern PATTERN = Pattern.compile("^([^.]+)\\.([^.]+)(\\.(.*))?");
|
||||||
@Column(length = 0)
|
@Column(length = 0)
|
||||||
|
@ -20,6 +20,7 @@ import java.util.UUID;
|
|||||||
|
|
||||||
import org.kar.archidata.annotation.DataIfNotExists;
|
import org.kar.archidata.annotation.DataIfNotExists;
|
||||||
import org.kar.archidata.annotation.DataJson;
|
import org.kar.archidata.annotation.DataJson;
|
||||||
|
import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
@ -36,6 +37,7 @@ import jakarta.ws.rs.DefaultValue;
|
|||||||
@Table(name = "user")
|
@Table(name = "user")
|
||||||
@DataIfNotExists
|
@DataIfNotExists
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
|
@ApiGenerationMode(create = true, update = true)
|
||||||
public class User extends GenericDataSoftDelete {
|
public class User extends GenericDataSoftDelete {
|
||||||
@NotNull
|
@NotNull
|
||||||
@Column(length = 128)
|
@Column(length = 128)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user