Skip to content
Open
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.apache.commons.lang3.StringUtils;
import org.phoebus.channelfinder.entity.Channel;
import org.phoebus.channelfinder.entity.Property;
import org.phoebus.channelfinder.service.external.ArchiverClient;
import org.phoebus.channelfinder.service.external.ArchiverService;
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
import org.phoebus.channelfinder.service.model.archiver.aa.ArchiveAction;
import org.phoebus.channelfinder.service.model.archiver.aa.ArchivePVOptions;
Expand Down Expand Up @@ -60,7 +60,7 @@ public class AAChannelProcessor implements ChannelProcessor {
@Value("${aa.auto_pause:}")
private List<String> autoPauseOptions;

@Autowired private final ArchiverClient archiverClient = new ArchiverClient();
@Autowired private final ArchiverService archiverService = new ArchiverService();

@Override
public boolean enabled() {
Expand Down Expand Up @@ -180,7 +180,7 @@ public long process(List<Channel> channels) throws JsonProcessingException {
Collectors.toMap(ArchivePVOptions::getPv, archivePVOptions -> archivePVOptions));
Map<ArchiveAction, List<ArchivePVOptions>> archiveActionArchivePVMap =
getArchiveActions(archivePVSList, archiverInfo);
count += archiverClient.configureAA(archiveActionArchivePVMap, archiverInfo.url());
count += archiverService.configureAA(archiveActionArchivePVMap, archiverInfo.url());
}
long finalCount = count;
logger.log(Level.INFO, () -> String.format("Configured %s channels.", finalCount));
Expand Down Expand Up @@ -240,7 +240,7 @@ private Map<ArchiveAction, List<ArchivePVOptions>> getArchiveActions(
return result;
}
List<Map<String, String>> statuses =
archiverClient.getStatuses(archivePVS, archiverInfo.url(), archiverInfo.alias());
archiverService.getStatuses(archivePVS, archiverInfo.url(), archiverInfo.alias());
logger.log(Level.FINER, "Statuses {0}", statuses);
statuses.forEach(
archivePVStatusJsonMap -> {
Expand Down Expand Up @@ -290,8 +290,8 @@ private Map<String, ArchiverInfo> getArchiversInfo(Map<String, String> aaURLs) {
// Empty archiver tagged
continue;
}
String version = archiverClient.getVersion(aa.getValue());
List<String> policies = archiverClient.getAAPolicies(aa.getValue());
String version = archiverService.getVersion(aa.getValue());
List<String> policies = archiverService.getAAPolicies(aa.getValue());
result.put(aa.getKey(), new ArchiverInfo(aa.getKey(), aa.getValue(), version, policies));
}
return result;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.phoebus.channelfinder.exceptions;

public class ArchiverServiceException extends RuntimeException {

public ArchiverServiceException(String message) {
super(message);
}

public ArchiverServiceException(String message, Throwable cause) {
super(message, cause);
}
}

This file was deleted.

Loading
Loading