This repository has been archived by the owner on Jul 17, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GUAC-1104: Move parent identifier functions to common base objects.
- Loading branch information
1 parent
f63b247
commit eb676c8
Showing
6 changed files
with
154 additions
and
116 deletions.
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
...dbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/GroupedDirectoryObject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright (C) 2015 Glyptodon LLC | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package org.glyptodon.guacamole.auth.jdbc.base; | ||
|
|
||
| import org.glyptodon.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup; | ||
|
|
||
| /** | ||
| * Common base class for objects that will ultimately be made available through | ||
| * the Directory class. All such objects will need the same base set of queries | ||
| * to fulfill the needs of the Directory class. | ||
| * | ||
| * @author Michael Jumper | ||
| * @param <ModelType> | ||
| * The type of model object that corresponds to this object. | ||
| */ | ||
| public abstract class GroupedDirectoryObject<ModelType extends GroupedObjectModel> | ||
| extends DirectoryObject<ModelType> { | ||
|
|
||
| /** | ||
| * Returns the identifier of the parent connection group, which cannot be | ||
| * null. If the parent is the root connection group, this will be | ||
| * RootConnectionGroup.IDENTIFIER. | ||
| * | ||
| * @return | ||
| * The identifier of the parent connection group. | ||
| */ | ||
| public String getParentIdentifier() { | ||
|
|
||
| // Translate null parent to proper identifier | ||
| String parentIdentifier = getModel().getParentIdentifier(); | ||
| if (parentIdentifier == null) | ||
| return RootConnectionGroup.IDENTIFIER; | ||
|
|
||
| return parentIdentifier; | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Sets the identifier of the associated parent connection group. If the | ||
| * parent is the root connection group, this should be | ||
| * RootConnectionGroup.IDENTIFIER. | ||
| * | ||
| * @param parentIdentifier | ||
| * The identifier of the connection group to associate as this object's | ||
| * parent. | ||
| */ | ||
| public void setParentIdentifier(String parentIdentifier) { | ||
|
|
||
| // Translate root identifier back into null | ||
| if (parentIdentifier != null | ||
| && parentIdentifier.equals(RootConnectionGroup.IDENTIFIER)) | ||
| parentIdentifier = null; | ||
|
|
||
| getModel().setParentIdentifier(parentIdentifier); | ||
|
|
||
| } | ||
|
|
||
| } |
67 changes: 67 additions & 0 deletions
67
...th-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/GroupedObjectModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright (C) 2015 Glyptodon LLC | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package org.glyptodon.guacamole.auth.jdbc.base; | ||
|
|
||
| /** | ||
| * Object representation of a Guacamole object, such as a user or connection, | ||
| * as represented in the database. | ||
| * | ||
| * @author Michael Jumper | ||
| */ | ||
| public abstract class GroupedObjectModel extends ObjectModel { | ||
|
|
||
| /** | ||
| * The unique identifier which identifies the parent of this object. | ||
| */ | ||
| private String parentIdentifier; | ||
|
|
||
| /** | ||
| * Creates a new, empty object. | ||
| */ | ||
| public GroupedObjectModel() { | ||
| } | ||
|
|
||
| /** | ||
| * Returns the identifier of the parent connection group, or null if the | ||
| * parent connection group is the root connection group. | ||
| * | ||
| * @return | ||
| * The identifier of the parent connection group, or null if the parent | ||
| * connection group is the root connection group. | ||
| */ | ||
| public String getParentIdentifier() { | ||
| return parentIdentifier; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the identifier of the parent connection group. | ||
| * | ||
| * @param parentIdentifier | ||
| * The identifier of the parent connection group, or null if the parent | ||
| * connection group is the root connection group. | ||
| */ | ||
| public void setParentIdentifier(String parentIdentifier) { | ||
| this.parentIdentifier = parentIdentifier; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters