> On Sept. 1, 2017, 8:18 p.m., Madhan Neethiraj wrote: > > intg/src/main/java/org/apache/atlas/AtlasErrorCode.java > > Lines 99 (patched) > > <https://reviews.apache.org/r/61526/diff/3/?file=1810640#file1810640line99> > > > > I think we should treat classification's empty entity-type to mean > > 'apply whatever restrictons placed on super-types'.
agreed > On Sept. 1, 2017, 8:18 p.m., Madhan Neethiraj wrote: > > intg/src/main/java/org/apache/atlas/AtlasErrorCode.java > > Lines 116 (patched) > > <https://reviews.apache.org/r/61526/diff/3/?file=1810640#file1810640line116> > > > > Consider replacing the message with the following: > > "Entity (guid=‘{0}‘,typename=‘{1}‘) cannot be classified as ‘{2}‘, > > because of the restrictions specified in the classification" I changed the msg text slightly but basically took this change. > On Sept. 1, 2017, 8:18 p.m., Madhan Neethiraj wrote: > > intg/src/main/java/org/apache/atlas/type/AtlasClassificationType.java > > Lines 114 (patched) > > <https://reviews.apache.org/r/61526/diff/3/?file=1810642#file1810642line114> > > > > Here we should find intersection of entity-types specified in all > > super-types. Using union of entity-types restrictions in super-types will > > likely to result in this classification to allow more entity-types than one > > or more of its super-types. > > > > Also, move this to resolveReferencesPhase3(), as typeAndAllSubTypes > > won't be populated until resolveReferencesPhase2() is complete. > > > > > > void resolveReferencesPhase3(AtlasTypeRegistry typeRegistry) throws > > AtlasBaseException { > > ... > > > > Set<String> superTypeEntityTypes = null; > > > > for (String superType : this.allSuperTypes) { > > AtlasClassificationDef superTypeDef = > > typeRegistry.getClassificationDefByName(superType); > > Set<String> entityTypeNames = > > superTypeDef.getEntityTypes(); > > > > if (CollectionUtils.isEmpty(entityTypeNames)) { // no restrictions > > specified > > continue; > > } > > > > // classification is applicable for specified entity-types and > > their sub-entity-types > > Set<String> typesAndSubEntityTypes = > > getEntityTypesAndAllSubTypes(entityTypeNames); > > > > if (superTypeEntityTypes == null) { > > superTypeEntityTypes = new > > HashSet<String>(typesAndSubEntityTypes); > > } else { > > superTypeEntityTypes.retainAll(typesAndSubEntityTypes); > > } > > } > > > > if (superTypeEntityTypes != null) { // restrictions are specified in > > super-types > > if (CollectionUtils.isEmpty(superTypeEntityTypes)) { // > > restrictions in super-types are disjoint! TODO: need a new error code for > > this case > > throw new > > AtlasBaseException(AtlasErrorCode.CLASSIFICATIONDEF_ENTITYTYPES_NOT_PARENTS_SUBSET, > > classificationDef.getName(), classificationDef.getEntityTypes()); > > } > > > > if (CollectionUtils.isEmpty(classificationDef.getEntityTypes())) { > > // no restriction specified; use the restrictions from super-types > > this.entityTypes = superTypeEntityTypes; > > } else { > > this.entityTypes = > > getEntityTypesAndAllSubTypes(classificationDef.getEntityTypes()); > > > > if (!superTypeEntityTypes.containsAll(this.entityTypes)) { > > throw new > > AtlasBaseException(AtlasErrorCode.CLASSIFICATIONDEF_ENTITYTYPES_NOT_PARENTS_SUBSET, > > classificationDef.getName(), classificationDef.getEntityTypes()); > > } > > } > > } else { // no restrictions specified in super-types > > this.entityTypes = > > getEntityTypesAndAllSubTypes(classificationDef.getEntityTypes()); > > } > > } > > > > private Set<String> getEntityTypesAndAllSubTypes(Set<String> > > entityTypes, AtlasTypeRegistry typeRegistry) { > > Set<String> ret = new HashSet<>(); > > > > for (String typeName : entityTypes) { > > AtlasEntityType entityType = > > typeRegistry.getEntityTypeByName(typeName); > > > > ret.addAll(entityType.getTypeAndAllSubTypes()); > > } > > > > return ret; > > } agreed > On Sept. 1, 2017, 8:18 p.m., Madhan Neethiraj wrote: > > intg/src/main/java/org/apache/atlas/type/AtlasEntityType.java > > Lines 450 (patched) > > <https://reviews.apache.org/r/61526/diff/3/?file=1810643#file1810643line450> > > > > No need to make this method public - please review my comment in > > AtlasClassificationType.canApplyToEntityType() reverted this change - David ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/61526/#review184373 ----------------------------------------------------------- On Sept. 12, 2017, 12:09 p.m., David Radley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/61526/ > ----------------------------------------------------------- > > (Updated Sept. 12, 2017, 12:09 p.m.) > > > Review request for atlas, Graham Wallis, Madhan Neethiraj, and Sarath > Subramanian. > > > Repository: atlas > > > Description > ------- > > ATLAS-2029: Restrict entities, classifications can be applied to > > > Diffs > ----- > > intg/src/main/java/org/apache/atlas/AtlasErrorCode.java > 2503d8ef203cf4efbe15b440257b1da2252b6153 > > intg/src/main/java/org/apache/atlas/model/typedef/AtlasClassificationDef.java > eeaf71413a56c08db8170fd3323b8e8245ae44fe > intg/src/main/java/org/apache/atlas/type/AtlasClassificationType.java > cc3e45ed2f059ad0c5731dc1da7e592d139c3e7a > intg/src/main/java/org/apache/atlas/type/AtlasEntityType.java > 28215fd2aa33ec8011f6900b68c672b685053e7a > intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java > ab063e23e355f74668af389b97f7da03b2a8f90f > intg/src/test/java/org/apache/atlas/TestUtilsV2.java > fc65af057255b4c17378080ee4fb7cbfc780c3fe > intg/src/test/java/org/apache/atlas/model/ModelTestUtil.java > e1ca889fba1540015850a57232936abad8fd6f37 > intg/src/test/java/org/apache/atlas/type/TestAtlasClassificationType.java > aaf4a6ac0a978e5eb6de41279cae1b1c82373374 > > repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasClassificationDefStoreV1.java > e3aa4e0b2317bec47426a914f6feae68b17851dd > > repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityStoreV1.java > 1c168b4cff0d105c7a0d4a9fbdb50871388c917e > > repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasGraphUtilsV1.java > 227f7cd12a9b23c3bbc1cfdc40d06616ea775ca4 > > repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasTypeDefGraphStoreV1.java > f639ea56e6188837e069a5fcba953d9d196af0e5 > > repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java > 8638a7f17e8a17d3a6e0bfb94879b5c5406be1a3 > > repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityStoreV1Test.java > 62fad5b02a7229d9bc3083690980eb063756bc29 > > > Diff: https://reviews.apache.org/r/61526/diff/4/ > > > Testing > ------- > > Testing > performed unit tests > > Using postman > 1) create an entityDef aaa > 2) create a classificationDef with an entitytype aaaa - checked that it is > in the response > 3) Create a entity instance of aaa > 4) add the classification to it > 5) Create an entity instance with a different type bbbb > 6) Attempt to add the classification to bbbb. this fails with an informative > message > 7) Attempt to update the ClassificationDef to remove the entity type - this > fails with an informative message > 8) Attempt to update the classificationdef to add bbbb. this update works. > 9) Attempt to add an entity type that does not exist to the > ClassificationDef. this should fail. > 10) Attempt to update an entity type that does not exist to the > ClassificationDef. this should fail. > > > Thanks, > > David Radley > >
