From 1b5f1057c1628b5d2baff895b778770f3c8b0791 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 10 Jul 2020 22:10:35 +0800 Subject: [PATCH] Scim change --- .../{GroupController.java => ScimGroupController.java} | 2 +- ...izationController.java => ScimOrganizationController.java} | 4 ++-- ...ntroller.java => ScimServiceProviderConfigController.java} | 2 +- .../{UserController.java => ScimUserController.java} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/{GroupController.java => ScimGroupController.java} (95%) rename maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/{OrganizationController.java => ScimOrganizationController.java} (97%) rename maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/{ServiceProviderConfigController.java => ScimServiceProviderConfigController.java} (98%) rename maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/{UserController.java => ScimUserController.java} (97%) diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/GroupController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java similarity index 95% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/GroupController.java rename to maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java index cc2784ddb..fdc20c501 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/GroupController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java @@ -20,6 +20,6 @@ package org.maxkey.identity.scim.controller; import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(value = "/identity/scim/v2/Groups") -public class GroupController { +public class ScimGroupController { } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/OrganizationController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/OrganizationController.java rename to maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java index 4ed58d9a2..f8f6570fd 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/OrganizationController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java @@ -46,7 +46,7 @@ import org.springframework.web.util.UriComponentsBuilder; */ @RestController @RequestMapping(value = "/identity/scim/v2/Organization") -public class OrganizationController { +public class ScimOrganizationController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) public MappingJacksonValue getOrganization(@PathVariable String id, @@ -91,7 +91,7 @@ public class OrganizationController { requestParameters.get("filter"), requestParameters.get("sortBy"), requestParameters.getOrDefault("sortOrder", "ascending"), // scim default - Integer.parseInt(requestParameters.getOrDefault("count", "" + ServiceProviderConfigController.MAX_RESULTS)), + Integer.parseInt(requestParameters.getOrDefault("count", "" + ScimServiceProviderConfigController.MAX_RESULTS)), Integer.parseInt(requestParameters.getOrDefault("startIndex", "1")); // scim default */ String attributes = (requestParameters.containsKey("attributes") ? requestParameters.get("attributes") : ""); diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ServiceProviderConfigController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java similarity index 98% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ServiceProviderConfigController.java rename to maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java index b7163e642..e4ddd5dc5 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ServiceProviderConfigController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java @@ -27,7 +27,7 @@ import java.util.Set; @RestController @RequestMapping(value = "/identity/scim/v2/ServiceProviderConfig") -public class ServiceProviderConfigController { +public class ScimServiceProviderConfigController { public static final int MAX_RESULTS = 100; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/UserController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/UserController.java rename to maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java index a2d6ece10..356f49f5b 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/UserController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java @@ -45,7 +45,7 @@ import org.springframework.web.util.UriComponentsBuilder; */ @RestController @RequestMapping(value = "/identity/scim/v2/Users") -public class UserController { +public class ScimUserController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) public MappingJacksonValue getUser(@PathVariable String id, @@ -90,7 +90,7 @@ public class UserController { requestParameters.get("filter"), requestParameters.get("sortBy"), requestParameters.getOrDefault("sortOrder", "ascending"), // scim default - Integer.parseInt(requestParameters.getOrDefault("count", "" + ServiceProviderConfigController.MAX_RESULTS)), + Integer.parseInt(requestParameters.getOrDefault("count", "" + ScimServiceProviderConfigController.MAX_RESULTS)), Integer.parseInt(requestParameters.getOrDefault("startIndex", "1")); // scim default */ String attributes = (requestParameters.containsKey("attributes") ? requestParameters.get("attributes") : "");