Move controller classes

imretoth-ess · imretoth-ess · commit 028894beb0ef · 2025-12-03T15:16:04.000+01:00
-  Create package for controller classes and move them there
diff --git a/src/main/java/org/phoebus/channelfinder/Application.java b/src/main/java/org/phoebus/channelfinder/Application.java
@@ -43,7 +43,7 @@
 @SpringBootApplication
 public class Application implements ApplicationRunner {
 
-  static final Logger logger = Logger.getLogger(Application.class.getName());
+  public static final Logger logger = Logger.getLogger(Application.class.getName());
 
   public static void main(String[] args) {
     // Set the java truststore used by channelfinder
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelManager.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelManager.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.CHANNEL_RESOURCE_URI;
 import static org.phoebus.channelfinder.CFResourceDescriptors.SEARCH_PARAM_DESCRIPTION;
@@ -21,6 +21,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javax.servlet.ServletContext;
+import org.phoebus.channelfinder.TextUtil;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Property;
 import org.phoebus.channelfinder.entity.SearchResult;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelProcessorManager.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelProcessorManager.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder.processors;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.CHANNEL_PROCESSOR_RESOURCE_URI;
 import static org.phoebus.channelfinder.CFResourceDescriptors.SEARCH_PARAM_DESCRIPTION;
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.phoebus.channelfinder.ChannelScroll;
+import org.phoebus.channelfinder.processors.ChannelProcessorInfo;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Scroll;
 import org.phoebus.channelfinder.service.AuthorizationService;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelScroll.java b/src/main/java/org/phoebus/channelfinder/rest/controller/ChannelScroll.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.SCROLL_RESOURCE_URI;
 
@@ -24,6 +24,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import org.phoebus.channelfinder.CFResourceDescriptors;
+import org.phoebus.channelfinder.TextUtil;
 import org.phoebus.channelfinder.configuration.ElasticConfig;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Scroll;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/InfoManager.java b/src/main/java/org/phoebus/channelfinder/rest/controller/InfoManager.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.CF_SERVICE_INFO;
 
@@ -17,6 +17,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.logging.Level;
+import org.phoebus.channelfinder.Application;
 import org.phoebus.channelfinder.configuration.ElasticConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/PropertyManager.java b/src/main/java/org/phoebus/channelfinder/rest/controller/PropertyManager.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.PROPERTY_RESOURCE_URI;
 
@@ -19,6 +19,7 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.phoebus.channelfinder.TextUtil;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Property;
 import org.phoebus.channelfinder.respository.ChannelRepository;
diff --git a/src/main/java/org/phoebus/channelfinder/rest/controller/TagManager.java b/src/main/java/org/phoebus/channelfinder/rest/controller/TagManager.java
@@ -1,4 +1,4 @@
-package org.phoebus.channelfinder;
+package org.phoebus.channelfinder.rest.controller;
 
 import static org.phoebus.channelfinder.CFResourceDescriptors.TAG_RESOURCE_URI;
 
@@ -20,6 +20,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+import org.phoebus.channelfinder.TextUtil;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelManagerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelManagerIT.java
@@ -20,6 +20,7 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.controller.ChannelManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollIT.java
@@ -12,6 +12,7 @@
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.controller.ChannelScroll;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.test.context.TestPropertySource;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollSearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollSearchIT.java
@@ -14,6 +14,7 @@
 import org.phoebus.channelfinder.entity.Scroll;
 import org.phoebus.channelfinder.respository.PropertyRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.controller.ChannelScroll;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.test.context.TestPropertySource;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java b/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.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.controller.ChannelManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyManagerIT.java b/src/test/java/org/phoebus/channelfinder/PropertyManagerIT.java
@@ -21,6 +21,7 @@
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.PropertyRepository;
+import org.phoebus.channelfinder.rest.controller.PropertyManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java b/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java
@@ -14,6 +14,7 @@
 import org.phoebus.channelfinder.entity.Property;
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
+import org.phoebus.channelfinder.rest.controller.PropertyManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/TagManagerIT.java b/src/test/java/org/phoebus/channelfinder/TagManagerIT.java
@@ -21,6 +21,7 @@
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
 import org.phoebus.channelfinder.respository.TagRepository;
+import org.phoebus.channelfinder.rest.controller.TagManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/TagValidationIT.java b/src/test/java/org/phoebus/channelfinder/TagValidationIT.java
@@ -13,6 +13,7 @@
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Tag;
 import org.phoebus.channelfinder.respository.ChannelRepository;
+import org.phoebus.channelfinder.rest.controller.TagManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderChannelsIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderChannelsIT.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.phoebus.channelfinder.docker.ITUtil.AuthorizationChoice;
 import org.phoebus.channelfinder.entity.Channel;
+import org.phoebus.channelfinder.rest.controller.ChannelManager;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -37,7 +38,7 @@
  * org.phoebus.channelfinder.CFResourceDescriptors#CHANNEL_RESOURCE_URI}.
  *
  * @author Lars Johansson
- * @see org.phoebus.channelfinder.ChannelManager
+ * @see ChannelManager
  * @see org.phoebus.channelfinder.docker.ITTestFixture
  * @see org.phoebus.channelfinder.docker.ITUtil
  * @see org.phoebus.channelfinder.docker.ITUtilChannels
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderPropertiesIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderPropertiesIT.java
@@ -29,6 +29,7 @@
 import org.phoebus.channelfinder.docker.ITUtil.AuthorizationChoice;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Property;
+import org.phoebus.channelfinder.rest.controller.PropertyManager;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -38,7 +39,7 @@
  * org.phoebus.channelfinder.CFResourceDescriptors#PROPERTY_RESOURCE_URI}.
  *
  * @author Lars Johansson
- * @see org.phoebus.channelfinder.PropertyManager
+ * @see PropertyManager
  * @see org.phoebus.channelfinder.docker.ITUtil
  * @see org.phoebus.channelfinder.docker.ITUtilProperties
  */
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderScrollIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderScrollIT.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.phoebus.channelfinder.entity.Scroll;
+import org.phoebus.channelfinder.rest.controller.ChannelScroll;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -34,7 +35,7 @@
  * org.phoebus.channelfinder.CFResourceDescriptors#SCROLL_RESOURCE_URI}.
  *
  * @author Lars Johansson
- * @see org.phoebus.channelfinder.ChannelScroll
+ * @see ChannelScroll
  * @see org.phoebus.channelfinder.docker.ITUtil
  * @see org.phoebus.channelfinder.docker.ITUtilScroll
  */
diff --git a/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderTagsIT.java b/src/test/java/org/phoebus/channelfinder/docker/ChannelFinderTagsIT.java
@@ -29,6 +29,7 @@
 import org.phoebus.channelfinder.docker.ITUtil.AuthorizationChoice;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Tag;
+import org.phoebus.channelfinder.rest.controller.TagManager;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -38,7 +39,7 @@
  * org.phoebus.channelfinder.CFResourceDescriptors#TAG_RESOURCE_URI}.
  *
  * @author Lars Johansson
- * @see org.phoebus.channelfinder.TagManager
+ * @see TagManager
  * @see org.phoebus.channelfinder.docker.ITUtil
  * @see org.phoebus.channelfinder.docker.ITUtilTags
  */
diff --git a/src/test/java/org/phoebus/channelfinder/epics/EpicsRPCRequestIT.java b/src/test/java/org/phoebus/channelfinder/epics/EpicsRPCRequestIT.java
@@ -15,9 +15,9 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.phoebus.channelfinder.ChannelManager;
-import org.phoebus.channelfinder.PropertyManager;
-import org.phoebus.channelfinder.TagManager;
+import org.phoebus.channelfinder.rest.controller.ChannelManager;
+import org.phoebus.channelfinder.rest.controller.PropertyManager;
+import org.phoebus.channelfinder.rest.controller.TagManager;
 import org.phoebus.channelfinder.entity.Channel;
 import org.phoebus.channelfinder.entity.Property;
 import org.phoebus.channelfinder.entity.Tag;
diff --git a/src/test/java/org/phoebus/channelfinder/processors/ChannelProcessorManagerIT.java b/src/test/java/org/phoebus/channelfinder/processors/ChannelProcessorManagerIT.java
@@ -10,7 +10,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.phoebus.channelfinder.CFResourceDescriptors;
-import org.phoebus.channelfinder.ChannelScroll;
+import org.phoebus.channelfinder.rest.controller.ChannelProcessorManager;
+import org.phoebus.channelfinder.rest.controller.ChannelScroll;
 import org.phoebus.channelfinder.entity.Scroll;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties
@@ -2,7 +2,7 @@ handlers= java.util.logging.ConsoleHandler
 
 .level = SEVERE
 
-org.phoebus.channelfinder.ChannelManager = SEVERE
+org.phoebus.channelfinder.rest.controller.ChannelManager = SEVERE
 o.p.channelfinder.ChannelManager = SEVERE
 org.phoebus.channelfinder.respository.ChannelRepository = SEVERE
 o.p.channelfinder.ChannelRepository = SEVERE
