Skip to content

Commit 384b401

Browse files
imretoth-essimretoth-ess
committed
Move configuration classes
- Create package for configuration classes and move them there - Adjust class name to represent it's function
1 parent 8f396a7 commit 384b401

27 files changed

+67
-51
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.ServiceLoader;
2222
import java.util.logging.Level;
2323
import java.util.logging.Logger;
24-
import org.phoebus.channelfinder.example.PopulateService;
24+
import org.phoebus.channelfinder.configuration.PopulateDBConfiguration;
2525
import org.phoebus.channelfinder.processors.ChannelProcessor;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.ApplicationArguments;
@@ -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/ChannelScroll.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.logging.Level;
2525
import java.util.logging.Logger;
2626
import java.util.stream.Collectors;
27+
import org.phoebus.channelfinder.configuration.ElasticConfig;
2728
import org.phoebus.channelfinder.entity.Channel;
2829
import org.phoebus.channelfinder.entity.Scroll;
2930
import org.springframework.beans.factory.annotation.Autowired;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.LinkedHashMap;
1818
import java.util.Map;
1919
import java.util.logging.Level;
20+
import org.phoebus.channelfinder.configuration.ElasticConfig;
2021
import org.springframework.beans.factory.annotation.Autowired;
2122
import org.springframework.beans.factory.annotation.Value;
2223
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

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.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;

src/main/java/org/phoebus/channelfinder/WebSecurityConfig.java renamed to src/main/java/org/phoebus/channelfinder/configuration/WebSecurityConfig.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.beans.factory.annotation.Value;
44
import org.springframework.context.annotation.Bean;

‎src/main/java/org/phoebus/channelfinder/respository/ChannelRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import java.util.stream.StreamSupport;
5151
import javax.annotation.PreDestroy;
5252
import org.phoebus.channelfinder.CFResourceDescriptors;
53-
import org.phoebus.channelfinder.ElasticConfig;
5453
import org.phoebus.channelfinder.TextUtil;
54+
import org.phoebus.channelfinder.configuration.ElasticConfig;
5555
import org.phoebus.channelfinder.entity.Channel;
5656
import org.phoebus.channelfinder.entity.Property;
5757
import org.phoebus.channelfinder.entity.SearchResult;

‎src/main/java/org/phoebus/channelfinder/respository/PropertyRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import java.util.logging.Level;
3232
import java.util.logging.Logger;
3333
import java.util.stream.StreamSupport;
34-
import org.phoebus.channelfinder.ElasticConfig;
3534
import org.phoebus.channelfinder.TextUtil;
35+
import org.phoebus.channelfinder.configuration.ElasticConfig;
3636
import org.phoebus.channelfinder.entity.Channel;
3737
import org.phoebus.channelfinder.entity.Property;
3838
import org.phoebus.channelfinder.entity.Property.OnlyNameOwnerProperty;

0 commit comments

Comments
 (0)