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 2018/10/11 12:42:17 UTC
[isis] branch v2 updated: ISIS-1976: finding a shorter name also
fixes typo -> 'explicitIdOfType'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new b748f92 ISIS-1976: finding a shorter name also fixes typo -> 'explicitIdOfType'
b748f92 is described below
commit b748f925d15564217448ca2893f54acc1676610a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 11 14:42:13 2018 +0200
ISIS-1976: finding a shorter name also fixes typo -> 'explicitIdOfType'
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../ObjectSpecIdFacetDerivedFromClassNameFactory.java | 2 +-
.../org/apache/isis/core/metamodel/services/ServiceUtil.java | 10 +++++-----
.../apache/isis/core/metamodel/services/ServiceUtil_Test.java | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 4d3d2ee..1f28e36 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -75,7 +75,7 @@ MetaModelValidatorRefiner {
final boolean isService = isService(facetHolder);
if (isService) {
- final String id = ServiceUtil.getExplicitelySpecifiedIdOfType(substitutedClass).orElse(null);
+ final String id = ServiceUtil.getExplicitIdOfType(substitutedClass).orElse(null);
if (id != null) {
return new ObjectSpecIdFacetDerivedFromDomainServiceAnnotationElseGetId(id, facetHolder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java
index 769fa6c..0a076e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java
@@ -34,13 +34,13 @@ public final class ServiceUtil {
public static String idOfPojo(final Object serviceObject) {
final Class<?> serviceClass = serviceObject.getClass();
- return explicitelySpecifiedIdOfType(serviceClass, ()->serviceObject)
+ return explicitIdOfType(serviceClass, ()->serviceObject)
.orElseGet(()->normalize(serviceClass));
}
public static String idOfSpec(final ObjectSpecification serviceSpec) {
final Class<?> serviceClass = serviceSpec.getCorrespondingClass();
- return explicitelySpecifiedIdOfType(serviceClass, serviceClass::newInstance)
+ return explicitIdOfType(serviceClass, serviceClass::newInstance)
.orElseGet(()->normalize(serviceClass));
}
@@ -48,13 +48,13 @@ public final class ServiceUtil {
return idOfPojo(serviceAdapter.getPojo());
}
- public static Optional<String> getExplicitelySpecifiedIdOfType(final Class<?> serviceClass) {
- return explicitelySpecifiedIdOfType(serviceClass, serviceClass::newInstance);
+ public static Optional<String> getExplicitIdOfType(final Class<?> serviceClass) {
+ return explicitIdOfType(serviceClass, serviceClass::newInstance);
}
// -- HELPER
- private static Optional<String> explicitelySpecifiedIdOfType(
+ private static Optional<String> explicitIdOfType(
final Class<?> serviceClass,
final _Functions.CheckedSupplier<Object> serviceInstanceSupplier) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceUtil_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceUtil_Test.java
index cd266fb..4498369 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceUtil_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceUtil_Test.java
@@ -63,7 +63,7 @@ public class ServiceUtil_Test {
is(equalTo("foo.SomeServiceAnnotated")));
assertThat(
- ServiceUtil.getExplicitelySpecifiedIdOfType(SomeServiceAnnotated.class).orElse(null),
+ ServiceUtil.getExplicitIdOfType(SomeServiceAnnotated.class).orElse(null),
is(equalTo("foo.SomeServiceAnnotated")));
}
@@ -75,7 +75,7 @@ public class ServiceUtil_Test {
is(equalTo("bar.SomeServiceWithId")));
assertThat(
- ServiceUtil.getExplicitelySpecifiedIdOfType(SomeServiceWithId.class).orElse(null),
+ ServiceUtil.getExplicitIdOfType(SomeServiceWithId.class).orElse(null),
is(equalTo("bar.SomeServiceWithId")));
}
@@ -87,7 +87,7 @@ public class ServiceUtil_Test {
is(equalTo("bop.SomeServiceAnnotated")));
assertThat(
- ServiceUtil.getExplicitelySpecifiedIdOfType(SomeServiceAnnotatedAndWithId.class).orElse(null),
+ ServiceUtil.getExplicitIdOfType(SomeServiceAnnotatedAndWithId.class).orElse(null),
is(equalTo("bop.SomeServiceAnnotated")));
}
@@ -97,7 +97,7 @@ public class ServiceUtil_Test {
ServiceUtil.idOfPojo(new SomeServiceWithoutAnnotationOrId()),
is(equalTo("org.apache.isis.core.metamodel.services.ServiceUtil_Test$SomeServiceWithoutAnnotationOrId")));
assertThat(
- ServiceUtil.getExplicitelySpecifiedIdOfType(SomeServiceWithoutAnnotationOrId.class).orElse(null),
+ ServiceUtil.getExplicitIdOfType(SomeServiceWithoutAnnotationOrId.class).orElse(null),
is(nullValue()));
}