Skip to content

Commit

Permalink
Merge pull request #8602 from mandy-chessell/oak2025
Browse files Browse the repository at this point in the history 
Fix continual refresh in integration daemon
  • Loading branch information
@mandy-chessell
mandy-chessell authored Jan 23, 2025
2 parents 3c91aed + f75eae7 commit f5a6c44
Show file tree
Hide file tree
Showing 123 changed files with 7,069 additions and 1,946 deletions.
2 changes: 1 addition & 1 deletion EgeriaContentPacksGUIDMap.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/APIsContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ApacheAtlasContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ApacheKafkaContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoBusinessSystemsArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoComboArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoGovernanceProgramArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoOrganizationArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoSustainabilityArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoTypesArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CoreContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ObservabilityContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OpenMetadataTypes.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/PostgresContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/UnityCatalogContentPack.omarchive
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...g/odpi/openmetadata/accessservices/communityprofile/api/CommunityManagementInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* Copyright Contributors to the ODPi Egeria project. */
package org.odpi.openmetadata.accessservices.communityprofile.api;

import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.CommunityElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.PersonRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.properties.communities.CommunityMembershipProperties;
import org.odpi.openmetadata.frameworks.openmetadata.properties.communities.CommunityProperties;
import org.odpi.openmetadata.accessservices.communityprofile.properties.TemplateProperties;
Expand Down Expand Up @@ -238,10 +238,10 @@ List<CommunityElement> getCommunities(String userId,
* @throws PropertyServerException problem accessing property server
* @throws UserNotAuthorizedException security access problem
*/
List<PersonRoleElement> getRolesForCommunity(String userId,
String communityGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
List<ActorRoleElement> getRolesForCommunity(String userId,
String communityGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException;

Expand Down
38 changes: 19 additions & 19 deletions ...dpi/openmetadata/accessservices/communityprofile/api/OrganizationManagementInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorProfileElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.Appointee;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.PersonRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.properties.actors.*;

import java.util.Date;
Expand Down Expand Up @@ -530,8 +530,8 @@ void unlinkTeamPlayer(String userId,
* @throws PropertyServerException problem accessing property server
* @throws UserNotAuthorizedException security access problem
*/
PersonRoleElement getPersonRoleByGUID(String userId,
String personRoleGUID) throws InvalidParameterException,
ActorRoleElement getPersonRoleByGUID(String userId,
String personRoleGUID) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException;

Expand All @@ -550,10 +550,10 @@ PersonRoleElement getPersonRoleByGUID(String userId,
* @throws PropertyServerException problem accessing property server
* @throws UserNotAuthorizedException security access problem
*/
List<PersonRoleElement> getPersonRolesByName(String userId,
String name,
int startFrom,
int pageSize) throws InvalidParameterException,
List<ActorRoleElement> getPersonRolesByName(String userId,
String name,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException;

Expand All @@ -572,10 +572,10 @@ List<PersonRoleElement> getPersonRolesByName(String userId,
* @throws PropertyServerException problem accessing property server
* @throws UserNotAuthorizedException security access problem
*/
List<PersonRoleElement> getLeadershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
List<ActorRoleElement> getLeadershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException;

Expand All @@ -594,10 +594,10 @@ List<PersonRoleElement> getLeadershipRolesForTeam(String userId,
* @throws PropertyServerException problem accessing property server
* @throws UserNotAuthorizedException security access problem
*/
List<PersonRoleElement> getMembershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
List<ActorRoleElement> getMembershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException;

Expand All @@ -616,10 +616,10 @@ List<PersonRoleElement> getMembershipRolesForTeam(String userId,
* @throws PropertyServerException the server is not available.
* @throws UserNotAuthorizedException the calling user is not authorized to issue the call.
*/
List<PersonRoleElement> findPersonRoles(String userId,
String searchString,
int startFrom,
int pageSize) throws InvalidParameterException,
List<ActorRoleElement> findPersonRoles(String userId,
String searchString,
int startFrom,
int pageSize) throws InvalidParameterException,
PropertyServerException,
UserNotAuthorizedException;
}
10 changes: 5 additions & 5 deletions ...ava/org/odpi/openmetadata/accessservices/communityprofile/client/CommunityManagement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.CommunityElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.PersonRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.properties.communities.CommunityMembershipProperties;
import org.odpi.openmetadata.frameworks.openmetadata.properties.communities.CommunityProperties;

Expand Down Expand Up @@ -480,10 +480,10 @@ public List<CommunityElement> getCommunities(String userId,
* @throws UserNotAuthorizedException security access problem
*/
@Override
public List<PersonRoleElement> getRolesForCommunity(String userId,
String communityGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
public List<ActorRoleElement> getRolesForCommunity(String userId,
String communityGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down
38 changes: 19 additions & 19 deletions .../org/odpi/openmetadata/accessservices/communityprofile/client/OrganizationManagement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorProfileElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ActorRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.Appointee;
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.PersonRoleElement;
import org.odpi.openmetadata.frameworks.openmetadata.properties.actors.*;

import java.util.Date;
Expand Down Expand Up @@ -1098,8 +1098,8 @@ public void unlinkTeamPlayer(String userId,
* @throws UserNotAuthorizedException security access problem
*/
@Override
public PersonRoleElement getPersonRoleByGUID(String userId,
String personRoleGUID) throws InvalidParameterException,
public ActorRoleElement getPersonRoleByGUID(String userId,
String personRoleGUID) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down Expand Up @@ -1136,10 +1136,10 @@ public PersonRoleElement getPersonRoleByGUID(String userId,
* @throws UserNotAuthorizedException security access problem
*/
@Override
public List<PersonRoleElement> getPersonRolesByName(String userId,
String name,
int startFrom,
int pageSize) throws InvalidParameterException,
public List<ActorRoleElement> getPersonRolesByName(String userId,
String name,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down Expand Up @@ -1185,10 +1185,10 @@ public List<PersonRoleElement> getPersonRolesByName(String userId,
* @throws UserNotAuthorizedException security access problem
*/
@Override
public List<PersonRoleElement> getLeadershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
public List<ActorRoleElement> getLeadershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down Expand Up @@ -1227,10 +1227,10 @@ public List<PersonRoleElement> getLeadershipRolesForTeam(String userId,
* @throws UserNotAuthorizedException security access problem
*/
@Override
public List<PersonRoleElement> getMembershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
public List<ActorRoleElement> getMembershipRolesForTeam(String userId,
String teamGUID,
int startFrom,
int pageSize) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down Expand Up @@ -1270,10 +1270,10 @@ public List<PersonRoleElement> getMembershipRolesForTeam(String userId,
* @throws UserNotAuthorizedException the calling user is not authorized to issue the call.
*/
@Override
public List<PersonRoleElement> findPersonRoles(String userId,
String searchString,
int startFrom,
int pageSize) throws InvalidParameterException,
public List<ActorRoleElement> findPersonRoles(String userId,
String searchString,
int startFrom,
int pageSize) throws InvalidParameterException,
PropertyServerException,
UserNotAuthorizedException
{
Expand Down
6 changes: 3 additions & 3 deletions .../openmetadata/accessservices/communityprofile/server/CommunityProfileInstanceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ ContributionRecordHandler<ContributionRecordElement> getContributionRecordHandle
* @throws UserNotAuthorizedException user does not have access to the requested server
* @throws PropertyServerException the service name is not known - indicating a logic error
*/
PersonRoleHandler<PersonRoleElement> getPersonRoleHandler(String userId,
String serverName,
String serviceOperationName) throws InvalidParameterException,
PersonRoleHandler<ActorRoleElement> getPersonRoleHandler(String userId,
String serverName,
String serviceOperationName) throws InvalidParameterException,
UserNotAuthorizedException,
PropertyServerException
{
Expand Down
8 changes: 4 additions & 4 deletions ...openmetadata/accessservices/communityprofile/server/CommunityProfileServicesInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public class CommunityProfileServicesInstance extends OMASServiceInstance
private final SoftwareCapabilityHandler<MetadataSourceElement> metadataSourceHandler;
private final UserIdentityHandler<UserIdentityElement> userIdentityHandler;
private final ActorProfileHandler<ActorProfileElement> actorProfileHandler;
private final PersonRoleHandler<PersonRoleElement> personRoleHandler;
private final CollectionHandler<CollectionElement> collectionHandler;
private final PersonRoleHandler<ActorRoleElement> personRoleHandler;
private final CollectionHandler<CollectionElement> collectionHandler;
private final CommunityHandler<CommunityElement> communityHandler;
private final ContributionRecordHandler<ContributionRecordElement> contributionRecordHandler;
private final ContactDetailsHandler<ContactMethodElement> contactDetailsHandler;
Expand Down Expand Up @@ -139,7 +139,7 @@ public CommunityProfileServicesInstance(OMRSRepositoryConnector repositoryConnec
auditLog);

this.personRoleHandler = new PersonRoleHandler<>(new PersonRoleConverter<>(repositoryHelper, serviceName, serverName),
PersonRoleElement.class,
ActorRoleElement.class,
serviceName,
serverName,
invalidParameterHandler,
Expand Down Expand Up @@ -385,7 +385,7 @@ public ActorProfileHandler<ActorProfileElement> getActorProfileHandler() throws
* @return handler object
* @throws PropertyServerException the instance has not been initialized successfully
*/
public PersonRoleHandler<PersonRoleElement> getPersonRoleHandler() throws PropertyServerException
public PersonRoleHandler<ActorRoleElement> getPersonRoleHandler() throws PropertyServerException
{
final String methodName = "getPersonRoleHandler";

Expand Down
2 changes: 1 addition & 1 deletion ...a/org/odpi/openmetadata/accessservices/communityprofile/server/CommunityRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ public PersonRolesResponse getRolesForCommunity(String serverName,

try
{
PersonRoleHandler<PersonRoleElement> handler = instanceHandler.getPersonRoleHandler(userId, serverName, methodName);
PersonRoleHandler<ActorRoleElement> handler = instanceHandler.getPersonRoleHandler(userId, serverName, methodName);

auditLog = instanceHandler.getAuditLog(userId, serverName, methodName);

Expand Down
Loading

0 comments on commit f5a6c44

Please sign in to comment.