You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2017/11/05 20:43:44 UTC
[4/5] atlas git commit: ATLAS-2251: relocated legacy classes in intg
module
ATLAS-2251: relocated legacy classes in intg module
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/eacf8513
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/eacf8513
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/eacf8513
Branch: refs/heads/ATLAS-2251
Commit: eacf85133bf9facc6bcd5c09d016aa28d7ef1873
Parents: da4cf2d
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sun Nov 5 12:41:07 2017 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sun Nov 5 12:41:07 2017 -0800
----------------------------------------------------------------------
.../atlas/falcon/bridge/FalconBridge.java | 2 +-
.../apache/atlas/falcon/hook/FalconHook.java | 2 +-
.../apache/atlas/falcon/hook/FalconHookIT.java | 6 +-
.../atlas/hbase/bridge/HBaseAtlasHook.java | 2 +-
.../apache/atlas/hbase/HBaseAtlasHookIT.java | 2 +-
.../atlas/hive/bridge/ColumnLineageUtils.java | 2 +-
.../atlas/hive/bridge/HiveMetaStoreBridge.java | 6 +-
.../org/apache/atlas/hive/hook/HiveHook.java | 2 +-
.../java/org/apache/atlas/hive/HiveITBase.java | 4 +-
.../hive/bridge/HiveMetaStoreBridgeTest.java | 2 +-
.../hive/bridge/HiveMetastoreBridgeIT.java | 4 +-
.../org/apache/atlas/hive/hook/HiveHookIT.java | 6 +-
.../org/apache/atlas/sqoop/hook/SqoopHook.java | 2 +-
.../apache/atlas/storm/hook/StormAtlasHook.java | 2 +-
.../atlas/storm/hook/StormAtlasHookIT.java | 2 +-
.../main/java/org/apache/atlas/AtlasClient.java | 12 +-
.../java/org/apache/atlas/EntityAuditEvent.java | 2 +-
.../java/org/apache/atlas/AtlasClientTest.java | 2 +-
.../v1/instance/AtlasSystemAttributes.java | 123 ------------
.../org/apache/atlas/model/v1/instance/Id.java | 171 ----------------
.../atlas/model/v1/instance/Referenceable.java | 201 -------------------
.../apache/atlas/model/v1/instance/Struct.java | 141 -------------
.../model/v1/typedef/AttributeDefinition.java | 159 ---------------
.../model/v1/typedef/ClassTypeDefinition.java | 51 -----
.../model/v1/typedef/EnumTypeDefinition.java | 174 ----------------
.../v1/typedef/HierarchicalTypeDefinition.java | 96 ---------
.../atlas/model/v1/typedef/Multiplicity.java | 113 -----------
.../model/v1/typedef/StructTypeDefinition.java | 119 -----------
.../model/v1/typedef/TraitTypeDefinition.java | 51 -----
.../apache/atlas/model/v1/typedef/TypesDef.java | 91 ---------
.../java/org/apache/atlas/type/AtlasType.java | 2 +-
.../atlas/typesystem/types/utils/TypesUtil.java | 112 -----------
.../model/instance/AtlasSystemAttributes.java | 123 ++++++++++++
.../org/apache/atlas/v1/model/instance/Id.java | 171 ++++++++++++++++
.../atlas/v1/model/instance/Referenceable.java | 201 +++++++++++++++++++
.../apache/atlas/v1/model/instance/Struct.java | 141 +++++++++++++
.../v1/model/typedef/AttributeDefinition.java | 159 +++++++++++++++
.../v1/model/typedef/ClassTypeDefinition.java | 51 +++++
.../v1/model/typedef/EnumTypeDefinition.java | 174 ++++++++++++++++
.../typedef/HierarchicalTypeDefinition.java | 96 +++++++++
.../atlas/v1/model/typedef/Multiplicity.java | 113 +++++++++++
.../v1/model/typedef/StructTypeDefinition.java | 119 +++++++++++
.../v1/model/typedef/TraitTypeDefinition.java | 51 +++++
.../apache/atlas/v1/model/typedef/TypesDef.java | 91 +++++++++
.../v1/typesystem/types/utils/TypesUtil.java | 112 +++++++++++
.../java/org/apache/atlas/hook/AtlasHook.java | 2 +-
.../AbstractMessageDeserializer.java | 4 +-
.../notification/AbstractNotification.java | 2 +-
.../notification/entity/EntityNotification.java | 4 +-
.../entity/EntityNotificationImpl.java | 4 +-
.../notification/hook/HookNotification.java | 4 +-
.../apache/atlas/kafka/KafkaConsumerTest.java | 4 +-
.../atlas/kafka/KafkaNotificationTest.java | 2 +-
.../entity/EntityMessageDeserializerTest.java | 4 +-
.../entity/EntityNotificationImplTest.java | 4 +-
.../hook/HookMessageDeserializerTest.java | 4 +-
.../notification/hook/HookNotificationTest.java | 2 +-
.../repository/audit/EntityAuditListener.java | 4 +-
.../AtlasClassificationFormatConverter.java | 2 +-
.../converters/AtlasEntityFormatConverter.java | 9 +-
.../converters/AtlasEnumFormatConverter.java | 2 +-
.../converters/AtlasInstanceConverter.java | 4 +-
.../converters/AtlasObjectIdConverter.java | 6 +-
.../converters/AtlasStructFormatConverter.java | 2 +-
.../converters/TypeConverterUtil.java | 16 +-
.../atlas/repository/graph/GraphHelper.java | 11 +-
.../graph/v1/AtlasEntityChangeNotifier.java | 5 +-
.../store/graph/v1/AtlasStructDefStoreV1.java | 2 +-
.../apache/atlas/util/AttributeValueMap.java | 2 +-
.../org/apache/atlas/util/IndexedInstance.java | 2 +-
.../atlas/listener/EntityChangeListener.java | 4 +-
.../org/apache/atlas/examples/QuickStart.java | 8 +-
.../NotificationEntityChangeListener.java | 4 +-
.../notification/NotificationHookConsumer.java | 2 +-
.../atlas/web/resources/EntityResource.java | 6 +-
.../atlas/web/resources/TypesResource.java | 2 +-
.../org/apache/atlas/web/util/LineageUtils.java | 2 +-
.../org/apache/atlas/examples/QuickStartIT.java | 4 +-
.../notification/EntityNotificationIT.java | 10 +-
.../NotificationEntityChangeListenerTest.java | 4 +-
.../NotificationHookConsumerIT.java | 4 +-
.../NotificationHookConsumerKafkaTest.java | 2 +-
.../NotificationHookConsumerTest.java | 2 +-
.../atlas/web/integration/BaseResourceIT.java | 12 +-
.../DataSetLineageJerseyResourceIT.java | 10 +-
.../EntityDiscoveryJerseyResourceIT.java | 4 +-
.../web/integration/EntityJerseyResourceIT.java | 10 +-
.../EntityLineageJerseyResourceIT.java | 4 +-
.../integration/EntityV2JerseyResourceIT.java | 2 +-
.../MetadataDiscoveryJerseyResourceIT.java | 10 +-
.../web/integration/TypesJerseyResourceIT.java | 6 +-
91 files changed, 1739 insertions(+), 1748 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/bridge/FalconBridge.java
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/bridge/FalconBridge.java b/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/bridge/FalconBridge.java
index cd61c9b..11d13b3 100644
--- a/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/bridge/FalconBridge.java
+++ b/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/bridge/FalconBridge.java
@@ -24,7 +24,7 @@ import org.apache.atlas.falcon.Util.EventUtil;
import org.apache.atlas.falcon.model.FalconDataTypes;
import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.falcon.FalconException;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/hook/FalconHook.java
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/hook/FalconHook.java b/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/hook/FalconHook.java
index 54335e0..e9b9765 100644
--- a/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/hook/FalconHook.java
+++ b/addons/falcon-bridge/src/main/java/org/apache/atlas/falcon/hook/FalconHook.java
@@ -25,7 +25,7 @@ import org.apache.atlas.falcon.event.FalconEvent;
import org.apache.atlas.falcon.publisher.FalconEventPublisher;
import org.apache.atlas.hook.AtlasHook;
import org.apache.atlas.kafka.NotificationProvider;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.notification.hook.HookNotification;
import org.apache.falcon.FalconException;
import org.apache.falcon.entity.store.ConfigurationStore;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java
index baa2ad2..c073b3e 100644
--- a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java
+++ b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java
@@ -26,9 +26,9 @@ import org.apache.atlas.falcon.bridge.FalconBridge;
import org.apache.atlas.falcon.model.FalconDataTypes;
import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Id;
-import org.apache.atlas.model.v1.instance.Referenceable;
-import org.apache.atlas.typesystem.types.utils.TypesUtil;
+import org.apache.atlas.v1.model.instance.Id;
+import org.apache.atlas.v1.model.instance.Referenceable;
+import org.apache.atlas.v1.typesystem.types.utils.TypesUtil;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.atlas.utils.ParamChecker;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
index a16e6ae..af5eda8 100644
--- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
+++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
@@ -23,7 +23,7 @@ import org.apache.atlas.AtlasConstants;
import org.apache.atlas.hbase.model.HBaseOperationContext;
import org.apache.atlas.hbase.model.HBaseDataTypes;
import org.apache.atlas.hook.AtlasHook;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.notification.hook.HookNotification;
import org.apache.commons.configuration.Configuration;
import org.apache.hadoop.hbase.HTableDescriptor;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
index abdf502..0d2e8df 100644
--- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
+++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
@@ -22,7 +22,7 @@ import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.hbase.bridge.HBaseAtlasHook;
import org.apache.atlas.hbase.model.HBaseDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.atlas.utils.ParamChecker;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/ColumnLineageUtils.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/ColumnLineageUtils.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/ColumnLineageUtils.java
index 0aab7b8..ba10008 100644
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/ColumnLineageUtils.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/ColumnLineageUtils.java
@@ -20,7 +20,7 @@ package org.apache.atlas.hive.bridge;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.hadoop.hive.ql.hooks.LineageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
index 8d34492..ab0094b 100755
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
@@ -27,9 +27,9 @@ import org.apache.atlas.AtlasServiceException;
import org.apache.atlas.hive.hook.HiveHook;
import org.apache.atlas.hive.model.HiveDataTypes;
import org.apache.atlas.hook.AtlasHookException;
-import org.apache.atlas.model.v1.instance.Id;
-import org.apache.atlas.model.v1.instance.Referenceable;
-import org.apache.atlas.model.v1.instance.Struct;
+import org.apache.atlas.v1.model.instance.Id;
+import org.apache.atlas.v1.model.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Struct;
import org.apache.atlas.type.AtlasType;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.commons.cli.BasicParser;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
index 18e7950..9a5d1b9 100755
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
@@ -28,7 +28,7 @@ import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.model.HiveDataTypes;
import org.apache.atlas.hook.AtlasHook;
import org.apache.atlas.hook.AtlasHookException;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.notification.hook.HookNotification;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java
index 608b6a0..d9fb46e 100644
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java
@@ -23,8 +23,8 @@ import org.apache.atlas.AtlasClient;
import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.hook.HiveHookIT;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
-import org.apache.atlas.model.v1.instance.Id;
+import org.apache.atlas.v1.model.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Id;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.atlas.utils.ParamChecker;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java
index aed2644..8cc1bc9 100644
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java
@@ -21,7 +21,7 @@ package org.apache.atlas.hive.bridge;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.AtlasServiceException;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.metastore.TableType;
import org.apache.hadoop.hive.metastore.api.Database;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetastoreBridgeIT.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetastoreBridgeIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetastoreBridgeIT.java
index 83c195e..22d3c59 100644
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetastoreBridgeIT.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetastoreBridgeIT.java
@@ -21,8 +21,8 @@ package org.apache.atlas.hive.bridge;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.hive.HiveITBase;
import org.apache.atlas.hive.model.HiveDataTypes;
-import org.apache.atlas.model.v1.instance.Referenceable;
-import org.apache.atlas.model.v1.instance.Id;
+import org.apache.atlas.v1.model.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Id;
import org.testng.annotations.Test;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
index 0e4a61b..e90e7e3 100755
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
@@ -27,9 +27,9 @@ import org.apache.atlas.hive.HiveITBase;
import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.model.HiveDataTypes;
import org.apache.atlas.model.typedef.AtlasBaseTypeDef;
-import org.apache.atlas.model.v1.instance.Id;
-import org.apache.atlas.model.v1.instance.Struct;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Id;
+import org.apache.atlas.v1.model.instance.Struct;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.metastore.TableType;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
index 79c0177..6c1aa99 100644
--- a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
+++ b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
@@ -26,7 +26,7 @@ import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
import org.apache.atlas.hive.model.HiveDataTypes;
import org.apache.atlas.hook.AtlasHook;
import org.apache.atlas.hook.AtlasHookException;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.notification.hook.HookNotification;
import org.apache.atlas.sqoop.model.SqoopDataTypes;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
index 4114323..57fc7a1 100644
--- a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
+++ b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
@@ -18,7 +18,7 @@
package org.apache.atlas.storm.hook;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.storm.ISubmitterHook;
import org.apache.storm.generated.Bolt;
import org.apache.storm.generated.SpoutSpec;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
index 3ff3052..5fef38d 100644
--- a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
+++ b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
@@ -21,7 +21,7 @@ package org.apache.atlas.storm.hook;
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.hive.bridge.HiveMetaStoreBridge;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.storm.model.StormDataTypes;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java
----------------------------------------------------------------------
diff --git a/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java b/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java
index c3f8602..bcdec71 100644
--- a/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java
+++ b/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java
@@ -21,12 +21,12 @@ package org.apache.atlas;
import com.google.common.annotations.VisibleForTesting;
import com.sun.jersey.api.client.WebResource;
import org.apache.atlas.model.legacy.EntityResult;
-import org.apache.atlas.model.v1.instance.Referenceable;
-import org.apache.atlas.model.v1.instance.Struct;
-import org.apache.atlas.model.v1.typedef.AttributeDefinition;
-import org.apache.atlas.model.v1.typedef.TraitTypeDefinition;
-import org.apache.atlas.model.v1.typedef.TypesDef;
-import org.apache.atlas.typesystem.types.utils.TypesUtil;
+import org.apache.atlas.v1.model.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Struct;
+import org.apache.atlas.v1.model.typedef.AttributeDefinition;
+import org.apache.atlas.v1.model.typedef.TraitTypeDefinition;
+import org.apache.atlas.v1.model.typedef.TypesDef;
+import org.apache.atlas.v1.typesystem.types.utils.TypesUtil;
import org.apache.atlas.type.AtlasType;
import org.apache.atlas.typesystem.types.DataTypes;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/client/client-v1/src/main/java/org/apache/atlas/EntityAuditEvent.java
----------------------------------------------------------------------
diff --git a/client/client-v1/src/main/java/org/apache/atlas/EntityAuditEvent.java b/client/client-v1/src/main/java/org/apache/atlas/EntityAuditEvent.java
index 05b9282..567205f 100644
--- a/client/client-v1/src/main/java/org/apache/atlas/EntityAuditEvent.java
+++ b/client/client-v1/src/main/java/org/apache/atlas/EntityAuditEvent.java
@@ -19,7 +19,7 @@
package org.apache.atlas;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.type.AtlasType;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java
----------------------------------------------------------------------
diff --git a/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java b/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java
index 99d1328..5287af4 100644
--- a/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java
+++ b/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java
@@ -22,7 +22,7 @@ import com.sun.jersey.api.client.ClientHandlerException;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
import org.apache.atlas.model.legacy.EntityResult;
-import org.apache.atlas.model.v1.instance.Referenceable;
+import org.apache.atlas.v1.model.instance.Referenceable;
import org.apache.atlas.type.AtlasType;
import org.apache.commons.configuration.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/instance/AtlasSystemAttributes.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/instance/AtlasSystemAttributes.java b/intg/src/main/java/org/apache/atlas/model/v1/instance/AtlasSystemAttributes.java
deleted file mode 100644
index 43a2fe1..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/instance/AtlasSystemAttributes.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.instance;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class AtlasSystemAttributes implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String createdBy;
- private String modifiedBy;
- private Date createdTime;
- private Date modifiedTime;
-
-
- public AtlasSystemAttributes() {
- }
-
- public AtlasSystemAttributes(AtlasSystemAttributes that) {
- if (that != null) {
- this.createdBy = that.createdBy;
- this.modifiedBy = that.modifiedBy;
- this.createdTime = that.createdTime;
- this.modifiedTime = that.modifiedTime;
- }
- }
-
- public AtlasSystemAttributes(String createdBy, String modifiedBy, Date createdTime, Date modifiedTime){
- this.createdBy = createdBy;
- this.modifiedBy = modifiedBy;
- this.createdTime = createdTime;
- this.modifiedTime = modifiedTime;
- }
-
- public String getCreatedBy(){
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public String getModifiedBy(){
- return modifiedBy;
- }
-
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- public Date getCreatedTime(){
- return createdTime;
- }
-
- public void setCreatedTime(Date createdTime) {
- this.createdTime = createdTime;
- }
-
- public Date getModifiedTime(){
- return modifiedTime;
- }
-
- public void setModifiedTime(Date modifiedTime) {
- this.modifiedTime = modifiedTime;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- AtlasSystemAttributes obj = (AtlasSystemAttributes) o;
-
- return Objects.equals(createdBy, obj.createdBy) &&
- Objects.equals(modifiedBy, obj.modifiedBy) &&
- Objects.equals(createdTime, obj.createdTime) &&
- Objects.equals(modifiedTime, obj.modifiedTime);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(createdBy, modifiedBy, createdTime, modifiedTime);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/instance/Id.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/instance/Id.java b/intg/src/main/java/org/apache/atlas/model/v1/instance/Id.java
deleted file mode 100644
index 5ff4c3d..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/instance/Id.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.instance;
-
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class Id implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @JsonIgnore
- private static AtomicLong s_nextId = new AtomicLong(System.nanoTime());
-
- public enum EntityState { ACTIVE, DELETED }
-
- private String id;
- private String typeName;
- private int version;
- private EntityState state;
-
-
- public Id() {
- }
-
- public Id(Id that) {
- if (that != null) {
- this.id = that.id;
- this.typeName = that.typeName;
- this.version = that.version;
- this.state = that.state;
- }
- }
-
- public Id(String typeName) {
- this("" + nextNegativeLong(), 0, typeName);
- }
-
- public Id(String id, int version, String typeName) {
- this(id, version, typeName, null);
- }
-
- public Id(long id, int version, String typeName) {
- this(id, version, typeName, null);
- }
-
- public Id(long id, int version, String typeName, String state) {
- this("" + id, version, typeName, state);
- }
-
- public Id(String id, int version, String typeName, String state) {
- this.id = id;
- this.typeName = typeName;
- this.version = version;
- this.state = state == null ? EntityState.ACTIVE : EntityState.valueOf(state.toUpperCase());
- }
-
- // for serialization backward compatibility
- public String getJsonClass() {
- return "org.apache.atlas.typesystem.json.InstanceSerialization$_Id";
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public int getVersion() {
- return version;
- }
-
- public void setVersion(int version) {
- this.version = version;
- }
-
- public EntityState getState() {
- return state;
- }
-
- public void setState(EntityState state) {
- this.state = state;
- }
-
- @JsonIgnore
- public String _getId() {
- return id;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- Id obj = (Id) o;
-
- return version == obj.version &&
- Objects.equals(id, obj.id) &&
- Objects.equals(typeName, obj.typeName) &&
- Objects.equals(state, obj.state);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id, typeName, version, state);
- }
-
-
-
- private static long nextNegativeLong() {
- long ret = s_nextId.getAndDecrement();
-
- if (ret > 0) {
- ret *= -1;
- } else if (ret == 0) {
- ret = Long.MIN_VALUE;
- }
-
- return ret;
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/instance/Referenceable.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/instance/Referenceable.java b/intg/src/main/java/org/apache/atlas/model/v1/instance/Referenceable.java
deleted file mode 100644
index df541b7..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/instance/Referenceable.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.instance;
-
-
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class Referenceable extends Struct implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private Id id;
- private Map<String, Struct> traits = new HashMap<>();
- private List<String> traitNames = new ArrayList<>();
- private AtlasSystemAttributes systemAttributes;
-
-
- public Referenceable() {
- super();
- }
-
- public Referenceable(Referenceable that) {
- super(that);
-
- if (that != null) {
- this.id = new Id(that.id);
-
- if (that.traits != null) {
- this.traits.putAll(that.traits);
- }
-
- if (that.traitNames != null) {
- this.traitNames.addAll(that.traitNames);
- }
-
- this.systemAttributes = new AtlasSystemAttributes(that.systemAttributes);
- }
- }
-
- public Referenceable(String typeName, String... traitNames) {
- super(typeName);
-
- this.id = new Id(typeName);
- this.systemAttributes = null;
-
- if (traitNames != null) {
- for (String traitName : traitNames) {
- this.traitNames.add(traitName);
- this.traits.put(traitName, new Struct(traitName));
- }
- }
- }
-
- public Referenceable(String typeName, Map<String, Object> values) {
- this(new Id(typeName), typeName, values, null, null);
- }
-
- public Referenceable(String guid, String typeName, Map<String, Object> values) {
- this(new Id(guid, 0, typeName), typeName, values, null, null, null);
- }
-
- public Referenceable(String guid, String typeName, Map<String, Object> values, AtlasSystemAttributes systemAttributes) {
- this(new Id(guid, 0, typeName), typeName, values, systemAttributes, null, null);
- }
-
- public Referenceable(String guid, String typeName, Map<String, Object> values, AtlasSystemAttributes systemAttributes, List<String> traitNames, Map<String, Struct> traits) {
- this(new Id(guid, 0, typeName), typeName, values, systemAttributes, traitNames, traits);
- }
-
- public Referenceable(String guid, String typeName, Map<String, Object> values, List<String> traitNames, Map<String, Struct> traits) {
- this(new Id(guid, 0, typeName), typeName, values, null, traitNames, traits);
- }
-
- public Referenceable(Id id, String typeName, Map<String, Object> values, List<String> traitNames, Map<String, Struct> traits) {
- this(id, typeName, values, null, traitNames, traits);
- }
-
- public Referenceable(Id id, String typeName, Map<String, Object> values, AtlasSystemAttributes systemAttributes, List<String> traitNames, Map<String, Struct> traits) {
- super(typeName, values);
-
- this.id = id;
- this.systemAttributes = systemAttributes;
-
- if (traitNames != null) {
- this.traitNames = traitNames;
- }
-
- if (traits != null) {
- this.traits = traits;
- }
- }
-
-
- // for serialization backward compatibility
- public String getJsonClass() {
- return "org.apache.atlas.typesystem.json.InstanceSerialization$_Reference";
- }
-
- public Id getId() {
- return id;
- }
-
- public void setId(Id id) {
- this.id = id;
- }
-
- public Map<String, Struct> getTraits() {
- return traits;
- }
-
- public void setTraits(Map<String, Struct> traits) {
- this.traits = traits;
- }
-
- public List<String> getTraitNames() {
- return traitNames;
- }
-
- public void setTraitNames(List<String> traitNames) {
- this.traitNames = traitNames;
- }
-
- public AtlasSystemAttributes getSystemAttributes() {
- return systemAttributes;
- }
-
- public void setSystemAttributes(AtlasSystemAttributes systemAttributes) {
- this.systemAttributes = systemAttributes;
- }
-
- @JsonIgnore
- public Struct getTrait(String name) {
- return traits != null ? traits.get(name) : null;
- }
-
- @JsonIgnore
- public String toShortString() {
- return String.format("entity[type=%s guid=%s]", getTypeName(), id._getId());
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || o.getClass() != getClass()) {
- return false;
- }
-
- Referenceable obj = (Referenceable)o;
-
- return Objects.equals(id, obj.id) &&
- Objects.equals(traits, obj.traits) &&
- Objects.equals(traitNames, obj.traitNames) &&
- Objects.equals(systemAttributes, obj.systemAttributes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id, traits, traitNames, systemAttributes);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/instance/Struct.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/instance/Struct.java b/intg/src/main/java/org/apache/atlas/model/v1/instance/Struct.java
deleted file mode 100644
index 52bf98e..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/instance/Struct.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.instance;
-
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class Struct implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String typeName;
- private Map<String, Object> values;
-
-
- public Struct() {
- }
-
- public Struct(Struct that) {
- if (that != null) {
- this.typeName = that.typeName;
-
- if (that.values != null) {
- this.values = new HashMap<>(that.values);
- }
- }
- }
-
- public Struct(String typeName) {
- this(typeName, null);
- }
-
- public Struct(String typeName, Map<String, Object> values) {
- this.typeName = typeName;
- this.values = values;
- }
-
- // for serialization backward compatibility
- public String getJsonClass() {
- return "org.apache.atlas.typesystem.json.InstanceSerialization$_Struct";
- }
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public Map<String, Object> getValues() {
- return values;
- }
-
- public void setValues(Map<String, Object> values) {
- this.values = values;
- }
-
- @JsonIgnore
- public Map<String, Object> getValuesMap() {
- return values;
- }
-
- @JsonIgnore
- public void set(String attrName, Object attrValue) {
- if (values == null) {
- values = new HashMap<>();
- }
-
- values.put(attrName, attrValue);
- }
-
- @JsonIgnore
- public Object get(String attrName) {
- return values != null ? values.get(attrName) : null;
- }
-
- @JsonIgnore
- public void setNull(String attrName) {
- if (values != null) {
- values.remove(attrName);
- }
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || o.getClass() != getClass()) {
- return false;
- }
-
- Struct obj = (Struct)o;
-
- return Objects.equals(typeName, obj.typeName) &&
- Objects.equals(values, obj.values);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(typeName, values);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/AttributeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/AttributeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/AttributeDefinition.java
deleted file mode 100644
index c1369f7..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/AttributeDefinition.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class AttributeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String name;
- private String dataTypeName;
- private Multiplicity multiplicity;
- private boolean isComposite; // A composite is the one whose lifecycle is dependent on the enclosing type and is not just a reference
- private boolean isUnique;
- private boolean isIndexable;
- private String reverseAttributeName; // If this is a reference attribute, then the name of the attribute on the Class that this refers to.
-
-
-
- public AttributeDefinition() {
- }
-
- public AttributeDefinition(String name, String dataTypeName, Multiplicity multiplicity) {
- this(name, dataTypeName, multiplicity, false, false, true, null);
- }
-
- public AttributeDefinition(String name, String dataTypeName, Multiplicity multiplicity, boolean isComposite,
- String reverseAttributeName) {
- this(name, dataTypeName, multiplicity, isComposite, false, false, reverseAttributeName);
- }
-
- public AttributeDefinition(String name, String dataTypeName, Multiplicity multiplicity, boolean isComposite, boolean isUnique, boolean isIndexable, String reverseAttributeName) {
- this.name = name;
- this.dataTypeName = dataTypeName;
- this.multiplicity = multiplicity;
- this.isComposite = isComposite;
- this.isUnique = isUnique;
- this.isIndexable = isIndexable;
- this.reverseAttributeName = reverseAttributeName;
- }
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDataTypeName() {
- return dataTypeName;
- }
-
- public void setDataTypeName(String dataTypeName) {
- this.dataTypeName = dataTypeName;
- }
-
- public Multiplicity getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(Multiplicity multiplicity) {
- this.multiplicity = multiplicity;
- }
-
- public boolean getIsComposite() {
- return isComposite;
- }
-
- public void setIsComposite(boolean isComposite) {
- this.isComposite = isComposite;
- }
-
- public boolean getIsUnique() {
- return isUnique;
- }
-
- public void setIsUnique(boolean isUnique) {
- this.isUnique = isUnique;
- }
-
- public boolean getIsIndexable() {
- return isIndexable;
- }
-
- public void setIsIndexable(boolean isIndexable) {
- this.isIndexable = isIndexable;
- }
-
- public String getReverseAttributeName() {
- return reverseAttributeName;
- }
-
- public void setReverseAttributeName(String reverseAttributeName) {
- this.reverseAttributeName = reverseAttributeName;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- AttributeDefinition that = (AttributeDefinition) o;
-
- return isComposite == that.isComposite &&
- isUnique == that.isUnique &&
- isIndexable == that.isIndexable &&
- Objects.equals(name, that.name) &&
- Objects.equals(dataTypeName, that.dataTypeName) &&
- Objects.equals(multiplicity, that.multiplicity) &&
- Objects.equals(reverseAttributeName, that.reverseAttributeName);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(name, dataTypeName, multiplicity, isComposite, isUnique, isIndexable, reverseAttributeName);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/ClassTypeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/ClassTypeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/ClassTypeDefinition.java
deleted file mode 100644
index 54440e6..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/ClassTypeDefinition.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class ClassTypeDefinition extends HierarchicalTypeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
-
- public ClassTypeDefinition() {
- }
-
- public ClassTypeDefinition(String typeName, String typeDescription, String typeVersion, List<AttributeDefinition> attributeDefinitions, Set<String> superTypes) {
- super(typeName, typeDescription, typeVersion, attributeDefinitions, "org.apache.atlas.typesystem.types.ClassType", superTypes);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/EnumTypeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/EnumTypeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/EnumTypeDefinition.java
deleted file mode 100644
index 45ffce5..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/EnumTypeDefinition.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class EnumTypeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String name;
- private String description;
- private String version;
- private List<EnumValue> enumValues;
-
-
- public EnumTypeDefinition() {
- }
-
- public EnumTypeDefinition(String name, String description, String version, List<EnumValue> enumValues) {
- this.name = name;
- this.description = description;
- this.version = version;
- this.enumValues = enumValues;
- }
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public List<EnumValue> getEnumValues() {
- return enumValues;
- }
-
- public void setEnumValues(List<EnumValue> enumValues) {
- this.enumValues = enumValues;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- EnumTypeDefinition that = (EnumTypeDefinition) o;
-
- return Objects.equals(name, that.name) &&
- Objects.equals(description, that.description) &&
- Objects.equals(version, that.version) &&
- Objects.equals(enumValues, that.enumValues);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(name, description, version, enumValues);
- }
-
-
- @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
- @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
- @JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.PROPERTY)
- public static class EnumValue implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String value;
- private int ordinal;
-
- public EnumValue() {
- }
-
- public EnumValue(String value, int ordinal) {
- this.value = value;
- this.ordinal = ordinal;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public int getOrdinal() {
- return ordinal;
- }
-
- public void setOrdinal(int ordinal) {
- this.ordinal = ordinal;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- EnumValue that = (EnumValue) o;
-
- return ordinal == that.ordinal &&
- Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value, ordinal);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/HierarchicalTypeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/HierarchicalTypeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/HierarchicalTypeDefinition.java
deleted file mode 100644
index 0a3daba..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/HierarchicalTypeDefinition.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class HierarchicalTypeDefinition extends StructTypeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
-
- private String hierarchicalMetaTypeName = "org.apache.atlas.typesystem.types.TraitType";
- private Set<String> superTypes;
-
-
- public HierarchicalTypeDefinition() {
- }
-
- public HierarchicalTypeDefinition(String typeName, String typeDescription, String typeVersion, List<AttributeDefinition> attributeDefinitions, String hierarchicalMetaTypeName, Set<String> superTypes) {
- super(typeName, typeDescription, typeVersion, attributeDefinitions);
-
- this.hierarchicalMetaTypeName = hierarchicalMetaTypeName;
- this.superTypes = superTypes;
- }
-
- public String getHierarchicalMetaTypeName() {
- return hierarchicalMetaTypeName;
- }
-
- public void setHierarchicalMetaTypeName(String hierarchicalMetaTypeName) {
- this.hierarchicalMetaTypeName = hierarchicalMetaTypeName;
- }
-
- public Set<String> getSuperTypes() {
- return superTypes;
- }
-
- public void setSuperTypes(Set<String> superTypes) {
- this.superTypes = superTypes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass() || !super.equals(o)) {
- return false;
- }
-
- HierarchicalTypeDefinition that = (HierarchicalTypeDefinition) o;
-
- return Objects.equals(superTypes, that.superTypes) &&
- Objects.equals(hierarchicalMetaTypeName, that.hierarchicalMetaTypeName);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(super.hashCode(), superTypes, hierarchicalMetaTypeName);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/Multiplicity.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/Multiplicity.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/Multiplicity.java
deleted file mode 100644
index b975834..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/Multiplicity.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class Multiplicity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- public static final Multiplicity OPTIONAL = new Multiplicity(0, 1, false);
- public static final Multiplicity REQUIRED = new Multiplicity(1, 1, false);
- public static final Multiplicity COLLECTION = new Multiplicity(1, Integer.MAX_VALUE, false);
- public static final Multiplicity SET = new Multiplicity(1, Integer.MAX_VALUE, true);
-
- private int lower;
- private int upper;
- private boolean isUnique;
-
- public Multiplicity() {
- this(Multiplicity.REQUIRED);
- }
-
- public Multiplicity(Multiplicity copyFrom) {
- this(copyFrom.lower, copyFrom.upper, copyFrom.isUnique);
- }
-
- public Multiplicity(int lower, int upper, boolean isUnique) {
- this.lower = lower;
- this.upper = upper;
- this.isUnique = isUnique;
- }
-
- public int getLower() {
- return lower;
- }
-
- public void setLower(int lower) {
- this.lower = lower;
- }
-
- public int getUpper() {
- return upper;
- }
-
- public void setUpper(int upper) {
- this.upper = upper;
- }
-
- public boolean getIsUnique() {
- return isUnique;
- }
-
- public void setIsUnique(boolean isUnique) {
- this.isUnique = isUnique;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- Multiplicity that = (Multiplicity) o;
-
- return lower == that.lower &&
- upper == that.upper &&
- isUnique == that.isUnique;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(lower, upper, isUnique);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/StructTypeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/StructTypeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/StructTypeDefinition.java
deleted file mode 100644
index e030a8f..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/StructTypeDefinition.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class StructTypeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String typeName;
- private String typeDescription;
- private String typeVersion;
- private List<AttributeDefinition> attributeDefinitions;
-
-
- public StructTypeDefinition() {
- }
-
- public StructTypeDefinition(String typeName, String typeDescription, List<AttributeDefinition> attributeDefinitions) {
- this(typeName, typeDescription, "1.0", attributeDefinitions);
- }
-
- public StructTypeDefinition(String typeName, String typeDescription, String typeVersion, List<AttributeDefinition> attributeDefinitions) {
- this.typeName = typeName;
- this.typeDescription = typeDescription;
- this.typeVersion = typeVersion;
- this.attributeDefinitions = attributeDefinitions;
- }
-
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public String getTypeDescription() {
- return typeDescription;
- }
-
- public void setTypeDescription(String typeDescription) {
- this.typeDescription = typeDescription;
- }
-
- public String getTypeVersion() {
- return typeVersion;
- }
-
- public void setTypeVersion(String typeVersion) {
- this.typeVersion = typeVersion;
- }
-
- public List<AttributeDefinition> getAttributeDefinitions() {
- return attributeDefinitions;
- }
-
- public void setAttributeDefinitions(List<AttributeDefinition> attributeDefinitions) {
- this.attributeDefinitions = attributeDefinitions;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- StructTypeDefinition that = (StructTypeDefinition) o;
-
- return Objects.equals(typeName, that.typeName) &&
- Objects.equals(typeDescription, that.typeDescription) &&
- Objects.equals(typeVersion, that.typeVersion) &&
- Objects.equals(attributeDefinitions, that.attributeDefinitions);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(typeName, typeDescription, typeVersion, attributeDefinitions);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/TraitTypeDefinition.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/TraitTypeDefinition.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/TraitTypeDefinition.java
deleted file mode 100644
index 0e99201..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/TraitTypeDefinition.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class TraitTypeDefinition extends HierarchicalTypeDefinition implements Serializable {
- private static final long serialVersionUID = 1L;
-
-
- public TraitTypeDefinition() {
- }
-
- public TraitTypeDefinition(String typeName, String typeDescription, String typeVersion, List<AttributeDefinition> attributeDefinitions, Set<String> superTypes) {
- super(typeName, typeDescription, typeVersion, attributeDefinitions, "org.apache.atlas.typesystem.types.TraitType", superTypes);
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/model/v1/typedef/TypesDef.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/v1/typedef/TypesDef.java b/intg/src/main/java/org/apache/atlas/model/v1/typedef/TypesDef.java
deleted file mode 100644
index 6e11841..0000000
--- a/intg/src/main/java/org/apache/atlas/model/v1/typedef/TypesDef.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.model.v1.typedef;
-
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY;
-
-
-@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class TypesDef implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private List<EnumTypeDefinition> enumTypes;
- private List<StructTypeDefinition> structTypes;
- private List<TraitTypeDefinition> traitTypes;
- private List<ClassTypeDefinition> classTypes;
-
-
- public TypesDef() {
- }
-
- public TypesDef(List<EnumTypeDefinition> enumTypes, List<StructTypeDefinition> structTypes, List<TraitTypeDefinition> traitTypes, List<ClassTypeDefinition> classTypes) {
- this.enumTypes = enumTypes;
- this.structTypes = structTypes;
- this.traitTypes = traitTypes;
- this.classTypes = classTypes;
- }
-
-
- public List<EnumTypeDefinition> getEnumTypes() {
- return enumTypes;
- }
-
- public void setEnumTypes(List<EnumTypeDefinition> enumTypes) {
- this.enumTypes = enumTypes;
- }
-
- public List<StructTypeDefinition> getStructTypes() {
- return structTypes;
- }
-
- public void setStructTypes(List<StructTypeDefinition> structTypes) {
- this.structTypes = structTypes;
- }
-
- public List<TraitTypeDefinition> getTraitTypes() {
- return traitTypes;
- }
-
- public void setTraitTypes(List<TraitTypeDefinition> traitTypes) {
- this.traitTypes = traitTypes;
- }
-
- public List<ClassTypeDefinition> getClassTypes() {
- return classTypes;
- }
-
- public void setClassTypes(List<ClassTypeDefinition> classTypes) {
- this.classTypes = classTypes;
- }
-}
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/type/AtlasType.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/type/AtlasType.java b/intg/src/main/java/org/apache/atlas/type/AtlasType.java
index b5c89af..551ee21 100644
--- a/intg/src/main/java/org/apache/atlas/type/AtlasType.java
+++ b/intg/src/main/java/org/apache/atlas/type/AtlasType.java
@@ -21,7 +21,7 @@ package org.apache.atlas.type;
import org.apache.atlas.exception.AtlasBaseException;
import org.apache.atlas.model.TypeCategory;
import org.apache.atlas.model.typedef.AtlasBaseTypeDef;
-import org.apache.atlas.model.v1.typedef.Multiplicity;
+import org.apache.atlas.v1.model.typedef.Multiplicity;
import org.codehaus.jackson.*;
import org.codehaus.jackson.map.*;
import org.codehaus.jackson.map.module.SimpleModule;
http://git-wip-us.apache.org/repos/asf/atlas/blob/eacf8513/intg/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java b/intg/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java
deleted file mode 100644
index ed82e2a..0000000
--- a/intg/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.atlas.typesystem.types.utils;
-
-
-import org.apache.atlas.model.v1.typedef.AttributeDefinition;
-import org.apache.atlas.model.v1.typedef.ClassTypeDefinition;
-import org.apache.atlas.model.v1.typedef.Multiplicity;
-import org.apache.atlas.model.v1.typedef.TraitTypeDefinition;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public class TypesUtil {
- public static ClassTypeDefinition createClassTypeDef(String name, String description, Set<String> superTypes, AttributeDefinition... attributes) {
- ClassTypeDefinition ret = new ClassTypeDefinition(name, description, "1.0", Arrays.asList(attributes), superTypes);
-
- return ret;
- }
-
- public static ClassTypeDefinition createClassTypeDef(String name, String description, String typeVersion, Set<String> superTypes, AttributeDefinition... attributes) {
- ClassTypeDefinition ret = new ClassTypeDefinition(name, description, typeVersion, Arrays.asList(attributes), superTypes);
-
- return ret;
- }
-
- public static TraitTypeDefinition createTraitTypeDef(String name, String description, Set<String> superTypes, AttributeDefinition... attributes) {
- return createTraitTypeDef(name, description, superTypes, Arrays.asList(attributes));
- }
-
- public static TraitTypeDefinition createTraitTypeDef(String name, String description, String typeVersion, Set<String> superTypes, AttributeDefinition... attributes) {
- return createTraitTypeDef(name, description, typeVersion, superTypes, Arrays.asList(attributes));
- }
-
- public static TraitTypeDefinition createTraitTypeDef(String name, String description, Set<String> superTypes, List<AttributeDefinition> attributes) {
- TraitTypeDefinition ret = new TraitTypeDefinition(name, description, "1.0", attributes, superTypes);
-
- return ret;
- }
-
- public static TraitTypeDefinition createTraitTypeDef(String name, String description, String typeVersion, Set<String> superTypes, List<AttributeDefinition> attributes) {
- TraitTypeDefinition ret = new TraitTypeDefinition(name, description, typeVersion, attributes, superTypes);
-
- return ret;
- }
-
- public static AttributeDefinition createUniqueRequiredAttrDef(String name, String dataTypeName) {
- AttributeDefinition ret = new AttributeDefinition(name, dataTypeName, Multiplicity.REQUIRED, false, true, true, null);
-
- return ret;
- }
-
- public static AttributeDefinition createRequiredAttrDef(String name, String dataTypeName) {
- AttributeDefinition ret = new AttributeDefinition(name, dataTypeName, Multiplicity.REQUIRED, false, false, true, null);
-
- return ret;
- }
-
- public static AttributeDefinition createOptionalAttrDef(String name, String dataTypeName) {
- AttributeDefinition ret = new AttributeDefinition(name, dataTypeName, Multiplicity.OPTIONAL, false, false, true, null);
-
- return ret;
- }
-
- public static class Pair<L, R> {
- public L left;
- public R right;
-
- public Pair(L left, R right) {
- this.left = left;
- this.right = right;
- }
-
- public static <L, R> Pair<L, R> of(L left, R right) {
- return new Pair<>(left, right);
- }
-
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- Pair p = (Pair)o;
-
- return Objects.equals(left, p.left) && Objects.equals(right, p.right);
- }
-
- public int hashCode() { return Objects.hash(left, right); }
- }
-}