@@ -147,7 +147,7 @@ Optional<String> getArtifactUrl(final String planKeyString,
147 147
.flatMap(rs -> getArtifactHandlerByClassName(
148 148
fromCustomData(rs.getCustomBuildData()).getArtifactHandlerClass())
149 149
.map(handler -> getArtifactUrl(planKeyString, buildNumber,
150 -
filePath, artifactConfig, planResultKey, handler)
150 +
filePath, artifactConfig, planResultKey, handler)
151 151
)
152 152
);
153 153
}
@@ -164,10 +164,10 @@ private String getArtifactUrl(final String planKeyString,
164 164
final ArtifactDefinitionContextImpl artifactDef = getAllureArtifactDef();
165 165 166 166
return Optional.ofNullable(
167 -
artifactHandler.getArtifactLinkDataProvider(
168 -
mutableArtifact(planResultKey, artifactDef.getName()),
169 -
configProvider(artifactConfig)
170 -
))
167 +
artifactHandler.getArtifactLinkDataProvider(
168 +
mutableArtifact(planResultKey, artifactDef.getName()),
169 +
configProvider(artifactConfig)
170 +
))
171 171
.map(lp -> getArtifactUrl(filePath, planResultKey, artifactDef, lp))
172 172
.orElse(null);
173 173
}
@@ -326,19 +326,19 @@ Optional<AllureBuildResult> uploadReportArtifacts(final @NotNull ImmutableChain
326 326
final String errorMessage = "Unable to publish artifact via " + artifactHandler;
327 327
final ArtifactHandlerPublishingResult publishingResult = BambooPluginUtils.callUnsafeCode(
328 328
new BambooPluginUtils.NoThrowCallable<ArtifactHandlerPublishingResult>(errorMessage) {
329 -
@NotNull
330 -
@Override
331 -
public ArtifactHandlerPublishingResult call() {
332 -
try {
333 -
return artifactHandler.publish(
334 -
summary.getPlanResultKey(), artifact, artifactPublishingConfig);
335 -
} catch (final Exception e) {
336 -
LOGGER.error("Failed to publish Allure Report using handler "
337 -
+ artifactHandler.getClass().getName(), e);
338 -
return ArtifactHandlerPublishingResultImpl.failure();
339 -
}
340 -
}
341 -
});
329 +
@NotNull
330 +
@Override
331 +
public ArtifactHandlerPublishingResult call() {
332 +
try {
333 +
return artifactHandler.publish(
334 +
summary.getPlanResultKey(), artifact, artifactPublishingConfig);
335 +
} catch (final Exception e) {
336 +
LOGGER.error("Failed to publish Allure Report using handler "
337 +
+ artifactHandler.getClass().getName(), e);
338 +
return ArtifactHandlerPublishingResultImpl.failure();
339 +
}
340 +
}
341 +
});
342 342
if (publishingResult != null) {
343 343
publishingResult.setArtifactHandlerKey(artifactHandler.getModuleDescriptor().getCompleteKey());
344 344
return Optional.of(allureBuildResult(publishingResult.isSuccessful(), null)
@@ -451,17 +451,17 @@ private <T extends ArtifactHandler> Optional<T> getArtifactHandlerByClassName(fi
451 451
final AtomicReference<Predicate<ModuleDescriptor<T>>> predicate = new AtomicReference<>();
452 452
return Optional.ofNullable(className)
453 453
.map(clazz -> {
454 -
final Class<T> aClass;
455 -
try {
456 -
aClass = (Class<T>) Class.forName(clazz);
457 -
predicate.set(new ModuleOfClassPredicate<>(aClass).and(new EnabledModulePredicate()));
458 - 459 -
return pluginAccessor.getModules(predicate.get()).stream().findAny().orElse(null);
460 -
} catch (ClassNotFoundException e) {
461 -
LOGGER.error("Failed to find artifact handler for class name " + className, e);
454 +
final Class<T> aClass;
455 +
try {
456 +
aClass = (Class<T>) Class.forName(clazz);
457 +
predicate.set(new ModuleOfClassPredicate<>(aClass).and(new EnabledModulePredicate()));
458 + 459 +
return pluginAccessor.getModules(predicate.get()).stream().findAny().orElse(null);
460 +
} catch (ClassNotFoundException e) {
461 +
LOGGER.error("Failed to find artifact handler for class name " + className, e);
462 +
}
463 +
return null;
462 464
}
463 -
return null;
464 -
}
465 465
);
466 466
}
467 467
}
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4