GUACAMOLE-292: Allow object/model creation to throw exceptions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/0a4b1f33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/0a4b1f33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/0a4b1f33 Branch: refs/heads/master Commit: 0a4b1f33da94b9b551f32ae4d4477738e256a88d Parents: 22cce48 Author: Michael Jumper <[email protected]> Authored: Tue Feb 21 23:39:42 2017 -0800 Committer: Michael Jumper <[email protected]> Committed: Fri May 26 20:15:02 2017 -0700 ---------------------------------------------------------------------- .../jdbc/base/ModeledDirectoryObjectService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/0a4b1f33/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java index 1ee9bee..2c1402e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java @@ -97,9 +97,12 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled * * @return * An object which is backed by the given model object. + * + * @throws GuacamoleException + * If the object instance cannot be created. */ protected abstract InternalType getObjectInstance(ModeledAuthenticatedUser currentUser, - ModelType model); + ModelType model) throws GuacamoleException; /** * Returns an instance of a model object which is based on the given @@ -113,9 +116,12 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled * * @return * A model object which is based on the given object. + * + * @throws GuacamoleException + * If the model object instance cannot be created. */ protected abstract ModelType getModelInstance(ModeledAuthenticatedUser currentUser, - ExternalType object); + ExternalType object) throws GuacamoleException; /** * Returns whether the given user has permission to create the type of @@ -199,9 +205,12 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled * @return * A collection of objects which are backed by the models in the given * collection. + * + * @throws GuacamoleException + * If any of the object instances cannot be created. */ protected Collection<InternalType> getObjectInstances(ModeledAuthenticatedUser currentUser, - Collection<ModelType> models) { + Collection<ModelType> models) throws GuacamoleException { // Create new collection of objects by manually converting each model Collection<InternalType> objects = new ArrayList<InternalType>(models.size());
