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 2016/05/13 18:14:04 UTC
[22/50] [abbrv] isis git commit: ISIS-1397: rename ReturnDto to
ValueWithTypeDto, use for new param of property modification also.
ISIS-1397: rename ReturnDto to ValueWithTypeDto, use for new param of property modification also.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/362350c0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/362350c0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/362350c0
Branch: refs/heads/master
Commit: 362350c00b0fef9d3f4717c72629399fe0a614f6
Parents: a282f19
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 3 09:31:18 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 3 09:31:18 2016 +0100
----------------------------------------------------------------------
.../isis/schema/utils/InteractionDtoUtils.java | 62 ++++++++++----------
.../org/apache/isis/schema/utils/Roundtrip.java | 6 +-
.../InteractionDtoServiceInternalDefault.java | 4 +-
.../org/apache/isis/schema/ixn/ixn-1.0.xsd | 10 ++--
4 files changed, 42 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/362350c0/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
index 356c04c..278467c 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
@@ -58,7 +58,7 @@ import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
import org.apache.isis.schema.ixn.v1.InteractionDto;
import org.apache.isis.schema.ixn.v1.InteractionExecutionDto;
import org.apache.isis.schema.ixn.v1.PropertyModificationDto;
-import org.apache.isis.schema.ixn.v1.ReturnDto;
+import org.apache.isis.schema.ixn.v1.ValueWithTypeDto;
import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
public final class InteractionDtoUtils {
@@ -134,7 +134,7 @@ public final class InteractionDtoUtils {
final String targetTitle,
final String actionIdentifier,
final List<ParamDto> parameterDtos,
- final ReturnDto returnDto,
+ final ValueWithTypeDto returnDto,
final String user) {
final InteractionDto interactionDto = newInteractionDto(transactionId);
@@ -155,7 +155,7 @@ public final class InteractionDtoUtils {
final Bookmark targetBookmark,
final String targetTitle,
final String propertyIdentifier,
- final ParamDto newValueDto,
+ final ValueWithTypeDto newValueDto,
final String user
) {
@@ -181,7 +181,9 @@ public final class InteractionDtoUtils {
final String targetTitle,
final String actionIdentifier,
final List<ParamDto> parameterDtos,
- final ReturnDto returnDto, final String user, final String transactionId) {
+ final ValueWithTypeDto returnDto,
+ final String user,
+ final String transactionId) {
return (ActionInvocationDto) newInteractionExecutionDto(
InteractionType.ACTION_INVOCATION, transactionId, sequence,
@@ -195,7 +197,7 @@ public final class InteractionDtoUtils {
final Bookmark targetBookmark,
final String targetTitle,
final String propertyIdentifier,
- final ParamDto newValueDto,
+ final ValueWithTypeDto newValueDto,
final String user,
final String transactionId) {
return (PropertyModificationDto) newInteractionExecutionDto(
@@ -213,8 +215,8 @@ public final class InteractionDtoUtils {
final String targetTitle,
final String memberIdentifier,
final List<ParamDto> parameterDtos,
- final ReturnDto returnDto,
- final ParamDto newValueDto,
+ final ValueWithTypeDto returnDto,
+ final ValueWithTypeDto newValueDto,
final String user) {
final InteractionExecutionDto executionDto;
@@ -344,7 +346,7 @@ public final class InteractionDtoUtils {
final ActionInvocationDto invocationDto,
final Class<?> returnType,
final Object result, final BookmarkService bookmarkService) {
- final ReturnDto returnDto = returnValueFor(invocationDto);
+ final ValueWithTypeDto returnDto = returnValueFor(invocationDto);
boolean isValueType = setValue(returnDto, returnType, result);
if(!isValueType) {
addReturnReference(bookmarkService.bookmarkFor(result), invocationDto);
@@ -353,19 +355,19 @@ public final class InteractionDtoUtils {
// REVIEW: done in InteractionDtoServiceInternalDefault, I believe
private static void addReturnReference(final Bookmark bookmark, final ActionInvocationDto invocationDto) {
- final ReturnDto returnedDto = returnValueFor(invocationDto);
+ final ValueWithTypeDto returnedDto = returnValueFor(invocationDto);
OidDto oidDto = CommonDtoUtils.asOidDto(bookmark);
ValueDto value = new ValueDto();
value.setReference(oidDto);
returnedDto.setValue(value);
- returnedDto.setReturnType(ValueType.REFERENCE);
+ returnedDto.setType(ValueType.REFERENCE);
}
// REVIEW: done in InteractionDtoServiceInternalDefault, I believe
- private static ReturnDto returnValueFor(final ActionInvocationDto invocationDto) {
- ReturnDto returned = invocationDto.getReturned();
+ private static ValueWithTypeDto returnValueFor(final ActionInvocationDto invocationDto) {
+ ValueWithTypeDto returned = invocationDto.getReturned();
if(returned == null) {
- returned = new ReturnDto();
+ returned = new ValueWithTypeDto();
invocationDto.setReturned(returned);
}
return returned;
@@ -446,7 +448,7 @@ public final class InteractionDtoUtils {
}
public static boolean setValue(
- final ReturnDto returnDto,
+ final ValueWithTypeDto returnDto,
final Class<?> type,
final Object val) {
if(val == null) {
@@ -462,52 +464,52 @@ public final class InteractionDtoUtils {
}
private static boolean setValueType(
- final ReturnDto returnDto,
+ final ValueWithTypeDto returnDto,
final Class<?> type) {
if(type == String.class) {
- returnDto.setReturnType(ValueType.STRING);
+ returnDto.setType(ValueType.STRING);
} else
if(type == byte.class || type == Byte.class) {
- returnDto.setReturnType(ValueType.BYTE);
+ returnDto.setType(ValueType.BYTE);
} else
if(type == short.class || type == Short.class) {
- returnDto.setReturnType(ValueType.SHORT);
+ returnDto.setType(ValueType.SHORT);
}else
if(type == int.class || type == Integer.class) {
- returnDto.setReturnType(ValueType.INT);
+ returnDto.setType(ValueType.INT);
}else
if(type == long.class || type == Long.class) {
- returnDto.setReturnType(ValueType.LONG);
+ returnDto.setType(ValueType.LONG);
}else
if(type == char.class || type == Character.class) {
- returnDto.setReturnType(ValueType.CHAR);
+ returnDto.setType(ValueType.CHAR);
}else
if(type == boolean.class || type == Boolean.class) {
- returnDto.setReturnType(ValueType.BOOLEAN);
+ returnDto.setType(ValueType.BOOLEAN);
}else
if(type == float.class || type == Float.class) {
- returnDto.setReturnType(ValueType.FLOAT);
+ returnDto.setType(ValueType.FLOAT);
}else
if(type == double.class || type == Double.class) {
- returnDto.setReturnType(ValueType.DOUBLE);
+ returnDto.setType(ValueType.DOUBLE);
}else
if(type == BigInteger.class) {
- returnDto.setReturnType(ValueType.BIG_INTEGER);
+ returnDto.setType(ValueType.BIG_INTEGER);
}else
if(type == BigDecimal.class) {
- returnDto.setReturnType(ValueType.BIG_DECIMAL);
+ returnDto.setType(ValueType.BIG_DECIMAL);
}else
if(type == DateTime.class) {
- returnDto.setReturnType(ValueType.JODA_DATE_TIME);
+ returnDto.setType(ValueType.JODA_DATE_TIME);
}else
if(type == LocalDateTime.class) {
- returnDto.setReturnType(ValueType.JODA_LOCAL_DATE_TIME);
+ returnDto.setType(ValueType.JODA_LOCAL_DATE_TIME);
}else
if(type == LocalDate.class) {
- returnDto.setReturnType(ValueType.JODA_LOCAL_DATE);
+ returnDto.setType(ValueType.JODA_LOCAL_DATE);
}else
if(type == LocalTime.class) {
- returnDto.setReturnType(ValueType.JODA_LOCAL_TIME);
+ returnDto.setType(ValueType.JODA_LOCAL_TIME);
}else
{
// none of the supported value types
http://git-wip-us.apache.org/repos/asf/isis/blob/362350c0/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
index 1a81c2f..91c8a2b 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
@@ -38,7 +38,7 @@ import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.ValueType;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
import org.apache.isis.schema.ixn.v1.InteractionDto;
-import org.apache.isis.schema.ixn.v1.ReturnDto;
+import org.apache.isis.schema.ixn.v1.ValueWithTypeDto;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -55,8 +55,8 @@ public class Roundtrip {
final Timestamp startedAt = new Timestamp(new Date().getTime());
final Timestamp completedAt = new Timestamp(startedAt.getTime() + 1000);
- final ReturnDto returnDto = new ReturnDto();
- returnDto.setReturnType(ValueType.BOOLEAN);
+ final ValueWithTypeDto returnDto = new ValueWithTypeDto();
+ returnDto.setType(ValueType.BOOLEAN);
returnDto.setNull(true);
final InteractionDto interactionDto = InteractionDtoUtils.newInteractionDtoWithActionInvocation(
http://git-wip-us.apache.org/repos/asf/isis/blob/362350c0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index 04fb7fe..85b1830 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
import org.apache.isis.schema.ixn.v1.PropertyModificationDto;
-import org.apache.isis.schema.ixn.v1.ReturnDto;
+import org.apache.isis.schema.ixn.v1.ValueWithTypeDto;
import org.apache.isis.schema.utils.InteractionDtoUtils;
@DomainService(nature = NatureOfService.DOMAIN)
@@ -81,7 +81,7 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
final Class<?> returnType = returnSpec.getCorrespondingClass();
final Object resultPojo = resultAdapter != null? resultAdapter.getObject(): null;
- final ReturnDto returnDto = new ReturnDto();
+ final ValueWithTypeDto returnDto = new ValueWithTypeDto();
InteractionDtoUtils.setValue(returnDto, returnType, resultPojo);
final String transactionIdStr = transactionId.toString();
http://git-wip-us.apache.org/repos/asf/isis/blob/362350c0/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.0.xsd
----------------------------------------------------------------------
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.0.xsd b/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.0.xsd
index 116d9ab..071365b 100644
--- a/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.0.xsd
+++ b/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.0.xsd
@@ -145,7 +145,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="returned" type="returnDto" minOccurs="0" maxOccurs="1">
+ <xs:element name="returned" type="valueWithTypeDto" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>The value returned by this action (including the type of that returned value). Either the 'returned' or the 'threw' element (from 'memberInteractionDto') will be populated.
</xs:documentation>
@@ -160,21 +160,21 @@
<xs:complexContent>
<xs:extension base="interactionExecutionDto">
<xs:sequence>
- <xs:element name="newValue" type="cmd:paramDto"/>
+ <xs:element name="newValue" type="valueWithTypeDto"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="returnDto">
+ <xs:complexType name="valueWithTypeDto">
<xs:annotation>
- <xs:documentation>Captures both the value returned of an action, and also the type of that returned value.
+ <xs:documentation>Captures both a value and its corresponding type. Used for the return value of action invocations, and for the new value in property modifications.
</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="value" type="common:valueDto"/>
</xs:sequence>
- <xs:attribute name="returnType" use="required" type="common:valueType"/>
+ <xs:attribute name="type" use="required" type="common:valueType"/>
<xs:attribute name="null" use="optional" type="xs:boolean"/>
</xs:complexType>