You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2018/10/25 13:08:38 UTC

directory-fortress-core git commit: o make FortEntity include the FQCN of sub-types in JSON data(FC-250) o added dependency on jackson-annotations

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 4d2a61302 -> 2d8a53071


o make FortEntity include the FQCN of sub-types in JSON data(FC-250)
o added dependency on jackson-annotations


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/2d8a5307
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/2d8a5307
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/2d8a5307

Branch: refs/heads/master
Commit: 2d8a53071b8d8b5bb3b6256f084a9e12d4a7cc10
Parents: 4d2a613
Author: Kiran Ayyagari <ka...@apache.org>
Authored: Thu Oct 25 18:37:02 2018 +0530
Committer: Kiran Ayyagari <ka...@apache.org>
Committed: Thu Oct 25 18:37:02 2018 +0530

----------------------------------------------------------------------
 pom.xml                                                     | 9 ++++++++-
 .../apache/directory/fortress/core/model/FortEntity.java    | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2d8a5307/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5f17df..7c40b0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,8 @@
     <version.xml.apis>1.0b2</version.xml.apis>
     <version.xmlschema.core>2.0.3</version.xmlschema.core>
     <version.xpp3>1.1.4c</version.xpp3>
-
+    <version.jackson-annotations>2.9.7</version.jackson-annotations>
+    
     <!-- ===================================================== -->
     <!-- This is a hack to allow someone to release            -->
     <!-- without having to run the tests. In order to          -->
@@ -252,6 +253,12 @@
     </dependency>
 
     <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${version.jackson-annotations}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${version.apacheds}</version>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2d8a5307/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
index ebefc69..2d83507 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
@@ -29,6 +29,10 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
 
 /**
  * This abstract class is extended by other Fortress entities.  It is used to store contextual data that can be used for
@@ -91,6 +95,7 @@ import javax.xml.bind.annotation.XmlType;
         PermissionAttributeSet.class,
         RoleConstraint.class
 })
+@JsonTypeInfo(use=Id.CLASS, include=As.PROPERTY, property="fqcn", visible=false)
 public abstract class FortEntity
 {
     protected String modCode;