From b6e7fc9cfc6c53b83b882a699c375e5d0084b584 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Sun, 24 Mar 2019 15:58:59 -0400
Subject: [PATCH] GUACAMOLE-678: Rename UriGuacamoleProperty to
 URIGuacamoleProperty.

---
 .../auth/cas/conf/CASGuacamoleProperties.java      | 10 +++++-----
 .../auth/openid/conf/ConfigurationService.java     | 14 +++++++-------
 ...moleProperty.java => URIGuacamoleProperty.java} |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename guacamole-ext/src/main/java/org/apache/guacamole/properties/{UriGuacamoleProperty.java => URIGuacamoleProperty.java} (95%)

diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java
index f9876e055..2ee42dba9 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java
@@ -19,7 +19,7 @@
 
 package org.apache.guacamole.auth.cas.conf;
 
-import org.apache.guacamole.properties.UriGuacamoleProperty;
+import org.apache.guacamole.properties.URIGuacamoleProperty;
 
 /**
  * Provides properties required for use of the CAS authentication provider.
@@ -36,8 +36,8 @@ public class CASGuacamoleProperties {
     /**
      * The authorization endpoint (URI) of the CAS service.
      */
-    public static final UriGuacamoleProperty CAS_AUTHORIZATION_ENDPOINT =
-            new UriGuacamoleProperty() {
+    public static final URIGuacamoleProperty CAS_AUTHORIZATION_ENDPOINT =
+            new URIGuacamoleProperty() {
 
         @Override
         public String getName() { return "cas-authorization-endpoint"; }
@@ -49,8 +49,8 @@ public class CASGuacamoleProperties {
      * authentication process is complete. This must be the full URL that a
      * user would enter into their browser to access Guacamole.
      */
-    public static final UriGuacamoleProperty CAS_REDIRECT_URI =
-            new UriGuacamoleProperty() {
+    public static final URIGuacamoleProperty CAS_REDIRECT_URI =
+            new URIGuacamoleProperty() {
 
         @Override
         public String getName() { return "cas-redirect-uri"; }
diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java
index 8b4874c13..9d889a84f 100644
--- a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java
+++ b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java
@@ -25,7 +25,7 @@ import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.Environment;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
-import org.apache.guacamole.properties.UriGuacamoleProperty;
+import org.apache.guacamole.properties.URIGuacamoleProperty;
 
 /**
  * Service for retrieving configuration information regarding the OpenID
@@ -65,8 +65,8 @@ public class ConfigurationService {
     /**
      * The authorization endpoint (URI) of the OpenID service.
      */
-    private static final UriGuacamoleProperty OPENID_AUTHORIZATION_ENDPOINT =
-            new UriGuacamoleProperty() {
+    private static final URIGuacamoleProperty OPENID_AUTHORIZATION_ENDPOINT =
+            new URIGuacamoleProperty() {
 
         @Override
         public String getName() { return "openid-authorization-endpoint"; }
@@ -77,8 +77,8 @@ public class ConfigurationService {
      * The endpoint (URI) of the JWKS service which defines how received ID
      * tokens (JWTs) shall be validated.
      */
-    private static final UriGuacamoleProperty OPENID_JWKS_ENDPOINT =
-            new UriGuacamoleProperty() {
+    private static final URIGuacamoleProperty OPENID_JWKS_ENDPOINT =
+            new URIGuacamoleProperty() {
 
         @Override
         public String getName() { return "openid-jwks-endpoint"; }
@@ -176,8 +176,8 @@ public class ConfigurationService {
      * authentication process is complete. This must be the full URL that a
      * user would enter into their browser to access Guacamole.
      */
-    private static final UriGuacamoleProperty OPENID_REDIRECT_URI =
-            new UriGuacamoleProperty() {
+    private static final URIGuacamoleProperty OPENID_REDIRECT_URI =
+            new URIGuacamoleProperty() {
 
         @Override
         public String getName() { return "openid-redirect-uri"; }
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/UriGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
similarity index 95%
rename from guacamole-ext/src/main/java/org/apache/guacamole/properties/UriGuacamoleProperty.java
rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
index 3c64bbf64..d40f91e36 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/UriGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
@@ -27,7 +27,7 @@ import org.apache.guacamole.GuacamoleServerException;
 /**
  * A GuacamoleProperty whose value is a URI.
  */
-public abstract class UriGuacamoleProperty implements GuacamoleProperty<URI> {
+public abstract class URIGuacamoleProperty implements GuacamoleProperty<URI> {
     
     @Override
     public URI parseValue(String value) throws GuacamoleException {