Repository: zest-java Updated Branches: refs/heads/develop 30f555958 -> 52d69b6e0
Remove unused imports, fix typo in build script and some javadoc Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/52d69b6e Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/52d69b6e Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/52d69b6e Branch: refs/heads/develop Commit: 52d69b6e03964696c90ba0ee2f46add756cfbf32 Parents: 30f5559 Author: Paul Merlin <[email protected]> Authored: Mon Nov 16 18:44:50 2015 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Nov 16 18:44:50 2015 +0100 ---------------------------------------------------------------------- .../apache/zest/api/unitofwork/UnitOfWork.java | 18 +++++++++++------- .../org/apache/zest/spi/module/ModuleSpi.java | 5 ----- libraries/restlet/build.gradle | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/52d69b6e/core/api/src/main/java/org/apache/zest/api/unitofwork/UnitOfWork.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/zest/api/unitofwork/UnitOfWork.java b/core/api/src/main/java/org/apache/zest/api/unitofwork/UnitOfWork.java index e8fce81..d735afa 100644 --- a/core/api/src/main/java/org/apache/zest/api/unitofwork/UnitOfWork.java +++ b/core/api/src/main/java/org/apache/zest/api/unitofwork/UnitOfWork.java @@ -378,9 +378,12 @@ public interface UnitOfWork extends MetaInfoHolder, AutoCloseable * } * </code></pre> * - * @param primaryType The shared type for which the properties and associations will - * be converted. Properties outside this type will be ignored. + * @param <T> The generic shared type + * @param primaryType The shared type for which the properties and associations will + * be converted. Properties outside this type will be ignored. * @param entityComposite The entity to be convered. + * + * @return The Value */ <T extends Identity> T toValue( Class<T> primaryType, T entityComposite ); @@ -399,7 +402,7 @@ public interface UnitOfWork extends MetaInfoHolder, AutoCloseable * <p> * If an Entity with the Identity in the ValueComposite already exists, then that * Entity is updated with the values from the ValueComposite. If an Entity of - * that Identity doesn't exist and new one is created. + * that Identity doesn't exist a new one is created. * </p> * <p> * For this to work, the Composites (both Entity and Value) must not declare the @@ -419,11 +422,12 @@ public interface UnitOfWork extends MetaInfoHolder, AutoCloseable * } * </code></pre> * - * @param primaryType The shared type for which the properties and associations will - * be converted. Properties outside this type will be ignored. + * @param <T> The generic shared type + * @param primaryType The shared type for which the properties and associations will + * be converted. Properties outside this type will be ignored. * @param valueComposite The Value to be convered into an Entity. + * + * @return The new or updated Entity */ <T extends Identity> T toEntity( Class<T> primaryType, T valueComposite ); - - } http://git-wip-us.apache.org/repos/asf/zest-java/blob/52d69b6e/core/spi/src/main/java/org/apache/zest/spi/module/ModuleSpi.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/apache/zest/spi/module/ModuleSpi.java b/core/spi/src/main/java/org/apache/zest/spi/module/ModuleSpi.java index e464fd6..3057b05 100644 --- a/core/spi/src/main/java/org/apache/zest/spi/module/ModuleSpi.java +++ b/core/spi/src/main/java/org/apache/zest/spi/module/ModuleSpi.java @@ -18,14 +18,9 @@ package org.apache.zest.spi.module; import java.util.stream.Stream; import org.apache.zest.api.composite.ModelDescriptor; -import org.apache.zest.api.composite.TransientDescriptor; -import org.apache.zest.api.entity.EntityDescriptor; import org.apache.zest.api.entity.IdentityGenerator; -import org.apache.zest.api.object.ObjectDescriptor; -import org.apache.zest.api.service.ServiceDescriptor; import org.apache.zest.api.service.ServiceReference; import org.apache.zest.api.structure.Module; -import org.apache.zest.api.value.ValueDescriptor; import org.apache.zest.api.value.ValueSerialization; import org.apache.zest.spi.entitystore.EntityStore; http://git-wip-us.apache.org/repos/asf/zest-java/blob/52d69b6e/libraries/restlet/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/restlet/build.gradle b/libraries/restlet/build.gradle index 8d224b9..a366da8 100644 --- a/libraries/restlet/build.gradle +++ b/libraries/restlet/build.gradle @@ -18,7 +18,7 @@ * */ -description = "Apache Zest⢠Restlet Library provides utomatic CRUD resources as well as custom resources integrated to Zest." +description = "Apache Zest⢠Restlet Library provides automatic CRUD resources as well as custom resources integrated to Zest." jar { manifest { name = "Apache Zest⢠Library - Restlet" } }
