safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1298: Migrate to centralized declarations of common dependencies.

Browse Source
This commit is contained in:
Michael Jumper
2021-03-25 19:58:53 -07:00
parent d4e3d8c98f
commit 53fe6e34f8
35 changed files with 306 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/extension/Extension.java
View File

@@ -19,6 +19,8 @@
package org.apache.guacamole.extension;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,8 +32,6 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import org.apache.guacamole.net.event.listener.Listener;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.ObjectMapper;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.net.auth.AuthenticationProvider;

2
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java
View File

@@ -19,9 +19,9 @@
package org.apache.guacamole.extension;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collection;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* Java representation of the JSON manifest contained within every Guacamole

18
guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java
View File

@@ -19,6 +19,10 @@
package org.apache.guacamole.extension;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
@@ -29,10 +33,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.ServletContext;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.environment.Environment;
import org.apache.guacamole.properties.StringSetProperty;
@@ -178,17 +178,17 @@ public class LanguageResourceService {
// Create mutable copy of original
ObjectNode newNode = JsonNodeFactory.instance.objectNode();
Iterator<String> fieldNames = original.getFieldNames();
Iterator<String> fieldNames = original.fieldNames();
while (fieldNames.hasNext()) {
String fieldName = fieldNames.next();
newNode.put(fieldName, original.get(fieldName));
newNode.set(fieldName, original.get(fieldName));
}
// Merge each field
fieldNames = overlay.getFieldNames();
fieldNames = overlay.fieldNames();
while (fieldNames.hasNext()) {
String fieldName = fieldNames.next();
newNode.put(fieldName, mergeTranslations(original.get(fieldName), overlay.get(fieldName)));
newNode.set(fieldName, mergeTranslations(original.get(fieldName), overlay.get(fieldName)));
}
return newNode;
@@ -425,7 +425,7 @@ public class LanguageResourceService {
// Attempt to read language name from node
String languageName;
if (nameNode == null || (languageName = nameNode.getTextValue()) == null) {
if (nameNode == null || (languageName = nameNode.textValue()) == null) {
logger.warn("Root-level \"" + LANGUAGE_DISPLAY_NAME_KEY + "\" string missing or invalid in language \"{}\"", languageKey);
languageName = languageKey;
}

7
guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java
View File

@@ -19,11 +19,12 @@
package org.apache.guacamole.rest.connection;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.net.auth.Connection;
import org.apache.guacamole.protocol.GuacamoleConfiguration;
@@ -33,7 +34,7 @@ import org.apache.guacamole.rest.sharingprofile.APISharingProfile;
* A simple connection to expose through the REST endpoints.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class APIConnection {
/**

7
guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java
View File

@@ -19,10 +19,11 @@
package org.apache.guacamole.rest.connectiongroup;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Collection;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.apache.guacamole.net.auth.ConnectionGroup;
import org.apache.guacamole.net.auth.ConnectionGroup.Type;
import org.apache.guacamole.rest.connection.APIConnection;
@@ -31,7 +32,7 @@ import org.apache.guacamole.rest.connection.APIConnection;
* A simple connection group to expose through the REST endpoints.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class APIConnectionGroup {
/**

5
guacamole/src/main/java/org/apache/guacamole/rest/sharingprofile/APISharingProfile.java
View File

@@ -19,14 +19,17 @@
package org.apache.guacamole.rest.sharingprofile;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.apache.guacamole.net.auth.SharingProfile;
/**
* The external representation used by the REST API for sharing profiles.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(value=Include.NON_NULL)
public class APISharingProfile {
/**

7
guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java
View File

@@ -19,17 +19,18 @@
package org.apache.guacamole.rest.user;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Date;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.apache.guacamole.net.auth.User;
/**
* A simple User to expose through the REST endpoints.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class APIUser {
/**

7
guacamole/src/main/java/org/apache/guacamole/rest/usergroup/APIUserGroup.java
View File

@@ -19,16 +19,17 @@
package org.apache.guacamole.rest.usergroup;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.apache.guacamole.net.auth.UserGroup;
/**
* A simple UserGroup to expose through the REST endpoints.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class APIUserGroup {
/**