Merge branch 'master' into dal
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/f4579b6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/f4579b6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/f4579b6b Branch: refs/heads/master Commit: f4579b6b50b51399cd76261ab48051d5ebe92d93 Parents: e9dacce 3e1637a Author: Shwetha GS <[email protected]> Authored: Thu Jun 11 21:27:11 2015 +0530 Committer: Shwetha GS <[email protected]> Committed: Thu Jun 11 21:27:11 2015 +0530 ---------------------------------------------------------------------- DISCLAIMER.txt | 6 +- InstallationSteps.txt | 24 +- .../atlas/hive/bridge/HiveMetaStoreBridge.java | 35 +- .../hive/model/HiveDataModelGenerator.java | 42 +-- .../org/apache/atlas/hive/hook/HiveHookIT.java | 10 +- .../hive/hook/SSLAndKerberosHiveHookIT.java | 10 +- .../apache/atlas/hive/hook/SSLHiveHookIT.java | 10 +- .../main/java/org/apache/atlas/AtlasClient.java | 368 +++++++++++++++++++ .../org/apache/atlas/AtlasServiceException.java | 45 +++ .../org/apache/atlas/MetadataServiceClient.java | 368 ------------------- .../apache/atlas/MetadataServiceException.java | 45 --- .../java/org/apache/atlas/PropertiesUtil.java | 8 +- .../atlas/security/SecureClientUtils.java | 8 +- docs/src/site/twiki/Configuration.twiki | 26 +- docs/src/site/twiki/security.twiki | 26 +- pom.xml | 6 +- .../atlas/discovery/DiscoveryException.java | 4 +- .../atlas/discovery/HiveLineageService.java | 18 +- .../apache/atlas/discovery/LineageService.java | 12 +- .../graph/DefaultGraphPersistenceStrategy.java | 7 +- .../graph/GraphBackedDiscoveryService.java | 4 +- .../atlas/listener/EntityChangeListener.java | 14 +- .../atlas/listener/TypesChangeListener.java | 8 +- .../atlas/repository/DiscoverInstances.java | 4 +- .../apache/atlas/repository/IndexException.java | 4 +- .../atlas/repository/MetadataRepository.java | 6 +- .../atlas/repository/RepositoryException.java | 4 +- .../graph/GraphBackedMetadataRepository.java | 88 ++--- .../graph/GraphBackedSearchIndexer.java | 6 +- .../repository/graph/TitanGraphProvider.java | 6 +- .../atlas/repository/memory/ClassStore.java | 4 +- .../atlas/repository/memory/MemRepository.java | 8 +- .../memory/ReplaceIdWithInstance.java | 10 +- .../typestore/GraphBackedTypeStore.java | 69 ++-- .../atlas/repository/typestore/ITypeStore.java | 10 +- .../repository/typestore/StorageException.java | 4 +- .../atlas/services/DefaultMetadataService.java | 79 ++-- .../apache/atlas/services/MetadataService.java | 30 +- .../org/apache/atlas/query/Expressions.scala | 10 +- .../org/apache/atlas/query/TypeUtils.scala | 10 +- .../test/java/org/apache/atlas/TestUtils.java | 4 +- .../org/apache/atlas/repository/BaseTest.java | 10 +- .../atlas/repository/memory/ClassTest.java | 4 +- .../atlas/repository/memory/EnumTest.java | 20 +- .../repository/memory/InstanceE2ETest.java | 14 +- .../atlas/repository/memory/StorageTest.java | 10 +- .../atlas/repository/memory/StructTest.java | 8 +- .../atlas/repository/memory/TraitTest.java | 6 +- .../typestore/GraphBackedTypeStoreTest.java | 4 +- .../org/apache/atlas/tools/dsl/package.scala | 2 +- .../atlas/tools/thrift/ThriftParser.scala | 6 +- .../atlas/tools/thrift/ThriftTypesGen.scala | 20 +- .../org/apache/atlas/tools/dsl/DSLTest.scala | 6 +- .../java/org/apache/atlas/AtlasException.java | 44 +++ .../org/apache/atlas/MetadataException.java | 45 --- .../org/apache/atlas/TypeNotFoundException.java | 2 +- .../org/apache/atlas/typesystem/IInstance.java | 8 +- .../apache/atlas/typesystem/ITypedInstance.java | 48 +-- .../persistence/DownCastStructInstance.java | 8 +- .../apache/atlas/typesystem/persistence/Id.java | 104 +++--- .../atlas/typesystem/persistence/MapIds.java | 4 +- .../persistence/ReferenceableInstance.java | 4 +- .../typesystem/persistence/StructInstance.java | 154 ++++---- .../typesystem/types/AbstractDataType.java | 6 +- .../atlas/typesystem/types/AttributeInfo.java | 4 +- .../atlas/typesystem/types/ClassType.java | 24 +- .../atlas/typesystem/types/DataTypes.java | 34 +- .../typesystem/types/DownCastFieldMapping.java | 6 +- .../apache/atlas/typesystem/types/EnumType.java | 4 +- .../atlas/typesystem/types/FieldMapping.java | 8 +- .../typesystem/types/HierarchicalType.java | 40 +- .../typesystem/types/IConstructableType.java | 4 +- .../atlas/typesystem/types/IDataType.java | 6 +- .../typesystem/types/ObjectGraphTraversal.java | 16 +- .../typesystem/types/ObjectGraphWalker.java | 22 +- .../atlas/typesystem/types/StructType.java | 14 +- .../atlas/typesystem/types/TraitType.java | 8 +- .../atlas/typesystem/types/TypeSystem.java | 112 +++--- .../atlas/typesystem/types/TypeUtils.java | 6 +- .../typesystem/types/TypedStructHandler.java | 6 +- .../types/ValueConversionException.java | 4 +- .../typesystem/json/TypesSerialization.scala | 4 +- .../typesystem/json/SerializationJavaTest.java | 6 +- .../apache/atlas/typesystem/types/BaseTest.java | 12 +- .../atlas/typesystem/types/ClassTest.java | 4 +- .../apache/atlas/typesystem/types/EnumTest.java | 16 +- .../atlas/typesystem/types/StructTest.java | 6 +- .../atlas/typesystem/types/TraitTest.java | 6 +- .../typesystem/types/TypeInheritanceTest.java | 10 +- .../typesystem/builders/MultiplicityTest.scala | 4 +- webapp/src/main/java/org/apache/atlas/Main.java | 17 +- .../org/apache/atlas/examples/QuickStart.java | 10 +- .../web/filters/AtlasAuthenticationFilter.java | 104 ++++++ .../apache/atlas/web/filters/AuditFilter.java | 4 +- .../filters/MetadataAuthenticationFilter.java | 104 ------ .../atlas/web/listeners/GuiceServletConfig.java | 12 +- .../atlas/web/listeners/LoginProcessor.java | 4 +- .../atlas/web/resources/EntityResource.java | 58 +-- .../web/resources/HiveLineageResource.java | 14 +- .../resources/MetadataDiscoveryResource.java | 26 +- .../web/resources/RexsterGraphResource.java | 18 +- .../atlas/web/resources/TypesResource.java | 30 +- .../org/apache/atlas/web/util/Servlets.java | 6 +- .../atlas/web/resources/BaseResourceIT.java | 10 +- .../web/resources/EntityJerseyResourceIT.java | 54 +-- .../resources/HiveLineageJerseyResourceIT.java | 42 +-- .../MetadataDiscoveryJerseyResourceIT.java | 20 +- .../web/resources/TypesJerseyResourceIT.java | 25 +- 108 files changed, 1467 insertions(+), 1474 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4579b6b/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java ---------------------------------------------------------------------- diff --cc repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java index ce31412,0371782..86a10f4 --- a/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java +++ b/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java @@@ -352,7 -349,7 +349,7 @@@ public class DefaultMetadataService imp } private ITypedStruct deserializeTraitInstance(String traitInstanceDefinition) - throws MetadataException { - throws AtlasException { ++ throws AtlasException { try { Struct traitInstance = InstanceSerialization.fromJsonStruct( @@@ -418,7 -415,7 +415,7 @@@ } private void onEntityAddedToRepo(ITypedReferenceableInstance typedInstance) - throws MetadataException { - throws AtlasException { ++ throws AtlasException { for (EntityChangeListener listener : entityChangeListeners) { listener.onEntityAdded(typedInstance); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4579b6b/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4579b6b/webapp/src/test/java/org/apache/atlas/web/resources/MetadataDiscoveryJerseyResourceIT.java ----------------------------------------------------------------------
