class renaming

src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java → src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureController.java

@@ -3,8 +3,8 @@ package gov.usgs.earthquake.nshmp.www.source;
 import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
 import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
-import gov.usgs.earthquake.nshmp.www.source.FeaturesService.Metadata;
-import gov.usgs.earthquake.nshmp.www.source.FeaturesService.RequestData;
+import gov.usgs.earthquake.nshmp.www.source.FeatureService.Metadata;
+import gov.usgs.earthquake.nshmp.www.source.FeatureService.RequestData;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -31,10 +31,10 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = FeaturesService.NAME,
+    name = FeatureService.NAME,
     description = "USGS NSHM source model features service")
 @Controller("/features")
-public class FeaturesController {
+public class FeatureController {
 
   @Inject
   private NshmpMicronautServlet servlet;
@@ -52,11 +52,11 @@ public class FeaturesController {
   @Get
   public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
     try {
-      return FeaturesService.getMetadata(http);
+      return FeatureService.getMetadata(http);
     } catch (Exception e) {
       return ServletUtil.error(
-          FeaturesService.LOG, e,
-          FeaturesService.NAME,
+          FeatureService.LOG, e,
+          FeatureService.NAME,
           http.getUri().toString());
     }
   }
@@ -76,11 +76,11 @@ public class FeaturesController {
   @Get(uri = "/{id}")
   public HttpResponse<String> doGetTree(HttpRequest<?> http, @PathVariable int id) {
     try {
-      return FeaturesService.getTree(http, id);
+      return FeatureService.getTree(http, id);
     } catch (Exception e) {
       return ServletUtil.error(
-          FeaturesService.LOG, e,
-          FeaturesService.NAME,
+          FeatureService.LOG, e,
+          FeatureService.NAME,
           http.getUri().toString());
     }
   }

src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java → src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureService.java

@@ -16,15 +16,15 @@ import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
 
 /**
- * Source model tree feature handler for {@link FeaturesController}
+ * Source model tree feature handler for {@link FeatureController}
  *
  * @author U.S. Geological Survey
  */
 @Singleton
-public class FeaturesService {
+public class FeatureService {
 
   static final String NAME = "Model Features";
-  static final Logger LOG = LoggerFactory.getLogger(FeaturesService.class);
+  static final Logger LOG = LoggerFactory.getLogger(FeatureService.class);
 
   public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
     var url = request.getUri().toString();

src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java → src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreeController.java

@@ -3,8 +3,8 @@ package gov.usgs.earthquake.nshmp.www.source;
 import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
 import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
-import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.Metadata;
-import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.RequestData;
+import gov.usgs.earthquake.nshmp.www.source.LogicTreeService.Metadata;
+import gov.usgs.earthquake.nshmp.www.source.LogicTreeService.RequestData;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -31,10 +31,10 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = SourceLogicTreesService.NAME,
+    name = LogicTreeService.NAME,
     description = "USGS NSHM source model logic tree service")
 @Controller("/trees")
-public class SourceLogicTreesController {
+public class LogicTreeController {
 
   @Inject
   private NshmpMicronautServlet servlet;
@@ -52,11 +52,11 @@ public class SourceLogicTreesController {
   @Get
   public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
     try {
-      return SourceLogicTreesService.getMetadata(http);
+      return LogicTreeService.getMetadata(http);
     } catch (Exception e) {
       return ServletUtil.error(
-          SourceLogicTreesService.LOG, e,
-          SourceLogicTreesService.NAME,
+          LogicTreeService.LOG, e,
+          LogicTreeService.NAME,
           http.getUri().toString());
     }
   }
@@ -76,11 +76,11 @@ public class SourceLogicTreesController {
   @Get(uri = "/{id}")
   public HttpResponse<String> doGetTree(HttpRequest<?> http, @PathVariable int id) {
     try {
-      return SourceLogicTreesService.getTree(http, id);
+      return LogicTreeService.getTree(http, id);
     } catch (Exception e) {
       return ServletUtil.error(
-          SourceLogicTreesService.LOG, e,
-          SourceLogicTreesService.NAME,
+          LogicTreeService.LOG, e,
+          LogicTreeService.NAME,
           http.getUri().toString());
     }
   }

src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java → src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreeService.java

@@ -16,15 +16,15 @@ import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
 
 /**
- * Source model tree handler for {@link SourceLogicTreesController}
+ * Source model tree handler for {@link LogicTreeController}
  *
  * @author U.S. Geological Survey
  */
 @Singleton
-public class SourceLogicTreesService {
+public class LogicTreeService {
 
   static final String NAME = "Model Logic Trees";
-  static final Logger LOG = LoggerFactory.getLogger(SourceLogicTreesService.class);
+  static final Logger LOG = LoggerFactory.getLogger(LogicTreeService.class);
 
   public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
     var url = request.getUri().toString();