kangaroo-and-rabbit/karso
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Activity

[DEV] correct json serialization

Browse Source
This commit is contained in:
Edouard DUPIN 2023-01-19 00:22:13 +01:00
parent b6c95ad42d
commit 856dbeeca3
6 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
back/src/org/kar/karso/model/Application.java
View File

@ -10,24 +10,18 @@ CREATE TABLE `application` (
*/ */
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;
import org.kar.archidata.annotation.SQLAutoIncrement;
import org.kar.archidata.annotation.SQLComment; import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLIfNotExists; import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.annotation.SQLLimitSize; import org.kar.archidata.annotation.SQLLimitSize;
import org.kar.archidata.annotation.SQLNotNull; import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLPrimaryKey;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import org.kar.archidata.model.GenericTable; import org.kar.archidata.model.GenericTable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@SQLTableName ("application") @SQLTableName ("application")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class Application extends GenericTable{ public class Application extends GenericTable{
@SQLLimitSize(512) @SQLLimitSize(512)
public String name; public String name;

12
back/src/org/kar/karso/model/ApplicationSmall.java
View File

@ -10,24 +10,16 @@ CREATE TABLE `application` (
*/ */
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;
import org.kar.archidata.annotation.SQLAutoIncrement;
import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLIfNotExists; import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.annotation.SQLLimitSize; import org.kar.archidata.annotation.SQLLimitSize;
import org.kar.archidata.annotation.SQLNotNull; import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLPrimaryKey;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import org.kar.archidata.model.GenericTable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@SQLTableName ("application") @SQLTableName ("application")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class ApplicationSmall{ public class ApplicationSmall{
@SQLLimitSize(512) @SQLLimitSize(512)
public String name; public String name;

5
back/src/org/kar/karso/model/Settings.java
View File

@ -12,14 +12,13 @@ CREATE TABLE `application` (
import org.kar.archidata.annotation.SQLComment; import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLDefault; import org.kar.archidata.annotation.SQLDefault;
import org.kar.archidata.annotation.SQLForeignKey;
import org.kar.archidata.annotation.SQLIfNotExists; import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.annotation.SQLLimitSize; import org.kar.archidata.annotation.SQLLimitSize;
import org.kar.archidata.annotation.SQLNotNull; import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import org.kar.archidata.model.GenericTable; import org.kar.archidata.model.GenericTable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
enum PropertyType { enum PropertyType {
@ -30,7 +29,7 @@ enum PropertyType {
@SQLTableName ("settings") @SQLTableName ("settings")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class Settings extends GenericTable { public class Settings extends GenericTable {
@SQLLimitSize(512) @SQLLimitSize(512)
@SQLNotNull @SQLNotNull

4
back/src/org/kar/karso/model/UserAuth.java
View File

@ -9,11 +9,11 @@ import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import org.kar.archidata.model.User; import org.kar.archidata.model.User;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@SQLTableName ("user") @SQLTableName ("user")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class UserAuth extends User { public class UserAuth extends User {
@SQLLimitSize(128) @SQLLimitSize(128)
@SQLNotNull @SQLNotNull

4
back/src/org/kar/karso/model/UserAuthGet.java
View File

@ -7,11 +7,11 @@ import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import org.kar.archidata.model.User; import org.kar.archidata.model.User;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@SQLTableName ("user") @SQLTableName ("user")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class UserAuthGet extends User { public class UserAuthGet extends User {
@SQLLimitSize(512) @SQLLimitSize(512)
@SQLNotNull @SQLNotNull

4
back/src/org/kar/karso/model/UserCreate.java
View File

@ -1,8 +1,8 @@
package org.kar.karso.model; package org.kar.karso.model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class UserCreate { public class UserCreate {
public String login; public String login;
public String email; public String email;