REST API Method implementation for ConfigResources Controller

integrationtesting/fixtures/build.gradle

@@ -1,13 +1,27 @@
 plugins {
     id 'opendcs.java-conventions'
     id 'opendcs.deps-conventions'
+    id 'opendcs.publishing-conventions'
 }
 
 dependencies {
     api project(":opendcs")
-    api enforcedPlatform(libs.junit.bom)
+    api platform(libs.junit.bom)
     api(libs.bundles.junit)
     api(libs.commons.io)
     api(libs.apache.derby)
     api(libs.webcompere.system.stubs.jupiter)
-}
+    api(libs.testcontainers.core)
+    api(libs.testcontainers.postgresql)
+    api(libs.hec.testcontainers.cwms)
+    api(libs.bundles.jdbi)
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'opendcs-integrationtesting-fixtures'
+            from components.java
+        }
+    }
+}

integrationtesting/opendcs-tests/src/test/java/org/opendcs/spi/configuration/Configuration.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/Configuration.java

@@ -1,4 +1,4 @@
-package org.opendcs.spi.configuration;
+package org.opendcs.fixtures.configuration;
 
 import java.io.File;
 import java.util.Map;
@@ -74,7 +74,7 @@ default public TimeSeriesDb getTsdb() throws Throwable
     }
 
     /**
-     * Returns an independent instance of the {@decodes.db.Database} Decodes Database for this configuration.
+     * Returns an independent instance of the {@link decodes.db.Database} Decodes Database for this configuration.
      *
      * @return Instance of the Decodes Database for this run/test.
      * @throws Throwable

integrationtesting/opendcs-tests/src/test/java/org/opendcs/spi/configuration/ConfigurationProvider.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/ConfigurationProvider.java

@@ -1,4 +1,4 @@
-package org.opendcs.spi.configuration;
+package org.opendcs.fixtures.configuration;
 
 import java.io.File;
 

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/UserPropertiesBuilder.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/UserPropertiesBuilder.java

@@ -1,4 +1,4 @@
-package org.opendcs.fixtures;
+package org.opendcs.fixtures.configuration;
 
 import java.io.IOException;
 import java.io.OutputStream;

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/cwms/CwmsOracleConfiguration.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/cwms/CwmsOracleConfiguration.java

@@ -1,4 +1,4 @@
-package org.opendcs.fixtures.configurations.cwms;
+package org.opendcs.fixtures.configuration.cwms;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -12,19 +12,17 @@
 import org.apache.commons.io.FileUtils;
 import org.opendcs.database.DatabaseService;
 import org.opendcs.database.api.OpenDcsDatabase;
-import org.opendcs.fixtures.UserPropertiesBuilder;
-import org.opendcs.fixtures.configurations.opendcs.pg.OpenDCSPGConfiguration;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.UserPropertiesBuilder;
+import org.opendcs.fixtures.configuration.opendcs.pg.OpenDCSPGConfiguration;
+import org.opendcs.fixtures.configuration.Configuration;
 
-import decodes.cwms.CwmsTimeSeriesDb;
 import decodes.db.Database;
 import decodes.launcher.Profile;
 import decodes.sql.OracleSequenceKeyGenerator;
 import decodes.tsdb.ComputationApp;
 import decodes.tsdb.TimeSeriesDb;
 import decodes.tsdb.TsdbAppTemplate;
 import decodes.util.DecodesSettings;
-import ilex.util.Pair;
 import mil.army.usace.hec.test.database.CwmsDatabaseContainer;
 import opendcs.dao.CompDependsDAO;
 import opendcs.dao.DaoBase;
@@ -77,8 +75,10 @@ private void installDb(SystemExit exit,EnvironmentVariables environment) throws
         dcsUserPassword = System.getProperty("opendcs.cwms.dcsuser.password",cwmsDb.getPassword());
         environment.set("DB_USERNAME",dcsUser);
         environment.set("DB_PASSWORD",dcsUserPassword);
+        environment.set("DB_URL",dbUrl);
         environmentVars.put("DB_USERNAME",dcsUser);
         environmentVars.put("DB_PASSWORD",dcsUserPassword);
+        environmentVars.put("DB_URL",dbUrl);
         started = true;
         //TODO strip/reinstall schema
     }

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/cwms/CwmsOracleConfigurationProvider.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/cwms/CwmsOracleConfigurationProvider.java

@@ -1,9 +1,9 @@
-package org.opendcs.fixtures.configurations.cwms;
+package org.opendcs.fixtures.configuration.cwms;
 
 import java.io.File;
 
-import org.opendcs.spi.configuration.Configuration;
-import org.opendcs.spi.configuration.ConfigurationProvider;
+import org.opendcs.fixtures.configuration.Configuration;
+import org.opendcs.fixtures.configuration.ConfigurationProvider;
 
 public class CwmsOracleConfigurationProvider implements ConfigurationProvider
 {

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/opendcs/pg/OpenDCSPGConfiguration.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/opendcs/pg/OpenDCSPGConfiguration.java

@@ -1,4 +1,4 @@
-package org.opendcs.fixtures.configurations.opendcs.pg;
+package org.opendcs.fixtures.configuration.opendcs.pg;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -23,27 +23,23 @@
 import org.opendcs.database.api.OpenDcsDatabase;
 import org.opendcs.database.SimpleDataSource;
 import org.opendcs.database.impl.opendcs.OpenDcsPgProvider;
-import org.opendcs.fixtures.UserPropertiesBuilder;
-import org.opendcs.fixtures.helpers.Programs;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
+import org.opendcs.fixtures.configuration.UserPropertiesBuilder;
 import org.opendcs.spi.database.MigrationProvider;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import decodes.db.Database;
 import decodes.launcher.Profile;
-import decodes.sql.DecodesDatabaseVersion;
 import decodes.sql.SequenceKeyGenerator;
 import decodes.tsdb.ComputationApp;
 import decodes.tsdb.TimeSeriesDb;
 import decodes.tsdb.TsdbAppTemplate;
 import decodes.util.DecodesSettings;
 import ilex.util.FileLogger;
-import ilex.util.Pair;
 import opendcs.dao.CompDependsDAO;
 import opendcs.dao.DaoBase;
 import opendcs.dao.LoadingAppDao;
 import opendcs.dao.XmitRecordDAO;
-import opendcs.opentsdb.OpenTsdb;
 import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
 import uk.org.webcompere.systemstubs.properties.SystemProperties;
 import uk.org.webcompere.systemstubs.security.SystemExit;
@@ -134,6 +130,8 @@ private void installDb(SystemExit exit,EnvironmentVariables environment, SystemP
         }
 
         db.start();
+        environmentVars.put("DB_URL",db.getJdbcUrl());
+        environment.set("DB_URL",db.getJdbcUrl());
         createPropertiesFile(configBuilder, this.propertiesFile);
         profile = Profile.getProfile(this.propertiesFile);
         DataSource ds = new SimpleDataSource(db.getJdbcUrl(),db.getUsername(),db.getPassword());

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/opendcs/pg/OpenDCSPGConfigurationProvider.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/opendcs/pg/OpenDCSPGConfigurationProvider.java

@@ -1,9 +1,9 @@
-package org.opendcs.fixtures.configurations.opendcs.pg;
+package org.opendcs.fixtures.configuration.opendcs.pg;
 
 import java.io.File;
 
-import org.opendcs.spi.configuration.Configuration;
-import org.opendcs.spi.configuration.ConfigurationProvider;
+import org.opendcs.fixtures.configuration.Configuration;
+import org.opendcs.fixtures.configuration.ConfigurationProvider;
 
 public class OpenDCSPGConfigurationProvider implements ConfigurationProvider
 {

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/xml/XmlConfiguration.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/xml/XmlConfiguration.java

@@ -1,4 +1,4 @@
-package org.opendcs.fixtures.configurations.xml;
+package org.opendcs.fixtures.configuration.xml;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -10,15 +10,12 @@
 import org.apache.commons.io.FileUtils;
 import org.opendcs.database.DatabaseService;
 import org.opendcs.database.api.OpenDcsDatabase;
-import org.opendcs.fixtures.UserPropertiesBuilder;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 import decodes.db.Database;
-import decodes.db.DatabaseIO;
 import decodes.launcher.Profile;
-import decodes.tsdb.TimeSeriesDb;
 import decodes.util.DecodesSettings;
-import ilex.util.Pair;
+import org.opendcs.fixtures.configuration.UserPropertiesBuilder;
 import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
 import uk.org.webcompere.systemstubs.properties.SystemProperties;
 import uk.org.webcompere.systemstubs.security.SystemExit;

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/configurations/xml/XmlConfigurationProvider.java → integrationtesting/fixtures/src/main/java/org/opendcs/fixtures/configuration/xml/XmlConfigurationProvider.java

@@ -1,9 +1,9 @@
-package org.opendcs.fixtures.configurations.xml;
+package org.opendcs.fixtures.configuration.xml;
 
 import java.io.File;
 
-import org.opendcs.spi.configuration.Configuration;
-import org.opendcs.spi.configuration.ConfigurationProvider;
+import org.opendcs.fixtures.configuration.Configuration;
+import org.opendcs.fixtures.configuration.ConfigurationProvider;
 
 public class XmlConfigurationProvider implements ConfigurationProvider
 {

integrationtesting/fixtures/src/main/resources/META-INF/services/org.opendcs.fixtures.configuration.ConfigurationProvider

@@ -0,0 +1,3 @@
+org.opendcs.fixtures.configuration.xml.XmlConfigurationProvider
+org.opendcs.fixtures.configuration.opendcs.pg.OpenDCSPGConfigurationProvider
+org.opendcs.fixtures.configuration.cwms.CwmsOracleConfigurationProvider

integrationtesting/opendcs-tests/build.gradle

@@ -9,14 +9,8 @@ dependencies {
     testCompileOnly project(":opendcs")
     testImplementation project(":testing:fixtures")
     testImplementation enforcedPlatform(libs.junit.bom)
-    testImplementation(libs.testcontainers.core)
-    testImplementation(libs.testcontainers.postgresql)
-    testImplementation(libs.hec.testcontainers.cwms)
-    testImplementation(libs.bundles.jdbi)
     testImplementation(libs.bundles.junit)
     testImplementation(libs.bundles.junit.platform)
-    testImplementation(libs.commons.io)
-    testImplementation(libs.apache.derby)
     testImplementation(libs.fasterxml.jackson.databind)
     testImplementation(libs.webcompere.system.stubs.jupiter)
 }

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/AppTestBase.java

@@ -2,16 +2,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.File;
-
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.opendcs.fixtures.annotations.ConfiguredField;
-import org.opendcs.fixtures.helpers.TestResources;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
-import ilex.util.EnvExpander;
 import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/OpenDCSTestConfigExtension.java

@@ -30,8 +30,8 @@
 import org.opendcs.fixtures.helpers.BackgroundTsDbApp;
 import org.opendcs.fixtures.helpers.Programs;
 import org.opendcs.fixtures.helpers.TestResources;
-import org.opendcs.spi.configuration.Configuration;
-import org.opendcs.spi.configuration.ConfigurationProvider;
+import org.opendcs.fixtures.configuration.Configuration;
+import org.opendcs.fixtures.configuration.ConfigurationProvider;
 
 import decodes.db.Database;
 import decodes.tsdb.TimeSeriesDb;

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/annotations/EnableIfAppsSupportedCondition.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 /**
  * Simple check to help avoid methods getting called in implementations

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/annotations/EnableIfDaoSupported.java

@@ -1,9 +1,7 @@
 package org.opendcs.fixtures.annotations;
 
-import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -16,7 +14,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 import opendcs.dao.DaoBase;
 

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/annotations/EnableIfSql.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 /**
  * Only run this test if the database under test is a SQL based database

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/annotations/EnableIfTsDb.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 /**
  * Only run this test if the database under test is a SQL based database

integrationtesting/opendcs-tests/src/test/java/org/opendcs/fixtures/helpers/TestResources.java

@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 import ilex.util.EnvExpander;
 

integrationtesting/opendcs-tests/src/test/java/org/opendcs/regression_tests/CompProcTestIT.java

@@ -20,12 +20,11 @@
 import org.opendcs.fixtures.annotations.ComputationConfigurationRequired;
 import org.opendcs.fixtures.annotations.ConfiguredField;
 import org.opendcs.fixtures.annotations.DecodesConfigurationRequired;
-import org.opendcs.fixtures.annotations.EnableIfTsDb;
 import org.opendcs.fixtures.annotations.TsdbAppRequired;
 import org.opendcs.fixtures.assertions.Waiting;
 import org.opendcs.fixtures.helpers.BackgroundTsDbApp;
 import org.opendcs.fixtures.helpers.Programs;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 import decodes.sql.DbKey;
 import decodes.sql.KeyGenerator;

integrationtesting/opendcs-tests/src/test/java/org/opendcs/regression_tests/DecodesTest.java

@@ -11,7 +11,7 @@
 import org.opendcs.fixtures.AppTestBase;
 import org.opendcs.fixtures.annotations.DecodesConfigurationRequired;
 import org.opendcs.fixtures.helpers.TestResources;
-import org.opendcs.spi.configuration.Configuration;
+import org.opendcs.fixtures.configuration.Configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

java/annotations/build.gradle

@@ -16,7 +16,5 @@ publishing {
             artifactId = 'opendcs-annotations'
             from components.java
         }
-
-
     }
 }

java/opendcs-api/build.gradle

@@ -11,7 +11,7 @@ plugins {
 publishing {
     publications {
         maven(MavenPublication) {
-            artifactId = 'opendcs-annotations'
+            artifactId = 'opendcs-api'
             from components.java
         }
     }

java/opendcs/build.gradle

@@ -2,7 +2,7 @@ plugins
 {
     id 'opendcs.deps-conventions'
     id 'opendcs.java-conventions'
-    id 'java-library'
+    id 'opendcs.publishing-conventions'
 }
 
 configurations {
@@ -123,4 +123,13 @@ test.dependsOn jar
 javadoc {
     options.addBooleanOption('Xdoclint:none', true)
     source("8")
-}
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'opendcs'
+            from components.java
+        }
+    }
+}