Skip to content

Commit 8f396a7

Browse files
imretoth-essimretoth-ess
committed
Move repository classes
- Create package for repository classes and move them there
1 parent 3f69e18 commit 8f396a7

26 files changed

+69
-29
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
import java.util.stream.Collectors;
2222
import java.util.stream.StreamSupport;
2323
import javax.servlet.ServletContext;
24-
import org.phoebus.channelfinder.service.AuthorizationService;
25-
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
2624
import org.phoebus.channelfinder.entity.Channel;
2725
import org.phoebus.channelfinder.entity.Property;
2826
import org.phoebus.channelfinder.entity.SearchResult;
2927
import org.phoebus.channelfinder.entity.Tag;
28+
import org.phoebus.channelfinder.respository.ChannelRepository;
29+
import org.phoebus.channelfinder.respository.PropertyRepository;
30+
import org.phoebus.channelfinder.respository.TagRepository;
31+
import org.phoebus.channelfinder.service.AuthorizationService;
32+
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
3033
import org.phoebus.channelfinder.service.ChannelProcessorService;
3134
import org.springframework.beans.factory.annotation.Autowired;
3235
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -63,8 +66,7 @@ public class ChannelManager {
6366

6467
@Autowired ChannelRepository channelRepository;
6568

66-
@Autowired
67-
AuthorizationService authorizationService;
69+
@Autowired AuthorizationService authorizationService;
6870

6971
@Autowired ChannelProcessorService channelProcessorService;
7072

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
import java.util.Optional;
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
22-
import org.phoebus.channelfinder.service.AuthorizationService;
23-
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
2422
import org.phoebus.channelfinder.entity.Channel;
2523
import org.phoebus.channelfinder.entity.Property;
24+
import org.phoebus.channelfinder.respository.ChannelRepository;
25+
import org.phoebus.channelfinder.respository.PropertyRepository;
26+
import org.phoebus.channelfinder.respository.TagRepository;
27+
import org.phoebus.channelfinder.service.AuthorizationService;
28+
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
2629
import org.springframework.beans.factory.annotation.Autowired;
2730
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2831
import org.springframework.http.HttpStatus;
@@ -55,8 +58,7 @@ public class PropertyManager {
5558

5659
@Autowired ChannelRepository channelRepository;
5760

58-
@Autowired
59-
AuthorizationService authorizationService;
61+
@Autowired AuthorizationService authorizationService;
6062

6163
@Operation(
6264
summary = "List all properties",

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
import java.util.logging.Logger;
2121
import java.util.stream.Collectors;
2222
import java.util.stream.StreamSupport;
23-
import org.phoebus.channelfinder.service.AuthorizationService;
24-
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
2523
import org.phoebus.channelfinder.entity.Channel;
2624
import org.phoebus.channelfinder.entity.Tag;
25+
import org.phoebus.channelfinder.respository.ChannelRepository;
26+
import org.phoebus.channelfinder.respository.TagRepository;
27+
import org.phoebus.channelfinder.service.AuthorizationService;
28+
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
2729
import org.springframework.beans.factory.annotation.Autowired;
2830
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2931
import org.springframework.http.HttpStatus;
@@ -54,8 +56,7 @@ public class TagManager {
5456

5557
@Autowired ChannelRepository channelRepository;
5658

57-
@Autowired
58-
AuthorizationService authorizationService;
59+
@Autowired AuthorizationService authorizationService;
5960

6061
@Operation(
6162
summary = "List all tags",

‎src/main/java/org/phoebus/channelfinder/processors/ChannelProcessorManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import java.util.List;
1414
import java.util.logging.Level;
1515
import java.util.logging.Logger;
16-
import org.phoebus.channelfinder.service.AuthorizationService;
1716
import org.phoebus.channelfinder.ChannelScroll;
1817
import org.phoebus.channelfinder.entity.Channel;
1918
import org.phoebus.channelfinder.entity.Scroll;
19+
import org.phoebus.channelfinder.service.AuthorizationService;
2020
import org.phoebus.channelfinder.service.ChannelProcessorService;
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.beans.factory.annotation.Value;
@@ -40,8 +40,7 @@ public class ChannelProcessorManager {
4040

4141
private static final Logger logger = Logger.getLogger(ChannelProcessorManager.class.getName());
4242

43-
@Autowired
44-
ChannelProcessorService channelProcessorService;
43+
@Autowired ChannelProcessorService channelProcessorService;
4544
@Autowired AuthorizationService authorizationService;
4645

4746
// TODO replace with PIT and search_after

src/main/java/org/phoebus/channelfinder/ChannelRepository.java renamed to src/main/java/org/phoebus/channelfinder/respository/ChannelRepository.java

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

33
import co.elastic.clients.elasticsearch.ElasticsearchClient;
44
import co.elastic.clients.elasticsearch._types.ElasticsearchException;
@@ -49,6 +49,9 @@
4949
import java.util.stream.Collectors;
5050
import java.util.stream.StreamSupport;
5151
import javax.annotation.PreDestroy;
52+
import org.phoebus.channelfinder.CFResourceDescriptors;
53+
import org.phoebus.channelfinder.ElasticConfig;
54+
import org.phoebus.channelfinder.TextUtil;
5255
import org.phoebus.channelfinder.entity.Channel;
5356
import org.phoebus.channelfinder.entity.Property;
5457
import org.phoebus.channelfinder.entity.SearchResult;

src/main/java/org/phoebus/channelfinder/PropertyRepository.java renamed to src/main/java/org/phoebus/channelfinder/respository/PropertyRepository.java

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

33
import co.elastic.clients.elasticsearch.ElasticsearchClient;
44
import co.elastic.clients.elasticsearch._types.ElasticsearchException;
@@ -31,6 +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;
35+
import org.phoebus.channelfinder.TextUtil;
3436
import org.phoebus.channelfinder.entity.Channel;
3537
import org.phoebus.channelfinder.entity.Property;
3638
import org.phoebus.channelfinder.entity.Property.OnlyNameOwnerProperty;

src/main/java/org/phoebus/channelfinder/TagRepository.java renamed to src/main/java/org/phoebus/channelfinder/respository/TagRepository.java

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

33
import co.elastic.clients.elasticsearch.ElasticsearchClient;
44
import co.elastic.clients.elasticsearch._types.ElasticsearchException;
@@ -32,6 +32,8 @@
3232
import java.util.logging.Level;
3333
import java.util.logging.Logger;
3434
import java.util.stream.StreamSupport;
35+
import org.phoebus.channelfinder.ElasticConfig;
36+
import org.phoebus.channelfinder.TextUtil;
3537
import org.phoebus.channelfinder.entity.Channel;
3638
import org.phoebus.channelfinder.entity.Tag;
3739
import org.phoebus.channelfinder.entity.Tag.OnlyTag;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.epics.pva.server.PVAServer;
2020
import org.epics.pva.server.RPCService;
2121
import org.epics.pva.server.ServerPV;
22-
import org.phoebus.channelfinder.ChannelRepository;
2322
import org.phoebus.channelfinder.entity.Channel;
23+
import org.phoebus.channelfinder.respository.ChannelRepository;
2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.context.annotation.ComponentScan;
2626
import org.springframework.stereotype.Service;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import java.util.concurrent.atomic.AtomicLong;
1414
import java.util.stream.Collectors;
1515
import javax.annotation.PostConstruct;
16-
import org.phoebus.channelfinder.ChannelRepository;
17-
import org.phoebus.channelfinder.PropertyRepository;
18-
import org.phoebus.channelfinder.TagRepository;
16+
import org.phoebus.channelfinder.respository.ChannelRepository;
17+
import org.phoebus.channelfinder.respository.PropertyRepository;
18+
import org.phoebus.channelfinder.respository.TagRepository;
1919
import org.springframework.beans.factory.annotation.Autowired;
2020
import org.springframework.beans.factory.annotation.Value;
2121
import org.springframework.context.annotation.PropertySource;

‎src/test/java/org/phoebus/channelfinder/AuthorizationIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
5-
import org.phoebus.channelfinder.service.AuthorizationService;
6-
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
75
import org.phoebus.channelfinder.entity.Channel;
86
import org.phoebus.channelfinder.entity.Property;
97
import org.phoebus.channelfinder.entity.Tag;
8+
import org.phoebus.channelfinder.service.AuthorizationService;
9+
import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
1212
import org.springframework.security.core.context.SecurityContextHolder;

0 commit comments

Comments
 (0)