METAMODEL-6: Changed API to use the Java 8 Optional interface Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/5f478328 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/5f478328 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/5f478328
Branch: refs/heads/master Commit: 5f478328f697437d6883b8adc95a12122bdf3cc4 Parents: 58f8c2a Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Mon Dec 14 21:58:34 2015 +0100 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Mon Dec 14 21:59:31 2015 +0100 ---------------------------------------------------------------------- .../apache/metamodel/DefaultUpdateSummary.java | 18 ++++++++++-------- .../java/org/apache/metamodel/UpdateSummary.java | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f478328/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java index 9b02f22..bc8ec27 100644 --- a/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java +++ b/core/src/main/java/org/apache/metamodel/DefaultUpdateSummary.java @@ -18,6 +18,8 @@ */ package org.apache.metamodel; +import java.util.Optional; + /** * Default implementation of {@link UpdateSummary}. */ @@ -50,23 +52,23 @@ public class DefaultUpdateSummary implements UpdateSummary { } @Override - public Integer getInsertedRows() { - return _insertedRows; + public Optional<Integer> getInsertedRows() { + return Optional.ofNullable(_insertedRows); } @Override - public Integer getUpdatedRows() { - return _updatedRows; + public Optional<Integer> getUpdatedRows() { + return Optional.ofNullable(_updatedRows); } @Override - public Integer getDeletedRows() { - return _deletedRows; + public Optional<Integer> getDeletedRows() { + return Optional.ofNullable(_deletedRows); } @Override - public Iterable<Object> getGeneratedKeys() { - return _generatedKeys; + public Optional<Iterable<Object>> getGeneratedKeys() { + return Optional.ofNullable(_generatedKeys); } } http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f478328/core/src/main/java/org/apache/metamodel/UpdateSummary.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/UpdateSummary.java b/core/src/main/java/org/apache/metamodel/UpdateSummary.java index 4124b0a..fc7239b 100644 --- a/core/src/main/java/org/apache/metamodel/UpdateSummary.java +++ b/core/src/main/java/org/apache/metamodel/UpdateSummary.java @@ -18,6 +18,8 @@ */ package org.apache.metamodel; +import java.util.Optional; + /** * Represents a summary of changes made in a given * {@link UpdateableDataContext#executeUpdate(UpdateScript)} call. @@ -34,30 +36,30 @@ public interface UpdateSummary { /** * Gets the number of inserted rows, or null if this number is unknown. * - * @return a row count or null if the number is unknown. + * @return an optional row count. */ - public Integer getInsertedRows(); + public Optional<Integer> getInsertedRows(); /** * Gets the number of updated rows, or null if this number is unknown. * - * @return a row count or null if the number is unknown. + * @return an optional row count. */ - public Integer getUpdatedRows(); + public Optional<Integer> getUpdatedRows(); /** * Gets the number of deleted rows, or null if this number is unknown. * - * @return a row count or null if the number is unknown. + * @return an optional row count. */ - public Integer getDeletedRows(); + public Optional<Integer> getDeletedRows(); /** * Gets a collection of keys that was generated as part of the update - * typically because INSERTs where executed on an underlying database which * generated record IDs for each insert. * - * @return a collection of generated keys, or null if not available. + * @return an optional collection of generated keys. */ - public Iterable<Object> getGeneratedKeys(); + public Optional<Iterable<Object>> getGeneratedKeys(); }