Skip to content

Commit afaf8a3

Browse files
imretoth-essimretoth-ess
committed
Refactor archiver packages
- Move classes into corresponding packages
1 parent df9f045 commit afaf8a3

22 files changed

+38
-20
lines changed

‎src/main/java/org/phoebus/channelfinder/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.ServiceLoader;
2222
import java.util.logging.Level;
2323
import java.util.logging.Logger;
24+
import org.phoebus.channelfinder.configuration.ChannelProcessor;
2425
import org.phoebus.channelfinder.configuration.PopulateDBConfiguration;
25-
import org.phoebus.channelfinder.processors.ChannelProcessor;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.ApplicationArguments;
2828
import org.springframework.boot.ApplicationRunner;

src/main/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessor.java renamed to src/main/java/org/phoebus/channelfinder/configuration/AAChannelProcessor.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors.aa;
1+
package org.phoebus.channelfinder.configuration;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import java.util.ArrayList;
@@ -14,8 +14,11 @@
1414
import org.apache.commons.lang3.StringUtils;
1515
import org.phoebus.channelfinder.entity.Channel;
1616
import org.phoebus.channelfinder.entity.Property;
17-
import org.phoebus.channelfinder.processors.ChannelProcessor;
18-
import org.phoebus.channelfinder.processors.ChannelProcessorInfo;
17+
import org.phoebus.channelfinder.service.ArchiverClient;
18+
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
19+
import org.phoebus.channelfinder.service.model.archiver.aa.ArchiveAction;
20+
import org.phoebus.channelfinder.service.model.archiver.aa.ArchivePVOptions;
21+
import org.phoebus.channelfinder.service.model.archiver.aa.ArchiverInfo;
1922
import org.springframework.beans.factory.annotation.Autowired;
2023
import org.springframework.beans.factory.annotation.Value;
2124
import org.springframework.context.annotation.Configuration;

src/main/java/org/phoebus/channelfinder/processors/ChannelProcessor.java renamed to src/main/java/org/phoebus/channelfinder/configuration/ChannelProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.configuration;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import java.util.List;
55
import org.phoebus.channelfinder.entity.Channel;
6+
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
67

78
public interface ChannelProcessor {
89

‎src/main/java/org/phoebus/channelfinder/rest/api/IChannelProcessorManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.swagger.v3.oas.annotations.responses.ApiResponses;
1313
import java.util.List;
1414
import org.phoebus.channelfinder.entity.Channel;
15-
import org.phoebus.channelfinder.processors.ChannelProcessorInfo;
15+
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
1616
import org.springframework.util.MultiValueMap;
1717
import org.springframework.web.bind.annotation.GetMapping;
1818
import org.springframework.web.bind.annotation.PathVariable;

‎src/main/java/org/phoebus/channelfinder/rest/controller/ChannelProcessorManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import java.util.logging.Logger;
99
import org.phoebus.channelfinder.entity.Channel;
1010
import org.phoebus.channelfinder.entity.Scroll;
11-
import org.phoebus.channelfinder.processors.ChannelProcessorInfo;
1211
import org.phoebus.channelfinder.rest.api.IChannelScroll;
1312
import org.phoebus.channelfinder.service.AuthorizationService;
1413
import org.phoebus.channelfinder.service.ChannelProcessorService;
14+
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
1515
import org.springframework.beans.factory.annotation.Autowired;
1616
import org.springframework.beans.factory.annotation.Value;
1717
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

src/main/java/org/phoebus/channelfinder/processors/aa/ArchiverClient.java renamed to src/main/java/org/phoebus/channelfinder/service/ArchiverClient.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors.aa;
1+
package org.phoebus.channelfinder.service;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.core.type.TypeReference;
@@ -16,6 +16,8 @@
1616
import java.util.stream.IntStream;
1717
import java.util.stream.Stream;
1818
import org.apache.commons.lang3.StringUtils;
19+
import org.phoebus.channelfinder.service.model.archiver.aa.ArchiveAction;
20+
import org.phoebus.channelfinder.service.model.archiver.aa.ArchivePVOptions;
1921
import org.springframework.beans.factory.annotation.Value;
2022
import org.springframework.http.MediaType;
2123
import org.springframework.stereotype.Component;
@@ -50,7 +52,7 @@ private Stream<List<String>> partitionSet(Set<String> pvSet, int pageSize) {
5052
.mapToObj(i -> list.subList(i * pageSize, Math.min(pageSize * (i + 1), list.size())));
5153
}
5254

53-
List<Map<String, String>> getStatuses(
55+
public List<Map<String, String>> getStatuses(
5456
Map<String, ArchivePVOptions> archivePVS, String archiverURL, String archiverAlias) {
5557
Set<String> pvs = archivePVS.keySet();
5658
Boolean postSupportOverride = postSupportArchivers.contains(archiverAlias);
@@ -158,7 +160,7 @@ private void submitAction(String values, String endpoint, String aaURL) {
158160
}
159161
}
160162

161-
long configureAA(Map<ArchiveAction, List<ArchivePVOptions>> archivePVS, String aaURL)
163+
public long configureAA(Map<ArchiveAction, List<ArchivePVOptions>> archivePVS, String aaURL)
162164
throws JsonProcessingException {
163165
logger.log(
164166
Level.INFO, () -> String.format("Configure PVs %s in %s", archivePVS.toString(), aaURL));
@@ -207,7 +209,7 @@ long configureAA(Map<ArchiveAction, List<ArchivePVOptions>> archivePVS, String a
207209
return count;
208210
}
209211

210-
List<String> getAAPolicies(String aaURL) {
212+
public List<String> getAAPolicies(String aaURL) {
211213
if (StringUtils.isEmpty(aaURL)) {
212214
return List.of();
213215
}
@@ -231,7 +233,7 @@ List<String> getAAPolicies(String aaURL) {
231233
}
232234
}
233235

234-
String getVersion(String archiverURL) {
236+
public String getVersion(String archiverURL) {
235237
try {
236238
String uriString = archiverURL + ARCHIVER_VERSIONS_RESOURCE;
237239
String response =

‎src/main/java/org/phoebus/channelfinder/service/ChannelProcessorService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.logging.Level;
99
import java.util.logging.Logger;
1010
import java.util.stream.Collectors;
11+
import org.phoebus.channelfinder.configuration.ChannelProcessor;
1112
import org.phoebus.channelfinder.entity.Channel;
12-
import org.phoebus.channelfinder.processors.ChannelProcessor;
13-
import org.phoebus.channelfinder.processors.ChannelProcessorInfo;
13+
import org.phoebus.channelfinder.service.model.archiver.ChannelProcessorInfo;
1414
import org.springframework.beans.factory.annotation.Autowired;
1515
import org.springframework.beans.factory.annotation.Value;
1616
import org.springframework.core.task.TaskExecutor;

src/main/java/org/phoebus/channelfinder/processors/ChannelProcessorInfo.java renamed to src/main/java/org/phoebus/channelfinder/service/model/archiver/ChannelProcessorInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.service.model.archiver;
22

33
import java.util.Map;
44

src/main/java/org/phoebus/channelfinder/processors/aa/ArchiveAction.java renamed to src/main/java/org/phoebus/channelfinder/service/model/archiver/aa/ArchiveAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors.aa;
1+
package org.phoebus.channelfinder.service.model.archiver.aa;
22

33
public enum ArchiveAction {
44
ARCHIVE("/archivePV"),

src/main/java/org/phoebus/channelfinder/processors/aa/ArchivePVOptions.java renamed to src/main/java/org/phoebus/channelfinder/service/model/archiver/aa/ArchivePVOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors.aa;
1+
package org.phoebus.channelfinder.service.model.archiver.aa;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.fasterxml.jackson.annotation.JsonInclude;

0 commit comments

Comments
 (0)