Skip to content

Commit ba431dd

Browse files
imretoth-essimretoth-ess
authored
Merge pull request #193 from ChannelFinder/Restructure_project
Restructure project
2 parents 9f93d76 + b0900ba commit ba431dd

File tree

72 files changed

+1504
-1121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1504
-1121
lines changed

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

Lines changed: 4 additions & 4 deletions
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.example.PopulateService;
25-
import org.phoebus.channelfinder.processors.ChannelProcessor;
24+
import org.phoebus.channelfinder.configuration.ChannelProcessor;
25+
import org.phoebus.channelfinder.configuration.PopulateDBConfiguration;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.ApplicationArguments;
2828
import org.springframework.boot.ApplicationRunner;
@@ -43,7 +43,7 @@
4343
@SpringBootApplication
4444
public class Application implements ApplicationRunner {
4545

46-
static final Logger logger = Logger.getLogger(Application.class.getName());
46+
private static final Logger logger = Logger.getLogger(Application.class.getName());
4747

4848
public static void main(String[] args) {
4949
// Set the java truststore used by channelfinder
@@ -72,7 +72,7 @@ private static void configureTruststore() {
7272
}
7373
}
7474

75-
@Autowired PopulateService service;
75+
@Autowired PopulateDBConfiguration service;
7676

7777
public void run(ApplicationArguments args) throws Exception {
7878
if (args.containsOption("demo-data")) {

src/main/java/org/phoebus/channelfinder/CFResourceDescriptors.java renamed to src/main/java/org/phoebus/channelfinder/common/CFResourceDescriptors.java

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

33
public class CFResourceDescriptors {
44

src/main/java/org/phoebus/channelfinder/epics/NTXmlUtil.java renamed to src/main/java/org/phoebus/channelfinder/common/NTXmlUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.phoebus.channelfinder.epics;
1+
package org.phoebus.channelfinder.common;
22

3-
import static org.phoebus.channelfinder.epics.ChannelFinderEpicsService.COLUMN_CHANNEL_NAME;
4-
import static org.phoebus.channelfinder.epics.ChannelFinderEpicsService.COLUMN_OWNER;
3+
import static org.phoebus.channelfinder.service.ChannelFinderEpicsService.COLUMN_CHANNEL_NAME;
4+
import static org.phoebus.channelfinder.service.ChannelFinderEpicsService.COLUMN_OWNER;
55

66
import java.util.ArrayList;
77
import java.util.Arrays;

src/main/java/org/phoebus/channelfinder/TextUtil.java renamed to src/main/java/org/phoebus/channelfinder/common/TextUtil.java

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

33
/**
44
* Utility class to assist in handling of text.

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.external.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/ElasticConfig.java renamed to src/main/java/org/phoebus/channelfinder/configuration/ElasticConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** */
2-
package org.phoebus.channelfinder;
2+
package org.phoebus.channelfinder.configuration;
33

44
/*
55
* #%L
@@ -41,6 +41,7 @@
4141
import org.apache.http.message.BasicHeader;
4242
import org.elasticsearch.client.RestClient;
4343
import org.elasticsearch.client.RestClientBuilder;
44+
import org.phoebus.channelfinder.common.TextUtil;
4445
import org.phoebus.channelfinder.entity.Property;
4546
import org.phoebus.channelfinder.entity.Tag;
4647
import org.springframework.beans.factory.annotation.Value;
@@ -215,7 +216,7 @@ public void contextDestroyed(ServletContextEvent sce) {
215216
*
216217
* @param client client connected to elasticsearch
217218
*/
218-
void elasticIndexValidation(ElasticsearchClient client) {
219+
public void elasticIndexValidation(ElasticsearchClient client) {
219220
validateIndex(client, ES_CHANNEL_INDEX, "/channel_mapping.json");
220221
validateIndex(client, ES_TAG_INDEX, "/tag_mapping.json");
221222
validateIndex(client, ES_PROPERTY_INDEX, "/properties_mapping.json");

src/main/java/org/phoebus/channelfinder/HttpConnectorConfig.java renamed to src/main/java/org/phoebus/channelfinder/configuration/HttpConnectorConfig.java

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

33
import org.apache.catalina.connector.Connector;
44
import org.springframework.beans.factory.annotation.Value;

src/main/java/org/phoebus/channelfinder/example/PopulateService.java renamed to src/main/java/org/phoebus/channelfinder/configuration/PopulateDBConfiguration.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.example;
1+
package org.phoebus.channelfinder.configuration;
22

33
import co.elastic.clients.elasticsearch.ElasticsearchClient;
44
import co.elastic.clients.elasticsearch._types.Refresh;
@@ -25,7 +25,6 @@
2525
import java.util.logging.Level;
2626
import java.util.logging.Logger;
2727
import java.util.stream.Collectors;
28-
import org.phoebus.channelfinder.ElasticConfig;
2928
import org.phoebus.channelfinder.entity.Channel;
3029
import org.phoebus.channelfinder.entity.Property;
3130
import org.phoebus.channelfinder.entity.Tag;
@@ -56,9 +55,9 @@
5655
* @author Kunal Shroff
5756
*/
5857
@Configuration
59-
public class PopulateService {
58+
public class PopulateDBConfiguration {
6059

61-
private static final Logger logger = Logger.getLogger(PopulateService.class.getName());
60+
private static final Logger logger = Logger.getLogger(PopulateDBConfiguration.class.getName());
6261
public static final String DEVICE_POWER_SUPPLY = "power supply";
6362
public static final String DEVICE_MAGNET = "magnet";
6463
public static final String UNIT_TEMP = "temperature";
@@ -843,7 +842,7 @@ private Collection<Channel> insertValves(
843842
"{" + "GV" + "}Opn-Sw",
844843
loc,
845844
cell,
846-
PopulateService.ELEMENT_VACUUM,
845+
PopulateDBConfiguration.ELEMENT_VACUUM,
847846
"valve",
848847
"position",
849848
SIGTYPE_SWITCH));
@@ -857,7 +856,7 @@ private Collection<Channel> insertValves(
857856
"{" + "GV" + "}Opn-St",
858857
loc,
859858
cell,
860-
PopulateService.ELEMENT_VACUUM,
859+
PopulateDBConfiguration.ELEMENT_VACUUM,
861860
"valve",
862861
"position",
863862
SIGTYPE_STATUS));
@@ -883,7 +882,7 @@ private Collection<Channel> insertGauges(
883882
"{" + dev + "}P-RB",
884883
loc,
885884
cell,
886-
PopulateService.ELEMENT_VACUUM,
885+
PopulateDBConfiguration.ELEMENT_VACUUM,
887886
"gauge",
888887
"pressure",
889888
SIGTYPE_READBACK));
@@ -897,7 +896,7 @@ private Collection<Channel> insertGauges(
897896
"{" + dev + OK_ST,
898897
loc,
899898
cell,
900-
PopulateService.ELEMENT_VACUUM,
899+
PopulateDBConfiguration.ELEMENT_VACUUM,
901900
"gauge",
902901
"error",
903902
SIGTYPE_STATUS));
@@ -922,7 +921,7 @@ private Collection<Channel> insertPumps(
922921
"{" + dev + "}I-RB",
923922
loc,
924923
cell,
925-
PopulateService.ELEMENT_VACUUM,
924+
PopulateDBConfiguration.ELEMENT_VACUUM,
926925
"pump",
927926
UNIT_CURRENT,
928927
SIGTYPE_READBACK));
@@ -936,7 +935,7 @@ private Collection<Channel> insertPumps(
936935
"{" + dev + "}P-RB",
937936
loc,
938937
cell,
939-
PopulateService.ELEMENT_VACUUM,
938+
PopulateDBConfiguration.ELEMENT_VACUUM,
940939
"pump",
941940
"pressure",
942941
SIGTYPE_READBACK));
@@ -950,7 +949,7 @@ private Collection<Channel> insertPumps(
950949
"{" + dev + "}On-Sw",
951950
loc,
952951
cell,
953-
PopulateService.ELEMENT_VACUUM,
952+
PopulateDBConfiguration.ELEMENT_VACUUM,
954953
"pump",
955954
UNIT_POWER,
956955
SIGTYPE_SWITCH));
@@ -964,7 +963,7 @@ private Collection<Channel> insertPumps(
964963
"{" + dev + OK_ST,
965964
loc,
966965
cell,
967-
PopulateService.ELEMENT_VACUUM,
966+
PopulateDBConfiguration.ELEMENT_VACUUM,
968967
"pump",
969968
"error",
970969
SIGTYPE_STATUS));
@@ -978,7 +977,7 @@ private Collection<Channel> insertPumps(
978977
"{" + dev + ON_ST,
979978
loc,
980979
cell,
981-
PopulateService.ELEMENT_VACUUM,
980+
PopulateDBConfiguration.ELEMENT_VACUUM,
982981
"pump",
983982
UNIT_POWER,
984983
SIGTYPE_STATUS));

src/main/java/org/phoebus/channelfinder/RequestLoggingFilterConfig.java renamed to src/main/java/org/phoebus/channelfinder/configuration/RequestLoggingFilterConfig.java

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

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;

0 commit comments

Comments
 (0)