You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/05/28 08:48:09 UTC
[isis] 01/03: ISIS-2483: removes unnecessary import,
fixes javadoc is all or whitespace
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 647a6ad4e21261fe6cd674de4caeda6ec892b2bb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 28 09:45:20 2021 +0100
ISIS-2483: removes unnecessary import, fixes javadoc is all or whitespace
---
.../facets/object/hidden/method/HiddenObjectFacetViaMethod.java | 2 +-
.../java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java | 2 +-
.../core/runtimeservices/executor/MemberExecutorServiceDefault.java | 2 +-
.../extensions/secman/integration/IsisModuleExtSecmanIntegration.java | 1 -
.../secman/integration/facets/TenantedAuthorizationPostProcessor.java | 2 --
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
index 98eb12b..55b2951 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
@@ -51,7 +51,7 @@ extends HiddenObjectFacetAbstract {
return null;
}
final Boolean isHidden = (Boolean) ManagedObjects.InvokeUtil.invoke(method, target);
- return isHidden.booleanValue() ? "Hidden" : null;
+ return isHidden ? "Hidden" : null;
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
index 61e660d..2870e73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
@@ -73,7 +73,7 @@ public interface ObjectFeature extends Specification {
* <li>for an {@link ObjectAction action}, will always return <tt>null</tt>.
* See instead {@link ObjectAction#getReturnType()} and
* {@link ObjectAction#getParameterTypes()}.
- * <li>for a {@link ObjectActionParameter action}, will return the type of
+ * <li>for an {@link ObjectActionParameter action parameter}, will return the type of
* the parameter}.
* </ul>
*/
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index 99d0358..979023e 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -260,7 +260,7 @@ implements MemberExecutorService {
}
val entityState = ManagedObjects.EntityUtil.getEntityState(resultAdapter);
- if(entityState.isDetached()) {
+ if(entityState.isDetached()) {
// ensure that any still-to-be-persisted adapters get persisted to DB.
getTransactionService().flushTransaction();
}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
index f48b694..23eb2a8 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import org.apache.isis.extensions.secman.integration.authorizor.AuthorizorSecman;
import org.apache.isis.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor;
-import org.apache.isis.extensions.secman.applib.seed.SeedSecurityModuleService;
import org.apache.isis.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman;
import org.apache.isis.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman;
import org.apache.isis.extensions.secman.integration.userreg.UserRegistrationServiceForSecman;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index f4b6fdf..993e1ae 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -26,7 +26,6 @@ import javax.inject.Provider;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.user.UserService;
@@ -107,7 +106,6 @@ public class TenantedAuthorizationPostProcessor
}
@Inject ServiceRegistry serviceRegistry;
- @Inject ServiceInjector serviceInjector;
@Inject UserService userService;
@Inject @Lazy ApplicationUserRepository userRepository;
@Inject Provider<QueryResultsCache> queryResultsCacheProvider;