From b12609211ee368fbfb779f2ef60e0d16f2e0aa76 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Fri, 6 Mar 2020 17:04:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/authorization/define/ResourcesDefinition.java | 5 +++++ .../basic/define/DefaultBasicAuthorizeDefinitionTest.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/ResourcesDefinition.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/ResourcesDefinition.java index c75d50381..3aefa1c43 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/ResourcesDefinition.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/ResourcesDefinition.java @@ -37,6 +37,7 @@ public class ResourcesDefinition { } + public Optional getResource(String id) { return resources .stream() @@ -61,6 +62,10 @@ public class ResourcesDefinition { .isPresent(); } + public boolean isEmpty(){ + return resources.isEmpty(); + } + public boolean hasPermission(Collection permissions) { if (CollectionUtils.isEmpty(resources)) { diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinitionTest.java b/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinitionTest.java index 54d6bf245..43d562167 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinitionTest.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinitionTest.java @@ -35,7 +35,7 @@ public class DefaultBasicAuthorizeDefinitionTest { public void testNoMerge() { AopAuthorizeDefinition definition = DefaultBasicAuthorizeDefinition.from(TestController.class, TestController.class.getMethod("noMerge")); - Assert.assertTrue(definition.isEmpty()); + Assert.assertTrue(definition.getResources().isEmpty()); }