anchela commented on code in PR #1014:
URL: https://github.com/apache/jackrabbit-oak/pull/1014#discussion_r1259349658
##########
oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java:
##########
@@ -98,19 +107,23 @@ public Filter getFilter(@NotNull SecurityProvider
securityProvider, @NotNull Roo
//----------------------------------------------------< SCR Integration
>---
+ public FilterProviderImpl() {
+ // constructor to use from SCR (not yet possible to use constructor
injection, see https://issues.apache.org/jira/browse/OAK-9837)
+ }
+
@Activate
- protected void activate(Configuration configuration, Map<String, Object>
properties) {
- setPath(configuration);
+ protected void activate(Configuration configuration) {
Review Comment:
removing the unused property map is an unrelated change, right? i would not
do it as part of this PR but create a separate task for that.
##########
oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java:
##########
@@ -98,19 +107,23 @@ public Filter getFilter(@NotNull SecurityProvider
securityProvider, @NotNull Roo
//----------------------------------------------------< SCR Integration
>---
+ public FilterProviderImpl() {
+ // constructor to use from SCR (not yet possible to use constructor
injection, see https://issues.apache.org/jira/browse/OAK-9837)
+ }
+
@Activate
- protected void activate(Configuration configuration, Map<String, Object>
properties) {
- setPath(configuration);
+ protected void activate(Configuration configuration) {
+ setPath(configuration.path());
}
@Modified
- protected void modified(Configuration configuration, Map<String, Object>
properties) {
- setPath(configuration);
+ protected void modified(Configuration configuration) {
+ setPath(configuration.path());
}
- private void setPath(@NotNull Configuration configuration) {
- checkState(isValidPath(configuration.path()), "Configured path must be
a valid absolute path.");
- oakPath = configuration.path();
+ private void setPath(String path) {
Review Comment:
please add @Nullable or @NotNull annotation. was there a reason for removing
the annotation?
##########
oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java:
##########
@@ -76,6 +76,15 @@ public class FilterProviderImpl implements FilterProvider {
private final Map<String, String> validatedPrincipalNamesPathMap =
Maps.newConcurrentMap();
private final Map<String, String> unsupportedPrincipalNames =
Maps.newConcurrentMap();
+ /**
+ * Constructor to use outside OSGi containers
+ * @param oakPath the repository path where the principals are located
+ * @since 1.54
+ */
+ public FilterProviderImpl(String oakPath) {
Review Comment:
@kwin , please add @NotNull annotation for the path param
##########
oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java:
##########
@@ -98,19 +107,23 @@ public Filter getFilter(@NotNull SecurityProvider
securityProvider, @NotNull Roo
//----------------------------------------------------< SCR Integration
>---
+ public FilterProviderImpl() {
+ // constructor to use from SCR (not yet possible to use constructor
injection, see https://issues.apache.org/jira/browse/OAK-9837)
+ }
+
@Activate
- protected void activate(Configuration configuration, Map<String, Object>
properties) {
- setPath(configuration);
+ protected void activate(Configuration configuration) {
+ setPath(configuration.path());
}
@Modified
- protected void modified(Configuration configuration, Map<String, Object>
properties) {
- setPath(configuration);
+ protected void modified(Configuration configuration) {
Review Comment:
same as above
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
