Compare commits

...

7 Commits

Author SHA1 Message Date
d9e118afaa [RELEASE] new version 0.15.0 2024-09-20 19:46:56 +02:00
9f43ebc782 [FIX] some fixes 2024-09-20 19:45:11 +02:00
8b831522dc [DEV] fix the get of the data 2024-09-20 19:02:22 +02:00
4f5d55bb01 [DEV] update dev tag version 2024-09-15 15:56:06 +02:00
9cbeee66c9 [RELEASE] new version 0.14.2 2024-09-15 15:55:00 +02:00
d25be53b77 [FIX] dot generation 2024-09-15 15:52:10 +02:00
d36f9c005a [DEV] update dev tag version 2024-09-15 15:46:37 +02:00
8 changed files with 17 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

@@ -10,6 +10,7 @@ import java.util.Set;
import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition; import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition;
import org.kar.archidata.externalRestApi.model.ApiGroupModel; import org.kar.archidata.externalRestApi.model.ApiGroupModel;
import org.kar.archidata.externalRestApi.model.ApiModel; import org.kar.archidata.externalRestApi.model.ApiModel;
import org.kar.archidata.externalRestApi.model.ApiModel.OptionalClassModel;
import org.kar.archidata.externalRestApi.model.ClassEnumModel; import org.kar.archidata.externalRestApi.model.ClassEnumModel;
import org.kar.archidata.externalRestApi.model.ClassListModel; import org.kar.archidata.externalRestApi.model.ClassListModel;
import org.kar.archidata.externalRestApi.model.ClassMapModel; import org.kar.archidata.externalRestApi.model.ClassMapModel;
@@ -216,7 +217,7 @@ public class DotApiGeneration {
hasParam = true; hasParam = true;
boolean hasParam2 = false; boolean hasParam2 = false;
data.append("data: {"); data.append("data: {");
for (final Entry<String, List<ClassModel>> pathEntry : interfaceElement.multiPartParameters for (final Entry<String, OptionalClassModel> pathEntry : interfaceElement.multiPartParameters
.entrySet()) { .entrySet()) {
if (hasParam2) { if (hasParam2) {
data.append(", "); data.append(", ");
@@ -224,7 +225,7 @@ public class DotApiGeneration {
hasParam2 = true; hasParam2 = true;
data.append(pathEntry.getKey()); data.append(pathEntry.getKey());
data.append(": "); data.append(": ");
data.append(generateClassModelsTypescript(pathEntry.getValue(), dotGroup)); data.append(generateClassModelsTypescript(pathEntry.getValue().model(), dotGroup));
} }
data.append("}"); data.append("}");
} }

View File

@@ -16,8 +16,10 @@ public class CORSFilter implements ContainerResponseFilter {
// System.err.println("filter cors ..." + request.toString()); // System.err.println("filter cors ..." + request.toString());
response.getHeaders().add("Access-Control-Allow-Origin", "*"); 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", response.getHeaders().add("Access-Control-Allow-Headers",
"Origin, content-type, Content-type, Accept, Authorization, mime-type, filename"); "Origin, content-type, Content-type, Accept, Authorization, mime-type, filename, Range");
response.getHeaders().add("Access-Control-Allow-Credentials", "true"); response.getHeaders().add("Access-Control-Allow-Credentials", "true");
response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD"); response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD");
} }

View File

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

View File

@@ -1 +1 @@
0.14.0 0.15.0