You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/01/29 10:24:04 UTC
[isis] branch master updated: ISIS-2950: respect internal naming convention
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 42e70e2 ISIS-2950: respect internal naming convention
42e70e2 is described below
commit 42e70e2a5ce0d672ef636c3bc44615db1ce35584
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 29 11:23:57 2022 +0100
ISIS-2950: respect internal naming convention
- don't use 'lookup' prefix, when not returning an Optional<T>
---
.../apache/isis/core/config/progmodel/ProgrammingModelConstants.java | 2 +-
.../apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java | 2 +-
.../apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
index dafaf24..b62bbe6 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
@@ -132,7 +132,7 @@ public final class ProgrammingModelConstants {
PUBLIC_SINGLE_ARG_RECEIVING_MIXEE;
// while this enum only has a single value, we just provide a (quasi) static method here
- public <T> Constructor<T> lookupConstructor(
+ public <T> Constructor<T> getConstructorElseFail(
final @NonNull Class<T> mixinClass,
final @NonNull Class<?> mixeeClass) {
return _Casts.uncheckedCast(_Reflect
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
index cddb527..bf8fb6c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -112,7 +112,7 @@ public class FactoryServiceDefault implements FactoryService {
mixinClass.getName(), mixedIn);
}
val mixinConstructor = MixinConstructor.PUBLIC_SINGLE_ARG_RECEIVING_MIXEE
- .lookupConstructor(mixinClass, mixedIn.getClass());
+ .getConstructorElseFail(mixinClass, mixedIn.getClass());
try {
val mixin = mixinConstructor.newInstance(mixedIn);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index cdd51f4..cb0712d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -312,7 +312,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
val mixinAdapter = adaptAndGuardAgainstWrappingNotSupported(mixin);
val mixinConstructor = MixinConstructor.PUBLIC_SINGLE_ARG_RECEIVING_MIXEE
- .lookupConstructor(mixinClass, mixee.getClass());
+ .getConstructorElseFail(mixinClass, mixee.getClass());
val proxyFactory = proxyFactoryService
.factory(mixinClass, new Class[]{WrappingObject.class}, mixinConstructor.getParameterTypes());