Compare commits
No commits in common. "11b49ea95dc35825154cd5d344d4b0786606a38b" and "8dde49adff15c2b05a59753bb3662d8a0879f055" have entirely different histories.
11b49ea95d
...
8dde49adff
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>
|
||||
|
||||
4
.github/workflows/maven.yml
vendored
4
.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'
|
||||
@ -32,4 +32,4 @@ jobs:
|
||||
|
||||
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
|
||||
- name: Update dependency graph
|
||||
uses: advanced-security/maven-dependency-submission-action@aeab9f885293af501bae8bdfe88c589528ea5e25
|
||||
uses: advanced-security/maven-dependency-submission-action@4f64ddab9d742a4806eeb588d238e4c311a8397d
|
||||
|
||||
@ -28,4 +28,4 @@ def getEnvName(branchName) {
|
||||
return "dev";
|
||||
}
|
||||
return "other";
|
||||
}
|
||||
}
|
||||
58
pom.xml
58
pom.xml
@ -3,9 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.atria-soft</groupId>
|
||||
<artifactId>archidata</artifactId>
|
||||
<version>0.28.5-SNAPSHOT</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>
|
||||
<version>0.26.3-SNAPSHOT</version>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Mozilla Public License 2.0</name>
|
||||
@ -28,6 +26,12 @@
|
||||
<connection>scm:git:git://github.com/kangaroo-and-rabbit/archidata.git</connection>
|
||||
<developerConnection>scm:git:ssh:github.com/kangaroo-and-rabbit/archidata.git</developerConnection>
|
||||
</scm>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>ossrh</id>
|
||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@ -149,7 +153,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 +177,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 +213,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 +222,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>
|
||||
@ -249,7 +253,7 @@
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
@ -292,14 +296,10 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<show>private</show>
|
||||
<nohelp>true</nohelp>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Check the style of the code -->
|
||||
<plugin>
|
||||
@ -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,26 +361,28 @@
|
||||
<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>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<!-- Generate Java-docs As Part Of Project Reports -->
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.central</groupId>
|
||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
||||
<version>0.7.0</version>
|
||||
<extensions>true</extensions>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<configuration>
|
||||
<publishingServerId>central</publishingServerId>
|
||||
<show>public</show>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</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,34 +0,0 @@
|
||||
package org.atriasoft.archidata.catcher;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.glassfish.jersey.server.ParamException.QueryParamException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import jakarta.ws.rs.ext.ExceptionMapper;
|
||||
|
||||
public class QueryParamExceptionCatcher implements ExceptionMapper<QueryParamException> {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(QueryParamExceptionCatcher.class);
|
||||
|
||||
@Override
|
||||
public Response toResponse(final QueryParamException exception) {
|
||||
LOGGER.trace("Catch IllegalArgumentException: {}", exception.getLocalizedMessage());
|
||||
final RestErrorResponse ret = build(exception);
|
||||
LOGGER.error("Error OID={}", ret.oid);
|
||||
return Response.status(Response.Status.BAD_REQUEST).entity(ret).type(MediaType.APPLICATION_JSON).build();
|
||||
}
|
||||
|
||||
private RestErrorResponse build(final QueryParamException exception) {
|
||||
final List<RestInputError> inputError = new ArrayList<>();
|
||||
inputError.add(new RestInputError("query", exception.getParameterName(), exception.getCause().getMessage()));
|
||||
final String errorType = "Error on query input='" + exception.getParameterName() + "'";
|
||||
return new RestErrorResponse(Response.Status.BAD_REQUEST, Instant.now().toString(), errorType,
|
||||
"Input parsing fail", inputError);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
package org.atriasoft.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 jakarta.annotation.Priority;
|
||||
import jakarta.ws.rs.ext.ParamConverter;
|
||||
import jakarta.ws.rs.ext.ParamConverterProvider;
|
||||
import jakarta.ws.rs.ext.Provider;
|
||||
|
||||
@Provider
|
||||
@Priority(1)
|
||||
public class DateParamConverterProvider implements ParamConverterProvider {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public <T> ParamConverter<T> getConverter(
|
||||
final Class<T> rawType,
|
||||
final Type genericType,
|
||||
final Annotation[] annotations) {
|
||||
if (rawType != Date.class) {
|
||||
return null;
|
||||
}
|
||||
return (ParamConverter<T>) new DateParamConverter();
|
||||
}
|
||||
|
||||
public class DateParamConverter implements ParamConverter<Date> {
|
||||
@Override
|
||||
public Date fromString(final String value) {
|
||||
if (value == null || value.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return DateTools.parseDate(value);
|
||||
} catch (final IOException e) {
|
||||
throw new IllegalArgumentException("Invalid date format. Please use ISO8601", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(final Date value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
return DateTools.serializeMilliWithUTCTimeZone(value);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
package org.atriasoft.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 jakarta.ws.rs.ext.ParamConverter;
|
||||
import jakarta.ws.rs.ext.ParamConverterProvider;
|
||||
import jakarta.ws.rs.ext.Provider;
|
||||
|
||||
@Provider
|
||||
public class OffsetDateTimeParamConverterProvider implements ParamConverterProvider {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public <T> ParamConverter<T> getConverter(
|
||||
final Class<T> rawType,
|
||||
final Type genericType,
|
||||
final Annotation[] annotations) {
|
||||
if (rawType != OffsetDateTime.class) {
|
||||
return null;
|
||||
}
|
||||
return (ParamConverter<T>) new OffsetDateTimeParamConverter();
|
||||
}
|
||||
|
||||
public class OffsetDateTimeParamConverter implements ParamConverter<OffsetDateTime> {
|
||||
|
||||
@Override
|
||||
public OffsetDateTime fromString(final String value) {
|
||||
if (value == null || value.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return DateTools.parseOffsetDateTime(value);
|
||||
} catch (final IOException e) {
|
||||
throw new IllegalArgumentException("Invalid date format. Please use ISO8601", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(final OffsetDateTime value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
return DateTools.serializeMilliWithUTCTimeZone(value);
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer;
|
||||
|
||||
public class DateDeserializer extends JsonDeserializer<Date> {
|
||||
@Override
|
||||
public Date deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
|
||||
final String value = p.getText();
|
||||
final Date ret = DateTools.parseDate(value);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||
|
||||
public class DateSerializer extends JsonSerializer<Date> {
|
||||
@Override
|
||||
public void serialize(final Date value, final JsonGenerator gen, final SerializerProvider serializers)
|
||||
throws IOException {
|
||||
gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
|
||||
}
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||
|
||||
public class JacksonModules {
|
||||
public static SimpleModule getAllModules() {
|
||||
final SimpleModule module = new SimpleModule();
|
||||
module.addSerializer(ObjectId.class, new ObjectIdSerializer());
|
||||
module.addDeserializer(ObjectId.class, new ObjectIdDeserializer());
|
||||
module.addSerializer(Date.class, new DateSerializer());
|
||||
module.addDeserializer(Date.class, new DateDeserializer());
|
||||
module.addSerializer(OffsetDateTime.class, new OffsetDateTimeSerializer());
|
||||
module.addDeserializer(OffsetDateTime.class, new OffsetDateTimeDeserializer());
|
||||
return module;
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer;
|
||||
|
||||
public class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime> {
|
||||
@Override
|
||||
public OffsetDateTime deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
|
||||
final String value = p.getText();
|
||||
final OffsetDateTime ret = DateTools.parseOffsetDateTime(value);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
package org.atriasoft.archidata.converter.jackson;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
import org.atriasoft.archidata.tools.DateTools;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||
|
||||
public class OffsetDateTimeSerializer extends JsonSerializer<OffsetDateTime> {
|
||||
@Override
|
||||
public void serialize(final OffsetDateTime value, final JsonGenerator gen, final SerializerProvider serializers)
|
||||
throws IOException {
|
||||
gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
|
||||
}
|
||||
}
|
||||
@ -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,170 +0,0 @@
|
||||
package org.atriasoft.archidata.tools;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.format.DateTimeParseException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class DateTools {
|
||||
private final static Logger LOGGER = LoggerFactory.getLogger(DateTools.class);
|
||||
|
||||
// List of supported parsers for flexible date string parsing.
|
||||
// Includes patterns with optional parts, slashes, and ISO standard formats.
|
||||
static final List<DateTimeFormatter> FORMATTERS = Arrays.asList(
|
||||
DateTimeFormatter.ofPattern("[yyyy[-MM[-dd]]]['T'][' '][HH[:mm[:ss['.'nnnnnnnnn]]]]XXXXX"),
|
||||
DateTimeFormatter.ofPattern("[yyyy[/MM[/dd]]]['T'][' '][HH[:mm[:ss['.'nnnnnnnnn]]]]XXXXX"),
|
||||
DateTimeFormatter.ISO_OFFSET_DATE_TIME, // e.g., 2025-04-04T15:30:00+02:00
|
||||
DateTimeFormatter.ISO_ZONED_DATE_TIME, // e.g., 2025-04-04T15:30:00+02:00[Europe/Paris]
|
||||
DateTimeFormatter.ISO_INSTANT // e.g., 2025-04-04T13:30:00Z
|
||||
);
|
||||
|
||||
/**
|
||||
* Attempts to parse a date string into an OffsetDateTime using a flexible list of patterns.
|
||||
* Supports ISO 8601 formats, optional zone, and fallback to LocalDate or LocalTime if needed.
|
||||
*
|
||||
* @param dateString the date string to parse
|
||||
* @return OffsetDateTime representation of the parsed input
|
||||
* @throws IOException if no supported format matches the input
|
||||
*/
|
||||
public static OffsetDateTime parseOffsetDateTime(final String dateString) throws IOException {
|
||||
return parseOffsetDateTime(dateString, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempts to parse a date string into an OffsetDateTime using a flexible list of patterns.
|
||||
* Supports ISO 8601 formats, optional zone, and fallback to LocalDate or LocalTime if needed.
|
||||
*
|
||||
* @param dateString the date string to parse
|
||||
* @param missingAsUTC Parse date when missing the time zone consider it as a UTC Date-time
|
||||
* @return OffsetDateTime representation of the parsed input
|
||||
* @throws IOException if no supported format matches the input
|
||||
*/
|
||||
public static OffsetDateTime parseOffsetDateTime(final String dateString, final boolean missingAsUTC)
|
||||
throws IOException {
|
||||
if (dateString == null) {
|
||||
return null;
|
||||
}
|
||||
for (final DateTimeFormatter formatter : FORMATTERS) {
|
||||
try {
|
||||
return OffsetDateTime.parse(dateString, formatter);
|
||||
} catch (final DateTimeParseException ex) {
|
||||
if (missingAsUTC) {
|
||||
// If the date string is missing a zone, try appending "Z"
|
||||
try {
|
||||
if (dateString.endsWith("Z") || dateString.endsWith("z")) {
|
||||
continue;
|
||||
}
|
||||
return OffsetDateTime.parse(dateString + "Z", formatter);
|
||||
} catch (final DateTimeParseException ex2) {
|
||||
// Still failed, try next pattern
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new IOException("Unrecognized DATE format: '" + dateString + "' supported format ISO8601");
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses a flexible date string and returns a java.util.Date,
|
||||
* using system default time-zone for conversion.
|
||||
*
|
||||
* @param dateString the input string to parse
|
||||
* @return The parsed Date
|
||||
* @throws IOException if parsing fails.
|
||||
*/
|
||||
public static Date parseDate(final String dateString) throws IOException {
|
||||
final OffsetDateTime dateTime = parseOffsetDateTime(dateString, true);
|
||||
dateTime.atZoneSameInstant(ZoneId.systemDefault());
|
||||
return Date.from(dateTime.toInstant());
|
||||
}
|
||||
|
||||
/**
|
||||
* Formatter for date-time with milliseconds and original timezone offset (e.g., 2025-04-06T15:00:00.123+02:00)
|
||||
*/
|
||||
public static final DateTimeFormatter PATTERN_MS_TIME_WITH_ZONE = DateTimeFormatter
|
||||
.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'SSSXXX");
|
||||
|
||||
/**
|
||||
* Serializes an OffsetDateTime to a string including milliseconds and the original timezone offset.
|
||||
* Example output: 2025-04-06T15:00:00.123+02:00
|
||||
*/
|
||||
public static String serializeMilliWithOriginalTimeZone(final OffsetDateTime offsetDateTime) {
|
||||
if (offsetDateTime == null) {
|
||||
return null;
|
||||
}
|
||||
return offsetDateTime.format(PATTERN_MS_TIME_WITH_ZONE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a java.util.Date to OffsetDateTime using the system's default timezone,
|
||||
* then serializes it to a string with milliseconds and original timezone offset.
|
||||
*/
|
||||
public static String serializeMilliWithOriginalTimeZone(final Date date) {
|
||||
if (date == null) {
|
||||
return null;
|
||||
}
|
||||
return serializeMilliWithOriginalTimeZone(date.toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* Formatter for date-time with milliseconds in UTC offset (e.g., 2025-04-06T13:00:00.123Z)
|
||||
*/
|
||||
public static final DateTimeFormatter PATTERN_MS_TIME = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'SSSX");
|
||||
|
||||
/**
|
||||
* Serializes an OffsetDateTime to a string with milliseconds in UTC.
|
||||
* The offset is explicitly changed to UTC before formatting.
|
||||
*/
|
||||
public static String serializeMilliWithUTCTimeZone(final OffsetDateTime offsetDateTime) {
|
||||
if (offsetDateTime == null) {
|
||||
return null;
|
||||
}
|
||||
return offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC).format(PATTERN_MS_TIME);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a java.util.Date to OffsetDateTime in the system's default timezone,
|
||||
* then serializes it with milliseconds in UTC.
|
||||
*/
|
||||
public static String serializeMilliWithUTCTimeZone(final Date date) {
|
||||
if (date == null) {
|
||||
return null;
|
||||
}
|
||||
return serializeMilliWithUTCTimeZone(date.toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* Formatter for date-time with nanoseconds in UTC offset (e.g., 2025-04-06T13:00:00.123456789Z)
|
||||
*/
|
||||
public static final DateTimeFormatter PATTERN_NS_TIME = DateTimeFormatter
|
||||
.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'nnnnnnnnnX");
|
||||
|
||||
/**
|
||||
* Serializes an OffsetDateTime to a string with nanosecond precision in UTC.
|
||||
*/
|
||||
public static String serializeNanoWithUTCTimeZone(final OffsetDateTime offsetDateTime) {
|
||||
if (offsetDateTime == null) {
|
||||
return null;
|
||||
}
|
||||
return offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC).format(PATTERN_NS_TIME);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a java.util.Date to OffsetDateTime in the system's default timezone,
|
||||
* then serializes it with nanoseconds in UTC.
|
||||
*/
|
||||
public static String serializeNanoWithUTCTimeZone(final Date date) {
|
||||
if (date == null) {
|
||||
return null;
|
||||
}
|
||||
return serializeNanoWithUTCTimeZone(date.toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime());
|
||||
}
|
||||
}
|
||||
@ -1,490 +0,0 @@
|
||||
package org.atriasoft.archidata.tools;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.URLEncoder;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpClient.Version;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpRequest.BodyPublishers;
|
||||
import java.net.http.HttpRequest.Builder;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.atriasoft.archidata.exception.RESTErrorResponseException;
|
||||
import org.bson.types.ObjectId;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParseException;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
|
||||
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
|
||||
|
||||
import jakarta.ws.rs.core.HttpHeaders;
|
||||
|
||||
public class RESTApiRequest {
|
||||
final static Logger LOGGER = LoggerFactory.getLogger(RESTApiRequest.class);
|
||||
private final String url;
|
||||
private final String token;
|
||||
private final ObjectMapper mapper;
|
||||
private String serializedBodyString = null;
|
||||
private byte[] serializedBodyByte = null;
|
||||
private String contentType = null;
|
||||
private final Map<String, String> headers = new HashMap<>();
|
||||
private final Map<String, String> queryParam = new HashMap<>();
|
||||
private String verb = "GET";
|
||||
|
||||
/**
|
||||
* Constructor to initialize the RESTApiRequest with base URL and authorization token.
|
||||
*
|
||||
* @param url The base URL of the API.
|
||||
* @param token The Bearer token for authentication.
|
||||
*/
|
||||
public RESTApiRequest(final String url, final String token) {
|
||||
this.url = url;
|
||||
this.token = token;
|
||||
this.mapper = ContextGenericTools.createObjectMapper();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP method (GET, POST, etc.).
|
||||
*
|
||||
* @param verb The HTTP verb to use.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest verb(final String verb) {
|
||||
this.verb = verb;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the request body as a raw String.
|
||||
*
|
||||
* @param body The raw string body.
|
||||
* @param contentType The content type of the request body.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyString(final String body, final String contentType) {
|
||||
this.serializedBodyByte = null;
|
||||
this.serializedBodyString = body;
|
||||
this.contentType = contentType;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the request body as a raw String.
|
||||
*
|
||||
* @param body The raw string body (consider as "text/plain").
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyString(final String body) {
|
||||
this.serializedBodyByte = null;
|
||||
this.serializedBodyString = body;
|
||||
this.contentType = "text/plain";
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Serializes a Map to a JSON string and sets it as the body.
|
||||
*
|
||||
* @param data A map representing the body content.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
* @throws JsonProcessingException If the map fails to serialize.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyMap(final Map<String, Object> data) throws JsonProcessingException {
|
||||
this.serializedBodyByte = null;
|
||||
this.serializedBodyString = this.mapper.writeValueAsString(data);
|
||||
this.contentType = "application/json";
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the request body as a byte array.
|
||||
*
|
||||
* @param body The byte array representing the body.
|
||||
* @param contentType The content type of the body.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyByte(final byte[] body, final String contentType) {
|
||||
this.serializedBodyByte = body;
|
||||
this.serializedBodyString = null;
|
||||
this.contentType = contentType;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Serializes a POJO into JSON and sets it as the body.
|
||||
*
|
||||
* @param body A Java object to serialize.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
* @throws JsonProcessingException If serialization fails.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyJson(final TYPE_BODY body) throws JsonProcessingException {
|
||||
this.serializedBodyString = this.mapper.writeValueAsString(body);
|
||||
this.contentType = "application/json";
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set data as a json body.
|
||||
*
|
||||
* @param body a serialized Json object.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyAsJson(final String body) {
|
||||
this.serializedBodyString = body;
|
||||
this.contentType = "application/json";
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a multipart/form-data request body from a map of fields.
|
||||
* Handles both File and standard form fields.
|
||||
*
|
||||
* @param body A map of key-values where values can be File or String.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
* @throws IOException If reading files fails.
|
||||
*/
|
||||
public <TYPE_BODY> RESTApiRequest bodyMultipart(final Map<String, Object> body) throws IOException {
|
||||
this.serializedBodyString = null;
|
||||
LOGGER.trace("body (MULTIPART)");
|
||||
// Create multipart key element
|
||||
final String boundary = (new ObjectId()).toString();
|
||||
this.contentType = "multipart/form-data; boundary=" + boundary;
|
||||
// create the body;
|
||||
final List<byte[]> bodyParts = new ArrayList<>();
|
||||
|
||||
for (final Map.Entry<String, Object> entry : body.entrySet()) {
|
||||
final StringBuilder partHeader = new StringBuilder();
|
||||
partHeader.append("--").append(boundary).append("\r\n");
|
||||
if (entry.getValue() instanceof File) {
|
||||
final File file = (File) entry.getValue();
|
||||
partHeader.append("Content-Disposition: form-data; name=\"").append(entry.getKey())
|
||||
.append("\"; filename=\"").append(file.getName()).append("\"\r\n");
|
||||
partHeader.append("Content-Type: application/octet-stream\r\n\r\n");
|
||||
bodyParts.add(partHeader.toString().getBytes());
|
||||
bodyParts.add(Files.readAllBytes(file.toPath()));
|
||||
bodyParts.add("\r\n".getBytes());
|
||||
} else {
|
||||
partHeader.append("Content-Disposition: form-data; name=\"").append(entry.getKey())
|
||||
.append("\"\r\n\r\n");
|
||||
if (entry.getValue() == null) {
|
||||
partHeader.append("null\r\n");
|
||||
} else {
|
||||
partHeader.append(entry.getValue().toString()).append("\r\n");
|
||||
}
|
||||
bodyParts.add(partHeader.toString().getBytes());
|
||||
}
|
||||
}
|
||||
bodyParts.add(("--" + boundary + "--\r\n").getBytes());
|
||||
|
||||
final int totalSize = bodyParts.stream().mapToInt(b -> b.length).sum();
|
||||
this.serializedBodyByte = new byte[totalSize];
|
||||
int position = 0;
|
||||
for (final byte[] part : bodyParts) {
|
||||
System.arraycopy(part, 0, this.serializedBodyByte, position, part.length);
|
||||
position += part.length;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a query parameter to the request URL.
|
||||
*
|
||||
* @param paramKey The parameter name.
|
||||
* @param body The parameter value.
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public <TYPE_PARAM> RESTApiRequest queryParam(final String paramKey, final TYPE_PARAM body) {
|
||||
this.queryParam.put(paramKey, body.toString());
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to GET.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest get() {
|
||||
verb("GET");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to PUT.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest put() {
|
||||
verb("PUT");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to POST.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest post() {
|
||||
verb("POST");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to PATCH.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest patch() {
|
||||
verb("PATCH");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to DELETE.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest delete() {
|
||||
verb("DELETE");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to ARCHIVE.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest archive() {
|
||||
verb("ARCHIVE");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the HTTP verb to RESTORE.
|
||||
*
|
||||
* @return The updated RESTApiRequest instance.
|
||||
*/
|
||||
public RESTApiRequest restore() {
|
||||
verb("RESTORE");
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the request and parses the response into a List of objects.
|
||||
*
|
||||
* @param clazz The class of each element in the expected response.
|
||||
* @return List of parsed response objects.
|
||||
* @throws RESTErrorResponseException If an error response is received.
|
||||
* @throws IOException If the request fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
public <TYPE_RESPONSE> List<TYPE_RESPONSE> fetchList(final Class<TYPE_RESPONSE> clazz)
|
||||
throws RESTErrorResponseException, IOException, InterruptedException {
|
||||
final HttpRequest request = fetch();
|
||||
return callAndParseRequestList(clazz, request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the request and parses the response into a single object.
|
||||
*
|
||||
* @param clazz The class of the expected response.
|
||||
* @return Parsed response object.
|
||||
* @throws RESTErrorResponseException If an error response is received.
|
||||
* @throws IOException If the request fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
public <TYPE_RESPONSE> TYPE_RESPONSE fetch(final Class<TYPE_RESPONSE> clazz)
|
||||
throws RESTErrorResponseException, IOException, InterruptedException {
|
||||
final HttpRequest request = fetch();
|
||||
return callAndParseRequest(clazz, request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a query parameter string from a map of key-value pairs.
|
||||
*
|
||||
* <p>This method encodes each key and value using UTF-8 encoding to ensure that
|
||||
* the resulting query string is safe for use in a URL. The encoded key-value pairs
|
||||
* are then joined together with `&` separators.</p>
|
||||
*
|
||||
* @param params A map containing query parameter names and their corresponding values.
|
||||
* Both keys and values will be URL-encoded.
|
||||
* @return A URL-encoded query string.
|
||||
*/
|
||||
public static String buildQueryParams(final Map<String, String> params) {
|
||||
return params.entrySet().stream().map(entry -> URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8) + "="
|
||||
+ URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)).collect(Collectors.joining("&"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the final HttpRequest based on method, headers, and body.
|
||||
*
|
||||
* @return A built HttpRequest instance.
|
||||
* @throws RESTErrorResponseException If error happens during body serialization.
|
||||
* @throws IOException If body serialization fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
public HttpRequest fetch() throws RESTErrorResponseException, IOException, InterruptedException {
|
||||
Builder requestBuilding = null;
|
||||
final String queryParams = buildQueryParams(this.queryParam);
|
||||
if (queryParams == null || queryParams.isEmpty()) {
|
||||
requestBuilding = createRequestBuilder("");
|
||||
} else {
|
||||
requestBuilding = createRequestBuilder("?" + queryParams);
|
||||
}
|
||||
if (this.contentType != null) {
|
||||
requestBuilding.header("Content-Type", this.contentType);
|
||||
}
|
||||
for (final Map.Entry<String, String> entry : this.headers.entrySet()) {
|
||||
requestBuilding.header(entry.getKey(), entry.getValue());
|
||||
}
|
||||
if (this.serializedBodyString != null) {
|
||||
LOGGER.trace("publish body: {}", this.serializedBodyString);
|
||||
return requestBuilding.method(this.verb, BodyPublishers.ofString(this.serializedBodyString)).build();
|
||||
}
|
||||
if (this.serializedBodyByte != null) {
|
||||
LOGGER.trace("publish body: {}", this.serializedBodyString);
|
||||
return requestBuilding.method(this.verb, BodyPublishers.ofByteArray(this.serializedBodyByte)).build();
|
||||
}
|
||||
return requestBuilding.method(this.verb, BodyPublishers.ofString("")).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs a raw GET request and returns the raw HttpResponse as bytes.
|
||||
*
|
||||
* @param urlOffset The URL path relative to the base URL.
|
||||
* @return Raw HTTP response in byte array.
|
||||
* @throws IOException If the request fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
protected HttpResponse<byte[]> getRaw(final String urlOffset) throws IOException, InterruptedException {
|
||||
final Builder requestBuilding = createRequestBuilder(urlOffset);
|
||||
final HttpRequest request = requestBuilding.method("GET", BodyPublishers.ofString("")).build();
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
// client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
|
||||
return client.send(request, HttpResponse.BodyHandlers.ofByteArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and initializes a HttpRequest.Builder with authorization and URL.
|
||||
*
|
||||
* @param urlOffset The URL path relative to the base URL.
|
||||
* @return Initialized HttpRequest.Builder.
|
||||
*/
|
||||
private Builder createRequestBuilder(final String urlOffset) {
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
|
||||
.uri(URI.create(this.url + urlOffset));
|
||||
if (this.token != null) {
|
||||
requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
|
||||
}
|
||||
return requestBuilding;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the request and parses the response as a single object.
|
||||
*
|
||||
* @param clazzReturn The expected class of the response.
|
||||
* @param request The built HttpRequest to send.
|
||||
* @return Parsed object of the response.
|
||||
* @throws RESTErrorResponseException If an error response is received.
|
||||
* @throws IOException If the response cannot be parsed or network fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private <TYPE_RESPONSE> TYPE_RESPONSE callAndParseRequest(
|
||||
final Class<TYPE_RESPONSE> clazzReturn,
|
||||
final HttpRequest request) throws RESTErrorResponseException, IOException, InterruptedException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
// client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (clazzReturn == HttpResponse.class) {
|
||||
return (TYPE_RESPONSE) httpResponse;
|
||||
}
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
LOGGER.trace("Receive Error: {}", httpResponse.body());
|
||||
try {
|
||||
final RESTErrorResponseException out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseException.class);
|
||||
throw out;
|
||||
} catch (final InvalidDefinitionException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
} catch (final MismatchedInputException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
} catch (final JsonParseException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
if (clazzReturn == Void.class || clazzReturn == void.class) {
|
||||
return null;
|
||||
}
|
||||
if (clazzReturn.equals(String.class)) {
|
||||
return (TYPE_RESPONSE) httpResponse.body();
|
||||
}
|
||||
LOGGER.trace("Receive model: {} with data: '{}'", clazzReturn.getCanonicalName(), httpResponse.body());
|
||||
return this.mapper.readValue(httpResponse.body(), clazzReturn);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the request and parses the response as a list of objects.
|
||||
*
|
||||
* @param clazzReturn The class of the expected response elements.
|
||||
* @param request The HttpRequest to send.
|
||||
* @return List of parsed response objects.
|
||||
* @throws RESTErrorResponseException If an error response is received.
|
||||
* @throws IOException If the response cannot be parsed or network fails.
|
||||
* @throws InterruptedException If the request is interrupted.
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private <TYPE_RESPONSE> List<TYPE_RESPONSE> callAndParseRequestList(
|
||||
final Class<TYPE_RESPONSE> clazzReturn,
|
||||
final HttpRequest request) throws IOException, InterruptedException, RESTErrorResponseException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
// client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
LOGGER.trace("Receive Error: {}", httpResponse.body());
|
||||
try {
|
||||
final RESTErrorResponseException out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseException.class);
|
||||
throw out;
|
||||
} catch (final InvalidDefinitionException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
} catch (final MismatchedInputException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
} catch (final JsonParseException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("RestAPI Fail to parse the error " + ex.getClass().getName() + " ["
|
||||
+ httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
LOGGER.trace("Receive model: List<{}> with data: '{}'", clazzReturn.getCanonicalName(), httpResponse.body());
|
||||
return this.mapper.readValue(httpResponse.body(),
|
||||
this.mapper.getTypeFactory().constructCollectionType(List.class, clazzReturn));
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
@ -20,7 +20,7 @@ import java.lang.annotation.Target;
|
||||
* - When a field is annotated with @DataNotRead, it will not be included in the
|
||||
* default data retrieval process from the database.
|
||||
* - To override this behavior and read all columns, including those marked with
|
||||
* `@DataNotRead`, the query must include the option ReadAllColumn.
|
||||
* @DataNotRead, the query must include the option ReadAllColumn.
|
||||
*
|
||||
* <p>Example:
|
||||
* <pre>{@code
|
||||
@ -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;
|
||||
@ -22,8 +22,7 @@ import java.lang.annotation.Target;
|
||||
* more flexible API designs where certain inputs can be omitted.
|
||||
*
|
||||
* <p>Example:
|
||||
*
|
||||
* {@code
|
||||
* <pre>{@code
|
||||
* public class AlbumService {
|
||||
*
|
||||
* @POST
|
||||
@ -40,8 +39,7 @@ import java.lang.annotation.Target;
|
||||
* // some code
|
||||
* }
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* }</pre>
|
||||
*
|
||||
* Note: @FormDataParam must be allway at the last position.
|
||||
*
|
||||
@ -49,8 +47,7 @@ import java.lang.annotation.Target;
|
||||
* marked as optional, allowing the client to omit them when calling the API.
|
||||
*
|
||||
* <p>Generated TypeScript code example:
|
||||
*
|
||||
* {@code
|
||||
* <pre>{@code
|
||||
* //Add a cover on a specific album
|
||||
* export function uploadCover({
|
||||
* restConfig,
|
||||
@ -67,11 +64,10 @@ import java.lang.annotation.Target;
|
||||
* uri?: string, // element is optional
|
||||
* },
|
||||
* callbacks?: RESTCallbacks,
|
||||
* }): Promise<Album> { ... }
|
||||
* }
|
||||
* }): Promise<Album> { ...
|
||||
* }</pre>
|
||||
*
|
||||
*
|
||||
* The generated TypeScript function reflects the optional nature of the form data parameters
|
||||
* The generated TypeScript function reflects the optional nature of the form data parameters.
|
||||
*/
|
||||
@Target({ ElementType.PARAMETER })
|
||||
@Retention(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;
|
||||
@ -25,7 +25,7 @@ import java.lang.annotation.Target;
|
||||
* the older XMLHttpRequest interface is utilized.
|
||||
*
|
||||
* <p>Example:
|
||||
* {@code
|
||||
* <pre>{@code
|
||||
* public class SeasonService {
|
||||
*
|
||||
* @POST
|
||||
@ -41,13 +41,13 @@ import java.lang.annotation.Target;
|
||||
* // Upload logic
|
||||
* }
|
||||
* }
|
||||
* }
|
||||
* }</pre>
|
||||
*
|
||||
* In this example, the uploadCover method will generate a client-side API
|
||||
* with progress tracking capabilities using XMLHttpRequest.
|
||||
*
|
||||
* <p>Generated TypeScript code example:
|
||||
* {@code
|
||||
* <pre>{@code
|
||||
* export function uploadCover({
|
||||
* restConfig,
|
||||
* params,
|
||||
@ -62,9 +62,8 @@ import java.lang.annotation.Target;
|
||||
* file: File,
|
||||
* },
|
||||
* callbacks?: RESTCallbacks,
|
||||
* }): Promise<Season> {...}
|
||||
* }
|
||||
*
|
||||
* }): Promise<Season> {...
|
||||
* }</pre>
|
||||
*
|
||||
*/
|
||||
@Target({ ElementType.PARAMETER, ElementType.METHOD })
|
||||
@ -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;
|
||||
|
||||
@ -11,16 +11,15 @@ public class GenericCatcher {
|
||||
public static void addAll(final ResourceConfig rc) {
|
||||
// Generic Json parsing error
|
||||
rc.register(JacksonExceptionCatcher.class);
|
||||
// Catch jakarta generic errors
|
||||
rc.register(WebApplicationExceptionCatcher.class);
|
||||
// Archidata exceptions
|
||||
rc.register(InputExceptionCatcher.class);
|
||||
rc.register(SystemExceptionCatcher.class);
|
||||
rc.register(FailExceptionCatcher.class);
|
||||
// generic Exception catcher
|
||||
rc.register(ConstraintViolationExceptionCatcher.class);
|
||||
rc.register(QueryParamExceptionCatcher.class);
|
||||
rc.register(ExceptionCatcher.class);
|
||||
// Catch jakarta generic errors
|
||||
rc.register(WebApplicationExceptionCatcher.class);
|
||||
rc.register(ConstraintViolationExceptionCatcher.class);
|
||||
}
|
||||
|
||||
}
|
||||
@ -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,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;
|
||||
@ -27,17 +27,6 @@ public class RestInputError {
|
||||
|
||||
public RestInputError() {}
|
||||
|
||||
public RestInputError(final String argument, final String path, final String message) {
|
||||
this.path = argument;
|
||||
this.path = path;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public RestInputError(final String path, final String message) {
|
||||
this.path = path;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public RestInputError(final Path path, final String message) {
|
||||
final Matcher matcher = PATTERN.matcher(path.toString());
|
||||
if (matcher.find()) {
|
||||
@ -50,6 +39,11 @@ public class RestInputError {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public RestInputError(final String path, final String message) {
|
||||
this.path = path;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
String getFullPath() {
|
||||
if (this.path == null) {
|
||||
return this.argument;
|
||||
@ -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;
|
||||
|
||||
14
src/org/kar/archidata/converter/jackson/JacksonModules.java
Normal file
14
src/org/kar/archidata/converter/jackson/JacksonModules.java
Normal file
@ -0,0 +1,14 @@
|
||||
package org.kar.archidata.converter.jackson;
|
||||
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||
|
||||
public class JacksonModules {
|
||||
public static SimpleModule getAllModules() {
|
||||
final SimpleModule module = new SimpleModule();
|
||||
module.addSerializer(ObjectId.class, new ObjectIdSerializer());
|
||||
module.addDeserializer(ObjectId.class, new ObjectIdDeserializer());
|
||||
return module;
|
||||
}
|
||||
}
|
||||
@ -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,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;
|
||||
|
||||
@ -185,8 +185,7 @@ public abstract class DBAccess implements Closeable {
|
||||
/** @param <T>
|
||||
* @param data
|
||||
* @param id
|
||||
* @param updateColomn
|
||||
* @param option
|
||||
* @param filterValue
|
||||
* @return the affected rows.
|
||||
* @throws Exception */
|
||||
public <T, ID_TYPE> long update(
|
||||
@ -301,7 +300,8 @@ public abstract class DBAccess implements Closeable {
|
||||
|
||||
/** Delete items with the specific condition and some options. If the Entity is manage as a softDeleted model, then it is flag as removed (if not already done before).
|
||||
* @param clazz Data model that might remove element.
|
||||
* @param option (Optional) Options of the request.
|
||||
* @param condition Condition to remove elements.
|
||||
* @param options (Optional) Options of the request.
|
||||
* @return Number of element that is removed. */
|
||||
public long deleteWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
|
||||
final String hasDeletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
@ -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;
|
||||
@ -14,40 +14,37 @@ import java.sql.Types;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
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.AddOnManyToOne;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnOneToMany;
|
||||
import org.atriasoft.archidata.dataAccess.addOnSQL.DataAccessAddOn;
|
||||
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.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;
|
||||
|
||||
@ -373,18 +370,7 @@ public class DBAccessSQL extends DBAccess {
|
||||
if (tmp == null) {
|
||||
ps.setNull(iii.value, Types.INTEGER);
|
||||
} else {
|
||||
final OffsetDateTime offsetDateTime = ((Date) tmp).toInstant().atZone(ZoneId.systemDefault())
|
||||
.toOffsetDateTime();
|
||||
final Timestamp sqlDate = java.sql.Timestamp
|
||||
.from(offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
|
||||
ps.setTimestamp(iii.value, sqlDate);
|
||||
}
|
||||
} else if (type == OffsetDateTime.class) {
|
||||
if (tmp == null) {
|
||||
ps.setNull(iii.value, Types.INTEGER);
|
||||
} else {
|
||||
final Timestamp sqlDate = java.sql.Timestamp
|
||||
.from(((OffsetDateTime) tmp).withOffsetSameInstant(ZoneOffset.UTC).toInstant());
|
||||
final Timestamp sqlDate = java.sql.Timestamp.from(((Date) tmp).toInstant());
|
||||
ps.setTimestamp(iii.value, sqlDate);
|
||||
}
|
||||
} else if (type == Instant.class) {
|
||||
@ -536,9 +522,7 @@ public class DBAccessSQL extends DBAccess {
|
||||
if (rs.wasNull()) {
|
||||
field.set(data, null);
|
||||
} else {
|
||||
final OffsetDateTime odt = tmp.toInstant().atOffset(ZoneOffset.UTC);
|
||||
odt.atZoneSameInstant(ZoneId.systemDefault());
|
||||
field.set(data, Date.from(odt.toInstant()));
|
||||
field.set(data, Date.from(tmp.toInstant()));
|
||||
countNotNull.inc();
|
||||
}
|
||||
} catch (final SQLException ex) {
|
||||
@ -553,28 +537,6 @@ public class DBAccessSQL extends DBAccess {
|
||||
countNotNull.inc();
|
||||
}
|
||||
}
|
||||
} else if (type == OffsetDateTime.class) {
|
||||
try {
|
||||
final Timestamp tmp = rs.getTimestamp(count.value);
|
||||
if (rs.wasNull()) {
|
||||
field.set(data, null);
|
||||
} else {
|
||||
final OffsetDateTime odt = tmp.toInstant().atOffset(ZoneOffset.UTC);
|
||||
field.set(data, odt);
|
||||
countNotNull.inc();
|
||||
}
|
||||
} catch (final SQLException ex) {
|
||||
final String tmp = rs.getString(count.value);
|
||||
LOGGER.error("Fail to parse the SQL time !!! {}", tmp);
|
||||
if (rs.wasNull()) {
|
||||
field.set(data, null);
|
||||
} else {
|
||||
final OffsetDateTime date = DateTools.parseOffsetDateTime(tmp);
|
||||
LOGGER.error("Fail to parse the SQL time !!! {}", date);
|
||||
field.set(data, date);
|
||||
countNotNull.inc();
|
||||
}
|
||||
}
|
||||
} else if (type == Instant.class) {
|
||||
final String tmp = rs.getString(count.value);
|
||||
if (rs.wasNull()) {
|
||||
@ -1172,7 +1134,7 @@ public class DBAccessSQL extends DBAccess {
|
||||
}
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (addOn != null && !addOn.canInsert(field)) {
|
||||
if (addOn.isUpdateAsync(field)) {
|
||||
if (addOn.isInsertAsync(field)) {
|
||||
final List<TransmitKey> transmitKey = options.get(TransmitKey.class);
|
||||
if (transmitKey.size() != 1) {
|
||||
throw new DataAccessException(
|
||||
@ -1242,9 +1204,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;
|
||||
@ -1253,6 +1212,9 @@ public class DBAccessSQL extends DBAccess {
|
||||
} catch (final SQLException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
for (final LazyGetter action : asyncActions) {
|
||||
action.doRequest();
|
||||
}
|
||||
return 0L;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -111,6 +111,12 @@ public class DataAccess {
|
||||
}
|
||||
}
|
||||
|
||||
/** @param <T>
|
||||
* @param data
|
||||
* @param id
|
||||
* @param filterValue
|
||||
* @return the affected rows.
|
||||
* @throws Exception */
|
||||
public static <T, ID_TYPE> long update(
|
||||
final T data,
|
||||
final ID_TYPE id,
|
||||
@ -219,6 +225,7 @@ public class DataAccess {
|
||||
|
||||
/** Delete items with the specific condition and some options. If the Entity is manage as a softDeleted model, then it is flag as removed (if not already done before).
|
||||
* @param clazz Data model that might remove element.
|
||||
* @param condition Condition to remove elements.
|
||||
* @param options (Optional) Options of the request.
|
||||
* @return Number of element that is removed. */
|
||||
public static long deleteWhere(final Class<?> clazz, final QueryOption... options) throws Exception {
|
||||
@ -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
|
||||
@ -26,6 +26,12 @@ public interface DataAccessAddOn {
|
||||
* @return True of the field is manage by the current Add-on. */
|
||||
boolean isCompatibleField(Field elem);
|
||||
|
||||
/** Insert data in the specific field (the field must be in the current db, otherwiise it does not work at all.
|
||||
* @param ps DB statement interface.
|
||||
* @param data The date to inject.
|
||||
* @param iii The index of injection
|
||||
* @return the new index of injection in case of multiple value management
|
||||
* @throws SQLException */
|
||||
void insertData(
|
||||
final DBAccessMorphia ioDb,
|
||||
final Field field,
|
||||
@ -59,7 +65,14 @@ public interface DataAccessAddOn {
|
||||
throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
/** Create associated table of the specific element.
|
||||
*/
|
||||
* @param tableName
|
||||
* @param elem
|
||||
* @param mainTableBuilder
|
||||
* @param ListOtherTables
|
||||
* @param createIfNotExist
|
||||
* @param createDrop
|
||||
* @param fieldId
|
||||
* @throws Exception */
|
||||
void createTables(
|
||||
String tableName,
|
||||
final Field primaryField,
|
||||
@ -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;
|
||||
|
||||
@ -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");
|
||||
@ -425,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);
|
||||
}
|
||||
@ -465,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(
|
||||
@ -515,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(
|
||||
@ -537,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 {
|
||||
@ -552,8 +468,6 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
}
|
||||
|
||||
private static List<String> tableAlreadyCreated = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
@ -567,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;
|
||||
|
||||
@ -31,9 +31,10 @@ public interface DataAccessAddOn {
|
||||
boolean isCompatibleField(Field elem);
|
||||
|
||||
/** Insert data in the specific field (the field must be in the current db, otherwiise it does not work at all.
|
||||
* @param ioDb DB statement interface.
|
||||
* @param ps DB statement interface.
|
||||
* @param data The date to inject.
|
||||
* @param iii The index of injection
|
||||
* @return the new index of injection in case of multiple value management
|
||||
* @throws SQLException */
|
||||
void insertData(final DBAccessSQL ioDb, PreparedStatement ps, final Field field, Object data, CountInOut iii)
|
||||
throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
|
||||
@ -75,11 +76,9 @@ public interface DataAccessAddOn {
|
||||
|
||||
/** Create associated table of the specific element.
|
||||
* @param tableName
|
||||
* @param primaryField
|
||||
* @param field
|
||||
* @param elem
|
||||
* @param mainTableBuilder
|
||||
* @param preActionList
|
||||
* @param postActionList
|
||||
* @param ListOtherTables
|
||||
* @param createIfNotExist
|
||||
* @param createDrop
|
||||
* @param fieldId
|
||||
@ -1,6 +1,6 @@
|
||||
package org.atriasoft.archidata.dataAccess.addOnSQL.model;
|
||||
package org.kar.archidata.dataAccess.addOnSQL.model;
|
||||
|
||||
import org.atriasoft.archidata.model.OIDGenericDataSoftDelete;
|
||||
import org.kar.archidata.model.OIDGenericDataSoftDelete;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.Column;
|
||||
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