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

[FEAT] remove static from DataAPI

Browse Source
This commit is contained in:
Edouard DUPIN 2024-12-29 16:22:20 +01:00
parent fe84af5d96
commit b0d565b014
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/kar/archidata/api/DataResource.java
View File

@ -118,7 +118,7 @@ public class DataResource {
return getFileData(uuid) + ".json"; return getFileData(uuid) + ".json";
} }
public static Data getWithSha512(final String sha512) { public Data getWithSha512(final String sha512) {
LOGGER.info("find sha512 = {}", sha512); LOGGER.info("find sha512 = {}", sha512);
try { try {
return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512))); return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)));
@ -129,7 +129,7 @@ public class DataResource {
return null; return null;
} }
public static Data getWithId(final long id) { public Data getWithId(final long id) {
LOGGER.info("find id = {}", id); LOGGER.info("find id = {}", id);
try { try {
return DataAccess.get(Data.class, id); return DataAccess.get(Data.class, id);
@ -140,7 +140,7 @@ public class DataResource {
return null; return null;
} }
public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512) public Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
throws IOException { throws IOException {
// determine mime type: // determine mime type:
Data injectedData = new Data(); Data injectedData = new Data();
@ -304,11 +304,9 @@ 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) {
@ -502,7 +500,7 @@ public class DataResource {
} }
} }
public static void undelete(final Long id) throws Exception { public void undelete(final Long id) throws Exception {
DataAccess.unsetDelete(Data.class, id); DataAccess.unsetDelete(Data.class, id);
} }