From dc986338972a73b2b5ab82ca338fff27975f9b10 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 1 Dec 2021 23:07:37 -0800 Subject: [PATCH] GUACAMOLE-462: Separate Attributes interface into read-only and read/write variations. --- .../apache/guacamole/net/auth/Attributes.java | 17 ++------ .../net/auth/ReadableAttributes.java | 41 +++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ReadableAttributes.java diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Attributes.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Attributes.java index 050017dd7..cdb91868f 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Attributes.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Attributes.java @@ -22,21 +22,10 @@ package org.apache.guacamole.net.auth; import java.util.Map; /** - * An object which is associated with a set of arbitrary attributes, defined - * as name/value pairs. + * An object which is associated with a set of arbitrary attributes that may + * be modifiable, defined as name/value pairs. */ -public interface Attributes { - - /** - * Returns all attributes associated with this object. The returned map - * may not be modifiable. - * - * @return - * A map of all attribute identifiers to their corresponding values, - * for all attributes associated with this object, which may not be - * modifiable. - */ - Map getAttributes(); +public interface Attributes extends ReadableAttributes { /** * Sets the given attributes. If an attribute within the map is not diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ReadableAttributes.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ReadableAttributes.java new file mode 100644 index 000000000..9ad5b08b0 --- /dev/null +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ReadableAttributes.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.guacamole.net.auth; + +import java.util.Map; + +/** + * An object which is associated with a set of arbitrary attributes, defined + * as name/value pairs. + */ +public interface ReadableAttributes { + + /** + * Returns all attributes associated with this object. The returned map + * may not be modifiable. + * + * @return + * A map of all attribute identifiers to their corresponding values, + * for all attributes associated with this object, which may not be + * modifiable. + */ + Map getAttributes(); + +}