|
@@ -308,7 +308,7 @@ public class ModelSetup { |
|
|
if (listener != null && ((ModelEntity) entity).performSubstitutions()) { |
|
|
if (listener != null && ((ModelEntity) entity).performSubstitutions()) { |
|
|
entity = listener.subst(entity); |
|
|
entity = listener.subst(entity); |
|
|
} |
|
|
} |
|
|
log.info(logPrefix + " diffing: " + id(entity)); |
|
|
|
|
|
|
|
|
log.info(logPrefix + "diffing: " + id(entity)); |
|
|
if (listener != null && request.performSubstitutions()) { |
|
|
if (listener != null && request.performSubstitutions()) { |
|
|
request = listener.subst(request); |
|
|
request = listener.subst(request); |
|
|
} |
|
|
} |
|
@@ -326,10 +326,10 @@ public class ModelSetup { |
|
|
if (listener != null && ((ModelEntity) entity).performSubstitutions()) { |
|
|
if (listener != null && ((ModelEntity) entity).performSubstitutions()) { |
|
|
toUpdate = listener.subst(toUpdate); |
|
|
toUpdate = listener.subst(toUpdate); |
|
|
} |
|
|
} |
|
|
log.info(logPrefix + " already exists, updating: " + id(toUpdate)); |
|
|
|
|
|
|
|
|
log.info(logPrefix + "already exists, updating: " + id(toUpdate)); |
|
|
entity = update(api, context, entityConfig, toUpdate, listener); |
|
|
entity = update(api, context, entityConfig, toUpdate, listener); |
|
|
} else { |
|
|
} else { |
|
|
log.info(logPrefix+" already exists: "+getUri); |
|
|
|
|
|
|
|
|
log.info(logPrefix + "already exists: " + getUri); |
|
|
entity = json(response.json, request.getEntity().getClass()); |
|
|
entity = json(response.json, request.getEntity().getClass()); |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
@@ -341,7 +341,7 @@ public class ModelSetup { |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
die(logPrefix+"error creating " + entityType + ": " + response); |
|
|
|
|
|
|
|
|
die(logPrefix + "error creating " + entityType + ": " + response); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
entity = create(api, context, entityConfig, entity, listener, runName); |
|
|
entity = create(api, context, entityConfig, entity, listener, runName); |
|
|