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/01/22 16:58:02 UTC
[isis] branch ISIS-1846_internal_utils updated: ISIS-1846
underscore(_) instead of dollar($) prefix for internal classes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1846_internal_utils
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-1846_internal_utils by this push:
new 25f8b31 ISIS-1846 underscore(_) instead of dollar($) prefix for internal classes
25f8b31 is described below
commit 25f8b31600325efba432d9423fd7edb182e663ff
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 22 17:57:59 2018 +0100
ISIS-1846 underscore(_) instead of dollar($) prefix for internal classes
---
.../org/apache/isis/applib/ModuleAbstract.java | 4 ++--
.../applib/fixturescripts/ExecutionParameters.java | 6 +++---
.../applib/fixturescripts/FixtureResultList.java | 4 ++--
.../isis/applib/fixturescripts/FixtureScript.java | 22 +++++++++++-----------
.../internal/base/{$Casts.java => _Casts.java} | 4 ++--
.../base/{$NullSafe.java => _NullSafe.java} | 4 ++--
.../internal/base/{$Strings.java => _Strings.java} | 12 ++++++------
...aturalNames.java => _Strings_NaturalNames.java} | 4 ++--
.../{$Comparators.java => _Comparators.java} | 8 ++++----
...pare.java => _Comparators_SequenceCompare.java} | 8 ++++----
.../isis/applib/services/jaxb/JaxbService.java | 10 +++++-----
.../queryresultscache/QueryResultsCache.java | 4 ++--
.../isis/applib/spec/AbstractSpecification2.java | 4 ++--
.../java/org/apache/isis/applib/util/JaxbUtil.java | 4 ++--
.../apache/isis/applib/util/ObjectContracts.java | 6 +++---
.../apache/isis/schema/utils/CommonDtoUtils.java | 8 ++++----
.../isis/schema/utils/MemberExecutionDtoUtils.java | 4 ++--
.../isis/core/commons/lang/StringExtensions.java | 8 ++++----
...ctionInvocationFacetForDomainEventAbstract.java | 4 ++--
.../domainservice/DomainServiceMenuOrder.java | 4 ++--
.../MemberGroupLayoutFacetProperties.java | 12 ++++++------
...cetInvertedByNullableAnnotationOnParameter.java | 4 ++--
.../MemberOrderFacetComparator.java | 4 ++--
.../core/metamodel/spec/feature/ObjectAction.java | 12 ++++++------
.../core/metamodel/util/DeweyOrderComparator.java | 4 ++--
25 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/ModuleAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/ModuleAbstract.java
index 133ded1..8366f34 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/ModuleAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/ModuleAbstract.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.internal.base.$NullSafe;
+import org.apache.isis.applib.internal.base._NullSafe;
import com.google.common.collect.Sets;
@@ -52,7 +52,7 @@ public abstract class ModuleAbstract
@XmlElement(name = "module", required = true)
private Set<ModuleAbstract> getModuleDependencies() {
- return $NullSafe.stream(getDependencies())
+ return _NullSafe.stream(getDependencies())
.filter(module->module instanceof ModuleAbstract)
.map(module->(ModuleAbstract) module)
.collect(Collectors.toSet());
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParameters.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParameters.java
index a786957..b7f8f8d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParameters.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParameters.java
@@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.io.CharSource;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -78,14 +78,14 @@ public class ExecutionParameters {
}
public <T> T getParameterAsT(final String parameterName, final Class<T> cls) {
- return $Casts.uncheckedCast(getParameterAsObject(parameterName, cls));
+ return _Casts.uncheckedCast(getParameterAsObject(parameterName, cls));
}
protected Object getParameterAsObject(final String parameterName, final Class<?> cls) {
final Object value;
if (Enum.class.isAssignableFrom(cls)) {
Class<?> enumClass = cls;
- value = getParameterAsEnum(parameterName, $Casts.uncheckedCast(enumClass));
+ value = getParameterAsEnum(parameterName, _Casts.uncheckedCast(enumClass));
} else if (cls == Boolean.class) {
value = getParameterAsBoolean(parameterName);
} else if (cls == Byte.class) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
index 57b3743..0ffd878 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -136,7 +136,7 @@ public class FixtureResultList {
if (!cls.isAssignableFrom(object.getClass())) {
throw new IllegalStateException(String.format("Fixture result exists and contains object but is of type %s, not %s", object.getClass().getName(), cls.getName()));
}
- return $Casts.uncheckedCast(object);
+ return _Casts.uncheckedCast(object);
}
//endregion
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 5c26c90..8ffe7ae 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -35,8 +35,8 @@ import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.fixtures.FixtureType;
import org.apache.isis.applib.fixtures.InstallableFixture;
-import org.apache.isis.applib.internal.base.$Casts;
-import org.apache.isis.applib.internal.base.$Strings;
+import org.apache.isis.applib.internal.base._Casts;
+import org.apache.isis.applib.internal.base._Strings;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -117,11 +117,11 @@ public abstract class FixtureScript
}
protected String localNameElseDerived(final String str) {
- return str != null ? str : $Strings.asLowerDashed.apply(friendlyNameElseDerived(str));
+ return str != null ? str : _Strings.asLowerDashed.apply(friendlyNameElseDerived(str));
}
protected String friendlyNameElseDerived(final String str) {
- return str != null ? str : $Strings.asNaturalName2.apply(getClass().getSimpleName());
+ return str != null ? str : _Strings.asNaturalName2.apply(getClass().getSimpleName());
}
//endregion
@@ -629,7 +629,7 @@ public abstract class FixtureScript
return childFixtureScript;
} else {
trace(childFixtureScript, As.SKIP);
- return $Casts.uncheckedCast(previouslyExecutedScript);
+ return _Casts.uncheckedCast(previouslyExecutedScript);
}
case EXECUTE_ONCE_BY_VALUE:
@@ -677,7 +677,7 @@ public abstract class FixtureScript
return childFixtureScript;
} else {
trace(childFixtureScript, As.SKIP);
- return $Casts.uncheckedCast(previouslyExecutedScript);
+ return _Casts.uncheckedCast(previouslyExecutedScript);
}
}
@@ -773,11 +773,11 @@ public abstract class FixtureScript
}
@Programmatic
public <T> T getUserData(final Class<T> cls) {
- return $Casts.uncheckedCast(userData.get(cls));
+ return _Casts.uncheckedCast(userData.get(cls));
}
@Programmatic
public <T> T clearUserData(final Class<T> cls) {
- return $Casts.uncheckedCast(userData.remove(cls));
+ return _Casts.uncheckedCast(userData.remove(cls));
}
}
@@ -792,7 +792,7 @@ public abstract class FixtureScript
}
private <T> T valueFor(final String parameterName, final ExecutionContext ec, final T defaultValue) {
- final Class<T> cls = $Casts.uncheckedCast(defaultValue.getClass());
+ final Class<T> cls = _Casts.uncheckedCast(defaultValue.getClass());
final T value = readParam(parameterName, ec, cls);
if(value != null) { return (T) value; }
@@ -820,7 +820,7 @@ public abstract class FixtureScript
Method method;
try {
method = this.getClass().getMethod("get" + uppercase(parameterName));
- value = $Casts.uncheckedCast(method.invoke(this));
+ value = _Casts.uncheckedCast(method.invoke(this));
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
}
@@ -829,7 +829,7 @@ public abstract class FixtureScript
if (cls == Boolean.class || cls == boolean.class) {
try {
method = this.getClass().getMethod("is" + uppercase(parameterName));
- value = $Casts.uncheckedCast(method.invoke(this));
+ value = _Casts.uncheckedCast(method.invoke(this));
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Casts.java b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Casts.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/$Casts.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/base/_Casts.java
index 7e9adf8..0e97680 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Casts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Casts.java
@@ -29,9 +29,9 @@ package org.apache.isis.applib.internal.base;
*
* @since 2.0.0
*/
-public final class $Casts {
+public final class _Casts {
- private $Casts(){}
+ private _Casts(){}
@SuppressWarnings("unchecked")
public static <T> T uncheckedCast(Object obj) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$NullSafe.java b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java
similarity index 98%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/$NullSafe.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java
index dae3354..a51c9ed 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$NullSafe.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java
@@ -39,9 +39,9 @@ import java.util.stream.StreamSupport;
*
*/
-public final class $NullSafe {
+public final class _NullSafe {
- private $NullSafe(){}
+ private _NullSafe(){}
// -- STREAM CREATION
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings.java b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings.java
index c7be64f..6c43230 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings.java
@@ -39,9 +39,9 @@ import javax.annotation.Nullable;
*
* @since 2.0.0
*/
-public final class $Strings {
+public final class _Strings {
- private $Strings() {}
+ private _Strings() {}
// -- BASICS
@@ -180,14 +180,14 @@ public final class $Strings {
// using naming convention asXxx...
public final static StringOperator asLowerDashed = operator()
- .andThen($Strings::lower)
- .andThen(s->$Strings.condenseWhitespaces(s, "-"));
+ .andThen(_Strings::lower)
+ .andThen(s->_Strings.condenseWhitespaces(s, "-"));
public final static StringOperator asNormalized = operator()
- .andThen(s->$Strings.condenseWhitespaces(s, " "));
+ .andThen(s->_Strings.condenseWhitespaces(s, " "));
public final static StringOperator asNaturalName2 = operator()
- .andThen(s->$Strings_NaturalNames.naturalName2(s, true));
+ .andThen(s->_Strings_NaturalNames.naturalName2(s, true));
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings_NaturalNames.java b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings_NaturalNames.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java
index 4a9ec68..85192ab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/base/$Strings_NaturalNames.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java
@@ -23,10 +23,10 @@ import javax.annotation.Nullable;
/**
*
- * package private mixin for utility class {@link $Strings}
+ * package private mixin for utility class {@link _Strings}
*
*/
-class $Strings_NaturalNames {
+class _Strings_NaturalNames {
private static final char SPACE = ' ';
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators.java b/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java
similarity index 88%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java
index 13908f6..097faa9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java
@@ -33,19 +33,19 @@ import javax.annotation.Nullable;
*
* @since 2.0.0
*/
-public final class $Comparators {
+public final class _Comparators {
- private $Comparators(){}
+ private _Comparators(){}
private static final String DEWEY_SEPERATOR = ".";
public static int deweyOrderCompare(
@Nullable final String sequence1,
@Nullable final String sequence2) {
- return $Comparators_SequenceCompare.compareNullLast(sequence1, sequence2, DEWEY_SEPERATOR);
+ return _Comparators_SequenceCompare.compareNullLast(sequence1, sequence2, DEWEY_SEPERATOR);
}
- public static final Comparator<String> deweyOrderComparator = $Comparators::deweyOrderCompare;
+ public static final Comparator<String> deweyOrderComparator = _Comparators::deweyOrderCompare;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators_SequenceCompare.java b/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators_SequenceCompare.java
rename to core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java
index 2ebf914..2bbf6f9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/$Comparators_SequenceCompare.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java
@@ -22,18 +22,18 @@ import java.util.StringTokenizer;
import javax.annotation.Nullable;
-import org.apache.isis.applib.internal.base.$Strings;
+import org.apache.isis.applib.internal.base._Strings;
-final class $Comparators_SequenceCompare {
+final class _Comparators_SequenceCompare {
- private $Comparators_SequenceCompare(){}
+ private _Comparators_SequenceCompare(){}
public static int compareNullLast(
@Nullable final String sequence1,
@Nullable final String sequence2,
final String separator) {
- if($Strings.isEmpty(separator))
+ if(_Strings.isEmpty(separator))
throw new IllegalArgumentException("a non empty separator is required");
if (sequence1 == null && sequence2 == null) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 651f069..9df01a3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.ApplicationException;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.internal.base.$Casts;
-import org.apache.isis.applib.internal.base.$NullSafe;
+import org.apache.isis.applib.internal.base._Casts;
+import org.apache.isis.applib.internal.base._NullSafe;
import org.apache.isis.applib.services.dto.Dto_downloadXsd;
import com.google.common.collect.Maps;
@@ -133,7 +133,7 @@ public interface JaxbService {
public <T> T fromXml(final Class<T> domainClass, final String xml, final Map<String, Object> unmarshallerProperties) {
try {
final JAXBContext context = JAXBContext.newInstance(domainClass);
- return $Casts.uncheckedCast(fromXml(context, xml, unmarshallerProperties));
+ return _Casts.uncheckedCast(fromXml(context, xml, unmarshallerProperties));
} catch (final JAXBException ex) {
throw new NonRecoverableException("Error unmarshalling XML to class '" + domainClass.getName() + "'", ex);
@@ -178,10 +178,10 @@ public interface JaxbService {
String annotationExceptionMessages = null;
try {
final Method getErrorsMethod = exClass.getMethod("getErrors");
- errors = $Casts.uncheckedCast(getErrorsMethod.invoke(ex));
+ errors = _Casts.uncheckedCast(getErrorsMethod.invoke(ex));
annotationExceptionMessages = ": " +
- $NullSafe.stream(errors)
+ _NullSafe.stream(errors)
.map(Exception::getMessage)
.collect(Collectors.joining("; "));
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index f50c46e..4d4f8d4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.services.WithTransactionScope;
/**
@@ -171,7 +171,7 @@ public class QueryResultsCache implements WithTransactionScope {
final Value<?> cacheValue = cache.get(cacheKey);
logHitOrMiss(cacheKey, cacheValue);
if(cacheValue != null) {
- return $Casts.uncheckedCast(cacheValue.getResult());
+ return _Casts.uncheckedCast(cacheValue.getResult());
}
// cache miss, so get the result...
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index 412bf4a..818587a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.services.i18n.TranslatableString;
/**
@@ -101,7 +101,7 @@ public abstract class AbstractSpecification2<T> implements Specification2 {
? null
: TranslatableString.tr("Incorrect type");
}
- final T objAsT = $Casts.uncheckedCast(obj);
+ final T objAsT = _Casts.uncheckedCast(obj);
return satisfiesTranslatableSafely(objAsT);
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java b/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
index ebfcf96..0bac18a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
@@ -29,7 +29,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import com.google.common.io.Resources;
@@ -51,7 +51,7 @@ public class JaxbUtil {
Unmarshaller un = null;
try {
un = getJaxbContext(dtoClass).createUnmarshaller();
- return $Casts.uncheckedCast(un.unmarshal(reader));
+ return _Casts.uncheckedCast(un.unmarshal(reader));
} catch (JAXBException e) {
throw new RuntimeException(e);
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java b/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
index 2b0b1cb..a9c8328 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -70,8 +70,8 @@ public class ObjectContracts {
final Iterable<Clause> clauses = clausesFor(propertyNamesIter);
ComparisonChain chain = ComparisonChain.start();
for (final Clause clause : clauses) {
- final Comparable<T> propertyValueOfP = $Casts.uncheckedCast(clause.getValueOf(p));
- final Comparable<T> propertyValueOfQ = $Casts.uncheckedCast(clause.getValueOf(q));
+ final Comparable<T> propertyValueOfP = _Casts.uncheckedCast(clause.getValueOf(p));
+ final Comparable<T> propertyValueOfQ = _Casts.uncheckedCast(clause.getValueOf(q));
chain = chain.compare(propertyValueOfP, propertyValueOfQ, clause.getDirection().getOrdering());
}
return chain.result();
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
index 2b4f836..4291d82 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
@@ -30,7 +30,7 @@ import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.LocalTime;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.schema.cmd.v1.ParamDto;
@@ -277,7 +277,7 @@ public final class CommonDtoUtils {
public static <T> T getValue(
final ValueDto valueDto,
final ValueType valueType) {
- return $Casts.uncheckedCast(getValueAsObject(valueDto, valueType));
+ return _Casts.uncheckedCast(getValueAsObject(valueDto, valueType));
}
private static Object getValueAsObject(
@@ -323,7 +323,7 @@ public final class CommonDtoUtils {
final String enumType = enumDto.getEnumType();
@SuppressWarnings("rawtypes")
final Class<? extends Enum> enumClass = loadClassElseThrow(enumType);
- return Enum.valueOf($Casts.uncheckedCast(enumClass), enumDto.getEnumName());
+ return Enum.valueOf(_Casts.uncheckedCast(enumClass), enumDto.getEnumName());
case REFERENCE:
return valueDto.getReference();
case VOID:
@@ -338,7 +338,7 @@ public final class CommonDtoUtils {
private static <T> Class<T> loadClassElseThrow(final String className) {
try {
- return $Casts.uncheckedCast(loadClass(className));
+ return _Casts.uncheckedCast(loadClass(className));
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
index 11b1cd8..7015738 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
@@ -29,7 +29,7 @@ import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
@@ -39,7 +39,7 @@ import org.apache.isis.schema.ixn.v1.ObjectCountsDto;
public final class MemberExecutionDtoUtils {
public static <T extends MemberExecutionDto> T clone(final T dto) {
- final Class<T> aClass = $Casts.uncheckedCast(dto.getClass());
+ final Class<T> aClass = _Casts.uncheckedCast(dto.getClass());
return clone(dto, aClass);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
index 949b0c4..8618dfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.isis.applib.internal.base.$Strings;
+import org.apache.isis.applib.internal.base._Strings;
import org.apache.isis.applib.util.Enums;
import com.google.common.base.Strings;
@@ -43,7 +43,7 @@ public final class StringExtensions {
* "NextAvailableDate" is returned as "Next Available Date".
*/
public static String asNaturalName2(String name) {
- return $Strings.asNaturalName2.apply(name);
+ return _Strings.asNaturalName2.apply(name);
}
public static String asNaturalName(final String extendee) {
@@ -119,7 +119,7 @@ public final class StringExtensions {
}
public static String asLowerDashed(String extendee) {
- return $Strings.asLowerDashed.apply(extendee);
+ return _Strings.asLowerDashed.apply(extendee);
}
public static String asPascal(final String extendee) {
@@ -250,7 +250,7 @@ public final class StringExtensions {
* @return
*/
public static String normalized(@javax.annotation.Nullable final String extendee) {
- return $Strings.asNormalized.apply(extendee);
+ return _Strings.asNormalized.apply(extendee);
}
public static String removePrefix(final String extendee, final String prefix) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index f9509aa..f6683fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Callable;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.internal.base.$Casts;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.clock.ClockService;
@@ -311,7 +311,7 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
// handle any exceptions
final Interaction.Execution<ActionInvocationDto, ?> priorExecution =
- $Casts.uncheckedCast(interaction.getPriorExecution());
+ _Casts.uncheckedCast(interaction.getPriorExecution());
final Exception executionExceptionIfAny = priorExecution.getThrew();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
index 8d04164..161c13c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.facets.object.domainservice;
import org.apache.isis.applib.annotation.Constants;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.applib.internal.compare.$Comparators;
+import org.apache.isis.applib.internal.compare._Comparators;
public class DomainServiceMenuOrder {
@@ -47,7 +47,7 @@ public class DomainServiceMenuOrder {
if(isUndefined(dsOrder))
return dslayoutOrder;
- return $Comparators.deweyOrderCompare(dslayoutOrder, dsOrder) < 0
+ return _Comparators.deweyOrderCompare(dslayoutOrder, dsOrder) < 0
? dslayoutOrder
: dsOrder;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
index a2bcd45..3aa838d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
@@ -24,7 +24,7 @@ import java.util.Properties;
import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans;
-import org.apache.isis.applib.internal.base.$Strings;
+import org.apache.isis.applib.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacetAbstract;
@@ -56,15 +56,15 @@ public class MemberGroupLayoutFacetProperties extends MemberGroupLayoutFacetAbst
static String[] asGroupList(Properties properties, final String key) {
final String property = properties.getProperty(key);
if(property == null) {
- return $Strings.emptyArray;
+ return _Strings.emptyArray;
}
return
- $Strings.splitThenStream(property, ",")
- .map($Strings::trim)
- .filter($Strings::isNotEmpty)
+ _Strings.splitThenStream(property, ",")
+ .map(_Strings::trim)
+ .filter(_Strings::isNotEmpty)
.collect(Collectors.toCollection(ArrayList::new)) // array list for fast to-array conversion
- .toArray($Strings.emptyArray);
+ .toArray(_Strings.emptyArray);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
index 7081870..dc78bff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.apache.isis.applib.internal.base.$NullSafe;
+import org.apache.isis.applib.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFace
public class MandatoryFacetInvertedByNullableAnnotationOnParameter extends MandatoryFacetAbstract {
public static MandatoryFacet create(final List<Nullable> annotation, final Class<?> parameterType, final FacetedMethodParameter holder) {
- if($NullSafe.isEmpty(annotation)) {
+ if(_NullSafe.isEmpty(annotation)) {
return null;
}
if(parameterType.isPrimitive()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
index 8bcb613..4eefcf7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.layout.memberorderfacet;
import java.util.Comparator;
-import org.apache.isis.applib.internal.compare.$Comparators;
+import org.apache.isis.applib.internal.compare._Comparators;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
public class MemberOrderFacetComparator implements Comparator<MemberOrderFacet> {
@@ -48,7 +48,7 @@ public class MemberOrderFacetComparator implements Comparator<MemberOrderFacet>
throw new IllegalArgumentException("Not in same group");
}
- return $Comparators.deweyOrderCompare(m1.sequence(), m2.sequence());
+ return _Comparators.deweyOrderCompare(m1.sequence(), m2.sequence());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index d46fcad..ad9525b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -28,8 +28,8 @@ import org.apache.isis.applib.annotation.InvokeOn;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.internal.base.$NullSafe;
-import org.apache.isis.applib.internal.base.$Strings;
+import org.apache.isis.applib.internal.base._NullSafe;
+import org.apache.isis.applib.internal.base._Strings;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -480,14 +480,14 @@ public interface ObjectAction extends ObjectMember {
final List<ObjectAssociation> associations = adapterSpec.getAssociations(Contributed.INCLUDED);
- final List<String> associationNames = $NullSafe.stream(associations)
+ final List<String> associationNames = _NullSafe.stream(associations)
.map(ObjectAssociation::getName)
- .map($Strings::lower)
+ .map(_Strings::lower)
.collect(Collectors.toList());
- final List<String> associationIds = $NullSafe.stream(associations)
+ final List<String> associationIds = _NullSafe.stream(associations)
.map(ObjectAssociation::getId)
- .map($Strings::lower)
+ .map(_Strings::lower)
.collect(Collectors.toList());
return new Predicate<ObjectAction>() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/DeweyOrderComparator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/DeweyOrderComparator.java
index ecf8c49..92a8520 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/DeweyOrderComparator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/DeweyOrderComparator.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.util;
import java.util.Comparator;
-import org.apache.isis.applib.internal.compare.$Comparators;
+import org.apache.isis.applib.internal.compare._Comparators;
public class DeweyOrderComparator implements Comparator<String> {
@@ -29,7 +29,7 @@ public class DeweyOrderComparator implements Comparator<String> {
@Override
public int compare(String o1, String o2) {
- return $Comparators.deweyOrderCompare(o1, o2);
+ return _Comparators.deweyOrderCompare(o1, o2);
}
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.