You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/30 08:42:29 UTC
[2/5] syncope git commit: [SYNCOPE-1289] YAML support provided
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/MailTemplateService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/MailTemplateService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/MailTemplateService.java
index a942001..79768a9 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/MailTemplateService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/MailTemplateService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -45,8 +46,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for mail templates.
*/
@Api(tags = "MailTemplates", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("mailTemplates")
public interface MailTemplateService extends JAXRSService {
@@ -56,7 +57,7 @@ public interface MailTemplateService extends JAXRSService {
* @return list of all mail templates.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<MailTemplateTO> list();
/**
@@ -69,12 +70,12 @@ public interface MailTemplateService extends JAXRSService {
@ApiResponse(code = 201,
message = "MailTemplate successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull MailTemplateTO mailTemplateTO);
/**
@@ -85,7 +86,7 @@ public interface MailTemplateService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
MailTemplateTO read(@NotNull @PathParam("key") String key);
/**
@@ -97,7 +98,7 @@ public interface MailTemplateService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -124,7 +125,7 @@ public interface MailTemplateService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}/{format}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void setFormat(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("format") MailTemplateFormat format,
@@ -140,7 +141,7 @@ public interface MailTemplateService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}/{format}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void removeFormat(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("format") MailTemplateFormat format);
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
index 5015f7e..74e33cc 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.JobTO;
import org.apache.syncope.common.lib.to.NotificationTO;
import org.apache.syncope.common.lib.types.JobAction;
@@ -46,8 +47,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for notifications.
*/
@Api(tags = "Notifications", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("notifications")
public interface NotificationService extends JAXRSService {
@@ -60,7 +61,7 @@ public interface NotificationService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
NotificationTO read(@NotNull @PathParam("key") String key);
/**
@@ -69,7 +70,7 @@ public interface NotificationService extends JAXRSService {
* @return list of all notifications.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<NotificationTO> list();
/**
@@ -82,12 +83,12 @@ public interface NotificationService extends JAXRSService {
@ApiResponse(code = 201,
message = "Notification successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "UUID generated for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull NotificationTO notificationTO);
/**
@@ -99,8 +100,8 @@ public interface NotificationService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull NotificationTO notificationTO);
/**
@@ -112,7 +113,7 @@ public interface NotificationService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -122,7 +123,7 @@ public interface NotificationService extends JAXRSService {
*/
@GET
@Path("job")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
JobTO getJob();
/**
@@ -134,6 +135,6 @@ public interface NotificationService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("job")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void actionJob(@QueryParam("action") JobAction action);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
index def5145..c2d604b 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
@@ -36,6 +36,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -44,8 +45,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for policies.
*/
@Api(tags = "Policies", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("policies")
public interface PolicyService extends JAXRSService {
@@ -59,7 +60,7 @@ public interface PolicyService extends JAXRSService {
*/
@GET
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends PolicyTO> T read(@NotNull @PathParam("type") PolicyType type, @NotNull @PathParam("key") String key);
/**
@@ -71,7 +72,7 @@ public interface PolicyService extends JAXRSService {
*/
@GET
@Path("{type}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends PolicyTO> List<T> list(@NotNull @PathParam("type") PolicyType type);
/**
@@ -85,13 +86,13 @@ public interface PolicyService extends JAXRSService {
@ApiResponse(code = 201,
message = "Policy successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "UUID generated for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
@Path("{type}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull @PathParam("type") PolicyType type, @NotNull PolicyTO policyTO);
/**
@@ -104,8 +105,8 @@ public interface PolicyService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{type}/{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull @PathParam("type") PolicyType type, @NotNull PolicyTO policyTO);
/**
@@ -118,7 +119,7 @@ public interface PolicyService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("type") PolicyType type, @NotNull @PathParam("key") String key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
index 4e0751e..0aafcc2 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
@@ -38,6 +38,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ProvisioningResult;
import org.apache.syncope.common.lib.to.RealmTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -46,8 +47,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for realms.
*/
@Api(tags = "Realms", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("realms")
public interface RealmService extends JAXRSService {
@@ -57,7 +58,7 @@ public interface RealmService extends JAXRSService {
* @return list of all realms.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<RealmTO> list();
/**
@@ -68,7 +69,7 @@ public interface RealmService extends JAXRSService {
*/
@GET
@Path("{fullPath:.*}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<RealmTO> list(@NotNull @PathParam("fullPath") String fullPath);
/**
@@ -83,8 +84,8 @@ public interface RealmService extends JAXRSService {
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
defaultValue = "return-content", allowableValues = "return-content, return-no-content",
- allowEmptyValue = true)
- , @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
+ allowEmptyValue = true),
+ @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
value = "If 'true', instructs the propagation process not to wait for completion when communicating"
+ " with External Resources with no priority set",
defaultValue = "false", allowEmptyValue = true) })
@@ -94,16 +95,16 @@ public interface RealmService extends JAXRSService {
+ "or empty if 'Prefer: return-no-content' was specified",
response = ProvisioningResult.class, responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the realm created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
- description = "URL of the realm created")
- , @ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
+ description = "UUID generated for the realm created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "URL of the realm created"),
+ @ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied") }))
@POST
@Path("{parentPath:.*}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull @PathParam("parentPath") String parentPath, @NotNull RealmTO realmTO);
/**
@@ -116,24 +117,24 @@ public interface RealmService extends JAXRSService {
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
defaultValue = "return-content", allowableValues = "return-content, return-no-content",
- allowEmptyValue = true)
- , @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
+ allowEmptyValue = true),
+ @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
value = "If 'true', instructs the propagation process not to wait for completion when communicating"
+ " with External Resources with no priority set",
defaultValue = "false", allowEmptyValue = true) })
@ApiResponses({
@ApiResponse(code = 200,
message = "Realm successfully updated enriched with propagation status information, as Entity",
- response = ProvisioningResult.class)
- , @ApiResponse(code = 204,
+ response = ProvisioningResult.class),
+ @ApiResponse(code = 204,
message = "No content if 'Prefer: return-no-content' was specified", responseHeaders =
@ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied")) })
@PUT
@Path("{fullPath:.*}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response update(@NotNull RealmTO realmTO);
/**
@@ -146,22 +147,22 @@ public interface RealmService extends JAXRSService {
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
defaultValue = "return-content", allowableValues = "return-content, return-no-content",
- allowEmptyValue = true)
- , @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
+ allowEmptyValue = true),
+ @ApiImplicitParam(name = RESTHeaders.NULL_PRIORITY_ASYNC, paramType = "header", dataType = "boolean",
value = "If 'true', instructs the propagation process not to wait for completion when communicating"
+ " with External Resources with no priority set",
defaultValue = "false", allowEmptyValue = true) })
@ApiResponses({
@ApiResponse(code = 200,
message = "Realm successfully deleted enriched with propagation status information, as Entity",
- response = ProvisioningResult.class)
- , @ApiResponse(code = 204,
+ response = ProvisioningResult.class),
+ @ApiResponse(code = 204,
message = "No content if 'Prefer: return-no-content' was specified", responseHeaders =
@ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied")) })
@DELETE
@Path("{fullPath:.*}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response delete(@NotNull @PathParam("fullPath") String fullPath);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
index db20a97..2cadb77 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
@@ -36,6 +36,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.RelationshipTypeTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -43,8 +44,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for relationship types.
*/
@Api(tags = "RelationshipTypes", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("relationshipTypes")
public interface RelationshipTypeService extends JAXRSService {
@@ -54,7 +55,7 @@ public interface RelationshipTypeService extends JAXRSService {
* @return list of all relationshipTypes.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<RelationshipTypeTO> list();
/**
@@ -65,7 +66,7 @@ public interface RelationshipTypeService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
RelationshipTypeTO read(@NotNull @PathParam("key") String key);
/**
@@ -78,12 +79,12 @@ public interface RelationshipTypeService extends JAXRSService {
@ApiResponse(code = 201,
message = "RelationshipType successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull RelationshipTypeTO relationshipTypeTO);
/**
@@ -95,8 +96,8 @@ public interface RelationshipTypeService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull RelationshipTypeTO relationshipTypeTO);
/**
@@ -108,6 +109,6 @@ public interface RelationshipTypeService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
index a07ef24..5bab18e 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.types.ReportExecExportFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -45,8 +46,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for reports.
*/
@Api(tags = "Reports", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("reports")
public interface ReportService extends ExecutableService {
@@ -58,7 +59,7 @@ public interface ReportService extends ExecutableService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
ReportTO read(@NotNull @PathParam("key") String key);
/**
@@ -67,7 +68,7 @@ public interface ReportService extends ExecutableService {
* @return paged list of existing reports matching the given query
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<ReportTO> list();
/**
@@ -80,12 +81,12 @@ public interface ReportService extends ExecutableService {
@ApiResponse(code = 201,
message = "Report successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "UUID generated for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull ReportTO reportTO);
/**
@@ -97,8 +98,8 @@ public interface ReportService extends ExecutableService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull ReportTO reportTO);
/**
@@ -110,7 +111,7 @@ public interface ReportService extends ExecutableService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -122,7 +123,7 @@ public interface ReportService extends ExecutableService {
*/
@GET
@Path("executions/{executionKey}/stream")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response exportExecutionResult(
@NotNull @PathParam("executionKey") String executionKey,
@QueryParam("format") ReportExecExportFormat fmt);
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportTemplateService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportTemplateService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportTemplateService.java
index da81fa2..8364447 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportTemplateService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportTemplateService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ReportTemplateTO;
import org.apache.syncope.common.lib.types.ReportTemplateFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -45,8 +46,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for report templates.
*/
@Api(tags = "ReportTemplates", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("reportTemplates")
public interface ReportTemplateService extends JAXRSService {
@@ -56,7 +57,7 @@ public interface ReportTemplateService extends JAXRSService {
* @return list of all report templates.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<ReportTemplateTO> list();
/**
@@ -69,11 +70,11 @@ public interface ReportTemplateService extends JAXRSService {
@ApiResponse(code = 201,
message = "ReportTemplate successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull ReportTemplateTO reportTemplateTO);
/**
@@ -84,7 +85,7 @@ public interface ReportTemplateService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
ReportTemplateTO read(@NotNull @PathParam("key") String key);
/**
@@ -96,7 +97,7 @@ public interface ReportTemplateService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceHistoryService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceHistoryService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceHistoryService.java
index 76e38df..6a83961 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceHistoryService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceHistoryService.java
@@ -31,14 +31,15 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ResourceHistoryConfTO;
/**
* REST operations for resource configuration versioning.
*/
@Api(tags = "ResourceHistory", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("resourcesHistory")
public interface ResourceHistoryService extends JAXRSService {
@@ -50,7 +51,7 @@ public interface ResourceHistoryService extends JAXRSService {
*/
@GET
@Path("{resourceKey}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<ResourceHistoryConfTO> list(@NotNull @PathParam("resourceKey") String resourceKey);
/**
@@ -62,7 +63,7 @@ public interface ResourceHistoryService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void restore(@NotNull @PathParam("key") String key);
/**
@@ -74,6 +75,6 @@ public interface ResourceHistoryService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
index 758947f..1f2da67 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.patch.ResourceDeassociationPatch;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -49,8 +50,8 @@ import org.apache.syncope.common.rest.api.beans.ConnObjectTOListQuery;
* REST operations for external resources.
*/
@Api(tags = "Resources", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("resources")
public interface ResourceService extends JAXRSService {
@@ -64,7 +65,7 @@ public interface ResourceService extends JAXRSService {
*/
@GET
@Path("{key}/{anyTypeKey}/{anyKey}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
ConnObjectTO readConnObject(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("anyTypeKey") String anyTypeKey,
@@ -81,7 +82,7 @@ public interface ResourceService extends JAXRSService {
*/
@GET
@Path("{key}/{anyTypeKey}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
PagedConnObjectTOResult listConnObjects(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("anyTypeKey") String anyTypeKey,
@@ -95,7 +96,7 @@ public interface ResourceService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
ResourceTO read(@NotNull @PathParam("key") String key);
/**
@@ -104,7 +105,7 @@ public interface ResourceService extends JAXRSService {
* @return list of all resources
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<ResourceTO> list();
/**
@@ -117,12 +118,12 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 201,
message = "Resource successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull ResourceTO resourceTO);
/**
@@ -134,8 +135,8 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull ResourceTO resourceTO);
/**
@@ -149,7 +150,7 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("{key}/{anyTypeKey}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void setLatestSyncToken(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("anyTypeKey") String anyTypeKey);
@@ -164,7 +165,7 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}/{anyTypeKey}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void removeSyncToken(
@NotNull @PathParam("key") String key,
@NotNull @PathParam("anyTypeKey") String anyTypeKey);
@@ -178,8 +179,8 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -191,8 +192,8 @@ public interface ResourceService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("check")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void check(@NotNull ResourceTO resourceTO);
/**
@@ -203,7 +204,7 @@ public interface ResourceService extends JAXRSService {
*/
@POST
@Path("{key}/bulkDeassociation/{anyTypeKey}/{action}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
BulkActionResult bulkDeassociation(@NotNull ResourceDeassociationPatch patch);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
index fe65840..ec6439f 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.RoleTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -44,8 +45,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for roles.
*/
@Api(tags = "Roles", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("roles")
public interface RoleService extends JAXRSService {
@@ -55,7 +56,7 @@ public interface RoleService extends JAXRSService {
* @return list of all roles.
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<RoleTO> list();
/**
@@ -66,7 +67,7 @@ public interface RoleService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
RoleTO read(@NotNull @PathParam("key") String key);
/**
@@ -79,12 +80,12 @@ public interface RoleService extends JAXRSService {
@ApiResponse(code = 201,
message = "Role successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull RoleTO roleTO);
/**
@@ -96,8 +97,8 @@ public interface RoleService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull RoleTO roleTO);
/**
@@ -109,7 +110,7 @@ public interface RoleService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -134,7 +135,7 @@ public interface RoleService extends JAXRSService {
@PUT
@Path("{key}/consoleLayout")
@Consumes({ MediaType.APPLICATION_JSON })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void setConsoleLayoutInfo(@NotNull @PathParam("key") String key, InputStream consoleLayoutInfoIn);
/**
@@ -146,6 +147,6 @@ public interface RoleService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}/consoleLayout")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void removeConsoleLayoutInfo(@NotNull @PathParam("key") String key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
index d8bf9dc..f1f8ae1 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
@@ -37,6 +37,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -46,8 +47,8 @@ import org.apache.syncope.common.rest.api.beans.SchemaQuery;
* REST operations for attribute schemas.
*/
@Api(tags = "Schemas", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("schemas")
public interface SchemaService extends JAXRSService {
@@ -61,7 +62,7 @@ public interface SchemaService extends JAXRSService {
*/
@GET
@Path("{type}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends SchemaTO> List<T> search(@BeanParam SchemaQuery query);
/**
@@ -74,7 +75,7 @@ public interface SchemaService extends JAXRSService {
*/
@GET
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends SchemaTO> T read(
@NotNull @PathParam("type") SchemaType type, @NotNull @PathParam("key") String key);
@@ -89,13 +90,13 @@ public interface SchemaService extends JAXRSService {
@ApiResponse(code = 201,
message = "Schema successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "Key value for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "Key value for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
@Path("{type}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull @PathParam("type") SchemaType type, @NotNull SchemaTO schemaTO);
/**
@@ -108,8 +109,8 @@ public interface SchemaService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{type}/{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull @PathParam("type") SchemaType type, @NotNull SchemaTO schemaTO);
/**
@@ -122,6 +123,6 @@ public interface SchemaService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("type") SchemaType type, @NotNull @PathParam("key") String key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
index b19f07f..64f3980 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
@@ -36,6 +36,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.SecurityQuestionTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -43,8 +44,8 @@ import org.apache.syncope.common.rest.api.RESTHeaders;
* REST operations for configuration.
*/
@Api(tags = "SecurityQuestions", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("securityQuestions")
public interface SecurityQuestionService extends JAXRSService {
@@ -54,7 +55,7 @@ public interface SecurityQuestionService extends JAXRSService {
* @return list of all security questions
*/
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
List<SecurityQuestionTO> list();
/**
@@ -65,7 +66,7 @@ public interface SecurityQuestionService extends JAXRSService {
*/
@GET
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
SecurityQuestionTO read(@NotNull @PathParam("key") String key);
/**
@@ -78,12 +79,12 @@ public interface SecurityQuestionService extends JAXRSService {
@ApiResponse(code = 201,
message = "SecurityQuestion successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "UUID generated for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull SecurityQuestionTO securityQuestionTO);
/**
@@ -95,8 +96,8 @@ public interface SecurityQuestionService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull SecurityQuestionTO securityQuestionTO);
/**
@@ -108,7 +109,7 @@ public interface SecurityQuestionService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("key") String key);
/**
@@ -119,7 +120,7 @@ public interface SecurityQuestionService extends JAXRSService {
*/
@GET
@Path("byUser/{username}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
SecurityQuestionTO readByUser(@NotNull @PathParam("username") String username);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
index 53d4bec..818f36d 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.info.NumbersInfo;
import org.apache.syncope.common.lib.info.SystemInfo;
import org.apache.syncope.common.lib.info.PlatformInfo;
@@ -41,8 +42,8 @@ import org.apache.syncope.common.lib.to.TypeExtensionTO;
* General info about this Apache Syncope deployment.
*/
@Api(tags = "Syncope", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("")
public interface SyncopeService extends JAXRSService {
@@ -55,7 +56,7 @@ public interface SyncopeService extends JAXRSService {
*/
@GET
@Path("/platform")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
PlatformInfo platform();
/**
@@ -65,7 +66,7 @@ public interface SyncopeService extends JAXRSService {
*/
@GET
@Path("/system")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
SystemInfo system();
/** *
@@ -75,7 +76,7 @@ public interface SyncopeService extends JAXRSService {
*/
@GET
@Path("/numbers")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
NumbersInfo numbers();
/**
@@ -91,7 +92,7 @@ public interface SyncopeService extends JAXRSService {
*/
@POST
@Path("/assignableGroups/{realm:.*}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
PagedResult<GroupTO> searchAssignableGroups(
@NotNull @PathParam("realm") String realm,
@QueryParam("term") String term,
@@ -106,7 +107,6 @@ public interface SyncopeService extends JAXRSService {
*/
@GET
@Path("/userTypeExtension/{groupName}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- TypeExtensionTO readUserTypeExtension(
- @NotNull @PathParam("groupName") String groupName);
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ TypeExtensionTO readUserTypeExtension(@NotNull @PathParam("groupName") String groupName);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 740d961..b883518 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -38,6 +38,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
@@ -51,8 +52,8 @@ import org.apache.syncope.common.rest.api.beans.TaskQuery;
* REST operations for tasks.
*/
@Api(tags = "Tasks", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@Path("tasks")
public interface TaskService extends ExecutableService {
@@ -67,7 +68,7 @@ public interface TaskService extends ExecutableService {
*/
@GET
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends TaskTO> T read(
@NotNull @PathParam("type") TaskType type,
@NotNull @PathParam("key") String key,
@@ -82,7 +83,7 @@ public interface TaskService extends ExecutableService {
*/
@GET
@Path("{type}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
<T extends TaskTO> PagedResult<T> search(@BeanParam TaskQuery query);
/**
@@ -96,13 +97,13 @@ public interface TaskService extends ExecutableService {
@ApiResponse(code = 201,
message = "Task successfully created", responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the entity created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "UUID generated for the entity created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
description = "URL of the entity created") }))
@POST
@Path("{type}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull @PathParam("type") TaskType type, @NotNull SchedTaskTO taskTO);
/**
@@ -115,8 +116,8 @@ public interface TaskService extends ExecutableService {
@ApiResponse(code = 204, message = "Operation was successful"))
@PUT
@Path("{type}/{key}")
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void update(@NotNull @PathParam("type") TaskType type, @NotNull SchedTaskTO taskTO);
/**
@@ -129,7 +130,7 @@ public interface TaskService extends ExecutableService {
@ApiResponse(code = 204, message = "Operation was successful"))
@DELETE
@Path("{type}/{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void delete(@NotNull @PathParam("type") TaskType type, @NotNull @PathParam("key") String key);
/**
@@ -140,7 +141,7 @@ public interface TaskService extends ExecutableService {
*/
@POST
@Path("bulk")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
BulkActionResult bulk(@NotNull BulkAction bulkAction);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3983e2f3/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
index 3ac6cf5..c2f8e27 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
@@ -40,6 +40,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.PATCH;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.patch.StatusPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.ProvisioningResult;
@@ -59,19 +60,18 @@ public interface UserSelfService extends JAXRSService {
* @return calling user data, including own UUID and entitlements
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@ApiResponses(
@ApiResponse(code = 200, message = "Calling user data, including own UUID and entitlements",
response = UserTO.class, responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID of the calling user")
- ,
+ description = "UUID of the calling user"),
@ResponseHeader(name = RESTHeaders.OWNED_ENTITLEMENTS, response = String.class,
description = "List of entitlements owned by the calling user")
}))
@GET
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response read();
/**
@@ -93,15 +93,15 @@ public interface UserSelfService extends JAXRSService {
+ "or empty if 'Prefer: return-no-content' was specified",
response = ProvisioningResult.class, responseHeaders = {
@ResponseHeader(name = RESTHeaders.RESOURCE_KEY, response = String.class,
- description = "UUID generated for the user created")
- , @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
- description = "URL of the user created")
- , @ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
+ description = "UUID generated for the user created"),
+ @ResponseHeader(name = HttpHeaders.LOCATION, response = String.class,
+ description = "URL of the user created"),
+ @ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied") }))
@POST
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response create(@NotNull UserTO userTO,
@DefaultValue("true") @QueryParam("storePassword") boolean storePassword);
@@ -112,8 +112,8 @@ public interface UserSelfService extends JAXRSService {
* @return Response object featuring the updated user
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@ApiImplicitParams(
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
@@ -122,16 +122,16 @@ public interface UserSelfService extends JAXRSService {
@ApiResponses({
@ApiResponse(code = 200,
message = "User successfully updated enriched with propagation status information, as Entity",
- response = ProvisioningResult.class)
- , @ApiResponse(code = 204,
+ response = ProvisioningResult.class),
+ @ApiResponse(code = 204,
message = "No content if 'Prefer: return-no-content' was specified", responseHeaders =
@ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied")) })
@PATCH
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response update(@NotNull UserPatch patch);
/**
@@ -141,8 +141,8 @@ public interface UserSelfService extends JAXRSService {
* @return Response object featuring the updated user
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@ApiImplicitParams(
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
@@ -151,16 +151,16 @@ public interface UserSelfService extends JAXRSService {
@ApiResponses({
@ApiResponse(code = 200,
message = "User successfully updated enriched with propagation status information, as Entity",
- response = ProvisioningResult.class)
- , @ApiResponse(code = 204,
+ response = ProvisioningResult.class),
+ @ApiResponse(code = 204,
message = "No content if 'Prefer: return-no-content' was specified", responseHeaders =
@ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied")) })
@PUT
@Path("{key}")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response update(@NotNull UserTO user);
/**
@@ -170,8 +170,8 @@ public interface UserSelfService extends JAXRSService {
* @return Response object featuring the updated user enriched with propagation status information
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@ApiImplicitParams(
@ApiImplicitParam(name = RESTHeaders.PREFER, paramType = "header", dataType = "string",
value = "Allows the client to specify a preference for the result to be returned from the server",
@@ -180,16 +180,16 @@ public interface UserSelfService extends JAXRSService {
@ApiResponses({
@ApiResponse(code = 200,
message = "User successfully updated enriched with propagation status information, as Entity",
- response = ProvisioningResult.class)
- , @ApiResponse(code = 204,
+ response = ProvisioningResult.class),
+ @ApiResponse(code = 204,
message = "No content if 'Prefer: return-no-content' was specified", responseHeaders =
@ResponseHeader(name = RESTHeaders.PREFERENCE_APPLIED, response = String.class,
description = "Allows the server to inform the "
+ "client about the fact that a specified preference was applied")) })
@POST
@Path("{key}/status")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
+ @Consumes({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response status(@NotNull StatusPatch statusPatch);
/**
@@ -198,10 +198,10 @@ public interface UserSelfService extends JAXRSService {
* @return Response object featuring the deleted user
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@DELETE
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response delete();
/**
@@ -212,11 +212,11 @@ public interface UserSelfService extends JAXRSService {
* @return Response object featuring the updated user
*/
@ApiOperation(value = "", authorizations = {
- @Authorization(value = "BasicAuthentication")
- , @Authorization(value = "Bearer") })
+ @Authorization(value = "BasicAuthentication"),
+ @Authorization(value = "Bearer") })
@POST
@Path("changePassword")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
Response changePassword(String password);
/**
@@ -231,7 +231,7 @@ public interface UserSelfService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("requestPasswordReset")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void requestPasswordReset(@NotNull @QueryParam("username") String username, String securityAnswer);
/**
@@ -247,6 +247,6 @@ public interface UserSelfService extends JAXRSService {
@ApiResponse(code = 204, message = "Operation was successful"))
@POST
@Path("confirmPasswordReset")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+ @Produces({ MediaType.APPLICATION_JSON, SyncopeConstants.APPLICATION_YAML, MediaType.APPLICATION_XML })
void confirmPasswordReset(@NotNull @QueryParam("token") String token, String password);
}