3232import com .atomgraph .spinrdf .vocabulary .SPIN ;
3333import java .io .IOException ;
3434import java .util .Collections ;
35- import java .util .HashMap ;
3635import java .util .Map ;
3736import java .util .Optional ;
3837import jakarta .annotation .PostConstruct ;
5554import org .apache .jena .query .ResultSetRewindable ;
5655import org .apache .jena .rdf .model .Model ;
5756import org .apache .jena .rdf .model .ModelFactory ;
58- import org .apache .jena .rdf .model .ResIterator ;
5957import org .apache .jena .rdf .model .Resource ;
6058import org .apache .jena .rdf .model .ResourceFactory ;
6159import org .apache .jena .vocabulary .RDF ;
@@ -76,20 +74,14 @@ public class AuthorizationFilter implements ContainerRequestFilter
7674 /**
7775 * A mapping of HTTP methods to ACL access modes.
7876 */
79- public static final Map <String , Resource > ACCESS_MODES ;
80- static
81- {
82- final Map <String , Resource > accessModes = new HashMap <>();
83-
84- accessModes .put (HttpMethod .GET , ACL .Read );
85- accessModes .put (HttpMethod .HEAD , ACL .Read );
86- accessModes .put (HttpMethod .POST , ACL .Append );
87- accessModes .put (HttpMethod .PUT , ACL .Write );
88- accessModes .put (HttpMethod .DELETE , ACL .Write );
89- accessModes .put (HttpMethod .PATCH , ACL .Write );
90-
91- ACCESS_MODES = Collections .unmodifiableMap (accessModes );
92- }
77+ public static final Map <String , Resource > ACCESS_MODES = Map .of (
78+ HttpMethod .GET , ACL .Read ,
79+ HttpMethod .HEAD , ACL .Read ,
80+ HttpMethod .POST , ACL .Append ,
81+ HttpMethod .PUT , ACL .Write ,
82+ HttpMethod .DELETE , ACL .Write ,
83+ HttpMethod .PATCH , ACL .Write
84+ );
9385
9486 @ Inject com .atomgraph .linkeddatahub .Application system ;
9587 @ Inject jakarta .inject .Provider <com .atomgraph .linkeddatahub .apps .model .Application > app ;
@@ -239,15 +231,10 @@ public Resource authorize(ContainerRequestContext request, Resource agent, Resou
239231 */
240232 public Resource getAuthorizationByMode (Model authModel , Resource accessMode )
241233 {
242- ResIterator it = authModel .listResourcesWithProperty (ACL .mode , accessMode );
243- try
244- {
245- return it .nextOptional ().orElse (null );
246- }
247- finally
248- {
249- it .close ();
250- }
234+ return authModel .listResourcesWithProperty (ACL .mode , accessMode ).
235+ toList ().stream ().
236+ findFirst ().
237+ orElse (null );
251238 }
252239
253240 /**
0 commit comments