Merge pull request #1633 from /issues/1625

Ox trust/issues/1625
GluuFederation · May 6, 2019 · dd7dced · dd7dced
2 parents 515b3da + 574b66e
commit dd7dced
Show file tree

Hide file tree

Showing 49 changed files with 236 additions and 242 deletions.
diff --git a/cas-openid-auth-client/src/test/java/org/gluu/oxauth/client/dev/CasConfigurationTest.java b/cas-openid-auth-client/src/test/java/org/gluu/oxauth/client/dev/CasConfigurationTest.java
@@ -2,13 +2,14 @@
 
 import java.io.IOException;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.gluu.oxauth.cas.auth.client.AuthClient;
 import org.gluu.oxauth.cas.auth.conf.CasAppConfiguration;
 import org.gluu.oxauth.cas.auth.conf.CasLdapAppConfiguration;
 import org.gluu.oxauth.client.conf.Configuration;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
 public class CasConfigurationTest extends Configuration<CasAppConfiguration, CasLdapAppConfiguration> {
 
 	@Override

diff --git a/client/pom.xml b/client/pom.xml
@@ -75,17 +75,17 @@
 
 		<!-- Jackson -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-		</dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
 		<!-- Testing -->
 

diff --git a/model/pom.xml b/model/pom.xml
@@ -55,13 +55,17 @@
 		</dependency>
 		<!-- Jackson -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-		</dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 		<!-- Documentation -->
 		<dependency>
 			<groupId>com.wordnik</groupId>

diff --git a/model/src/main/java/org/gluu/oxtrust/model/ClientAttributes.java b/model/src/main/java/org/gluu/oxtrust/model/ClientAttributes.java
@@ -2,7 +2,8 @@
 
 import java.io.Serializable;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 
 public class ClientAttributes implements Serializable {
 

diff --git a/model/src/main/java/org/gluu/oxtrust/model/CustomAttribute.java b/model/src/main/java/org/gluu/oxtrust/model/CustomAttribute.java
@@ -13,7 +13,8 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * SCIM Custom Attributes

diff --git a/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java b/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java
@@ -19,11 +19,12 @@
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
 import org.gluu.model.GluuAttribute;
 import org.gluu.model.attribute.AttributeDataType;
 import org.gluu.persist.model.base.GluuBoolean;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * Attribute
  * 

diff --git a/model/src/main/java/org/gluu/oxtrust/model/InumConf.java b/model/src/main/java/org/gluu/oxtrust/model/InumConf.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * InumConfig

diff --git a/model/src/main/java/org/gluu/oxtrust/model/InumResponse.java b/model/src/main/java/org/gluu/oxtrust/model/InumResponse.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * InumReponse

diff --git a/model/src/main/java/org/gluu/oxtrust/model/LogViewerConfig.java b/model/src/main/java/org/gluu/oxtrust/model/LogViewerConfig.java
@@ -11,12 +11,12 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
 import org.gluu.model.SimpleCustomProperty;
 import org.gluu.model.SimpleExtendedCustomProperty;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Log viewer configuration model

diff --git a/model/src/main/java/org/gluu/oxtrust/model/OxIDPAuthConf.java b/model/src/main/java/org/gluu/oxtrust/model/OxIDPAuthConf.java
@@ -14,9 +14,10 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
 import org.gluu.model.ldap.GluuLdapConfiguration;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 /**
  * oxIDPAuthConf
  * 

diff --git a/model/src/main/java/org/gluu/oxtrust/model/RegistrationConfiguration.java b/model/src/main/java/org/gluu/oxtrust/model/RegistrationConfiguration.java
@@ -11,7 +11,8 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 
 /**
  * @author "Oleksiy Tataryn"

diff --git a/model/src/main/java/org/gluu/oxtrust/model/association/ClientAssociation.java b/model/src/main/java/org/gluu/oxtrust/model/association/ClientAssociation.java
@@ -16,7 +16,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * Client Association Entity

diff --git a/model/src/main/java/org/gluu/oxtrust/model/association/PersonAssociation.java b/model/src/main/java/org/gluu/oxtrust/model/association/PersonAssociation.java
@@ -16,7 +16,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * Client Association Entity

diff --git a/model/src/main/java/org/gluu/oxtrust/model/cert/TrustStoreCertificate.java b/model/src/main/java/org/gluu/oxtrust/model/cert/TrustStoreCertificate.java
@@ -9,7 +9,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 
 /**
  * Trust Store configuration

diff --git a/model/src/main/java/org/gluu/oxtrust/model/oxchooser/ForwardedRequest.java b/model/src/main/java/org/gluu/oxtrust/model/oxchooser/ForwardedRequest.java
@@ -14,7 +14,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * oxChooser response

diff --git a/model/src/main/java/org/gluu/oxtrust/model/oxchooser/IdentityRequest.java b/model/src/main/java/org/gluu/oxtrust/model/oxchooser/IdentityRequest.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * oxChooser request

diff --git a/model/src/main/java/org/gluu/oxtrust/model/oxchooser/IdentityResponse.java b/model/src/main/java/org/gluu/oxtrust/model/oxchooser/IdentityResponse.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * oxChooser response

diff --git a/model/src/main/java/org/gluu/oxtrust/model/oxchooser/InitialID.java b/model/src/main/java/org/gluu/oxtrust/model/oxchooser/InitialID.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 @XmlRootElement(name = "nitialID")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/model/src/main/java/org/gluu/oxtrust/model/oxchooser/OxChooserError.java b/model/src/main/java/org/gluu/oxtrust/model/oxchooser/OxChooserError.java
@@ -11,7 +11,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * oxChooser errors

diff --git a/model/src/main/java/org/gluu/oxtrust/model/push/PushApplicationConfiguration.java b/model/src/main/java/org/gluu/oxtrust/model/push/PushApplicationConfiguration.java
@@ -10,8 +10,9 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * Push application configuration for platforms

diff --git a/model/src/main/java/org/gluu/oxtrust/model/push/PushDeviceConfiguration.java b/model/src/main/java/org/gluu/oxtrust/model/push/PushDeviceConfiguration.java
@@ -9,8 +9,9 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 
 /**
  * Push pairing device configuration for platform

diff --git a/model/src/main/java/org/gluu/oxtrust/model/scim/ScimConfiguration.java b/model/src/main/java/org/gluu/oxtrust/model/scim/ScimConfiguration.java
@@ -6,12 +6,11 @@
 
 package org.gluu.oxtrust.model.scim;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wordnik.swagger.annotations.ApiModel;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
 /**
@@ -21,9 +20,10 @@
  */
 // try to ignore jettison as it's recommended here:
 // http://docs.jboss.org/resteasy/docs/2.3.4.Final/userguide/html/json.html
-@JsonPropertyOrder({ "version", "authorization_supported", "user_endpoint", "group_endpoint", "bulk_endpoint", "service_provider_endpoint",
-		"resource_types_endpoint" })
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonPropertyOrder({ "version", "authorization_supported", "user_endpoint", "group_endpoint", "bulk_endpoint",
+		"service_provider_endpoint", "resource_types_endpoint" })
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonSerialize
 @ApiModel(value = "SCIM Configuration")
 public class ScimConfiguration {
 
@@ -43,9 +43,9 @@ public class ScimConfiguration {
 	@ApiModelProperty(value = "The endpoint URI at which it's possible Retrieve, Add, Delete, Modify Groups.", required = true)
 	private String groupEndpoint;
 
-    @JsonProperty(value = "fido_devices_endpoint")
-    @ApiModelProperty(value = "The endpoint URI at which it's possible Retrieve, Delete, Modify Groups.", required = true)
-    private String fidoDevicesEndpoint;
+	@JsonProperty(value = "fido_devices_endpoint")
+	@ApiModelProperty(value = "The endpoint URI at which it's possible Retrieve, Delete, Modify Groups.", required = true)
+	private String fidoDevicesEndpoint;
 
 	@JsonProperty(value = "bulk_endpoint")
 	@ApiModelProperty(value = "The endpoint URI at which it's possible Bulk updates to one or more resources.", required = true)
@@ -59,9 +59,9 @@ public class ScimConfiguration {
 	@ApiModelProperty(value = "The endpoint URI at which it's possible to retrieve supported Resource Types.", required = true)
 	private String resourceTypesEndpoint;
 
-    @JsonProperty(value = "schemas_endpoint")
-    @ApiModelProperty(value = "The endpoint URI at which it's possible to retrieve information about resource schemas supported.", required = true)
-    private String schemasEndpoint;
+	@JsonProperty(value = "schemas_endpoint")
+	@ApiModelProperty(value = "The endpoint URI at which it's possible to retrieve information about resource schemas supported.", required = true)
+	private String schemasEndpoint;
 
 	public String getVersion() {
 		return version;
@@ -95,15 +95,15 @@ public void setGroupEndpoint(String groupEndpoint) {
 		this.groupEndpoint = groupEndpoint;
 	}
 
-    public String getFidoDevicesEndpoint() {
-        return fidoDevicesEndpoint;
-    }
+	public String getFidoDevicesEndpoint() {
+		return fidoDevicesEndpoint;
+	}
 
-    public void setFidoDevicesEndpoint(String fidoDevicesEndpoint) {
-        this.fidoDevicesEndpoint = fidoDevicesEndpoint;
-    }
+	public void setFidoDevicesEndpoint(String fidoDevicesEndpoint) {
+		this.fidoDevicesEndpoint = fidoDevicesEndpoint;
+	}
 
-    public String getBulkEndpoint() {
+	public String getBulkEndpoint() {
 		return bulkEndpoint;
 	}
 
@@ -127,11 +127,11 @@ public void setResourceTypesEndpoint(String resourceTypesEndpoint) {
 		this.resourceTypesEndpoint = resourceTypesEndpoint;
 	}
 
-    public String getSchemasEndpoint() {
-        return schemasEndpoint;
-    }
+	public String getSchemasEndpoint() {
+		return schemasEndpoint;
+	}
 
-    public void setSchemasEndpoint(String schemasEndpoint) {
-        this.schemasEndpoint = schemasEndpoint;
-    }
+	public void setSchemasEndpoint(String schemasEndpoint) {
+		this.schemasEndpoint = schemasEndpoint;
+	}
 }
diff --git a/openid-auth-client/src/main/java/org/gluu/oxauth/client/conf/AppConfiguration.java b/openid-auth-client/src/main/java/org/gluu/oxauth/client/conf/AppConfiguration.java
@@ -9,7 +9,8 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 
 /**
  * Base application configuration