atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [48/58] [abbrv] incubator-atlas git commit: Merge branch 'apache-local' into dal
Date Tue, 16 Jun 2015 23:05:22 GMT
Merge branch 'apache-local' into dal

Conflicts:
	repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/2fbe8d9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/2fbe8d9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/2fbe8d9b

Branch: refs/heads/master
Commit: 2fbe8d9b233b05fd61e46186025851ea3a7a0841
Parents: f4579b6 2febe21
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Fri Jun 12 17:08:17 2015 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Fri Jun 12 17:08:17 2015 -0700

----------------------------------------------------------------------
 InstallationSteps.txt                           |    21 +-
 LICENSE.txt                                     |   186 +-
 NOTICE.txt                                      |     2 +-
 README.txt                                      |     2 +-
 addons/falcon-bridge/pom.xml                    |    82 -
 .../org/apache/atlas/falcon/FalconImporter.java |   144 -
 .../apache/atlas/falcon/FalconTypeSystem.java   |   169 -
 .../apache/atlas/falcon/FalconImporterTest.java |   108 -
 .../atlas/falcon/FalconTypeSystemTest.java      |    35 -
 .../atlas/hive/bridge/HiveMetaStoreBridge.java  |    45 +-
 .../org/apache/atlas/hive/hook/HiveHook.java    |    52 +-
 .../hive/model/HiveDataModelGenerator.java      |   358 +-
 .../src/site/twiki/Bridge-Hive.twiki            |    14 +-
 .../atlas/hive/hook/BaseSSLAndKerberosTest.java |    18 +-
 .../org/apache/atlas/hive/hook/HiveHookIT.java  |    33 +-
 .../hook/NegativeSSLAndKerberosHiveHookIT.java  |     3 +-
 .../hive/hook/SSLAndKerberosHiveHookIT.java     |     8 +-
 .../apache/atlas/hive/hook/SSLHiveHookIT.java   |    26 +-
 .../metadata-bridge-core/.gitignore             |    17 -
 .../metadata-bridge-core/pom.xml                |    75 -
 .../apache/hadoop/metadata/bridge/ABridge.java  |   166 -
 .../hadoop/metadata/bridge/AEntityBean.java     |    23 -
 .../hadoop/metadata/bridge/BridgeException.java |    34 -
 .../hadoop/metadata/bridge/BridgeManager.java   |   153 -
 .../metadata/bridge/BridgeTypeBootstrapper.java |   106 -
 .../apache/hadoop/metadata/bridge/IBridge.java  |    25 -
 .../bridge/hivelineage/HiveLineageBridge.java   |    35 -
 .../bridge/hivelineage/hook/HiveLineage.java    |   349 -
 .../bridge/hivestructure/HiveMetaImporter.java  |   221 -
 .../hivestructure/HiveStructureBridge.java      |   121 -
 .../metadata/bridge/module/BridgeModule.java    |    89 -
 .../web/resources/HiveLineageResource.java      |    82 -
 .../main/resources/bridge-manager.properties    |    22 -
 .../metadata/bridge/BridgeManagerTest.java      |    58 -
 .../metadata/bridge/TestBridgeModule.java       |    34 -
 .../metadata/bridge/TestGenericBridges.java     |    25 -
 .../hivelineage/TestHiveLineageBridge.java      |    86 -
 .../test/resources/bridge-manager.properties    |    22 -
 .../src/test/resources/graph.properties         |    25 -
 .../src/test/resources/one.json                 |    48 -
 .../resources/test-bridge-manager.properties    |    22 -
 .../src/test/resources/two.json                 |    48 -
 .../metadata-bridge-hive/pom.xml                |   112 -
 .../bridge/hivelineage/hook/HiveLineage.java    |   398 -
 .../hivelineage/hook/HiveLineageInfo.java       |   535 -
 .../metadata/bridge/hivelineage/hook/Hook.java  |   317 -
 .../hivelineage/hook/HiveLineageInfoTest.java   |    34 -
 addons/metadata-bridge-parent/pom.xml           |    35 -
 .../main/java/org/apache/atlas/AtlasClient.java |    28 +-
 .../atlas/security/SecureClientUtils.java       |    35 +-
 .../apache/atlas/security/BaseSecurityTest.java |    40 +-
 dashboard/v1/Search.html                        |   126 -
 dashboard/v1/css/bootstrap-responsive.css       |  1109 -
 dashboard/v1/css/bootstrap-responsive.min.css   |     9 -
 dashboard/v1/css/bootstrap-theme.css            |   476 -
 dashboard/v1/css/bootstrap-theme.css.map        |     1 -
 dashboard/v1/css/bootstrap-theme.min.css        |     5 -
 dashboard/v1/css/bootstrap.css                  |  6332 -----
 dashboard/v1/css/bootstrap.css.map              |     1 -
 dashboard/v1/css/bootstrap.min.css              |     5 -
 dashboard/v1/css/heroic-features.css            |    21 -
 dashboard/v1/css/sticky-footer-navbar.css       |    39 -
 dashboard/v1/css/style.css                      |    93 -
 .../v1/fonts/glyphicons-halflings-regular.eot   |   Bin 20335 -> 0 bytes
 .../v1/fonts/glyphicons-halflings-regular.svg   |   229 -
 .../v1/fonts/glyphicons-halflings-regular.ttf   |   Bin 41280 -> 0 bytes
 .../v1/fonts/glyphicons-halflings-regular.woff  |   Bin 23320 -> 0 bytes
 .../v1/fonts/glyphicons-halflings-regular.woff2 |   Bin 18028 -> 0 bytes
 dashboard/v1/img/HWLOGO-g.png                   |   Bin 7271 -> 0 bytes
 dashboard/v1/img/HWLOGO.png                     |   Bin 6762 -> 0 bytes
 dashboard/v1/img/aetna-logo.png                 |   Bin 5306 -> 0 bytes
 dashboard/v1/img/elephant.png                   |   Bin 184672 -> 0 bytes
 dashboard/v1/img/glyphicons-halflings-white.png |   Bin 8777 -> 0 bytes
 dashboard/v1/img/glyphicons-halflings.png       |   Bin 12799 -> 0 bytes
 dashboard/v1/img/graph1.1.jpg                   |   Bin 38501 -> 0 bytes
 dashboard/v1/img/graph1.jpg                     |   Bin 15999 -> 0 bytes
 dashboard/v1/img/hwlogo1.png                    |   Bin 9263 -> 0 bytes
 dashboard/v1/img/img-1.jpg                      |   Bin 378640 -> 0 bytes
 dashboard/v1/img/img-2.jpg                      |   Bin 144750 -> 0 bytes
 dashboard/v1/img/logo-1.png                     |   Bin 4771 -> 0 bytes
 dashboard/v1/img/logo-sm.png                    |   Bin 2161 -> 0 bytes
 dashboard/v1/img/mid-img.png                    |   Bin 27460 -> 0 bytes
 dashboard/v1/img/mid-img2.png                   |   Bin 20836 -> 0 bytes
 dashboard/v1/img/process.png                    |   Bin 3204 -> 0 bytes
 dashboard/v1/img/splash2.png                    |   Bin 157503 -> 0 bytes
 dashboard/v1/img/text.ico                       |   Bin 4214 -> 0 bytes
 dashboard/v1/index.html                         |    75 -
 dashboard/v1/js/app.js                          |    38 -
 dashboard/v1/js/attributes.html                 |     2 -
 dashboard/v1/js/bootstrap.js                    |  2320 --
 dashboard/v1/js/bootstrap.min.js                |     7 -
 dashboard/v1/js/controllers.js                  |   310 -
 dashboard/v1/js/jquery.js                       |     4 -
 dashboard/v1/js/npm.js                          |    13 -
 dashboard/v1/lib/Angular/angular-route.min.js   |    14 -
 .../v1/lib/Angular/angular-route.min.js.map     |     8 -
 dashboard/v1/lib/Angular/angular.min.js         |   212 -
 dashboard/v1/lib/Angular/angular.min.js.map     |     8 -
 dashboard/v1/partials/attribute.html            |    20 -
 dashboard/v1/partials/lineage.html              |    26 -
 dashboard/v1/partials/search.html               |    57 -
 dashboard/v1/partials/wiki.html                 |    40 -
 dashboard/v2/.bowerrc                           |     2 +-
 dashboard/v2/.gitignore                         |     5 +-
 dashboard/v2/.jshintignore                      |    18 +
 dashboard/v2/.jshintrc                          |    18 +
 dashboard/v2/README.md                          |    26 +-
 dashboard/v2/bower.json                         |     3 +-
 dashboard/v2/gruntfile.js                       |   109 +-
 dashboard/v2/package.json                       |    11 +-
 dashboard/v2/public/css/common.css              |    46 +-
 dashboard/v2/public/css/details.css             |    21 +
 dashboard/v2/public/css/lineage.css             |    53 +-
 .../v2/public/css/sticky-footer-navbar.css      |    23 +
 dashboard/v2/public/img/ApacheAtlasLogo.png     |   Bin 0 -> 3115 bytes
 dashboard/v2/public/img/favicon.ico             |   Bin 2462 -> 3638 bytes
 dashboard/v2/public/img/process.png             |   Bin
 dashboard/v2/public/img/spinner.gif             |   Bin 0 -> 8275 bytes
 dashboard/v2/public/img/tableicon.png           |   Bin 0 -> 478 bytes
 dashboard/v2/public/index.html                  |    71 +
 dashboard/v2/public/js/app.js                   |     9 +-
 dashboard/v2/public/js/routes.js                |     2 +-
 .../public/modules/details/detailsController.js |    26 +-
 .../v2/public/modules/details/detailsModule.js  |     0
 .../public/modules/details/detailsResource.js   |     3 +-
 .../v2/public/modules/details/detailsRoutes.js  |     0
 .../public/modules/details/views/attribute.html |    13 +-
 .../public/modules/details/views/details.html   |    38 +-
 .../v2/public/modules/details/views/schema.html |    52 +
 dashboard/v2/public/modules/home/homeModule.js  |     2 +-
 dashboard/v2/public/modules/home/homeRoutes.js  |    31 -
 dashboard/v2/public/modules/home/img/splash.png |   Bin 157503 -> 275202 bytes
 .../v2/public/modules/home/views/header.html    |     4 +-
 .../public/modules/lineage/lineageController.js |   312 +-
 .../public/modules/lineage/lineageResource.js   |     5 +-
 .../public/modules/lineage/views/lineage.html   |     8 +-
 .../modules/navigation/navigationController.js  |    31 +
 .../modules/navigation/navigationModule.js      |    21 +
 .../modules/navigation/navigationResource.js    |    36 +
 .../modules/navigation/views/navigation.html    |    24 +
 .../public/modules/search/searchController.js   |    95 +-
 .../v2/public/modules/search/searchDirective.js |    34 +
 .../v2/public/modules/search/searchResource.js  |    10 +-
 .../v2/public/modules/search/searchRoutes.js    |     9 +-
 .../v2/public/modules/search/views/search.html  |    69 +-
 .../modules/search/views/searchResult.html      |    32 +-
 .../modules/search/views/types/column.html      |    21 +
 .../public/modules/search/views/types/db.html   |    22 +
 .../public/modules/search/views/types/guid.html |     4 +-
 .../modules/search/views/types/loadprocess.html |    22 +
 .../modules/search/views/types/storagedesc.html |    21 +
 .../modules/search/views/types/table.html       |    22 +
 .../public/modules/search/views/types/view.html |   Bin 0 -> 1242 bytes
 dashboard/v2/public/views/includes/foot.html    |    37 -
 dashboard/v2/public/views/includes/head.html    |    46 -
 dashboard/v2/public/views/index.html            |    39 -
 dashboard/v2/server.js                          |    18 +
 dashboard/v2/server/config/config.js            |    48 -
 dashboard/v2/server/config/express.js           |   146 -
 dashboard/v2/server/routes/system/homeRoute.js  |    29 -
 dashboard/v3/css/bootstrap-responsive.css       |  1109 -
 dashboard/v3/css/bootstrap-responsive.min.css   |     9 -
 dashboard/v3/css/bootstrap-theme.css            |   476 -
 dashboard/v3/css/bootstrap-theme.css.map        |     1 -
 dashboard/v3/css/bootstrap-theme.min.css        |     5 -
 dashboard/v3/css/bootstrap.css                  |     5 -
 dashboard/v3/css/bootstrap.css.map              |     1 -
 dashboard/v3/css/bootstrap.min.css              |     5 -
 dashboard/v3/css/heroic-features.css            |    21 -
 dashboard/v3/css/pagination.css                 |   536 -
 dashboard/v3/css/sticky-footer-navbar.css       |    39 -
 dashboard/v3/css/style.css                      |   204 -
 .../v3/fonts/glyphicons-halflings-regular.eot   |   Bin 20335 -> 0 bytes
 .../v3/fonts/glyphicons-halflings-regular.svg   |   229 -
 .../v3/fonts/glyphicons-halflings-regular.ttf   |   Bin 41280 -> 0 bytes
 .../v3/fonts/glyphicons-halflings-regular.woff  |   Bin 23320 -> 0 bytes
 .../v3/fonts/glyphicons-halflings-regular.woff2 |   Bin 18028 -> 0 bytes
 dashboard/v3/img/arrow.png                      |   Bin 305 -> 0 bytes
 dashboard/v3/img/bg1.jpg                        |   Bin 506 -> 0 bytes
 dashboard/v3/img/bg2.jpg                        |   Bin 506 -> 0 bytes
 dashboard/v3/img/glyphicons-halflings-white.png |   Bin 8777 -> 0 bytes
 dashboard/v3/img/glyphicons-halflings.png       |   Bin 12799 -> 0 bytes
 dashboard/v3/img/img1.jpg                       |   Bin 853 -> 0 bytes
 dashboard/v3/img/img1.png                       |   Bin 1429 -> 0 bytes
 dashboard/v3/img/img2.png                       |   Bin 15218 -> 0 bytes
 dashboard/v3/img/process.png                    |   Bin 6925 -> 0 bytes
 dashboard/v3/img/search_icon.jpg                |   Bin 893 -> 0 bytes
 dashboard/v3/img/search_icon.png                |   Bin 2161 -> 0 bytes
 dashboard/v3/img/tableicon.png                  |   Bin 478 -> 0 bytes
 dashboard/v3/img/topbg.jpg                      |   Bin 13844 -> 0 bytes
 dashboard/v3/index.html                         |   193 -
 dashboard/v3/js/app.js                          |    63 -
 dashboard/v3/js/config.json                     |    54 -
 dashboard/v3/js/controllers.js                  |  1259 -
 dashboard/v3/lib/angular-route.min.js           |    14 -
 dashboard/v3/lib/angular-route.min.js.map       |     8 -
 dashboard/v3/lib/angular-ui-router.js           |  4232 ----
 dashboard/v3/lib/angular-ui-router.min.js       |     7 -
 dashboard/v3/lib/angular.js                     | 21053 -----------------
 dashboard/v3/lib/angular.min.js                 |   212 -
 dashboard/v3/lib/angular.min.js.map             |     8 -
 dashboard/v3/lib/bootstrap.js                   |     7 -
 dashboard/v3/lib/bootstrap.min.js               |     7 -
 dashboard/v3/lib/d3.tip.v0.6.3.js               |   286 -
 dashboard/v3/lib/ie-emulation-modes-warning.js  |    51 -
 .../v3/lib/ie10-viewport-bug-workaround.js      |    22 -
 dashboard/v3/lib/jquery.js                      |     4 -
 dashboard/v3/lib/npm.js                         |    13 -
 dashboard/v3/partials/search.html               |   127 -
 dashboard/v3/partials/wiki.html                 |   257 -
 docs/license/d3-LICENSE.txt                     |    26 -
 docs/license/jquery-LICENSE.txt                 |    19 -
 docs/src/site/twiki/index.twiki                 |     4 +-
 docs/src/site/twiki/security.twiki              |    12 +-
 pom.xml                                         |    67 +-
 repository/pom.xml                              |     5 +
 .../java/org/apache/atlas/GraphTransaction.java |     6 +-
 .../atlas/GraphTransactionInterceptor.java      |     2 +-
 .../apache/atlas/RepositoryMetadataModule.java  |    14 +-
 .../atlas/discovery/HiveLineageService.java     |    67 +-
 .../apache/atlas/discovery/SearchIndexer.java   |     9 -
 .../graph/DefaultGraphPersistenceStrategy.java  |   124 +-
 .../graph/GraphBackedDiscoveryService.java      |    17 +-
 .../atlas/listener/TypesChangeListener.java     |     9 +-
 .../org/apache/atlas/repository/Constants.java  |     2 +-
 .../repository/EntityNotFoundException.java     |     2 +-
 .../repository/IndexCreationException.java      |     2 +-
 .../apache/atlas/repository/IndexException.java |     3 +-
 .../atlas/repository/MetadataRepository.java    |     7 +-
 .../atlas/repository/RepositoryException.java   |     3 +-
 .../graph/GraphBackedMetadataRepository.java    |   679 +-
 .../graph/GraphBackedSearchIndexer.java         |   214 +-
 .../atlas/repository/graph/GraphHelper.java     |    44 +-
 .../repository/memory/AttributeStores.java      |   146 +-
 .../atlas/repository/memory/ClassStore.java     |     6 +-
 .../memory/HierarchicalTypeStore.java           |    11 +-
 .../repository/memory/IAttributeStore.java      |     3 +-
 .../atlas/repository/memory/MemRepository.java  |    26 +-
 .../memory/ReplaceIdWithInstance.java           |    20 +-
 .../atlas/repository/memory/StructStore.java    |     3 +-
 .../atlas/repository/memory/TraitStore.java     |     3 +-
 .../typestore/GraphBackedTypeStore.java         |    98 +-
 .../atlas/services/DefaultMetadataService.java  |   101 +-
 .../apache/atlas/services/MetadataService.java  |     7 +-
 .../test/java/org/apache/atlas/TestUtils.java   |    57 +-
 .../GraphBackedDiscoveryServiceTest.java        |   108 +-
 .../atlas/discovery/HiveLineageServiceTest.java |   415 +-
 .../org/apache/atlas/repository/BaseTest.java   |   109 +-
 .../GraphBackedMetadataRepositoryTest.java      |   174 +-
 .../graph/GraphRepoMapperScaleTest.java         |   108 +-
 .../atlas/repository/memory/EnumTest.java       |    88 +-
 .../repository/memory/InstanceE2ETest.java      |    48 +-
 .../atlas/repository/memory/StructTest.java     |     3 +-
 .../atlas/repository/memory/TraitTest.java      |    20 +-
 .../typestore/GraphBackedTypeStoreTest.java     |     4 +-
 src/build/findbugs-exclude.xml                  |     2 +-
 src/main/assemblies/src-package.xml             |     5 +
 tools/pom.xml                                   |   187 -
 tools/src/main/resources/application.conf       |    54 -
 .../org/apache/atlas/tools/cli/Console.scala    |    67 -
 .../atlas/tools/dsl/DynamicTypedStruct.scala    |    38 -
 .../org/apache/atlas/tools/dsl/package.scala    |    99 -
 .../apache/atlas/tools/simpleserver/Main.scala  |    59 -
 .../tools/simpleserver/MetadataActor.scala      |   121 -
 .../tools/simpleserver/RestInterface.scala      |   126 -
 .../atlas/tools/thrift/ThriftParser.scala       |   664 -
 .../atlas/tools/thrift/ThriftTypesGen.scala     |   316 -
 tools/src/test/resources/test.thrift            |  1146 -
 .../org/apache/atlas/tools/dsl/DSLTest.scala    |   241 -
 .../tools/hive/HiveMockMetadataService.scala    |    84 -
 .../atlas/tools/thrift/ThriftLexerTest.scala    |   525 -
 .../atlas/tools/thrift/ThriftParserTest.scala   |   772 -
 .../org/apache/atlas/TypeNotFoundException.java |     2 +-
 .../apache/atlas/typesystem/Referenceable.java  |     5 +-
 .../persistence/DownCastStructInstance.java     |     5 +-
 .../apache/atlas/typesystem/persistence/Id.java |    23 +-
 .../atlas/typesystem/persistence/MapIds.java    |     3 +-
 .../persistence/ReferenceableInstance.java      |    20 +-
 .../typesystem/persistence/StructInstance.java  |   187 +-
 .../typesystem/types/AttributeDefinition.java   |    47 +-
 .../atlas/typesystem/types/AttributeInfo.java   |     5 +-
 .../atlas/typesystem/types/ClassType.java       |    48 +-
 .../atlas/typesystem/types/DataTypes.java       |    40 +-
 .../typesystem/types/DownCastFieldMapping.java  |     3 +-
 .../apache/atlas/typesystem/types/EnumType.java |    10 +-
 .../typesystem/types/EnumTypeDefinition.java    |    16 +-
 .../atlas/typesystem/types/EnumValue.java       |    16 +-
 .../atlas/typesystem/types/FieldMapping.java    |    15 +-
 .../typesystem/types/HierarchicalType.java      |    94 +-
 .../types/HierarchicalTypeDefinition.java       |    35 +-
 .../atlas/typesystem/types/Multiplicity.java    |    21 +-
 .../typesystem/types/ObjectGraphTraversal.java  |    11 +-
 .../typesystem/types/ObjectGraphWalker.java     |    17 +-
 .../atlas/typesystem/types/StructType.java      |    39 +-
 .../typesystem/types/StructTypeDefinition.java  |    16 +-
 .../atlas/typesystem/types/TraitType.java       |     6 +-
 .../atlas/typesystem/types/TypeSystem.java      |   213 +-
 .../atlas/typesystem/types/TypeUtils.java       |    14 +-
 .../typesystem/types/TypedStructHandler.java    |    16 +-
 .../types/ValueConversionException.java         |    11 +-
 .../atlas/typesystem/types/utils/TypesUtil.java |    32 +-
 .../typesystem/json/SerializationJavaTest.java  |    50 +-
 .../apache/atlas/typesystem/types/BaseTest.java |   120 +-
 .../apache/atlas/typesystem/types/EnumTest.java |    82 +-
 .../atlas/typesystem/types/StructTest.java      |     3 +-
 .../atlas/typesystem/types/TraitTest.java       |    29 +-
 .../typesystem/types/TypeInheritanceTest.java   |    47 +-
 .../atlas/typesystem/types/TypeSystemTest.java  |    46 +-
 .../atlas/typesystem/types/ValidationTest.java  |    21 +-
 webapp/pom.xml                                  |    47 +-
 webapp/src/main/java/org/apache/atlas/Main.java |    16 +-
 .../org/apache/atlas/examples/QuickStart.java   |   350 +-
 .../atlas/util/CredentialProviderUtility.java   |    33 +-
 .../web/errors/LoggingExceptionMapper.java      |     7 +-
 .../apache/atlas/web/filters/AuditFilter.java   |    17 +-
 .../atlas/web/listeners/GuiceServletConfig.java |     8 +-
 .../atlas/web/listeners/LoginProcessor.java     |    13 +-
 .../apache/atlas/web/params/AbstractParam.java  |     8 +-
 .../atlas/web/resources/AdminResource.java      |     9 +-
 .../atlas/web/resources/EntityResource.java     |    88 +-
 .../web/resources/HiveLineageResource.java      |    36 +-
 .../resources/MetadataDiscoveryResource.java    |    56 +-
 .../web/resources/RexsterGraphResource.java     |    64 +-
 .../atlas/web/resources/TypesResource.java      |    25 +-
 .../atlas/web/service/EmbeddedServer.java       |     3 +-
 .../atlas/web/service/SecureEmbeddedServer.java |     9 +-
 .../apache/atlas/web/util/DateTimeHelper.java   |    15 +-
 .../org/apache/atlas/web/util/Servlets.java     |     7 +-
 .../atlas/CredentialProviderUtilityIT.java      |    47 +-
 .../MetadataAuthenticationKerberosFilterIT.java |     2 +-
 .../MetadataAuthenticationSimpleFilterIT.java   |     8 +-
 .../atlas/web/listeners/LoginProcessorIT.java   |     3 +-
 .../web/resources/AdminJerseyResourceIT.java    |    19 +-
 .../atlas/web/resources/BaseResourceIT.java     |     9 +-
 .../web/resources/EntityJerseyResourceIT.java   |   219 +-
 .../resources/HiveLineageJerseyResourceIT.java  |   211 +-
 .../MetadataDiscoveryJerseyResourceIT.java      |    60 +-
 .../resources/RexsterGraphJerseyResourceIT.java |    15 +-
 .../web/resources/TypesJerseyResourceIT.java    |    89 +-
 .../web/service/SecureEmbeddedServerIT.java     |     4 +-
 .../web/service/SecureEmbeddedServerITBase.java |    32 +-
 341 files changed, 3971 insertions(+), 54917 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2fbe8d9b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2fbe8d9b/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java
----------------------------------------------------------------------
diff --cc repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java
index 86a10f4,f494a4a..9556272
--- a/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java
+++ b/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java
@@@ -348,12 -341,10 +341,11 @@@ public class DefaultMetadataService imp
          onTraitAddedToEntity(guid, traitName);
      }
  
 -    private ITypedStruct deserializeTraitInstance(String traitInstanceDefinition) throws
AtlasException {
 +    private ITypedStruct deserializeTraitInstance(String traitInstanceDefinition)
 +    throws AtlasException {
  
          try {
-             Struct traitInstance = InstanceSerialization.fromJsonStruct(
-                     traitInstanceDefinition, true);
+             Struct traitInstance = InstanceSerialization.fromJsonStruct(traitInstanceDefinition,
true);
              final String entityTypeName = traitInstance.getTypeName();
              ParamChecker.notEmpty(entityTypeName, "entity type cannot be null");
  
@@@ -443,5 -425,5 +427,4 @@@
      public void unregisterListener(EntityChangeListener listener) {
          entityChangeListeners.remove(listener);
      }
--
 -}
 +}

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2fbe8d9b/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2fbe8d9b/webapp/src/test/java/org/apache/atlas/web/resources/MetadataDiscoveryJerseyResourceIT.java
----------------------------------------------------------------------


Mime
View raw message