From bc2cedc83f6353259ea1364f98ce60bf11d7ecf4 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 23 Oct 2014 12:06:14 +0000
Subject: [PATCH] #2021 feature - Upgtaded Jackson annotations version and added request data hash management
---
securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java b/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
index 7431471..634cf10 100644
--- a/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
+++ b/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
@@ -5,7 +5,6 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -13,17 +12,18 @@
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Entity implementation class for Entity: application_metadata
*
*/
@JsonAutoDetect
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(Include.NON_NULL)
@Entity
@Table(name = "application_metadata")
@NamedQueries({
@@ -49,7 +49,6 @@
@Column(name = "creation_timestamp")
private Date creationTimestamp;
-
public String getKey() {
return key;
}
@@ -73,7 +72,6 @@
public void setCreationTimestamp(Date creationTimestamp) {
this.creationTimestamp = creationTimestamp;
}
-
@JsonProperty("application_id")
public Integer getApplicationId() {
@@ -105,18 +103,18 @@
public void setMandatory(boolean mandatory) {
this.mandatory = mandatory;
}
-
+
@Override
public boolean equals(Object obj) {
if (!(obj instanceof ApplicationMetadata))
return false;
- ApplicationMetadata other = (ApplicationMetadata)obj;
+ ApplicationMetadata other = (ApplicationMetadata) obj;
return key.equals(other.key) && (application == null || application.equals(other.application));
}
-
+
@Override
public int hashCode() {
-
+
return key.hashCode() + (application == null ? 0 : application.hashCode());
}
--
Gitblit v1.3.2