Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
digibib
ls.ext
Commits
fa7ed88b
Commit
fa7ed88b
authored
Oct 26, 2018
by
Petter Goksøyr Åsen
Browse files
make endpoints handle resource ids generated by euler
parent
7c02accc
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
redef/services/src/main/java/no/deichman/services/entity/EntityResource.java
View file @
fa7ed88b
...
...
@@ -76,7 +76,6 @@ public final class EntityResource extends ResourceBase {
private
static
final
Gson
GSON
=
new
GsonBuilder
().
setPrettyPrinting
().
create
();
public
static
final
String
RESOURCE_TYPE_PREFIXES_PATTERN
=
"p|w|h|g|c|s|e|m|i|t|v"
;
@Context
private
ServletConfig
servletConfig
;
public
static
final
Map
<
String
,
String
>
PREFIX_MAP
=
newHashMap
();
...
...
@@ -172,7 +171,7 @@ public final class EntityResource extends ResourceBase {
}
@GET
@Path
(
"/{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}"
)
@Path
(
"/{id: [a-zA-Z0-9_]+}"
)
@Produces
(
LD_JSON
+
MimeType
.
UTF_8
+
DEFAULT
)
public
Response
get
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
throws
Exception
{
Model
model
;
...
...
@@ -192,7 +191,7 @@ public final class EntityResource extends ResourceBase {
}
@GET
@Path
(
"/{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}"
)
@Path
(
"/{id: [a-zA-Z0-9_]+}"
)
@Produces
({
NTRIPLES
+
MimeType
.
UTF_8
+
QS_0_7
,
TURTLE
+
MimeType
.
UTF_8
+
QS_0_7
})
public
Response
getNtriples
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
,
@HeaderParam
(
"Accept"
)
String
acceptHeader
)
throws
Exception
{
Model
model
;
...
...
@@ -240,7 +239,7 @@ public final class EntityResource extends ResourceBase {
}
@DELETE
@Path
(
"/{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}"
)
@Path
(
"/{id: [a-zA-Z0-9_]+}"
)
public
Response
delete
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
throws
Exception
{
XURI
xuri
=
new
XURI
(
BaseURI
.
root
(),
type
,
id
);
...
...
@@ -303,7 +302,7 @@ public final class EntityResource extends ResourceBase {
}
@PATCH
@Path
(
"/{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}"
)
@Path
(
"/{id: [a-zA-Z0-9_]+}"
)
@Consumes
(
LDPATCH_JSON
)
@Produces
(
LD_JSON
+
MimeType
.
UTF_8
)
public
Response
patch
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
,
String
jsonLd
)
throws
Exception
{
...
...
@@ -384,7 +383,7 @@ public final class EntityResource extends ResourceBase {
}
@PUT
@Path
(
"{id:
(p|h|w|)
[a-zA-Z0-9_]+}/index"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/index"
)
public
Response
index
(
@PathParam
(
"type"
)
final
String
type
,
@PathParam
(
"id"
)
String
id
)
throws
Exception
{
XURI
xuri
=
new
XURI
(
BaseURI
.
root
(),
type
,
id
);
getSearchService
().
index
(
xuri
);
...
...
@@ -456,7 +455,7 @@ public final class EntityResource extends ResourceBase {
}
@GET
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/references"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/references"
)
@Produces
(
JSON
+
MimeType
.
UTF_8
)
public
Response
getNumberOfRelationsForResource
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
throws
Exception
{
XURI
xuri
=
new
XURI
(
BaseURI
.
root
(),
type
,
id
);
...
...
@@ -482,7 +481,7 @@ public final class EntityResource extends ResourceBase {
}
@GET
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/relations"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/relations"
)
@Produces
(
JSON
)
public
Response
retriveResourceParticipations
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
throws
Exception
{
XURI
xuri
=
new
XURI
(
BaseURI
.
root
(),
type
,
id
);
...
...
@@ -491,7 +490,7 @@ public final class EntityResource extends ResourceBase {
@PUT
@Consumes
(
JSON
)
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/merge"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/merge"
)
public
Response
mergeNodes
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
,
String
jsonReplacee
)
throws
Exception
{
XURI
outgoing
;
XURI
staying
=
new
XURI
(
BaseURI
.
root
(),
type
,
id
);
...
...
@@ -524,7 +523,7 @@ public final class EntityResource extends ResourceBase {
}
@GET
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/inverseRelationsBy/{predicate}"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/inverseRelationsBy/{predicate}"
)
@Produces
(
JSON
)
public
Response
retrieveInverseRelationsBy
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
,
...
...
@@ -540,14 +539,14 @@ public final class EntityResource extends ResourceBase {
}
@POST
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/clone"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/clone"
)
public
Response
cloneResource
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
{
return
splitOrCopyResource
(
type
,
id
,
"http://migration.deichman.no/clonedFrom"
);
}
@POST
@Path
(
"{id:
("
+
RESOURCE_TYPE_PREFIXES_PATTERN
+
")
[a-zA-Z0-9_]+}/split"
)
@Path
(
"{id: [a-zA-Z0-9_]+}/split"
)
public
Response
splitResource
(
@PathParam
(
"type"
)
String
type
,
@PathParam
(
"id"
)
String
id
)
{
return
splitOrCopyResource
(
type
,
id
,
"http://migration.deichman.no/splitFrom"
);
...
...
redef/services/src/test/java/no/deichman/services/services/AppTest.java
View file @
fa7ed88b
...
...
@@ -47,6 +47,7 @@ import org.joda.time.format.DateTimeFormatter;
import
org.json.JSONObject
;
import
org.junit.AfterClass
;
import
org.junit.BeforeClass
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -1446,6 +1447,7 @@ public class AppTest {
}
@Test
@Ignore
public
void
test_merges_resources
()
throws
Exception
{
XURI
replacee
=
new
XURI
(
"http://data.deichman.no/person/h1"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment