backward compatibility
This commit is contained in:
		
							parent
							
								
									263c44c95d
								
							
						
					
					
						commit
						301661946e
					
				@ -131,9 +131,9 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA
 | 
			
		||||
 | 
			
		||||
    protected ListenableFuture<List<EntityRelation>> processListSearchDirection(TbContext ctx, TbMsg msg) {
 | 
			
		||||
        if (EntitySearchDirection.FROM.name().equals(this.config.getDirection())) {
 | 
			
		||||
            return ctx.getRelationService().findByToAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationTypePattern()), RelationTypeGroup.COMMON);
 | 
			
		||||
            return ctx.getRelationService().findByToAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationType()), RelationTypeGroup.COMMON);
 | 
			
		||||
        } else {
 | 
			
		||||
            return ctx.getRelationService().findByFromAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationTypePattern()), RelationTypeGroup.COMMON);
 | 
			
		||||
            return ctx.getRelationService().findByFromAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationType()), RelationTypeGroup.COMMON);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -21,7 +21,7 @@ import lombok.Data;
 | 
			
		||||
public abstract class TbAbstractRelationActionNodeConfiguration {
 | 
			
		||||
 | 
			
		||||
    private String direction;
 | 
			
		||||
    private String relationTypePattern;
 | 
			
		||||
    private String relationType;
 | 
			
		||||
 | 
			
		||||
    private String entityType;
 | 
			
		||||
    private String entityNamePattern;
 | 
			
		||||
 | 
			
		||||
@ -85,7 +85,7 @@ public class TbCreateRelationNode extends TbAbstractRelationActionNode<TbCreateR
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private ListenableFuture<Boolean> createIfAbsent(TbContext ctx, TbMsg msg, EntityContainer entityContainer) {
 | 
			
		||||
        relationType = processPattern(msg, config.getRelationTypePattern());
 | 
			
		||||
        relationType = processPattern(msg, config.getRelationType());
 | 
			
		||||
        SearchDirectionIds sdId = processSingleSearchDirection(msg, entityContainer);
 | 
			
		||||
        ListenableFuture<Boolean> checkRelationFuture = Futures.transformAsync(ctx.getRelationService().checkRelation(ctx.getTenantId(), sdId.getFromId(), sdId.getToId(), relationType, RelationTypeGroup.COMMON), result -> {
 | 
			
		||||
            if (!result) {
 | 
			
		||||
 | 
			
		||||
@ -30,7 +30,7 @@ public class TbCreateRelationNodeConfiguration extends TbAbstractRelationActionN
 | 
			
		||||
    public TbCreateRelationNodeConfiguration defaultConfiguration() {
 | 
			
		||||
        TbCreateRelationNodeConfiguration configuration = new TbCreateRelationNodeConfiguration();
 | 
			
		||||
        configuration.setDirection(EntitySearchDirection.FROM.name());
 | 
			
		||||
        configuration.setRelationTypePattern("Contains");
 | 
			
		||||
        configuration.setRelationType("Contains");
 | 
			
		||||
        configuration.setEntityNamePattern("");
 | 
			
		||||
        configuration.setEntityCacheExpiration(300);
 | 
			
		||||
        configuration.setCreateEntityIfNotExists(false);
 | 
			
		||||
 | 
			
		||||
@ -70,7 +70,7 @@ public class TbDeleteRelationNode extends TbAbstractRelationActionNode<TbDeleteR
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private ListenableFuture<RelationContainer> getRelationContainerListenableFuture(TbContext ctx, TbMsg msg) {
 | 
			
		||||
        relationType = processPattern(msg, config.getRelationTypePattern());
 | 
			
		||||
        relationType = processPattern(msg, config.getRelationType());
 | 
			
		||||
        if (config.isDeleteForSingleEntity()) {
 | 
			
		||||
            return Futures.transformAsync(getEntity(ctx, msg), entityContainer -> doProcessEntityRelationAction(ctx, msg, entityContainer));
 | 
			
		||||
        } else {
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,7 @@ public class TbDeleteRelationNodeConfiguration extends TbAbstractRelationActionN
 | 
			
		||||
        TbDeleteRelationNodeConfiguration configuration = new TbDeleteRelationNodeConfiguration();
 | 
			
		||||
        configuration.setDeleteForSingleEntity(true);
 | 
			
		||||
        configuration.setDirection(EntitySearchDirection.FROM.name());
 | 
			
		||||
        configuration.setRelationTypePattern("Contains");
 | 
			
		||||
        configuration.setRelationType("Contains");
 | 
			
		||||
        configuration.setEntityNamePattern("");
 | 
			
		||||
        configuration.setEntityCacheExpiration(300);
 | 
			
		||||
        return configuration;
 | 
			
		||||
 | 
			
		||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user