Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AL OMAS - use type name instead of type GUID as parameter passed to generic handler findEntities #7661

Merged
merged 1 commit into from
May 11, 2023
Merged

AL OMAS - use type name instead of type GUID as parameter passed to generic handler findEntities #7661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...c/main/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,7 @@ private boolean addPagedEntities(String userId, String entityTypeName, SearchPro
FindEntitiesParameters findEntitiesParameters, List<EntityDetail> allEntities, int startingFrom, int pageSize)
throws InvalidParameterException, PropertyServerException, UserNotAuthorizedException {
final String methodName = "addPagedEntities";
String typeDefGUID = getTypeGUID(userId, entityTypeName);
List<EntityDetail> pagedEntities = genericHandler.findEntities(userId, typeDefGUID, findEntitiesParameters.getEntitySubtypeGUIDs(),
List<EntityDetail> pagedEntities = genericHandler.findEntities(userId, entityTypeName, findEntitiesParameters.getEntitySubtypeGUIDs(),
searchProperties, findEntitiesParameters.getLimitResultsByStatus(), findEntitiesParameters.getSearchClassifications(), null,
findEntitiesParameters.getSequencingProperty(), findEntitiesParameters.getSequencingOrder(),
true, false, startingFrom, pageSize, clockService.getNow(), methodName);
Expand Down
6 changes: 2 additions & 4 deletions ...st/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,10 @@ void findEntitiesByType() throws PropertyServerException, UserNotAuthorizedExcep
when(findEntitiesParameters.getEntitySubtypeGUIDs()).thenReturn(guids);
when(invalidParameterHandler.getMaxPagingSize()).thenReturn(500);

mockTypeDef(ENTITY_TYPE_NAME, ENTITY_TYPE_GUID);
List<EntityDetail> entities = new ArrayList<>();
EntityDetail entityDetail = mock(EntityDetail.class);
entities.add(entityDetail);
when(genericHandler.findEntities(USER, ENTITY_TYPE_GUID, guids, searchProperties, Collections.emptyList(),
when(genericHandler.findEntities(USER, ENTITY_TYPE_NAME, guids, searchProperties, Collections.emptyList(),
null, null, null, null, true, false, 0, 500,
null, "addPagedEntities")).thenReturn(entities);

Expand All @@ -226,8 +225,7 @@ void findEntitiesByType_noEntity() throws PropertyServerException, UserNotAuthor
when(findEntitiesParameters.getEntitySubtypeGUIDs()).thenReturn(guids);
when(invalidParameterHandler.getMaxPagingSize()).thenReturn(500);

mockTypeDef(ENTITY_TYPE_NAME, ENTITY_TYPE_GUID);
when(genericHandler.findEntities(USER, ENTITY_TYPE_GUID, guids, searchProperties, Collections.emptyList(),
when(genericHandler.findEntities(USER, ENTITY_TYPE_NAME, guids, searchProperties, Collections.emptyList(),
null, null, null, null, true,
false, 0, 500, null, "addPagedEntities")).thenReturn(null);

Expand Down