Rename controller classes

imretoth-ess · imretoth-ess · commit 3836472571e1 · 2025-12-04T11:03:15.000+01:00
- Rename controller classes
- Rename controller interfaces
diff --git a/src/main/java/org/phoebus/channelfinder/rest/api/IChannel.java b/src/main/java/org/phoebus/channelfinder/rest/api/IChannel.java
@@ -25,7 +25,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @RequestMapping(CHANNEL_RESOURCE_URI)
-public interface IChannelManager {
+public interface IChannel {
 
   @Operation(
       summary = "Query channels",
diff --git a/src/main/java/org/phoebus/channelfinder/rest/api/IChannelProcessor.java b/src/main/java/org/phoebus/channelfinder/rest/api/IChannelProcessor.java
@@ -22,7 +22,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @RequestMapping(CHANNEL_PROCESSOR_RESOURCE_URI)
-public interface IChannelProcessorManager {
+public interface IChannelProcessor {
 
   @Operation(
       summary = "Get processor count",
diff --git a/src/main/java/org/phoebus/channelfinder/rest/api/IInfo.java b/src/main/java/org/phoebus/channelfinder/rest/api/IInfo.java
@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @RequestMapping(CF_SERVICE_INFO)
-public interface IInfoManager {
+public interface IInfo {
 
   @Operation(
       summary = "Get ChannelFinder service info",
diff --git a/src/main/java/org/phoebus/channelfinder/rest/api/IProperty.java b/src/main/java/org/phoebus/channelfinder/rest/api/IProperty.java
@@ -20,7 +20,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @RequestMapping(PROPERTY_RESOURCE_URI)
-public interface IPropertyManager {
+public interface IProperty {
 
   @Operation(
       summary = "List all properties",
diff --git a/src/main/java/org/phoebus/channelfinder/rest/api/ITag.java b/src/main/java/org/phoebus/channelfinder/rest/api/ITag.java
@@ -20,7 +20,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @RequestMapping(TAG_RESOURCE_URI)
-public interface ITagManager {
+public interface ITag {
 
   @Operation(
       summary = "List all tags",
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelController.java
@@ -22,6 +22,7 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.api.IChannel;
 import org.phoebus.channelfinder.service.AuthorizationService;
 import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
 import org.phoebus.channelfinder.service.ChannelProcessorService;
@@ -40,11 +41,11 @@
 @CrossOrigin
 @RestController
 @EnableAutoConfiguration
-public class ChannelManager implements org.phoebus.channelfinder.rest.api.IChannelManager {
+public class ChannelController implements IChannel {
 
   private static final Logger channelManagerAudit =
-      Logger.getLogger(ChannelManager.class.getName() + ".audit");
-  private static final Logger logger = Logger.getLogger(ChannelManager.class.getName());
+      Logger.getLogger(ChannelController.class.getName() + ".audit");
+  private static final Logger logger = Logger.getLogger(ChannelController.class.getName());
 
   @Autowired private ServletContext servletContext;
 
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelProcessorController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelProcessorController.java
@@ -8,6 +8,7 @@
 import java.util.logging.Logger;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Scroll;
+import org.phoebus.channelfinder.rest.api.IChannelProcessor;
 import org.phoebus.channelfinder.rest.api.IChannelScroll;
 import org.phoebus.channelfinder.service.AuthorizationService;
 import org.phoebus.channelfinder.service.ChannelProcessorService;
@@ -26,10 +27,10 @@
 
 @RestController
 @EnableAutoConfiguration
-public class ChannelProcessorManager
-    implements org.phoebus.channelfinder.rest.api.IChannelProcessorManager {
+public class ChannelProcessorController
+    implements IChannelProcessor {
 
-  private static final Logger logger = Logger.getLogger(ChannelProcessorManager.class.getName());
+  private static final Logger logger = Logger.getLogger(ChannelProcessorController.class.getName());
 
   @Autowired ChannelProcessorService channelProcessorService;
   @Autowired AuthorizationService authorizationService;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelScrollController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelScrollController.java
@@ -36,9 +36,9 @@
 @CrossOrigin
 @RestController
 @EnableAutoConfiguration
-public class ChannelScroll implements org.phoebus.channelfinder.rest.api.IChannelScroll {
+public class ChannelScrollController implements org.phoebus.channelfinder.rest.api.IChannelScroll {
 
-  private static final Logger logger = Logger.getLogger(ChannelScroll.class.getName());
+  private static final Logger logger = Logger.getLogger(ChannelScrollController.class.getName());
 
   @Autowired ElasticConfig esService;
 
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/InfoController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/InfoController.java
@@ -12,6 +12,7 @@
 import java.util.logging.Level;
 import org.phoebus.channelfinder.Application;
 import org.phoebus.channelfinder.configuration.ElasticConfig;
+import org.phoebus.channelfinder.rest.api.IInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -21,7 +22,7 @@
 @CrossOrigin
 @RestController
 @EnableAutoConfiguration
-public class InfoManager implements org.phoebus.channelfinder.rest.api.IInfoManager {
+public class InfoController implements IInfo {
 
   @Value("${channelfinder.version:4.7.0}")
   private String version;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/PropertyController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/PropertyController.java
@@ -17,6 +17,7 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.api.IProperty;
 import org.phoebus.channelfinder.service.AuthorizationService;
 import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +34,11 @@
 @CrossOrigin
 @RestController
 @EnableAutoConfiguration
-public class PropertyManager implements org.phoebus.channelfinder.rest.api.IPropertyManager {
+public class PropertyController implements IProperty {
 
   private static final Logger propertyManagerAudit =
-      Logger.getLogger(PropertyManager.class.getName() + ".audit");
-  private static final Logger logger = Logger.getLogger(PropertyManager.class.getName());
+      Logger.getLogger(PropertyController.class.getName() + ".audit");
+  private static final Logger logger = Logger.getLogger(PropertyController.class.getName());
 
   @Autowired TagRepository tagRepository;
 
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/TagController.java b/src/main/java/org/phoebus/channelfinder/rest/controller/TagController.java
@@ -17,6 +17,7 @@
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.api.ITag;
 import org.phoebus.channelfinder.service.AuthorizationService;
 import org.phoebus.channelfinder.service.AuthorizationService.ROLES;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +34,11 @@
 @CrossOrigin
 @RestController
 @EnableAutoConfiguration
-public class TagManager implements org.phoebus.channelfinder.rest.api.ITagManager {
+public class TagController implements ITag {
 
   private static final Logger tagManagerAudit =
-      Logger.getLogger(TagManager.class.getName() + ".audit");
-  private static final Logger logger = Logger.getLogger(TagManager.class.getName());
+      Logger.getLogger(TagController.class.getName() + ".audit");
+  private static final Logger logger = Logger.getLogger(TagController.class.getName());
 
   @Autowired TagRepository tagRepository;
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java
@@ -20,21 +20,22 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
-import org.phoebus.channelfinder.rest.api.IChannelManager;
-import org.phoebus.channelfinder.rest.controller.ChannelManager;
+import org.phoebus.channelfinder.rest.api.IChannel;
+import org.phoebus.channelfinder.rest.controller.ChannelController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(ChannelManager.class)
+@WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
-class ChannelManagerIT {
+class ChannelControllerIT {
 
-  @Autowired IChannelManager channelManager;
+  @Autowired
+  IChannel channelManager;
 
   @Autowired TagRepository tagRepository;
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java
@@ -13,17 +13,17 @@
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
 import org.phoebus.channelfinder.rest.api.IChannelScroll;
-import org.phoebus.channelfinder.rest.controller.ChannelScroll;
+import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(ChannelScroll.class)
+@WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
-class ChannelScrollIT {
+class ChannelScrollControllerIT {
 
   @Autowired IChannelScroll channelScroll;
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java
@@ -15,19 +15,19 @@
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
 import org.phoebus.channelfinder.rest.api.IChannelScroll;
-import org.phoebus.channelfinder.rest.controller.ChannelScroll;
+import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(ChannelScroll.class)
+@WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
-class ChannelScrollSearchIT {
+class ChannelScrollControllerSearchIT {
 
-  private static final Logger logger = Logger.getLogger(ChannelScrollSearchIT.class.getName());
+  private static final Logger logger = Logger.getLogger(ChannelScrollControllerSearchIT.class.getName());
 
   @Autowired IChannelScroll channelScroll;
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java b/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java
@@ -17,21 +17,22 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
-import org.phoebus.channelfinder.rest.api.IChannelManager;
-import org.phoebus.channelfinder.rest.controller.ChannelManager;
+import org.phoebus.channelfinder.rest.api.IChannel;
+import org.phoebus.channelfinder.rest.controller.ChannelController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(ChannelManager.class)
+@WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
 class ChannelValidationIT {
 
-  @Autowired IChannelManager channelManager;
+  @Autowired
+  IChannel channelManager;
 
   @Autowired TagRepository tagRepository;
 
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java b/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java
@@ -21,8 +21,8 @@
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
-import org.phoebus.channelfinder.rest.api.IPropertyManager;
-import org.phoebus.channelfinder.rest.controller.PropertyManager;
+import org.phoebus.channelfinder.rest.api.IProperty;
+import org.phoebus.channelfinder.rest.controller.PropertyController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -32,12 +32,13 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(PropertyManager.class) // TODO Somehow creating one
+@WebMvcTest(PropertyController.class) // TODO Somehow creating one
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
-class PropertyManagerIT {
+class PropertyControllerIT {
 
-  @Autowired IPropertyManager propertyManager;
+  @Autowired
+  IProperty propertyManager;
 
   @Autowired PropertyRepository propertyRepository;
 
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java b/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java
@@ -14,21 +14,22 @@
 import org.phoebus.channelfinder.entity.Property;
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
-import org.phoebus.channelfinder.rest.api.IPropertyManager;
-import org.phoebus.channelfinder.rest.controller.PropertyManager;
+import org.phoebus.channelfinder.rest.api.IProperty;
+import org.phoebus.channelfinder.rest.controller.PropertyController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(PropertyManager.class)
+@WebMvcTest(PropertyController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
 class PropertyValidationIT {
 
-  @Autowired IPropertyManager propertyManager;
+  @Autowired
+  IProperty propertyManager;
 
   @Autowired ChannelRepository channelRepository;
 
diff --git a/src/test/java/org/phoebus/channelfinder/TagControllerIT.java b/src/test/java/org/phoebus/channelfinder/TagControllerIT.java
@@ -21,8 +21,8 @@
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
-import org.phoebus.channelfinder.rest.api.ITagManager;
-import org.phoebus.channelfinder.rest.controller.TagManager;
+import org.phoebus.channelfinder.rest.api.ITag;
+import org.phoebus.channelfinder.rest.controller.TagController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -33,20 +33,21 @@
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(TagManager.class)
+@WebMvcTest(TagController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @ContextConfiguration(classes = {TagRepository.class, ElasticConfig.class})
 @TestPropertySource(value = "classpath:application_test.properties")
-class TagManagerIT {
+class TagControllerIT {
 
-  @Autowired ITagManager tagManager;
+  @Autowired
+  ITag tagManager;
 
   @Autowired TagRepository tagRepository;
 
   @Autowired ChannelRepository channelRepository;
 
   @Autowired ElasticConfig esService;
-  private static final Logger logger = Logger.getLogger(TagManagerIT.class.getName());
+  private static final Logger logger = Logger.getLogger(TagControllerIT.class.getName());
 
   @AfterAll
   void tearDown() throws IOException {
diff --git a/src/test/java/org/phoebus/channelfinder/TagValidationIT.java b/src/test/java/org/phoebus/channelfinder/TagValidationIT.java
@@ -13,21 +13,22 @@
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
-import org.phoebus.channelfinder.rest.api.ITagManager;
-import org.phoebus.channelfinder.rest.controller.TagManager;
+import org.phoebus.channelfinder.rest.api.ITag;
+import org.phoebus.channelfinder.rest.controller.TagController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@WebMvcTest(TagManager.class)
+@WebMvcTest(TagController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
 class TagValidationIT {
 
-  @Autowired ITagManager tagManager;
+  @Autowired
+  ITag tagManager;
 
   @Autowired ElasticConfig esService;
   @Autowired ChannelRepository channelRepository;
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderChannelsIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderChannelsIT.java
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderPropertiesIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderPropertiesIT.java
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderScrollIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderScrollIT.java
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderTagsIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderTagsIT.java
diff --git a/src/test/java/org/phoebus/channelfinder/epics/EpicsRPCRequestIT.java b/src/test/java/org/phoebus/channelfinder/epics/EpicsRPCRequestIT.java
diff --git a/src/test/java/org/phoebus/channelfinder/processors/ChannelProcessorControllerIT.java b/src/test/java/org/phoebus/channelfinder/processors/ChannelProcessorControllerIT.java
diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties
