:libraries:shiro-* refine
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5901e24f Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5901e24f Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5901e24f Branch: refs/heads/develop Commit: 5901e24fb89705ec5d442796343b3b83396de75c Parents: 0ee07a1 Author: Paul Merlin <[email protected]> Authored: Mon May 15 10:20:15 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 15 10:20:15 2017 +0200 ---------------------------------------------------------------------- .../shiro/domain/common/IdentifiableSubject.java | 2 -- .../domain/passwords/PasswordRealmConfiguration.java | 4 ---- .../shiro/domain/passwords/PasswordRealmService.java | 4 +--- .../shiro/domain/passwords/PasswordSecurable.java | 5 +---- .../library/shiro/domain/permissions/Role.java | 8 ++------ .../shiro/domain/permissions/RoleAssignee.java | 14 +++++--------- .../shiro/domain/permissions/RoleAssignment.java | 4 ---- .../library/shiro/domain/permissions/RoleFactory.java | 2 -- .../library/shiro/ini/IniSecurityManagerService.java | 4 ++-- .../library/shiro/ini/ShiroIniConfiguration.java | 4 ---- .../library/shiro/web/ShiroFilterService.java | 3 +-- 11 files changed, 12 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/common/IdentifiableSubject.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/common/IdentifiableSubject.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/common/IdentifiableSubject.java index c049b4b..39f27a1 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/common/IdentifiableSubject.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/common/IdentifiableSubject.java @@ -23,7 +23,5 @@ import org.apache.polygene.api.property.Property; public interface IdentifiableSubject { - Property<String> subjectIdentifier(); - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmConfiguration.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmConfiguration.java index 127d750..8ddeb5a 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmConfiguration.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmConfiguration.java @@ -20,13 +20,10 @@ package org.apache.polygene.library.shiro.domain.passwords; import org.apache.polygene.api.common.Optional; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.property.Property; public interface PasswordRealmConfiguration - extends ConfigurationComposite { - // START SNIPPET: config /** * Sets the name of the MessageDigest algorithm that will be used to compute hashes. @@ -40,5 +37,4 @@ public interface PasswordRealmConfiguration @Optional Property<Integer> hashIterationsCount(); // END SNIPPET: config - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmService.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmService.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmService.java index 5320ab7..45c8e64 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmService.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordRealmService.java @@ -24,11 +24,9 @@ import org.apache.shiro.authz.Authorizer; import org.apache.shiro.realm.Realm; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceActivation; -import org.apache.polygene.api.service.ServiceComposite; @Mixins( PasswordRealmMixin.class ) public interface PasswordRealmService - extends Realm, Authorizer, PasswordService, - ServiceComposite, ServiceActivation + extends Realm, Authorizer, PasswordService, ServiceActivation { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordSecurable.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordSecurable.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordSecurable.java index a07a0aa..827d94e 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordSecurable.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/passwords/PasswordSecurable.java @@ -19,16 +19,13 @@ */ package org.apache.polygene.library.shiro.domain.passwords; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.entity.Queryable; import org.apache.polygene.api.property.Property; import org.apache.polygene.library.shiro.domain.common.IdentifiableSubject; public interface PasswordSecurable - extends IdentifiableSubject, EntityComposite + extends IdentifiableSubject { - @Queryable( false ) Property<String> password(); - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/Role.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/Role.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/Role.java index 85c7b02..fed39ec 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/Role.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/Role.java @@ -22,7 +22,7 @@ package org.apache.polygene.library.shiro.domain.permissions; import java.util.List; import org.apache.polygene.api.common.UseDefaults; import org.apache.polygene.api.entity.EntityBuilder; -import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.HasIdentity; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.injection.scope.This; import org.apache.polygene.api.mixin.Mixins; @@ -32,9 +32,8 @@ import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; @Mixins( Role.Mixin.class ) public interface Role - extends EntityComposite + extends HasIdentity { - Property<String> name(); @UseDefaults @@ -45,7 +44,6 @@ public interface Role abstract class Mixin implements Role { - @Structure private UnitOfWorkFactory uowf; @@ -64,7 +62,5 @@ public interface Role assignee.roleAssignments().add( assignment ); return assignment; } - } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignee.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignee.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignee.java index f75fbad..78b8f00 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignee.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignee.java @@ -25,16 +25,15 @@ import java.util.Set; import org.apache.polygene.api.association.ManyAssociation; import org.apache.polygene.api.common.UseDefaults; import org.apache.polygene.api.entity.Aggregated; -import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.HasIdentity; import org.apache.polygene.api.injection.scope.This; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.library.shiro.domain.common.IdentifiableSubject; @Mixins( RoleAssignee.Mixin.class ) public interface RoleAssignee - extends IdentifiableSubject, EntityComposite + extends IdentifiableSubject, HasIdentity { - @Aggregated @UseDefaults ManyAssociation<RoleAssignment> roleAssignments(); @@ -43,17 +42,16 @@ public interface RoleAssignee Set<String> permissionStrings(); - public abstract class Mixin + abstract class Mixin implements RoleAssignee { - @This private RoleAssignee roleAssignee; @Override public Set<String> roleNames() { - Set<String> roleNames = new HashSet<String>(); + Set<String> roleNames = new HashSet<>(); for ( RoleAssignment assignment : roleAssignee.roleAssignments() ) { roleNames.add( assignment.role().get().name().get() ); } @@ -63,13 +61,11 @@ public interface RoleAssignee @Override public Set<String> permissionStrings() { - Set<String> permissionStrings = new HashSet<String>(); + Set<String> permissionStrings = new HashSet<>(); for ( RoleAssignment assignment : roleAssignee.roleAssignments() ) { permissionStrings.addAll( assignment.role().get().permissions().get() ); } return Collections.unmodifiableSet( permissionStrings ); } - } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignment.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignment.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignment.java index 6d45bec..3c5ccb8 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignment.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleAssignment.java @@ -20,14 +20,10 @@ package org.apache.polygene.library.shiro.domain.permissions; import org.apache.polygene.api.association.Association; -import org.apache.polygene.api.entity.EntityComposite; public interface RoleAssignment - extends EntityComposite { - Association<Role> role(); Association<RoleAssignee> assignee(); - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleFactory.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleFactory.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleFactory.java index f1d2766..67f81a5 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleFactory.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/domain/permissions/RoleFactory.java @@ -23,13 +23,11 @@ import java.util.Arrays; import org.apache.polygene.api.entity.EntityBuilder; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; @Mixins( RoleFactory.Mixin.class ) public interface RoleFactory - extends ServiceComposite { Role create( String name, String... permissions ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/IniSecurityManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/IniSecurityManagerService.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/IniSecurityManagerService.java index dc2f1ee..ea24a8b 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/IniSecurityManagerService.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/IniSecurityManagerService.java @@ -45,7 +45,7 @@ public interface IniSecurityManagerService SecurityManager getSecurityManager(); - public class Mixin + class Mixin extends IniSecurityManagerFactory implements IniSecurityManagerService { @@ -79,7 +79,7 @@ public interface IniSecurityManagerService // Register Realms Services RealmSecurityManager realmSecurityManager = ( RealmSecurityManager ) securityManager; - Collection<Realm> iniRealms = new ArrayList<Realm>( realmSecurityManager.getRealms() ); + Collection<Realm> iniRealms = new ArrayList<>( realmSecurityManager.getRealms() ); for ( ServiceReference<Realm> realmRef : realmsRefs ) { iniRealms.add( realmRef.get() ); LOG.debug( "Realm Service '{}' registered!", realmRef.identity() ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/ShiroIniConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/ShiroIniConfiguration.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/ShiroIniConfiguration.java index c129183..cec7e60 100644 --- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/ShiroIniConfiguration.java +++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/ini/ShiroIniConfiguration.java @@ -20,14 +20,11 @@ package org.apache.polygene.library.shiro.ini; import org.apache.polygene.api.common.Optional; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.property.Property; // START SNIPPET: config public interface ShiroIniConfiguration - extends ConfigurationComposite { - /** * Resource path of the ini configuration file. * "classpath:", "file": and "url:" prefixes are supported. @@ -35,6 +32,5 @@ public interface ShiroIniConfiguration */ @Optional Property<String> iniResourcePath(); - } // END SNIPPET: config http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5901e24f/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/ShiroFilterService.java ---------------------------------------------------------------------- diff --git a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/ShiroFilterService.java b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/ShiroFilterService.java index 7e3a478..698bcaa 100644 --- a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/ShiroFilterService.java +++ b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/ShiroFilterService.java @@ -22,10 +22,9 @@ package org.apache.polygene.library.shiro.web; import javax.servlet.Filter; import org.apache.shiro.web.servlet.ShiroFilter; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; @Mixins( ShiroFilter.class ) public interface ShiroFilterService - extends Filter, ServiceComposite + extends Filter { }
