AL OMAS - use type name instead of type GUID as parameter passed to g…

…eneric handler findEntities Signed-off-by: Raluca Popa <[email protected]>
odpi · May 10, 2023 · 48e64d8 · 48e64d8
1 parent 27c2191
commit 48e64d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...c/main/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelper.java b/...c/main/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelper.java
@@ -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);

diff --git a/...st/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelperTest.java b/...st/java/org/odpi/openmetadata/accessservices/assetlineage/handlers/HandlerHelperTest.java
@@ -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);
 
@@ -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);