Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 38f5764683 |
46
.classpath
46
.classpath
@ -1,10 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="test/src">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="test/resources">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
@ -15,31 +35,5 @@
|
||||
<attribute name="optional" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/testResources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/classes" path="src/main">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
||||
2
.github/workflows/maven.yml
vendored
2
.github/workflows/maven.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 21
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '21'
|
||||
|
||||
@ -28,4 +28,4 @@ def getEnvName(branchName) {
|
||||
return "dev";
|
||||
}
|
||||
return "other";
|
||||
}
|
||||
}
|
||||
20
pom.xml
20
pom.xml
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.atria-soft</groupId>
|
||||
<artifactId>archidata</artifactId>
|
||||
<version>0.29.0</version>
|
||||
<version>0.27.2</version>
|
||||
<description>Wrapper to manage a simple interface for REST project to bind MySQL, SQLite or mongoDB.</description>
|
||||
<url>https://github.com/kangaroo-and-rabbit/archidata</url>
|
||||
<licenses>
|
||||
@ -17,7 +17,7 @@
|
||||
<developer>
|
||||
<id>dev1</id>
|
||||
<name>Edouard DUPIN</name>
|
||||
<email>edouard.dupin@proton.me</email>
|
||||
<email>yui.heero@gmail.com</email>
|
||||
<roles>
|
||||
<role>Lead Developer</role>
|
||||
</roles>
|
||||
@ -149,7 +149,7 @@
|
||||
<dependency>
|
||||
<groupId>com.nimbusds</groupId>
|
||||
<artifactId>nimbus-jose-jwt</artifactId>
|
||||
<version>10.2</version>
|
||||
<version>10.0.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.persistence</groupId>
|
||||
@ -173,7 +173,7 @@
|
||||
<dependency>
|
||||
<groupId>dev.morphia.morphia</groupId>
|
||||
<artifactId>morphia-core</artifactId>
|
||||
<version>2.4.16</version>
|
||||
<version>2.4.15</version>
|
||||
</dependency>
|
||||
<!-- MongoDB Java Driver -->
|
||||
<dependency>
|
||||
@ -209,7 +209,7 @@
|
||||
<dependency>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<version>2.26.0</version>
|
||||
<version>2.25.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -218,16 +218,16 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory>src/main</sourceDirectory>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/src/resources</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
<testSourceDirectory>src/test</testSourceDirectory>
|
||||
<testSourceDirectory>test/src</testSourceDirectory>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${basedir}/src/testResources</directory>
|
||||
<directory>${basedir}/test/resources</directory>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
@ -317,7 +317,7 @@
|
||||
<plugin>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<version>2.26.0</version>
|
||||
<version>2.24.1</version>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<lineEnding>LF</lineEnding>
|
||||
@ -361,7 +361,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>3.2.7</version>
|
||||
<version>1.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
|
||||
@ -1,311 +0,0 @@
|
||||
<?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>
|
||||
<groupId>kangaroo-and-rabbit</groupId>
|
||||
<artifactId>archidata</artifactId>
|
||||
<version>0.6.1</version>
|
||||
<properties>
|
||||
<maven.compiler.version>3.1</maven.compiler.version>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<maven.dependency.version>3.1.1</maven.dependency.version>
|
||||
<jersey.version>3.1.5</jersey.version>
|
||||
<jaxb.version>2.3.1</jaxb.version>
|
||||
<istack.version>4.1.1</istack.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>gitea</id>
|
||||
<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>gitea</id>
|
||||
<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>gitea</id>
|
||||
<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey</groupId>
|
||||
<artifactId>jersey-bom</artifactId>
|
||||
<version>${jersey.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>2.0.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>2.0.9</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.media</groupId>
|
||||
<artifactId>jersey-media-multipart</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.core</groupId>
|
||||
<artifactId>jersey-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.inject</groupId>
|
||||
<artifactId>jersey-hk2</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.containers</groupId>
|
||||
<artifactId>jersey-container-grizzly2-http</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
<version>${jaxb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jaxb</groupId>
|
||||
<artifactId>jaxb-runtime</artifactId>
|
||||
<version>4.0.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.ws.rs</groupId>
|
||||
<artifactId>jakarta.ws.rs-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.xml.bind</groupId>
|
||||
<artifactId>jaxb-impl</artifactId>
|
||||
<version>${jaxb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.istack</groupId>
|
||||
<artifactId>istack-commons-runtime</artifactId>
|
||||
<version>${istack.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
|
||||
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.media</groupId>
|
||||
<artifactId>jersey-media-json-jackson</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>2.16.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-csv</artifactId>
|
||||
<version>2.16.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>6.1.0-M1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- Interface for My-sql & sqlite DB -->
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<version>8.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
<artifactId>sqlite-jdbc</artifactId>
|
||||
<version>3.40.0.0</version>
|
||||
</dependency>
|
||||
<!-- Interface for JWT token -->
|
||||
<dependency>
|
||||
<groupId>com.nimbusds</groupId>
|
||||
<artifactId>nimbus-jose-jwt</artifactId>
|
||||
<version>9.37.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.persistence</groupId>
|
||||
<artifactId>jakarta.persistence-api</artifactId>
|
||||
<version>3.2.0-M1</version>
|
||||
</dependency>
|
||||
<!-- Swagger dependencies -->
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-jaxrs2-jakarta</artifactId>
|
||||
<version>2.1.10</version>
|
||||
</dependency>
|
||||
<!--
|
||||
************************************************************
|
||||
** TEST dependency **
|
||||
************************************************************
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.10.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.10.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<version>2.23.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<version>3.3.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<testSourceDirectory>test/src</testSourceDirectory>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${basedir}/test/resources</directory>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>${maven.compiler.version}</version>
|
||||
<configuration>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<target>${maven.compiler.target}</target>
|
||||
<!--<encoding>${project.build.sourceEncoding}</encoding>-->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Create the source bundle -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- For dependabot plugin -->
|
||||
<plugin>
|
||||
<groupId>org.apache.servicemix.tooling</groupId>
|
||||
<artifactId>depends-maven-plugin</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-depends-file</id>
|
||||
<goals>
|
||||
<goal>generate-depends-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- junit results -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>fully.qualified.MainClass</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Java-doc generation for stand-alone site -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<show>private</show>
|
||||
<nohelp>true</nohelp>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Check the style of the code -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<configuration>
|
||||
<configLocation>CheckStyle.xml</configLocation>
|
||||
<consoleOutput>true</consoleOutput>
|
||||
<failOnViolation>true</failOnViolation>
|
||||
<failsOnError>true</failsOnError>
|
||||
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<version>2.23.0</version>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<lineEnding>LF</lineEnding>
|
||||
<configFile>Formatter.xml</configFile>
|
||||
<directories>
|
||||
<directory>src/</directory>
|
||||
<directory>test/src</directory>
|
||||
</directories>
|
||||
<includes>
|
||||
<include>**/*.java</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>module-info.java</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>validate</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<!-- Generate Java-docs As Part Of Project Reports -->
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<show>public</show>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
</project>
|
||||
@ -7,18 +7,18 @@ import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
|
||||
import org.glassfish.jersey.jackson.JacksonFeature;
|
||||
import org.glassfish.jersey.media.multipart.MultiPartFeature;
|
||||
import org.glassfish.jersey.server.ResourceConfig;
|
||||
import org.atriasoft.archidata.GlobalConfiguration;
|
||||
import org.atriasoft.archidata.UpdateJwtPublicKey;
|
||||
import org.atriasoft.archidata.api.DataResource;
|
||||
import org.atriasoft.archidata.catcher.ExceptionCatcher;
|
||||
import org.atriasoft.archidata.catcher.FailExceptionCatcher;
|
||||
import org.atriasoft.archidata.catcher.InputExceptionCatcher;
|
||||
import org.atriasoft.archidata.catcher.SystemExceptionCatcher;
|
||||
import org.atriasoft.archidata.db.DBConfig;
|
||||
import org.atriasoft.archidata.filter.CORSFilter;
|
||||
import org.atriasoft.archidata.filter.OptionFilter;
|
||||
import org.atriasoft.archidata.migration.MigrationEngine;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.kar.archidata.GlobalConfiguration;
|
||||
import org.kar.archidata.UpdateJwtPublicKey;
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.catcher.ExceptionCatcher;
|
||||
import org.kar.archidata.catcher.FailExceptionCatcher;
|
||||
import org.kar.archidata.catcher.InputExceptionCatcher;
|
||||
import org.kar.archidata.catcher.SystemExceptionCatcher;
|
||||
import org.kar.archidata.db.DBConfig;
|
||||
import org.kar.archidata.filter.CORSFilter;
|
||||
import org.kar.archidata.filter.OptionFilter;
|
||||
import org.kar.archidata.migration.MigrationEngine;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import sample.archidata.basic.api.Front;
|
||||
import sample.archidata.basic.api.HealthCheck;
|
||||
import sample.archidata.basic.api.MediaResource;
|
||||
|
||||
@ -3,9 +3,9 @@ package sample.archidata.basic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.api.DataResource;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactoryTsApi;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.dataAccess.DataFactoryTsApi;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
@ -8,15 +8,15 @@ import java.util.UUID;
|
||||
|
||||
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
|
||||
import org.glassfish.jersey.media.multipart.FormDataParam;
|
||||
import org.atriasoft.archidata.annotation.AsyncType;
|
||||
import org.atriasoft.archidata.annotation.TypeScriptProgress;
|
||||
import org.atriasoft.archidata.api.DataResource;
|
||||
import org.atriasoft.archidata.dataAccess.DataAccess;
|
||||
import org.atriasoft.archidata.dataAccess.addOn.AddOnDataJson;
|
||||
import org.atriasoft.archidata.exception.FailException;
|
||||
import org.atriasoft.archidata.exception.InputException;
|
||||
import org.atriasoft.archidata.model.Data;
|
||||
import org.atriasoft.archidata.tools.DataTools;
|
||||
import org.kar.archidata.annotation.AsyncType;
|
||||
import org.kar.archidata.annotation.TypeScriptProgress;
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
import org.kar.archidata.dataAccess.addOn.AddOnDataJson;
|
||||
import org.kar.archidata.exception.FailException;
|
||||
import org.kar.archidata.exception.InputException;
|
||||
import org.kar.archidata.model.Data;
|
||||
import org.kar.archidata.tools.DataTools;
|
||||
import sample.archidata.basic.model.MyModel;
|
||||
import sample.archidata.basic.model.Season;
|
||||
import sample.archidata.basic.model.Series;
|
||||
|
||||
@ -2,7 +2,7 @@ package sample.archidata.basic.migration;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.migration.MigrationSqlStep;
|
||||
import org.kar.archidata.migration.MigrationSqlStep;
|
||||
import sample.archidata.basic.model.MyModel;
|
||||
|
||||
public class Initialization extends MigrationSqlStep {
|
||||
|
||||
@ -3,9 +3,9 @@ package sample.archidata.basic.model;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.DataJson;
|
||||
import org.atriasoft.archidata.model.Data;
|
||||
import org.atriasoft.archidata.model.GenericDataSoftDelete;
|
||||
import org.kar.archidata.annotation.DataJson;
|
||||
import org.kar.archidata.model.Data;
|
||||
import org.kar.archidata.model.GenericDataSoftDelete;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
|
||||
import static java.lang.annotation.ElementType.FIELD;
|
||||
import static java.lang.annotation.ElementType.METHOD;
|
||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* In NoSql entity the relation is stored in the 2 part of the entity,
|
||||
* then it is needed to define the field that store the relation data value in the remote elements.
|
||||
*/
|
||||
@Retention(RUNTIME)
|
||||
@Target({ FIELD, METHOD })
|
||||
public @interface ManyToManyLocal {
|
||||
/**
|
||||
* The entity class that is the target of the
|
||||
* association.
|
||||
*/
|
||||
Class<?> targetEntity();
|
||||
|
||||
/**
|
||||
* The field that owns the revert value. empty if the relationship is unidirectional.
|
||||
*/
|
||||
String remoteField() default "";
|
||||
}
|
||||
@ -1,464 +0,0 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Types;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.annotation.ManyToManyLocal;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryInList;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.model.TableCoversGeneric;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionRenameColumn;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.atriasoft.archidata.exception.SystemException;
|
||||
import org.atriasoft.archidata.tools.ContextGenericTools;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
public class AddOnManyToManyLocal implements DataAccessAddOn {
|
||||
static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToManyLocal.class);
|
||||
static final String SEPARATOR_LONG = "-";
|
||||
static final String SEPARATOR_UUID = "_";
|
||||
|
||||
@Override
|
||||
public Class<?> getAnnotationClass() {
|
||||
return ManyToManyLocal.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCompatibleField(final Field field) {
|
||||
if (field.getType() != List.class) {
|
||||
return false;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class || objectClass == UUID.class || objectClass == ObjectId.class) {
|
||||
return true;
|
||||
}
|
||||
final ManyToManyLocal decorators = field.getDeclaredAnnotation(ManyToManyLocal.class);
|
||||
if (decorators == null) {
|
||||
return false;
|
||||
}
|
||||
if (decorators.targetEntity() == objectClass) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(
|
||||
final DBAccessSQL ioDb,
|
||||
final PreparedStatement ps,
|
||||
final Field field,
|
||||
final Object rootObject,
|
||||
final CountInOut iii)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException, JsonProcessingException {
|
||||
final Object data = field.get(rootObject);
|
||||
if (data == null) {
|
||||
ps.setNull(iii.value, Types.VARCHAR);
|
||||
}
|
||||
final ObjectMapper objectMapper = ContextGenericTools.createObjectMapper();
|
||||
final String dataString = objectMapper.writeValueAsString(data);
|
||||
ps.setString(iii.value, dataString);
|
||||
iii.inc();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUpdateAsync(final Field field) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void asyncUpdate(
|
||||
final DBAccessSQL ioDb,
|
||||
final Object previousData,
|
||||
final String tableName,
|
||||
final Object primaryKeyValue,
|
||||
final Field field,
|
||||
final Object insertedData,
|
||||
final List<LazyGetter> actions,
|
||||
final QueryOptions options) throws Exception {
|
||||
final Object previousDataValue = field.get(previousData);
|
||||
Collection<?> previousDataCollection = new ArrayList<>();
|
||||
if (previousDataValue instanceof final Collection<?> tmpCollection) {
|
||||
previousDataCollection = tmpCollection;
|
||||
}
|
||||
final Object insertedDataValue = insertedData;
|
||||
Collection<?> insertedDataCollection = new ArrayList<>();
|
||||
if (insertedDataValue instanceof final Collection<?> tmpCollection) {
|
||||
insertedDataCollection = tmpCollection;
|
||||
}
|
||||
// add new Values
|
||||
for (final Object value : insertedDataCollection) {
|
||||
if (previousDataCollection.contains(value)) {
|
||||
continue;
|
||||
}
|
||||
actions.add(() -> {
|
||||
addLinkRemote(ioDb, field, primaryKeyValue, value);
|
||||
});
|
||||
}
|
||||
// remove old values:
|
||||
for (final Object value : previousDataCollection) {
|
||||
if (insertedDataCollection.contains(value)) {
|
||||
continue;
|
||||
}
|
||||
actions.add(() -> {
|
||||
removeLinkRemote(ioDb, field, primaryKeyValue, value);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/** Some action must be done asynchronously for update or remove element
|
||||
* @param field
|
||||
* @return */
|
||||
@Override
|
||||
public boolean isInsertAsync(final Field field) throws Exception {
|
||||
return true;
|
||||
}
|
||||
|
||||
/** When insert is mark async, this function permit to create or update the data
|
||||
* @param tableName Name of the Table.
|
||||
* @param localId Local ID of the current table
|
||||
* @param field Field that is updated.
|
||||
* @param data Data that might be inserted.
|
||||
* @param actions Asynchronous action to do after main request. */
|
||||
@Override
|
||||
public void asyncInsert(
|
||||
final DBAccessSQL ioDb,
|
||||
final String tableName,
|
||||
final Object primaryKeyValue,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final List<LazyGetter> actions,
|
||||
final QueryOptions options) throws Exception {
|
||||
final Object insertedData = data;
|
||||
if (insertedData == null) {
|
||||
return;
|
||||
}
|
||||
if (insertedData instanceof final Collection<?> insertedDataCollection) {
|
||||
for (final Object value : insertedDataCollection) {
|
||||
actions.add(() -> {
|
||||
addLinkRemote(ioDb, field, primaryKeyValue, value);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviousDataNeeded(final Field field) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInsert(final Field field) {
|
||||
return isCompatibleField(field);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canRetrieve(final Field field) {
|
||||
return isCompatibleField(field);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
count.inc();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuery(
|
||||
final DBAccessSQL ioDb,
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
if (field.getType() != List.class) {
|
||||
throw new SystemException("@ManyToManyLocal must contain a List");
|
||||
}
|
||||
final String jsonData = rs.getString(count.value);
|
||||
count.inc();
|
||||
if (rs.wasNull()) {
|
||||
return;
|
||||
}
|
||||
final ObjectMapper objectMapper = ContextGenericTools.createObjectMapper();
|
||||
final ParameterizedType listType = (ParameterizedType) field.getGenericType();
|
||||
final Class<?> objectClass = (Class<?>) listType.getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class) {
|
||||
final List<Long> dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});
|
||||
field.set(data, dataParsed);
|
||||
return;
|
||||
}
|
||||
if (objectClass == String.class) {
|
||||
final List<String> dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<String>>() {});
|
||||
field.set(data, dataParsed);
|
||||
return;
|
||||
}
|
||||
if (objectClass == UUID.class)
|
||||
|
||||
{
|
||||
final List<UUID> dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});
|
||||
field.set(data, dataParsed);
|
||||
return;
|
||||
}
|
||||
if (objectClass == ObjectId.class) {
|
||||
final List<ObjectId> dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<ObjectId>>() {});
|
||||
field.set(data, dataParsed);
|
||||
return;
|
||||
}
|
||||
final ManyToManyLocal decorators = field.getDeclaredAnnotation(ManyToManyLocal.class);
|
||||
if (decorators == null) {
|
||||
return;
|
||||
}
|
||||
if (objectClass == decorators.targetEntity()) {
|
||||
final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
|
||||
if (foreignKeyType == Long.class) {
|
||||
final List<Long> idList = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});
|
||||
if (idList != null && idList.size() > 0) {
|
||||
final FieldName idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass),
|
||||
options);
|
||||
// In the lazy mode, the request is done in asynchronous mode, they will be done after...
|
||||
final LazyGetter lambda = () -> {
|
||||
// TODO: update to have get with abstract types ....
|
||||
final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
|
||||
new Condition(new QueryInList<>(idField.inTable(), idList)));
|
||||
if (foreignData == null) {
|
||||
return;
|
||||
}
|
||||
field.set(data, foreignData);
|
||||
};
|
||||
lazyCall.add(lambda);
|
||||
}
|
||||
} else if (foreignKeyType == UUID.class) {
|
||||
final List<UUID> idList = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});
|
||||
if (idList != null && idList.size() > 0) {
|
||||
final FieldName idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass),
|
||||
options);
|
||||
// In the lazy mode, the request is done in asynchronous mode, they will be done after...
|
||||
final LazyGetter lambda = () -> {
|
||||
final List<UUID> childs = new ArrayList<>(idList);
|
||||
// TODO: update to have get with abstract types ....
|
||||
final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
|
||||
new Condition(new QueryInList<>(idField.inTable(), childs)));
|
||||
if (foreignData == null) {
|
||||
return;
|
||||
}
|
||||
field.set(data, foreignData);
|
||||
};
|
||||
lazyCall.add(lambda);
|
||||
}
|
||||
} else if (foreignKeyType == ObjectId.class) {
|
||||
final List<ObjectId> idList = objectMapper.readValue(jsonData, new TypeReference<List<ObjectId>>() {});
|
||||
if (idList != null && idList.size() > 0) {
|
||||
final FieldName idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass),
|
||||
options);
|
||||
// In the lazy mode, the request is done in asynchronous mode, they will be done after...
|
||||
final LazyGetter lambda = () -> {
|
||||
final List<ObjectId> childs = new ArrayList<>(idList);
|
||||
// TODO: update to have get with abstract types ....
|
||||
final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
|
||||
new Condition(new QueryInList<>(idField.inTable(), childs)));
|
||||
if (foreignData == null) {
|
||||
return;
|
||||
}
|
||||
field.set(data, foreignData);
|
||||
};
|
||||
lazyCall.add(lambda);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId,
|
||||
final QueryOptions options) throws Exception {
|
||||
// store data as json to response like a no-sql
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class, options);
|
||||
}
|
||||
|
||||
private static void addLinkLocal(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
final String clazzPrimaryKeyName,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToAdd) throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
|
||||
new OptionSpecifyType("idOfTheObject", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("filedNameOfTheObject", valueToAdd.getClass(), true));
|
||||
options.add(new OptionRenameColumn("idOfTheObject", clazzPrimaryKeyName));
|
||||
options.add(new OptionRenameColumn("filedNameOfTheObject", fieldNameToUpdate));
|
||||
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
|
||||
if (data.filedNameOfTheObject == null) {
|
||||
data.filedNameOfTheObject = new ArrayList<>();
|
||||
}
|
||||
for (final Object elem : data.filedNameOfTheObject) {
|
||||
if (elem.equals(valueToAdd)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
data.filedNameOfTheObject.add(valueToAdd);
|
||||
ioDb.update(data, data.idOfTheObject, List.of("filedNameOfTheObject"), options.getAllArray());
|
||||
}
|
||||
|
||||
public static void addLink(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToAdd) throws Exception {
|
||||
final Field localField = AnnotationTools.getFieldNamed(clazz, fieldNameToUpdate);
|
||||
{
|
||||
//get local field to find the remote field name:
|
||||
final Field primaryKeyField = AnnotationTools.getPrimaryKeyField(clazz);
|
||||
final FieldName primaryKeyColomnName = AnnotationTools.getFieldName(primaryKeyField, null);
|
||||
final FieldName localFieldName = AnnotationTools.getFieldName(localField, null);
|
||||
addLinkLocal(ioDb, clazz, primaryKeyColomnName.inTable(), clazzPrimaryKeyValue, localFieldName.inTable(),
|
||||
valueToAdd);
|
||||
}
|
||||
addLinkRemote(ioDb, localField, clazzPrimaryKeyValue, valueToAdd);
|
||||
}
|
||||
|
||||
private static void addLinkRemote(
|
||||
final DBAccess ioDb,
|
||||
final Field localField,
|
||||
final Object localPrimaryKeyValue,
|
||||
final Object remotePrimaryKeyValue) throws Exception {
|
||||
final ManyToManyLocal manyLocal = AnnotationTools.get(localField, ManyToManyLocal.class);
|
||||
// Update the remote elements:
|
||||
if (manyLocal == null || manyLocal.targetEntity() == null || manyLocal.remoteField() == null
|
||||
|| manyLocal.remoteField().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
{
|
||||
//get local field to find the remote field name:
|
||||
final Field primaryKeyField = AnnotationTools.getPrimaryKeyField(manyLocal.targetEntity());
|
||||
final FieldName primaryKeyColomnName = AnnotationTools.getFieldName(primaryKeyField, null);
|
||||
final Field remoteField = AnnotationTools.getFieldNamed(manyLocal.targetEntity(), manyLocal.remoteField());
|
||||
final FieldName localFieldName = AnnotationTools.getFieldName(remoteField, null);
|
||||
addLinkLocal(ioDb, manyLocal.targetEntity(), primaryKeyColomnName.inTable(), remotePrimaryKeyValue,
|
||||
localFieldName.inTable(), localPrimaryKeyValue);
|
||||
}
|
||||
}
|
||||
|
||||
private static void removeLinkLocal(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
final String clazzPrimaryKeyName,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToRemove) throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
|
||||
new OptionSpecifyType("idOfTheObject", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("filedNameOfTheObject", valueToRemove.getClass(), true));
|
||||
options.add(new OptionRenameColumn("idOfTheObject", clazzPrimaryKeyName));
|
||||
options.add(new OptionRenameColumn("filedNameOfTheObject", fieldNameToUpdate));
|
||||
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
|
||||
if (data.filedNameOfTheObject == null) {
|
||||
return;
|
||||
}
|
||||
final List<Object> newList = new ArrayList<>();
|
||||
for (final Object elem : data.filedNameOfTheObject) {
|
||||
if (elem.equals(valueToRemove)) {
|
||||
continue;
|
||||
}
|
||||
newList.add(elem);
|
||||
}
|
||||
data.filedNameOfTheObject = newList;
|
||||
if (data.filedNameOfTheObject.isEmpty()) {
|
||||
data.filedNameOfTheObject = null;
|
||||
}
|
||||
ioDb.update(data, data.idOfTheObject, List.of("filedNameOfTheObject"), options.getAllArray());
|
||||
}
|
||||
|
||||
public static void removeLink(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToRemove) throws Exception {
|
||||
|
||||
final Field localField = AnnotationTools.getFieldNamed(clazz, fieldNameToUpdate);
|
||||
{
|
||||
//get local field to find the remote field name:
|
||||
final Field primaryKeyField = AnnotationTools.getPrimaryKeyField(clazz);
|
||||
final FieldName primaryKeyColomnName = AnnotationTools.getFieldName(primaryKeyField, null);
|
||||
final FieldName localFieldName = AnnotationTools.getFieldName(localField, null);
|
||||
removeLinkLocal(ioDb, clazz, primaryKeyColomnName.inTable(), clazzPrimaryKeyValue, localFieldName.inTable(),
|
||||
valueToRemove);
|
||||
}
|
||||
removeLinkRemote(ioDb, localField, clazzPrimaryKeyValue, valueToRemove);
|
||||
}
|
||||
|
||||
private static void removeLinkRemote(
|
||||
final DBAccess ioDb,
|
||||
final Field localField,
|
||||
final Object localPrimaryKeyValue,
|
||||
final Object remotePrimaryKeyValue) throws Exception {
|
||||
final ManyToManyLocal manyLocal = AnnotationTools.get(localField, ManyToManyLocal.class);
|
||||
// Update the remote elements:
|
||||
if (manyLocal == null || manyLocal.targetEntity() == null || manyLocal.remoteField() == null
|
||||
|| manyLocal.remoteField().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
{
|
||||
//get local field to find the remote field name:
|
||||
final Field primaryKeyField = AnnotationTools.getPrimaryKeyField(manyLocal.targetEntity());
|
||||
final FieldName primaryKeyColomnName = AnnotationTools.getFieldName(primaryKeyField, null);
|
||||
final Field remoteField = AnnotationTools.getFieldNamed(manyLocal.targetEntity(), manyLocal.remoteField());
|
||||
final FieldName localFieldName = AnnotationTools.getFieldName(remoteField, null);
|
||||
removeLinkLocal(ioDb, manyLocal.targetEntity(), primaryKeyColomnName.inTable(), remotePrimaryKeyValue,
|
||||
localFieldName.inTable(), localPrimaryKeyValue);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.annotation.DataJson;
|
||||
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
public class TableCoversGeneric {
|
||||
public TableCoversGeneric() {
|
||||
// nothing to do...
|
||||
}
|
||||
|
||||
public TableCoversGeneric(final Object idOfTheObject, final List<Object> filedNameOfTheObject) {
|
||||
this.idOfTheObject = idOfTheObject;
|
||||
this.filedNameOfTheObject = filedNameOfTheObject;
|
||||
}
|
||||
|
||||
@Id
|
||||
public Object idOfTheObject;
|
||||
|
||||
@DataJson()
|
||||
public List<Object> filedNameOfTheObject;
|
||||
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
package org.atriasoft.archidata.dataAccess.options;
|
||||
|
||||
public class QueryOption {}
|
||||
@ -1,7 +0,0 @@
|
||||
package org.atriasoft.archidata.migration;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
|
||||
public interface AsyncCall {
|
||||
void doRequest(DBAccess da) throws Exception;
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
package org.atriasoft.archidata;
|
||||
package org.kar.archidata;
|
||||
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.atriasoft.archidata.tools.JWTWrapper;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.kar.archidata.tools.JWTWrapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.lang.reflect.Field;
|
||||
@ -6,14 +6,14 @@ import java.lang.reflect.Parameter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.annotation.checker.Checker;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionItemNotNull;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionItemUnique;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionNotEmpty;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionRenameColumn;
|
||||
import org.atriasoft.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.annotation.checker.Checker;
|
||||
import org.kar.archidata.annotation.checker.CollectionItemNotNull;
|
||||
import org.kar.archidata.annotation.checker.CollectionItemUnique;
|
||||
import org.kar.archidata.annotation.checker.CollectionNotEmpty;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.options.OptionRenameColumn;
|
||||
import org.kar.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation;
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.addOn;
|
||||
package org.kar.archidata.annotation.addOn;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import static java.lang.annotation.ElementType.FIELD;
|
||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.apiGenerator;
|
||||
package org.kar.archidata.annotation.apiGenerator;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,6 +1,6 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.DataAccess;
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.options.CheckFunctionInterface;
|
||||
import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
|
||||
|
||||
/**
|
||||
* The Checker annotation is used to specify a checker class that automatically
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.checker;
|
||||
package org.kar.archidata.annotation.checker;
|
||||
|
||||
import jakarta.validation.ConstraintValidator;
|
||||
import jakarta.validation.ConstraintValidatorContext;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.method;
|
||||
package org.kar.archidata.annotation.method;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.method;
|
||||
package org.kar.archidata.annotation.method;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.annotation.security;
|
||||
package org.kar.archidata.annotation.security;
|
||||
|
||||
import static java.lang.annotation.ElementType.METHOD;
|
||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.api;
|
||||
package org.kar.archidata.api;
|
||||
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.image.BufferedImage;
|
||||
@ -21,18 +21,18 @@ import java.util.UUID;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import org.atriasoft.archidata.annotation.apiGenerator.ApiInputOptional;
|
||||
import org.atriasoft.archidata.annotation.security.PermitTokenInURI;
|
||||
import org.atriasoft.archidata.dataAccess.DataAccess;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.exception.FailException;
|
||||
import org.atriasoft.archidata.filter.GenericContext;
|
||||
import org.atriasoft.archidata.model.Data;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
|
||||
import org.glassfish.jersey.media.multipart.FormDataParam;
|
||||
import org.kar.archidata.annotation.apiGenerator.ApiInputOptional;
|
||||
import org.kar.archidata.annotation.security.PermitTokenInURI;
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.exception.FailException;
|
||||
import org.kar.archidata.filter.GenericContext;
|
||||
import org.kar.archidata.model.Data;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -157,8 +157,13 @@ public class DataResource {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String getMimeType(final String extension) throws IOException {
|
||||
return switch (extension.toLowerCase()) {
|
||||
public Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
|
||||
throws IOException {
|
||||
// determine mime type:
|
||||
Data injectedData = new Data();
|
||||
String mimeType = "";
|
||||
final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
|
||||
mimeType = switch (extension.toLowerCase()) {
|
||||
case "jpg", "jpeg" -> "image/jpeg";
|
||||
case "png" -> "image/png";
|
||||
case "webp" -> "image/webp";
|
||||
@ -167,15 +172,6 @@ public class DataResource {
|
||||
case "webm" -> "video/webm";
|
||||
default -> throw new IOException("Can not find the mime type of data input: '" + extension + "'");
|
||||
};
|
||||
}
|
||||
|
||||
public Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
|
||||
throws IOException {
|
||||
// determine mime type:
|
||||
Data injectedData = new Data();
|
||||
String mimeType = "";
|
||||
final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
|
||||
mimeType = getMimeType(extension);
|
||||
injectedData.mimeType = mimeType;
|
||||
injectedData.sha512 = sha512;
|
||||
final String tmpPath = getTmpFileInData(tmpUID);
|
||||
@ -373,9 +369,10 @@ public class DataResource {
|
||||
}
|
||||
LOGGER.info("input size image: {}x{} type={}", inputImage.getWidth(), inputImage.getHeight(),
|
||||
inputImage.getType());
|
||||
final int scaledWidth = ConfigBaseVariable.getThumbnailWidth();
|
||||
final int scaledWidth = 250;
|
||||
final int scaledHeight = (int) ((float) inputImage.getHeight() / (float) inputImage.getWidth()
|
||||
* scaledWidth);
|
||||
|
||||
// creates output image
|
||||
final BufferedImage outputImage = new BufferedImage(scaledWidth, scaledHeight, inputImage.getType());
|
||||
|
||||
@ -384,10 +381,16 @@ public class DataResource {
|
||||
LOGGER.info("output size image: {}x{}", scaledWidth, scaledHeight);
|
||||
g2d.drawImage(inputImage, 0, 0, scaledWidth, scaledHeight, null);
|
||||
g2d.dispose();
|
||||
for (final String data : ImageIO.getWriterFormatNames()) {
|
||||
LOGGER.info("availlable format: {}", data);
|
||||
}
|
||||
// create the output stream:
|
||||
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try {
|
||||
ImageIO.write(outputImage, ConfigBaseVariable.getThumbnailFormat(), baos);
|
||||
// TODO: check how to remove buffer file !!! here, it is not needed at all...
|
||||
//ImageIO.write(outputImage, "JPEG", baos);
|
||||
//ImageIO.write(outputImage, "png", baos);
|
||||
ImageIO.write(outputImage, "WebP", baos);
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
return Response.status(500).entity("Internal Error: resize fail: " + e.getMessage()).type("text/plain")
|
||||
@ -395,20 +398,12 @@ public class DataResource {
|
||||
}
|
||||
final byte[] imageData = baos.toByteArray();
|
||||
LOGGER.info("output length {}", imageData.length);
|
||||
if (imageData.length == 0) {
|
||||
LOGGER.error("Fail to convert image... Availlable format:");
|
||||
for (final String data : ImageIO.getWriterFormatNames()) {
|
||||
LOGGER.error(" - {}", data);
|
||||
}
|
||||
}
|
||||
// Response.ok(new ByteArrayInputStream(imageData)).build();
|
||||
final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH,
|
||||
imageData.length);
|
||||
try {
|
||||
out.type(getMimeType(ConfigBaseVariable.getThumbnailFormat()));
|
||||
} catch (final IOException ex) {
|
||||
throw new FailException(Response.Status.INTERNAL_SERVER_ERROR,
|
||||
"Fail to convert mime type of " + ConfigBaseVariable.getThumbnailFormat(), ex);
|
||||
}
|
||||
//out.type("image/jpeg");
|
||||
out.type("image/webp");
|
||||
//out.type("image/png");
|
||||
// TODO: move this in a decorator !!!
|
||||
final CacheControl cc = new CacheControl();
|
||||
cc.setMaxAge(3600);
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.api;
|
||||
package org.kar.archidata.api;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.api;
|
||||
package org.kar.archidata.api;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.api;
|
||||
package org.kar.archidata.api;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.api;
|
||||
package org.kar.archidata.api;
|
||||
|
||||
import io.swagger.v3.jaxrs2.integration.resources.BaseOpenApiResource;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.backup;
|
||||
package org.kar.archidata.backup;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -1,6 +1,6 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.atriasoft.archidata.exception.FailException;
|
||||
import org.kar.archidata.exception.FailException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.glassfish.jersey.server.ResourceConfig;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.atriasoft.archidata.exception.InputException;
|
||||
import org.kar.archidata.exception.InputException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
@ -1,10 +1,10 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
@ -1,6 +1,6 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.atriasoft.archidata.exception.SystemException;
|
||||
import org.kar.archidata.exception.SystemException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
package org.kar.archidata.catcher;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.checker;
|
||||
package org.kar.archidata.checker;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.sql.Timestamp;
|
||||
@ -14,21 +14,21 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.checker.CheckForeignKey;
|
||||
import org.atriasoft.archidata.annotation.checker.Checker;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionItemNotNull;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionItemUnique;
|
||||
import org.atriasoft.archidata.annotation.checker.CollectionNotEmpty;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.options.CheckFunctionInterface;
|
||||
import org.atriasoft.archidata.dataAccess.options.CheckFunctionVoid;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.ConditionChecker;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.exception.InputException;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.checker.CheckForeignKey;
|
||||
import org.kar.archidata.annotation.checker.Checker;
|
||||
import org.kar.archidata.annotation.checker.CollectionItemNotNull;
|
||||
import org.kar.archidata.annotation.checker.CollectionItemUnique;
|
||||
import org.kar.archidata.annotation.checker.CollectionNotEmpty;
|
||||
import org.kar.archidata.dataAccess.DBAccess;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
|
||||
import org.kar.archidata.dataAccess.options.CheckFunctionVoid;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.ConditionChecker;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.exception.InputException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
package org.atriasoft.archidata.converter.Jakarta;
|
||||
package org.kar.archidata.converter.Jakarta;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.Date;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import jakarta.annotation.Priority;
|
||||
import jakarta.ws.rs.ext.ParamConverter;
|
||||
@ -1,11 +1,11 @@
|
||||
package org.atriasoft.archidata.converter.Jakarta;
|
||||
package org.kar.archidata.converter.Jakarta;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.lang.reflect.Type;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import jakarta.ws.rs.ext.ParamConverter;
|
||||
import jakarta.ws.rs.ext.ParamConverterProvider;
|
||||
@ -1,9 +1,9 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||
@ -16,4 +16,4 @@ public class DateDeserializer extends JsonDeserializer<Date> {
|
||||
final Date ret = DateTools.parseDate(value);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
@ -15,4 +15,4 @@ public class DateSerializer extends JsonSerializer<Date> {
|
||||
throws IOException {
|
||||
gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Date;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@ -13,4 +13,4 @@ public class ObjectIdDeserializer extends JsonDeserializer<ObjectId> {
|
||||
public ObjectId deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
|
||||
return new ObjectId(p.getValueAsString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@ -14,4 +14,4 @@ public class ObjectIdSerializer extends JsonSerializer<ObjectId> {
|
||||
throws IOException {
|
||||
gen.writeString(value.toHexString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||
@ -16,4 +16,4 @@ public class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime>
|
||||
final OffsetDateTime ret = DateTools.parseOffsetDateTime(value);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
@ -15,4 +15,4 @@ public class OffsetDateTimeSerializer extends JsonSerializer<OffsetDateTime> {
|
||||
throws IOException {
|
||||
gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.converter.morphia;
|
||||
package org.kar.archidata.converter.morphia;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
/** Java does not permit to set return data (eg: integer) in the function parameter. This class permit to update a value as in/out function parameters. */
|
||||
public class CountInOut {
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
@ -6,21 +6,21 @@ import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.FilterValue;
|
||||
import org.atriasoft.archidata.dataAccess.options.Limit;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.dataAccess.options.TransmitKey;
|
||||
import org.atriasoft.archidata.db.DbConfig;
|
||||
import org.atriasoft.archidata.db.DbIo;
|
||||
import org.atriasoft.archidata.db.DbIoFactory;
|
||||
import org.atriasoft.archidata.db.DbIoMorphia;
|
||||
import org.atriasoft.archidata.db.DbIoSql;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ContextGenericTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.FilterValue;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.dataAccess.options.TransmitKey;
|
||||
import org.kar.archidata.db.DbConfig;
|
||||
import org.kar.archidata.db.DbIo;
|
||||
import org.kar.archidata.db.DbIoFactory;
|
||||
import org.kar.archidata.db.DbIoMorphia;
|
||||
import org.kar.archidata.db.DbIoSql;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ContextGenericTools;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Constructor;
|
||||
@ -14,26 +14,26 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.annotation.CreationTimestamp;
|
||||
import org.atriasoft.archidata.annotation.UpdateTimestamp;
|
||||
import org.atriasoft.archidata.dataAccess.addOnMongo.AddOnManyToOne;
|
||||
import org.atriasoft.archidata.dataAccess.addOnMongo.AddOnOneToMany;
|
||||
import org.atriasoft.archidata.dataAccess.addOnMongo.DataAccessAddOn;
|
||||
import org.atriasoft.archidata.dataAccess.options.CheckFunction;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.FilterValue;
|
||||
import org.atriasoft.archidata.dataAccess.options.Limit;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OrderBy;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.db.DbIoMorphia;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.UuidUtils;
|
||||
import org.bson.Document;
|
||||
import org.bson.conversions.Bson;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.annotation.CreationTimestamp;
|
||||
import org.kar.archidata.annotation.UpdateTimestamp;
|
||||
import org.kar.archidata.dataAccess.addOnMongo.AddOnManyToOne;
|
||||
import org.kar.archidata.dataAccess.addOnMongo.AddOnOneToMany;
|
||||
import org.kar.archidata.dataAccess.addOnMongo.DataAccessAddOn;
|
||||
import org.kar.archidata.dataAccess.options.CheckFunction;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.FilterValue;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.OrderBy;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.db.DbIoMorphia;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.UuidUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Constructor;
|
||||
@ -23,34 +23,31 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.annotation.CreationTimestamp;
|
||||
import org.atriasoft.archidata.annotation.UpdateTimestamp;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnDataJson;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToMany;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToManyLocal;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToOne;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnOneToMany;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.DataAccessAddOn;
|
||||
import org.atriasoft.archidata.dataAccess.options.AccessDeletedItems;
|
||||
import org.atriasoft.archidata.dataAccess.options.CheckFunction;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.DBInterfaceRoot;
|
||||
import org.atriasoft.archidata.dataAccess.options.FilterValue;
|
||||
import org.atriasoft.archidata.dataAccess.options.GroupBy;
|
||||
import org.atriasoft.archidata.dataAccess.options.Limit;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OrderBy;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.dataAccess.options.ReadAllColumn;
|
||||
import org.atriasoft.archidata.dataAccess.options.TransmitKey;
|
||||
import org.atriasoft.archidata.db.DbIoSql;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.atriasoft.archidata.tools.UuidUtils;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.annotation.CreationTimestamp;
|
||||
import org.kar.archidata.annotation.UpdateTimestamp;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.AddOnDataJson;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToOne;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.AddOnOneToMany;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn;
|
||||
import org.kar.archidata.dataAccess.options.CheckFunction;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.DBInterfaceRoot;
|
||||
import org.kar.archidata.dataAccess.options.FilterValue;
|
||||
import org.kar.archidata.dataAccess.options.GroupBy;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.OrderBy;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.dataAccess.options.TransmitKey;
|
||||
import org.kar.archidata.db.DbIoSql;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
import org.kar.archidata.tools.UuidUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -67,12 +64,8 @@ import jakarta.ws.rs.InternalServerErrorException;
|
||||
public class DBAccessSQL extends DBAccess {
|
||||
final static Logger LOGGER = LoggerFactory.getLogger(DBAccessSQL.class);
|
||||
// by default we manage some add-on that permit to manage non-native model (like json serialization, List of external key as String list...)
|
||||
final static List<DataAccessAddOn> addOn = List.of(//
|
||||
new AddOnManyToMany(), //
|
||||
new AddOnManyToOne(), //
|
||||
new AddOnOneToMany(), //
|
||||
new AddOnDataJson(), //
|
||||
new AddOnManyToManyLocal());
|
||||
final static List<DataAccessAddOn> addOn = List.of(new AddOnManyToMany(), new AddOnManyToOne(),
|
||||
new AddOnOneToMany(), new AddOnDataJson());
|
||||
|
||||
private final DbIoSql db;
|
||||
|
||||
@ -948,13 +941,11 @@ public class DBAccessSQL extends DBAccess {
|
||||
continue;
|
||||
}
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (addOn != null) {
|
||||
if (addOn != null && !addOn.canInsert(field)) {
|
||||
if (addOn.isInsertAsync(field)) {
|
||||
asyncFieldUpdate.add(field);
|
||||
}
|
||||
if (!addOn.canInsert(field)) {
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
final boolean createTime = field.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
|
||||
if (createTime) {
|
||||
@ -1166,31 +1157,6 @@ public class DBAccessSQL extends DBAccess {
|
||||
query.append("UPDATE `");
|
||||
query.append(tableName);
|
||||
query.append("` SET ");
|
||||
//Some mode need to get the previous data to perform a correct update...
|
||||
boolean needPreviousValues = false;
|
||||
for (final Field field : clazz.getFields()) {
|
||||
// field is only for internal global declaration ==> remove it ..
|
||||
if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
|
||||
continue;
|
||||
}
|
||||
final FieldName name = AnnotationTools.getFieldName(field, options);
|
||||
if (!filter.getValues().contains(name.inStruct())) {
|
||||
continue;
|
||||
} else if (AnnotationTools.isGenericField(field)) {
|
||||
continue;
|
||||
}
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (addOn != null && addOn.isPreviousDataNeeded(field)) {
|
||||
needPreviousValues = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
Object previousData = null;
|
||||
if (needPreviousValues) {
|
||||
final List<TransmitKey> transmitKey = options.get(TransmitKey.class);
|
||||
previousData = this.get(data.getClass(), transmitKey.get(0).getKey(), new AccessDeletedItems(),
|
||||
new ReadAllColumn());
|
||||
}
|
||||
|
||||
boolean firstField = true;
|
||||
for (final Field field : clazz.getFields()) {
|
||||
@ -1205,19 +1171,17 @@ public class DBAccessSQL extends DBAccess {
|
||||
continue;
|
||||
}
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (addOn != null) {
|
||||
if (addOn.isUpdateAsync(field)) {
|
||||
if (addOn != null && !addOn.canInsert(field)) {
|
||||
if (addOn.isInsertAsync(field)) {
|
||||
final List<TransmitKey> transmitKey = options.get(TransmitKey.class);
|
||||
if (transmitKey.size() != 1) {
|
||||
throw new DataAccessException(
|
||||
"Fail to transmit Key to update the async update... (must have only 1)");
|
||||
}
|
||||
addOn.asyncUpdate(this, previousData, tableName, transmitKey.get(0).getKey(), field,
|
||||
field.get(data), asyncActions, options);
|
||||
}
|
||||
if (!addOn.canInsert(field)) {
|
||||
continue;
|
||||
addOn.asyncUpdate(this, tableName, transmitKey.get(0).getKey(), field, field.get(data),
|
||||
asyncActions, options);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (!field.getClass().isPrimitive()) {
|
||||
final Object tmp = field.get(data);
|
||||
@ -1242,6 +1206,7 @@ public class DBAccessSQL extends DBAccess {
|
||||
query.append(" ");
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
condition.whereAppendQuery(query, tableName, null, deletedFieldName);
|
||||
|
||||
// If the first field is not set, then nothing to update n the main base:
|
||||
if (!firstField) {
|
||||
LOGGER.debug("generate update query: '{}'", query.toString());
|
||||
@ -1277,9 +1242,6 @@ public class DBAccessSQL extends DBAccess {
|
||||
addOn.insertData(this, ps, field, data, iii);
|
||||
}
|
||||
}
|
||||
for (final LazyGetter action : asyncActions) {
|
||||
action.doRequest();
|
||||
}
|
||||
condition.injectQuery(this, ps, iii);
|
||||
final int out = ps.executeUpdate();
|
||||
return out;
|
||||
@ -1288,6 +1250,9 @@ public class DBAccessSQL extends DBAccess {
|
||||
} catch (final SQLException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
for (final LazyGetter action : asyncActions) {
|
||||
action.doRequest();
|
||||
}
|
||||
return 0L;
|
||||
}
|
||||
|
||||
@ -1458,7 +1423,7 @@ public class DBAccessSQL extends DBAccess {
|
||||
final T out = (T) data;
|
||||
outs.add(out);
|
||||
}
|
||||
LOGGER.trace("Async calls: {}", lazyCall.size());
|
||||
LOGGER.info("Async calls: {}", lazyCall.size());
|
||||
for (final LazyGetter elem : lazyCall) {
|
||||
elem.doRequest();
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.sql.PreparedStatement;
|
||||
@ -16,16 +16,16 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.exportTools.TableQuery;
|
||||
import org.atriasoft.archidata.dataAccess.exportTools.TableQueryTypes;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.GroupBy;
|
||||
import org.atriasoft.archidata.dataAccess.options.Limit;
|
||||
import org.atriasoft.archidata.dataAccess.options.OrderBy;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ContextGenericTools;
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
import org.kar.archidata.dataAccess.exportTools.TableQuery;
|
||||
import org.kar.archidata.dataAccess.exportTools.TableQueryTypes;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.GroupBy;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OrderBy;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ContextGenericTools;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.sql.Timestamp;
|
||||
@ -10,16 +10,16 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.CreationTimestamp;
|
||||
import org.atriasoft.archidata.annotation.DataIfNotExists;
|
||||
import org.atriasoft.archidata.annotation.UpdateTimestamp;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.DataAccessAddOn;
|
||||
import org.atriasoft.archidata.dataAccess.options.CreateDropTable;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.CreationTimestamp;
|
||||
import org.kar.archidata.annotation.DataIfNotExists;
|
||||
import org.kar.archidata.annotation.UpdateTimestamp;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn;
|
||||
import org.kar.archidata.dataAccess.options.CreateDropTable;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
// Mark as deprecated while the concept is not ready ...
|
||||
@Deprecated
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
public interface LazyGetter {
|
||||
void doRequest() throws Exception;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.ArrayList;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.options.AccessDeletedItems;
|
||||
import org.atriasoft.archidata.dataAccess.options.CreateDropTable;
|
||||
import org.atriasoft.archidata.dataAccess.options.QueryOption;
|
||||
import org.atriasoft.archidata.dataAccess.options.ReadAllColumn;
|
||||
import org.kar.archidata.dataAccess.options.AccessDeletedItems;
|
||||
import org.kar.archidata.dataAccess.options.CreateDropTable;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.dataAccess.options.ReadAllColumn;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.ArrayList;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnMongo;
|
||||
package org.kar.archidata.dataAccess.addOnMongo;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
@ -6,23 +6,23 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryAnd;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.model.LinkTableGeneric;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.bson.Document;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccess;
|
||||
import org.kar.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryAnd;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableGeneric;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnMongo;
|
||||
package org.kar.archidata.dataAccess.addOnMongo;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.bson.Document;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnMongo;
|
||||
package org.kar.archidata.dataAccess.addOnMongo;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
@ -6,15 +6,15 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.bson.Document;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnMongo;
|
||||
package org.kar.archidata.dataAccess.addOnMongo;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.bson.Document;
|
||||
import org.kar.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
|
||||
public interface DataAccessAddOn {
|
||||
/** Get the Class of the declaration annotation
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
package org.kar.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
@ -10,22 +10,22 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.annotation.DataJson;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.model.TableCoversGeneric;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionRenameColumn;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ContextGenericTools;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.annotation.DataJson;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccess;
|
||||
import org.kar.archidata.dataAccess.DBAccessSQL;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversGeneric;
|
||||
import org.kar.archidata.dataAccess.options.OptionRenameColumn;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ContextGenericTools;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -219,63 +219,62 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
public static void addLink(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
String clazzPrimaryKeyName,
|
||||
final String clazzPrimaryKeyName,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToAdd) throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
|
||||
new OptionSpecifyType("idOfTheObject", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("filedNameOfTheObject", valueToAdd.getClass(), true));
|
||||
if (clazzPrimaryKeyName == null) {
|
||||
clazzPrimaryKeyName = "id";
|
||||
new OptionSpecifyType("id", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("covers", valueToAdd.getClass(), true));
|
||||
if (clazzPrimaryKeyName != null && !clazzPrimaryKeyName.equals("id")) {
|
||||
options.add(new OptionRenameColumn("id", clazzPrimaryKeyName));
|
||||
}
|
||||
if (fieldNameToUpdate != null && !fieldNameToUpdate.equals("covers")) {
|
||||
options.add(new OptionRenameColumn("covers", fieldNameToUpdate));
|
||||
}
|
||||
options.add(new OptionRenameColumn("idOfTheObject", clazzPrimaryKeyName));
|
||||
options.add(new OptionRenameColumn("filedNameOfTheObject", fieldNameToUpdate));
|
||||
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
|
||||
if (data.filedNameOfTheObject == null) {
|
||||
data.filedNameOfTheObject = new ArrayList<>();
|
||||
if (data.covers == null) {
|
||||
data.covers = new ArrayList<>();
|
||||
}
|
||||
for (final Object elem : data.filedNameOfTheObject) {
|
||||
for (final Object elem : data.covers) {
|
||||
if (elem.equals(valueToAdd)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
data.filedNameOfTheObject.add(valueToAdd);
|
||||
ioDb.update(data, data.idOfTheObject, List.of("filedNameOfTheObject"), options.getAllArray());
|
||||
data.covers.add(valueToAdd);
|
||||
ioDb.update(data, data.id, List.of("covers"), options.getAllArray());
|
||||
}
|
||||
|
||||
public static void removeLink(
|
||||
final DBAccess ioDb,
|
||||
final Class<?> clazz,
|
||||
String clazzPrimaryKeyName,
|
||||
final String clazzPrimaryKeyName,
|
||||
final Object clazzPrimaryKeyValue,
|
||||
final String fieldNameToUpdate,
|
||||
final Object valueToRemove) throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final QueryOptions options = new QueryOptions(new OverrideTableName(tableName),
|
||||
new OptionSpecifyType("idOfTheObject", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("filedNameOfTheObject", valueToRemove.getClass(), true));
|
||||
if (clazzPrimaryKeyName == null) {
|
||||
clazzPrimaryKeyName = "id";
|
||||
new OptionSpecifyType("id", clazzPrimaryKeyValue.getClass()),
|
||||
new OptionSpecifyType("covers", valueToRemove.getClass(), true));
|
||||
if (clazzPrimaryKeyName != null && !clazzPrimaryKeyName.equals("id")) {
|
||||
options.add(new OptionRenameColumn("id", clazzPrimaryKeyName));
|
||||
}
|
||||
if (fieldNameToUpdate != null && !fieldNameToUpdate.equals("covers")) {
|
||||
options.add(new OptionRenameColumn("covers", fieldNameToUpdate));
|
||||
}
|
||||
options.add(new OptionRenameColumn("idOfTheObject", clazzPrimaryKeyName));
|
||||
options.add(new OptionRenameColumn("filedNameOfTheObject", fieldNameToUpdate));
|
||||
final TableCoversGeneric data = ioDb.get(TableCoversGeneric.class, clazzPrimaryKeyValue, options.getAllArray());
|
||||
if (data.filedNameOfTheObject == null) {
|
||||
if (data.covers == null) {
|
||||
return;
|
||||
}
|
||||
final List<Object> newList = new ArrayList<>();
|
||||
for (final Object elem : data.filedNameOfTheObject) {
|
||||
for (final Object elem : data.covers) {
|
||||
if (elem.equals(valueToRemove)) {
|
||||
continue;
|
||||
}
|
||||
newList.add(elem);
|
||||
}
|
||||
data.filedNameOfTheObject = newList;
|
||||
if (data.filedNameOfTheObject.isEmpty()) {
|
||||
data.filedNameOfTheObject = null;
|
||||
}
|
||||
ioDb.update(data, data.idOfTheObject, List.of("filedNameOfTheObject"), options.getAllArray());
|
||||
data.covers = newList;
|
||||
ioDb.update(data, data.id, List.of("covers"), options.getAllArray());
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,7 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
package org.kar.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
@ -11,26 +9,25 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccess;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryAnd;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.QueryInList;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.model.LinkTableGeneric;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.atriasoft.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.exception.SystemException;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccess;
|
||||
import org.kar.archidata.dataAccess.DBAccessMorphia;
|
||||
import org.kar.archidata.dataAccess.DBAccessSQL;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryAnd;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryInList;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableGeneric;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.OptionSpecifyType;
|
||||
import org.kar.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -89,102 +86,20 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static String hashTo64Chars(final String input) {
|
||||
try {
|
||||
final MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||
final byte[] hash = digest.digest(input.getBytes());
|
||||
final StringBuilder hexString = new StringBuilder();
|
||||
for (final byte b : hash) {
|
||||
final String hex = Integer.toHexString(0xff & b);
|
||||
if (hex.length() == 1) {
|
||||
hexString.append('0');
|
||||
}
|
||||
hexString.append(hex);
|
||||
}
|
||||
return hexString.toString().substring(0, 64);
|
||||
} catch (final NoSuchAlgorithmException e) {
|
||||
throw new RuntimeException("Erreur lors du hachage de la chaîne", e);
|
||||
}
|
||||
}
|
||||
|
||||
public static String hashIfNeeded(final String input) {
|
||||
if (input.length() > 64) {
|
||||
// Keep only the 50 first chars
|
||||
final String truncated = input.substring(0, Math.min(input.length(), 50));
|
||||
final String fullHash = hashTo64Chars(input);
|
||||
final String hashPart = fullHash.substring(0, 14);
|
||||
return truncated + hashPart;
|
||||
}
|
||||
return input;
|
||||
}
|
||||
|
||||
public record LinkTableWithMode(
|
||||
String tableName,
|
||||
boolean first,
|
||||
boolean equals) {}
|
||||
|
||||
public static LinkTableWithMode generateLinkTableNameField(
|
||||
public static String generateLinkTableNameField(
|
||||
final String tableName,
|
||||
final Field field,
|
||||
final QueryOptions options) throws Exception {
|
||||
return generateLinkTableName(tableName, field);
|
||||
final FieldName name = AnnotationTools.getFieldName(field, options);
|
||||
return generateLinkTableName(tableName, name.inTable());
|
||||
}
|
||||
|
||||
public static LinkTableWithMode generateLinkTableName(
|
||||
final String tableAName,
|
||||
final String tableAFieldName,
|
||||
final String tableBName,
|
||||
final String tableBFieldName) {
|
||||
final String concatElementA = tableAName + "_" + tableAFieldName;
|
||||
final String concatElementB = tableBName + "_" + tableBFieldName;
|
||||
final int compareResult = concatElementA.compareTo(concatElementB);
|
||||
if (compareResult == 0) {
|
||||
return new LinkTableWithMode(hashIfNeeded(concatElementA + "_autolink"), true, true);
|
||||
public static String generateLinkTableName(final String tableName, final String name) {
|
||||
String localName = name;
|
||||
if (name.endsWith("s")) {
|
||||
localName = name.substring(0, name.length() - 1);
|
||||
}
|
||||
if (compareResult < 0) {
|
||||
return new LinkTableWithMode(hashIfNeeded(concatElementA + "_link_" + concatElementB), true, false);
|
||||
}
|
||||
return new LinkTableWithMode(hashIfNeeded(concatElementB + "_link_" + concatElementA), false, false);
|
||||
}
|
||||
|
||||
public static LinkTableWithMode generateLinkTableName(
|
||||
final String tableAName,
|
||||
final String tableAFieldName,
|
||||
final ManyToMany manyToMany) throws SystemException {
|
||||
if (manyToMany == null) {
|
||||
throw new SystemException("@ManyMany is a null pointer " + tableAName);
|
||||
}
|
||||
if (manyToMany.targetEntity() == null) {
|
||||
throw new SystemException("@ManyMany target entity is a null pointer: " + tableAName);
|
||||
}
|
||||
if (manyToMany.mappedBy() == null || manyToMany.mappedBy().isEmpty()) {
|
||||
throw new SystemException("@ManyMany mapped by is not defined: " + tableAName);
|
||||
}
|
||||
final String tableNameRemote = AnnotationTools.getTableName(manyToMany.targetEntity());
|
||||
return generateLinkTableName(tableAName, tableAFieldName, tableNameRemote, manyToMany.mappedBy());
|
||||
}
|
||||
|
||||
public static LinkTableWithMode generateLinkTableName(final String tableAName, final Field field)
|
||||
throws SystemException {
|
||||
if (field == null) {
|
||||
// TODO: throw !!!!
|
||||
}
|
||||
final FieldName columnName = AnnotationTools.getFieldName(field, null);
|
||||
final ManyToMany manyToMany = AnnotationTools.get(field, ManyToMany.class);
|
||||
return generateLinkTableName(tableAName, columnName.inTable(), manyToMany);
|
||||
}
|
||||
|
||||
public static LinkTableWithMode generateLinkTableName(final Class<?> clazz, final String fieldName)
|
||||
throws SystemException {
|
||||
if (clazz == null) {
|
||||
throw new SystemException("@ManyMany class reference is a null pointer ");
|
||||
}
|
||||
if (fieldName == null || fieldName.isEmpty() || fieldName.isBlank()) {
|
||||
throw new SystemException("@ManyMany field of class reference is not defined");
|
||||
}
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final Field requestedField = AnnotationTools.getFieldNamed(clazz, fieldName);
|
||||
return generateLinkTableName(tableName, requestedField);
|
||||
return tableName + "_link_" + localName;
|
||||
}
|
||||
|
||||
public void generateConcatQuery(
|
||||
@ -197,13 +112,18 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
final ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(tableName, name, manyToMany);
|
||||
String linkTableName = generateLinkTableName(tableName, name);
|
||||
if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
|
||||
// TODO: get the remote table name .....
|
||||
final String remoteTableName = AnnotationTools.getTableName(manyToMany.targetEntity());
|
||||
linkTableName = generateLinkTableName(remoteTableName, manyToMany.mappedBy());
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
final String tmpVariable = "tmp_" + Integer.toString(count.value);
|
||||
querySelect.append(" (SELECT GROUP_CONCAT(");
|
||||
querySelect.append(tmpVariable);
|
||||
if (linkTable.first()) {
|
||||
if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
|
||||
querySelect.append(".object2Id ");
|
||||
} else {
|
||||
querySelect.append(".object1Id ");
|
||||
@ -227,7 +147,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
}
|
||||
querySelect.append("') FROM ");
|
||||
querySelect.append(linkTable.tableName());
|
||||
querySelect.append(linkTableName);
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(" WHERE ");
|
||||
@ -240,7 +160,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
querySelect.append(" = ");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(".");
|
||||
if (linkTable.first()) {
|
||||
if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
|
||||
querySelect.append("object1Id ");
|
||||
} else {
|
||||
querySelect.append("object2Id ");
|
||||
@ -248,7 +168,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
|
||||
querySelect.append(" GROUP BY ");
|
||||
querySelect.append(tmpVariable);
|
||||
if (linkTable.first()) {
|
||||
if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
|
||||
querySelect.append(".object1Id");
|
||||
} else {
|
||||
querySelect.append(".object2Id");
|
||||
@ -304,7 +224,8 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
if (field.getType() != List.class) {
|
||||
throw new SystemException("@ManyToMany must contain a List");
|
||||
LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
@ -313,14 +234,12 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
return;
|
||||
}
|
||||
if (objectClass == UUID.class) {
|
||||
} else if (objectClass == UUID.class) {
|
||||
final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
return;
|
||||
}
|
||||
if (objectClass == ObjectId.class) {
|
||||
} else if (objectClass == ObjectId.class) {
|
||||
final List<ObjectId> idList = ioDb.getListOfRawOIDs(rs, count.value);
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
@ -409,7 +328,6 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
@Override
|
||||
public void asyncUpdate(
|
||||
final DBAccessSQL ioDb,
|
||||
final Object previousData,
|
||||
final String tableName,
|
||||
final Object localKey,
|
||||
final Field field,
|
||||
@ -427,14 +345,14 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
"Can not ManyToMany with other than List<Long> or List<UUID> or List<ObjectId> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(tableName, field);
|
||||
final String obj1 = linkTable.first ? "object1Id" : "object2Id";
|
||||
final String obj2 = linkTable.first ? "object2Id" : "object1Id";
|
||||
final FieldName columnName = AnnotationTools.getFieldName(field, options);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
|
||||
|
||||
actions.add(() -> {
|
||||
ioDb.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTable.tableName()),
|
||||
new Condition(new QueryCondition(obj1, "=", localKey)),
|
||||
new OptionSpecifyType(obj1, localKey.getClass()), new OptionSpecifyType(obj2, objectClass));
|
||||
ioDb.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryCondition("object1Id", "=", localKey)),
|
||||
new OptionSpecifyType("object1Id", localKey.getClass()),
|
||||
new OptionSpecifyType("object2Id", objectClass));
|
||||
});
|
||||
asyncInsert(ioDb, tableName, localKey, field, data, actions, options);
|
||||
}
|
||||
@ -467,47 +385,45 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
"Can not ManyToMany with other than List<Long> or List<UUID> or List<ObjectId> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(tableName, field);
|
||||
final FieldName columnName = AnnotationTools.getFieldName(field, options);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<Object> dataCasted = (List<Object>) data;
|
||||
if (dataCasted.size() == 0) {
|
||||
return;
|
||||
}
|
||||
final String obj1 = linkTable.first ? "object1Id" : "object2Id";
|
||||
final String obj2 = linkTable.first ? "object2Id" : "object1Id";
|
||||
final List<LinkTableGeneric> insertElements = new ArrayList<>();
|
||||
for (final Object remoteKey : dataCasted) {
|
||||
if (remoteKey == null) {
|
||||
throw new DataAccessException("Try to insert remote key with null value");
|
||||
}
|
||||
if (linkTable.first) {
|
||||
insertElements.add(new LinkTableGeneric(localKey, remoteKey));
|
||||
} else {
|
||||
insertElements.add(new LinkTableGeneric(remoteKey, localKey));
|
||||
}
|
||||
insertElements.add(new LinkTableGeneric(localKey, remoteKey));
|
||||
}
|
||||
if (insertElements.size() == 0) {
|
||||
LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
|
||||
return;
|
||||
}
|
||||
actions.add(() -> {
|
||||
ioDb.insertMultiple(insertElements, new OverrideTableName(linkTable.tableName()),
|
||||
new OptionSpecifyType(obj1, localKey.getClass()), new OptionSpecifyType(obj2, objectClass));
|
||||
ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName),
|
||||
new OptionSpecifyType("object1Id", localKey.getClass()),
|
||||
new OptionSpecifyType("object2Id", objectClass));
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drop(final DBAccessSQL ioDb, final String tableName, final Field field, final QueryOptions options)
|
||||
throws Exception {
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(tableName, field);
|
||||
ioDb.drop(LinkTableGeneric.class, new OverrideTableName(linkTable.tableName()));
|
||||
final FieldName columnName = AnnotationTools.getFieldName(field, options);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
|
||||
ioDb.drop(LinkTableGeneric.class, new OverrideTableName(linkTableName));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanAll(final DBAccessSQL ioDb, final String tableName, final Field field, final QueryOptions options)
|
||||
throws Exception {
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(tableName, field);
|
||||
ioDb.cleanAll(LinkTableGeneric.class, new OverrideTableName(linkTable.tableName()));
|
||||
final FieldName columnName = AnnotationTools.getFieldName(field, options);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
|
||||
ioDb.cleanAll(LinkTableGeneric.class, new OverrideTableName(linkTableName));
|
||||
}
|
||||
|
||||
public static void addLink(
|
||||
@ -517,19 +433,18 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
final String column,
|
||||
final Object remoteKey) throws Exception {
|
||||
if (ioDb instanceof final DBAccessSQL daSQL) {
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(clazz, column);
|
||||
final LinkTableGeneric insertElement = linkTable.first ? new LinkTableGeneric(localKey, remoteKey)
|
||||
: new LinkTableGeneric(remoteKey, localKey);
|
||||
final String obj1 = linkTable.first ? "object1Id" : "object2Id";
|
||||
final String obj2 = linkTable.first ? "object2Id" : "object1Id";
|
||||
daSQL.insert(insertElement, new OverrideTableName(linkTable.tableName()),
|
||||
new OptionSpecifyType(obj1, localKey.getClass()),
|
||||
new OptionSpecifyType(obj2, remoteKey.getClass()));
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final String linkTableName = generateLinkTableName(tableName, column);
|
||||
final LinkTableGeneric insertElement = new LinkTableGeneric(localKey, remoteKey);
|
||||
daSQL.insert(insertElement, new OverrideTableName(linkTableName),
|
||||
new OptionSpecifyType("object1Id", localKey.getClass()),
|
||||
new OptionSpecifyType("object2Id", remoteKey.getClass()));
|
||||
} else if (ioDb instanceof final DBAccessMorphia dam) {
|
||||
|
||||
} else {
|
||||
throw new DataAccessException("DataAccess Not managed");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static long removeLink(
|
||||
@ -539,14 +454,13 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
final String column,
|
||||
final Object remoteKey) throws Exception {
|
||||
if (ioDb instanceof final DBAccessSQL daSQL) {
|
||||
final LinkTableWithMode linkTable = generateLinkTableName(clazz, column);
|
||||
final String obj1 = linkTable.first ? "object1Id" : "object2Id";
|
||||
final String obj2 = linkTable.first ? "object2Id" : "object1Id";
|
||||
return daSQL.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTable.tableName()),
|
||||
new Condition(new QueryAnd(new QueryCondition(obj1, "=", localKey),
|
||||
new QueryCondition(obj2, "=", remoteKey))),
|
||||
new OptionSpecifyType(obj1, localKey.getClass()),
|
||||
new OptionSpecifyType(obj2, remoteKey.getClass()));
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final String linkTableName = generateLinkTableName(tableName, column);
|
||||
return daSQL.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey),
|
||||
new QueryCondition("object2Id", "=", remoteKey))),
|
||||
new OptionSpecifyType("object1Id", localKey.getClass()),
|
||||
new OptionSpecifyType("object2Id", remoteKey.getClass()));
|
||||
} else if (ioDb instanceof final DBAccessMorphia dam) {
|
||||
return 0L;
|
||||
} else {
|
||||
@ -554,8 +468,6 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
}
|
||||
|
||||
private static List<String> tableAlreadyCreated = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
@ -569,21 +481,18 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
final int fieldId,
|
||||
final QueryOptions options) throws Exception {
|
||||
final ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
|
||||
if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
|
||||
throw new SystemException("MappedBy must be set in ManyMany: " + tableName + " " + field.getName());
|
||||
}
|
||||
final LinkTableWithMode linkTable = generateLinkTableNameField(tableName, field, options);
|
||||
if (linkTable.first() || linkTable.equals()) {
|
||||
final QueryOptions options2 = new QueryOptions(new OverrideTableName(linkTable.tableName()));
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
final Class<?> primaryType = primaryField.getType();
|
||||
final String obj1 = linkTable.first ? "object1Id" : "object2Id";
|
||||
final String obj2 = linkTable.first ? "object2Id" : "object1Id";
|
||||
options2.add(new OptionSpecifyType(obj1, primaryType));
|
||||
options2.add(new OptionSpecifyType(obj2, objectClass));
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableGeneric.class, options2);
|
||||
postActionList.addAll(sqlCommand);
|
||||
if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
|
||||
// not the reference model to create base:
|
||||
return;
|
||||
}
|
||||
final String linkTableName = generateLinkTableNameField(tableName, field, options);
|
||||
final QueryOptions options2 = new QueryOptions(new OverrideTableName(linkTableName));
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
final Class<?> primaryType = primaryField.getType();
|
||||
options2.add(new OptionSpecifyType("object1Id", primaryType));
|
||||
options2.add(new OptionSpecifyType("object2Id", objectClass));
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableGeneric.class, options2);
|
||||
postActionList.addAll(sqlCommand);
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
package org.kar.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.sql.PreparedStatement;
|
||||
@ -7,16 +7,16 @@ import java.sql.Types;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.UuidUtils;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccessSQL;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.UuidUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
package org.kar.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
@ -10,18 +10,18 @@ import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools;
|
||||
import org.atriasoft.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.DataFactory;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryCondition;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.atriasoft.archidata.dataAccess.options.Condition;
|
||||
import org.atriasoft.archidata.exception.DataAccessException;
|
||||
import org.atriasoft.archidata.tools.ConfigBaseVariable;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.annotation.AnnotationTools.FieldName;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccessSQL;
|
||||
import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL;
|
||||
package org.kar.archidata.dataAccess.addOnSQL;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.sql.PreparedStatement;
|
||||
@ -6,10 +6,10 @@ import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import org.atriasoft.archidata.dataAccess.CountInOut;
|
||||
import org.atriasoft.archidata.dataAccess.DBAccessSQL;
|
||||
import org.atriasoft.archidata.dataAccess.LazyGetter;
|
||||
import org.atriasoft.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DBAccessSQL;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
@ -137,7 +137,6 @@ public interface DataAccessAddOn {
|
||||
* @param actions Asynchronous action to do after main request. */
|
||||
default void asyncUpdate(
|
||||
final DBAccessSQL ioDb,
|
||||
final Object previousData,
|
||||
final String tableName,
|
||||
final Object localId,
|
||||
final Field field,
|
||||
@ -147,13 +146,6 @@ public interface DataAccessAddOn {
|
||||
|
||||
}
|
||||
|
||||
/** Some annotation need to collect data before updating the current values
|
||||
* @param field
|
||||
* @return */
|
||||
default boolean isPreviousDataNeeded(final Field field) {
|
||||
return false;
|
||||
}
|
||||
|
||||
default void drop(final DBAccessSQL ioDb, final String tableName, final Field field, final QueryOptions options)
|
||||
throws Exception {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user