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
2904f4c4
Commit
2904f4c4
authored
8 years ago
by
Madhan Neethiraj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-1571: fix for incorrect v1->v2 conversion of enum-type value
parent
485573fc
master
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
82 additions
and
2 deletions
+82
-2
AtlasEnumType.java
intg/src/main/java/org/apache/atlas/type/AtlasEnumType.java
+20
-0
AtlasEnumFormatConverter.java
...atlas/repository/converters/AtlasEnumFormatConverter.java
+62
-2
No files found.
intg/src/main/java/org/apache/atlas/type/AtlasEnumType.java
View file @
2904f4c4
...
@@ -91,4 +91,24 @@ public class AtlasEnumType extends AtlasType {
...
@@ -91,4 +91,24 @@ public class AtlasEnumType extends AtlasType {
return
null
;
return
null
;
}
}
public
AtlasEnumElementDef
getEnumElementDef
(
String
value
)
{
if
(
value
!=
null
)
{
return
elementDefs
.
get
(
value
.
toLowerCase
());
}
return
null
;
}
public
AtlasEnumElementDef
getEnumElementDef
(
Number
ordinal
)
{
if
(
ordinal
!=
null
)
{
for
(
AtlasEnumElementDef
elementDef
:
elementDefs
.
values
())
{
if
(
elementDef
.
getOrdinal
().
longValue
()
==
ordinal
.
longValue
())
{
return
elementDef
;
}
}
}
return
null
;
}
}
}
This diff is collapsed.
Click to expand it.
repository/src/main/java/org/apache/atlas/repository/converters/AtlasEnumFormatConverter.java
View file @
2904f4c4
...
@@ -20,8 +20,13 @@ package org.apache.atlas.repository.converters;
...
@@ -20,8 +20,13 @@ package org.apache.atlas.repository.converters;
import
org.apache.atlas.exception.AtlasBaseException
;
import
org.apache.atlas.exception.AtlasBaseException
;
import
org.apache.atlas.model.TypeCategory
;
import
org.apache.atlas.model.TypeCategory
;
import
org.apache.atlas.model.typedef.AtlasEnumDef.AtlasEnumElementDef
;
import
org.apache.atlas.type.AtlasEnumType
;
import
org.apache.atlas.type.AtlasType
;
import
org.apache.atlas.type.AtlasType
;
import
org.apache.atlas.type.AtlasTypeRegistry
;
import
org.apache.atlas.type.AtlasTypeRegistry
;
import
org.apache.atlas.typesystem.types.EnumValue
;
import
java.util.Map
;
public
class
AtlasEnumFormatConverter
extends
AtlasAbstractFormatConverter
{
public
class
AtlasEnumFormatConverter
extends
AtlasAbstractFormatConverter
{
...
@@ -31,12 +36,67 @@ public class AtlasEnumFormatConverter extends AtlasAbstractFormatConverter {
...
@@ -31,12 +36,67 @@ public class AtlasEnumFormatConverter extends AtlasAbstractFormatConverter {
@Override
@Override
public
Object
fromV1ToV2
(
Object
v1Obj
,
AtlasType
type
,
ConverterContext
ctx
)
throws
AtlasBaseException
{
public
Object
fromV1ToV2
(
Object
v1Obj
,
AtlasType
type
,
ConverterContext
ctx
)
throws
AtlasBaseException
{
return
type
.
getNormalizedValue
(
v1Obj
);
String
ret
=
null
;
if
(
v1Obj
==
null
||
!(
type
instanceof
AtlasEnumType
))
{
return
ret
;
}
Object
v1Value
=
null
;
if
(
v1Obj
instanceof
EnumValue
)
{
EnumValue
enumValue
=
(
EnumValue
)
v1Obj
;
v1Value
=
enumValue
.
value
;
if
(
v1Value
==
null
)
{
v1Value
=
enumValue
.
ordinal
;
}
}
else
if
(
v1Obj
instanceof
Map
)
{
Map
mapValue
=
(
Map
)
v1Obj
;
v1Value
=
mapValue
.
get
(
"value"
);
if
(
v1Value
==
null
)
{
v1Value
=
mapValue
.
get
(
"ordinal"
);
}
}
if
(
v1Value
==
null
)
{
// could be 'value' or 'ordinal'
v1Value
=
v1Obj
;
}
AtlasEnumElementDef
elementDef
;
if
(
v1Value
instanceof
Number
)
{
elementDef
=
((
AtlasEnumType
)
type
).
getEnumElementDef
((
Number
)
v1Value
);
}
else
{
elementDef
=
((
AtlasEnumType
)
type
).
getEnumElementDef
(
v1Value
.
toString
());
}
if
(
elementDef
!=
null
)
{
ret
=
elementDef
.
getValue
();
}
return
ret
;
}
}
@Override
@Override
public
Object
fromV2ToV1
(
Object
v2Obj
,
AtlasType
type
,
ConverterContext
ctx
)
throws
AtlasBaseException
{
public
Object
fromV2ToV1
(
Object
v2Obj
,
AtlasType
type
,
ConverterContext
ctx
)
throws
AtlasBaseException
{
return
type
.
getNormalizedValue
(
v2Obj
);
EnumValue
ret
=
null
;
if
(
v2Obj
==
null
||
!(
type
instanceof
AtlasEnumType
))
{
return
ret
;
}
AtlasEnumType
enumType
=
(
AtlasEnumType
)
type
;
AtlasEnumElementDef
elementDef
=
enumType
.
getEnumElementDef
(
v2Obj
.
toString
());
if
(
elementDef
!=
null
)
{
ret
=
new
EnumValue
(
elementDef
.
getValue
(),
elementDef
.
getOrdinal
());
}
return
ret
;
}
}
}
}
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