pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.16.0</version>
+	<version>0.14.2</version>
 	<properties>
 		<java.version>21</java.version>
 		<maven.compiler.version>3.1</maven.compiler.version>

src/org/kar/archidata/annotation/ARCHIVE.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.ws.rs.HttpMethod;
-
-/**
-* Indicates that the annotated method responds to HTTP ARCHIVE requests.
-*
-* @author Edouard DUPIN
-* @see HttpMethod
-*/
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod("ARCHIVE")
-public @interface ARCHIVE {}

src/org/kar/archidata/annotation/RESTORE.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.ws.rs.HttpMethod;
-
-/**
-* Indicates that the annotated method responds to HTTP RESTORE requests.
-*
-* @author Edouard DUPIN
-* @see HttpMethod
-*/
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod("RESTORE")
-public @interface RESTORE {}

src/org/kar/archidata/api/DataResource.java

@@ -304,11 +304,9 @@ public class DataResource {
 		// logger.info("===================================================");
 		final Data value = getSmall(uuid);
 		if (value == null) {
-			LOGGER.warn("Request data that does not exist : {}", uuid);
 			return Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
 		}
 		try {
-			LOGGER.warn("Generate stream : {}", uuid);
 			return buildStream(getFileData(uuid), range,
 					value.mimeType == null ? "application/octet-stream" : value.mimeType);
 		} catch (final Exception ex) {
@@ -480,9 +478,8 @@ public class DataResource {
 			to = file.length() - 1;
 		}
 		final String responseRange = String.format("bytes %d-%d/%d", from, to, file.length());
-		// LOGGER.info("responseRange: {}", responseRange);
-		try {
-			final RandomAccessFile raf = new RandomAccessFile(file, "r");
+		// logger.info("responseRange: {}", responseRange);
+		try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
 			raf.seek(from);
 
 			final long len = to - from + 1;

src/org/kar/archidata/api/MediaStreamer.java

@@ -58,4 +58,5 @@ public class MediaStreamer implements StreamingOutput {
 	public long getLenth() {
 		return this.length;
 	}
+
 }

src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java

@@ -20,7 +20,6 @@ public class WebApplicationExceptionCatcher implements ExceptionMapper<WebApplic
 	}
 
 	private RestErrorResponse build(final WebApplicationException exception) {
-		exception.printStackTrace();
 		return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception",
 				exception.getMessage());
 	}

src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java

@@ -120,8 +120,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		final String tmpVariable = "tmp_" + Integer.toString(count.value);
 		querySelect.append(" (SELECT GROUP_CONCAT(");
 		querySelect.append(tmpVariable);
-		final boolean mode = manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0;
-		if (mode) {
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
 			querySelect.append(".object2Id ");
 		} else {
 			querySelect.append(".object1Id ");
@@ -129,7 +128,6 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
 			querySelect.append(", ");
 		} else {
-			querySelect.append("ORDER BY uuid ASC ");
 			querySelect.append("SEPARATOR ");
 		}
 		querySelect.append("'");
@@ -155,7 +153,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		querySelect.append(" = ");
 		querySelect.append(tmpVariable);
 		querySelect.append(".");
-		if (mode) {
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
 			querySelect.append("object1Id ");
 		} else {
 			querySelect.append("object2Id ");
@@ -163,7 +161,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
 			querySelect.append(" GROUP BY ");
 			querySelect.append(tmpVariable);
-			if (mode) {
+			if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
 				querySelect.append(".object1Id");
 			} else {
 				querySelect.append(".object2Id");

src/org/kar/archidata/externalRestApi/model/ApiTool.java

@@ -7,10 +7,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.kar.archidata.annotation.ARCHIVE;
 import org.kar.archidata.annotation.AsyncType;
 import org.kar.archidata.annotation.FormDataOptional;
-import org.kar.archidata.annotation.RESTORE;
 import org.kar.archidata.annotation.TypeScriptProgress;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -109,12 +107,6 @@ public class ApiTool {
 		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
 			return "DELETE";
 		}
-		if (element.getDeclaredAnnotationsByType(RESTORE.class).length == 1) {
-			return "RESTORE";
-		}
-		if (element.getDeclaredAnnotationsByType(ARCHIVE.class).length == 1) {
-			return "ARCHIVE";
-		}
 		return null;
 	}
 
@@ -134,12 +126,6 @@ public class ApiTool {
 		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
 			return RestTypeRequest.DELETE;
 		}
-		if (element.getDeclaredAnnotationsByType(RESTORE.class).length == 1) {
-			return RestTypeRequest.RESTORE;
-		}
-		if (element.getDeclaredAnnotationsByType(ARCHIVE.class).length == 1) {
-			return RestTypeRequest.ARCHIVE;
-		}
 		return null;
 	}
 

src/org/kar/archidata/externalRestApi/model/RestTypeRequest.java

@@ -1,5 +1,5 @@
 package org.kar.archidata.externalRestApi.model;
 
 public enum RestTypeRequest {
-	GET, POST, PUT, PATCH, DELETE, RESTORE, ARCHIVE
+	GET, POST, PUT, PATCH, DELETE
 }

src/org/kar/archidata/filter/CORSFilter.java

@@ -16,12 +16,9 @@ public class CORSFilter implements ContainerResponseFilter {
 		// System.err.println("filter cors ..." + request.toString());
 
 		response.getHeaders().add("Access-Control-Allow-Origin", "*");
-		response.getHeaders().add("Access-Control-Allow-Range", "bytes");
-		response.getHeaders().add("access-control-expose-headers", "range");
 		response.getHeaders().add("Access-Control-Allow-Headers",
-				"Origin, content-type, Content-type, Accept, Authorization, mime-type, filename, Range");
+				"Origin, content-type, Content-type, Accept, Authorization, mime-type, filename");
 		response.getHeaders().add("Access-Control-Allow-Credentials", "true");
-		response.getHeaders().add("Access-Control-Allow-Methods",
-				"GET, POST, PUT, PATCH, DELETE, ARCHIVE, RESTORE, OPTIONS, HEAD");
+		response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD");
 	}
 }

src/org/kar/archidata/tools/DataTools.java

@@ -259,9 +259,6 @@ public class DataTools {
 		if (data.contentEquals("null")) {
 			return null;
 		}
-		if (data.contentEquals("undefined")) {
-			return null;
-		}
 		return data;
 	}
 

src/org/kar/archidata/tools/RESTApi.java

@@ -222,66 +222,13 @@ public class RESTApi {
 	 */
 	public <T> T delete(final Class<T> clazz, final String urlOffset)
 			throws RESTErrorResponseExeption, IOException, InterruptedException {
-		return simpleRequest("DELETE", clazz, urlOffset);
-	}
-
-	/**
-	 * Call an ARCHIVE on a REST API
-	 * @param urlOffset Offset to call the API
-	 */
-	public void archive(final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
-		archive(Void.class, urlOffset);
-	}
-
-	/**
-	 * Call a ARCHIVE on a REST API with retrieving some data
-	 * @param <T> Type of data that might be received.
-	 * @param clazz Class model of the data that might be parsed.
-	 * @param urlOffset Offset to call the API
-	 * @return The parsed object received.
-	 */
-	public <T> T archive(final Class<T> clazz, final String urlOffset)
-			throws RESTErrorResponseExeption, IOException, InterruptedException {
-		return simpleRequest("ARCHIVE", clazz, urlOffset);
-	}
-
-	/**
-	 * Call an RESTORE on a REST API
-	 * @param urlOffset Offset to call the API
-	 */
-	public void restore(final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
-		restore(Void.class, urlOffset);
-	}
-
-	/**
-	 * Call a RESTORE on a REST API with retrieving some data
-	 * @param <T> Type of data that might be received.
-	 * @param clazz Class model of the data that might be parsed.
-	 * @param urlOffset Offset to call the API
-	 * @return The parsed object received.
-	 */
-	public <T> T restore(final Class<T> clazz, final String urlOffset)
-			throws RESTErrorResponseExeption, IOException, InterruptedException {
-		return simpleRequest("RESTORE", clazz, urlOffset);
-	}
-
-	/**
-	 * Call a key on a REST API with retrieving some data
-	 * @param <T> Type of data that might be received.
-	 * @param model name of the key for the REST call
-	 * @param clazz Class model of the data that might be parsed.
-	 * @param urlOffset Offset to call the API
-	 * @return The parsed object received.
-	 */
-	public <T> T simpleRequest(final String model, final Class<T> clazz, final String urlOffset)
-			throws RESTErrorResponseExeption, IOException, InterruptedException {
 		final HttpClient client = HttpClient.newHttpClient();
 		Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
 				.uri(URI.create(this.baseUrl + urlOffset));
 		if (this.token != null) {
 			requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
 		}
-		final HttpRequest request = requestBuilding.method(model, BodyPublishers.ofString("")).build();
+		final HttpRequest request = requestBuilding.DELETE().build();
 		final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {

src/resources/rest-tools.ts

@@ -7,15 +7,11 @@
 import { RestErrorResponse, isRestErrorResponse } from "./model";
 
 export enum HTTPRequestModel {
-  ARCHIVE = "ARCHIVE",
   DELETE = "DELETE",
-  HEAD = "HEAD",
   GET = "GET",
-  OPTION = "OPTION",
   PATCH = "PATCH",
   POST = "POST",
   PUT = "PUT",
-  RESTORE = "RESTORE",
 }
 export enum HTTPMimeType {
   ALL = "*/*",
@@ -252,14 +248,9 @@ export function RESTRequest({
   if (restModel.accept !== undefined) {
     headers["Accept"] = restModel.accept;
   }
-  if (restModel.requestType !== HTTPRequestModel.GET &&
-	restModel.requestType !== HTTPRequestModel.ARCHIVE &&
-	restModel.requestType !== HTTPRequestModel.RESTORE
-  ) {
+  if (restModel.requestType !== HTTPRequestModel.GET) {
     // if Get we have not a content type, the body is empty
-    if (restModel.contentType !== HTTPMimeType.MULTIPART &&
-	  restModel.contentType !== undefined
-	) {
+    if (restModel.contentType !== HTTPMimeType.MULTIPART) {
       // special case of multi-part ==> no content type otherwise the browser does not set the ";bundary=--****"
       headers["Content-Type"] = restModel.contentType;
     }

version.txt

@@ -1 +1 @@
-0.16.0
+0.14.2