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

[DEV] folow the archidata API

Browse Source
This commit is contained in:
Edouard DUPIN 2023-10-25 23:54:40 +02:00
parent 5256278219
commit f92b582983
8 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
back/.classpath
View File

@ -27,6 +27,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>

1
back/.properties
View File

@ -1 +0,0 @@
io.scenarium.web.karso.address=sqdfsqdfqsdf

29
back/pom.xml
View File

@ -5,10 +5,6 @@
<artifactId>karso</artifactId>
<version>0.4.3</version>
<properties>
<!--
<jaxb.version>2.3.1</jaxb.version>
<istack.version>4.1.1</istack.version>
-->
<maven.compiler.version>3.1</maven.compiler.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
@ -26,19 +22,28 @@
<artifactId>archidata</artifactId>
<version>0.4.0</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.7</version>
<!--<scope>test</scope>-->
</dependency>
<!--
************************************************************
** TEST dependency **
************************************************************
-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.7.2</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
@ -49,6 +54,11 @@
<directory>src/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>${basedir}/test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -178,11 +188,6 @@
</plugin>
</plugins>
<testResources>
<testResource>
<directory>${basedir}/test/resources</directory>
</testResource>
</testResources>
</build>
<!-- Generate Java-docs As Part Of Project Reports -->
<reporting>

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

@ -13,7 +13,7 @@ CREATE TABLE `application` (
import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLDefault;
import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.model.GenericTable;
import org.kar.archidata.model.GenericTableSoftDelete;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -23,7 +23,7 @@ import jakarta.persistence.Table;
@Table(name = "application")
@SQLIfNotExists
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Application extends GenericTable {
public class Application extends GenericTableSoftDelete {
@Column(length = 256)
public String name;
@Column(length = 2048)

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

@ -2,7 +2,7 @@ package org.kar.karso.model;
import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.model.GenericTable;
import org.kar.archidata.model.GenericTableSoftDelete;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -14,7 +14,7 @@ import jakarta.persistence.Table;
@Table(name = "right")
@SQLIfNotExists
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Right extends GenericTable {
public class Right extends GenericTableSoftDelete {
@Column(nullable = false)
@SQLComment("application-ID that have the reference of the right")

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

@ -3,7 +3,7 @@ package org.kar.karso.model;
import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLDefault;
import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.model.GenericTable;
import org.kar.archidata.model.GenericTableSoftDelete;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -15,7 +15,7 @@ import jakarta.persistence.Table;
@Table(name = "rightDescription")
@SQLIfNotExists
@JsonInclude(JsonInclude.Include.NON_NULL)
public class RightDescription extends GenericTable {
public class RightDescription extends GenericTableSoftDelete {
@Column(nullable = false)
@SQLComment("Application id that have the reference of the right")
@ManyToOne(fetch = FetchType.LAZY, targetEntity = Application.class)

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

@ -13,7 +13,7 @@ CREATE TABLE `application` (
import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLDefault;
import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.model.GenericTable;
import org.kar.archidata.model.GenericTableSoftDelete;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -27,7 +27,7 @@ enum PropertyType {
@Table(name = "settings")
@SQLIfNotExists
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Settings extends GenericTable {
public class Settings extends GenericTableSoftDelete {
@Column(length = 512, nullable = false)
public String key;
@SQLComment("Right for the specific element(ADMIN [rw] USER [rw] other [rw])")

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

@ -11,7 +11,7 @@ CREATE TABLE `application` (
*/
import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.model.GenericTable;
import org.kar.archidata.model.GenericTableSoftDelete;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -21,7 +21,7 @@ import jakarta.persistence.Table;
@Table(name = "user_link_application")
@SQLIfNotExists
@JsonInclude(JsonInclude.Include.NON_NULL)
public class UserLinkApplication extends GenericTable {
public class UserLinkApplication extends GenericTableSoftDelete {
public long user_id;
public long application_id;
}