Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
0dcd6890
Commit
0dcd6890
authored
7 years ago
by
apoorvnaik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2551: Update AtlasRelatedObjectId to include relationship status
Change-Id: If1158a70b894e10d9b7205ba536aa6e8a928faa6
parent
0cde9f92
master
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
7 deletions
+24
-7
AtlasRelatedObjectId.java
...org/apache/atlas/model/instance/AtlasRelatedObjectId.java
+22
-6
EntityGraphRetriever.java
...atlas/repository/store/graph/v1/EntityGraphRetriever.java
+2
-1
No files found.
intg/src/main/java/org/apache/atlas/model/instance/AtlasRelatedObjectId.java
View file @
0dcd6890
...
@@ -46,24 +46,29 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
...
@@ -46,24 +46,29 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
public
static
final
String
KEY_RELATIONSHIP_GUID
=
"relationshipGuid"
;
public
static
final
String
KEY_RELATIONSHIP_GUID
=
"relationshipGuid"
;
public
static
final
String
KEY_RELATIONSHIP_ATTRIBUTES
=
"relationshipAttributes"
;
public
static
final
String
KEY_RELATIONSHIP_ATTRIBUTES
=
"relationshipAttributes"
;
private
String
displayText
=
null
;
private
String
displayText
=
null
;
private
String
relationshipGuid
=
null
;
private
String
relationshipGuid
=
null
;
private
AtlasStruct
relationshipAttributes
;
private
AtlasRelationship
.
Status
relationshipStatus
=
null
;
private
AtlasStruct
relationshipAttributes
;
public
AtlasRelatedObjectId
()
{
}
public
AtlasRelatedObjectId
()
{
}
public
AtlasRelatedObjectId
(
String
guid
,
String
typeName
,
String
relationshipGuid
,
AtlasStruct
relationshipAttributes
)
{
public
AtlasRelatedObjectId
(
String
guid
,
String
typeName
,
String
relationshipGuid
,
AtlasRelationship
.
Status
relationshipStatus
,
AtlasStruct
relationshipAttributes
)
{
super
(
guid
,
typeName
);
super
(
guid
,
typeName
);
setRelationshipGuid
(
relationshipGuid
);
setRelationshipGuid
(
relationshipGuid
);
setRelationshipStatus
(
relationshipStatus
);
setRelationshipAttributes
(
relationshipAttributes
);
setRelationshipAttributes
(
relationshipAttributes
);
}
}
public
AtlasRelatedObjectId
(
String
guid
,
String
typeName
,
Map
<
String
,
Object
>
uniqueAttributes
,
String
displayText
,
public
AtlasRelatedObjectId
(
String
guid
,
String
typeName
,
Map
<
String
,
Object
>
uniqueAttributes
,
String
displayText
,
String
relationshipGuid
,
AtlasStruct
relationshipAttributes
)
{
String
relationshipGuid
,
AtlasRelationship
.
Status
relationshipStatus
,
AtlasStruct
relationshipAttributes
)
{
super
(
guid
,
typeName
,
uniqueAttributes
);
super
(
guid
,
typeName
,
uniqueAttributes
);
setRelationshipGuid
(
relationshipGuid
);
setRelationshipGuid
(
relationshipGuid
);
setRelationshipStatus
(
relationshipStatus
);
setDisplayText
(
displayText
);
setDisplayText
(
displayText
);
setRelationshipAttributes
(
relationshipAttributes
);
setRelationshipAttributes
(
relationshipAttributes
);
}
}
...
@@ -88,12 +93,13 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
...
@@ -88,12 +93,13 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
AtlasRelatedObjectId
that
=
(
AtlasRelatedObjectId
)
o
;
AtlasRelatedObjectId
that
=
(
AtlasRelatedObjectId
)
o
;
return
Objects
.
equals
(
displayText
,
that
.
displayText
)
&&
return
Objects
.
equals
(
displayText
,
that
.
displayText
)
&&
Objects
.
equals
(
relationshipGuid
,
that
.
relationshipGuid
)
&&
Objects
.
equals
(
relationshipGuid
,
that
.
relationshipGuid
)
&&
Objects
.
equals
(
relationshipStatus
,
that
.
relationshipStatus
)
&&
Objects
.
equals
(
relationshipAttributes
,
that
.
relationshipAttributes
);
Objects
.
equals
(
relationshipAttributes
,
that
.
relationshipAttributes
);
}
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
Objects
.
hash
(
super
.
hashCode
(),
displayText
,
relationshipGuid
,
relationshipAttributes
);
return
Objects
.
hash
(
super
.
hashCode
(),
displayText
,
relationshipGuid
,
relationship
Status
,
relationship
Attributes
);
}
}
@Override
@Override
...
@@ -111,9 +117,18 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
...
@@ -111,9 +117,18 @@ public class AtlasRelatedObjectId extends AtlasObjectId implements Serializable
super
.
toString
(
sb
);
super
.
toString
(
sb
);
sb
.
append
(
"displayText='"
).
append
(
displayText
).
append
(
'\''
);
sb
.
append
(
"displayText='"
).
append
(
displayText
).
append
(
'\''
);
sb
.
append
(
", relationshipGuid='"
).
append
(
relationshipGuid
).
append
(
'\''
);
sb
.
append
(
", relationshipGuid='"
).
append
(
relationshipGuid
).
append
(
'\''
);
sb
.
append
(
", relationshipStatus='"
).
append
(
relationshipStatus
).
append
(
'\''
);
sb
.
append
(
", relationshipAttributes="
).
append
(
relationshipAttributes
);
sb
.
append
(
", relationshipAttributes="
).
append
(
relationshipAttributes
);
sb
.
append
(
'}'
);
sb
.
append
(
'}'
);
return
sb
;
return
sb
;
}
}
public
AtlasRelationship
.
Status
getRelationshipStatus
()
{
return
relationshipStatus
;
}
public
void
setRelationshipStatus
(
final
AtlasRelationship
.
Status
relationshipStatus
)
{
this
.
relationshipStatus
=
relationshipStatus
;
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
View file @
0dcd6890
...
@@ -848,7 +848,8 @@ public final class EntityGraphRetriever {
...
@@ -848,7 +848,8 @@ public final class EntityGraphRetriever {
String
entityGuid
=
getGuid
(
referenceVertex
);
String
entityGuid
=
getGuid
(
referenceVertex
);
AtlasRelationship
relationship
=
mapEdgeToAtlasRelationship
(
edge
);
AtlasRelationship
relationship
=
mapEdgeToAtlasRelationship
(
edge
);
ret
=
new
AtlasRelatedObjectId
(
entityGuid
,
entityTypeName
,
relationship
.
getGuid
(),
ret
=
new
AtlasRelatedObjectId
(
entityGuid
,
entityTypeName
,
relationship
.
getGuid
(),
relationship
.
getStatus
(),
new
AtlasStruct
(
relationship
.
getTypeName
(),
relationship
.
getAttributes
()));
new
AtlasStruct
(
relationship
.
getTypeName
(),
relationship
.
getAttributes
()));
Object
displayText
=
getDisplayText
(
referenceVertex
,
entityTypeName
);
Object
displayText
=
getDisplayText
(
referenceVertex
,
entityTypeName
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment