RSDEV-271: Rename property

rspace-os · Aug 19, 2024 · b8d77e4 · b8d77e4
1 parent 4fddd9d
commit b8d77e4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2942,7 +2942,7 @@
     <jstl.version>1.1.2</jstl.version>
     <lucene.version>5.5.5</lucene.version>
     <netty.version>4.1.63.Final</netty.version>
-    <rspace-core-model.version>2.1.2</rspace-core-model.version>
+    <rspace-core-model.version>RSDEV-271-model-2-SNAPSHOT</rspace-core-model.version>
     <servlet.version>3.1.0</servlet.version>
     <sitemesh.version>2.4.2</sitemesh.version>
     <urlrewrite.version>4.0.3</urlrewrite.version>

diff --git a/src/main/java/com/axiope/service/cfg/BaseConfig.java b/src/main/java/com/axiope/service/cfg/BaseConfig.java
@@ -1284,7 +1284,7 @@ public IRepository zenodoRepository() {
    *
    * @return the repository adapter
    */
-  @Bean(name = "digital_commons_dataRepository")
+  @Bean(name = "digitalCommonsDataRepository")
   public IRepository digitalCommonsDataRepository() {
     DigitalCommonsDataRepository rc = new DigitalCommonsDataRepository();
     log.info("Setting in repository implementation {}", rc);

diff --git a/src/main/resources/bundles/system/system.properties b/src/main/resources/bundles/system/system.properties
@@ -343,7 +343,7 @@ system.property.description.dryad.available=Makes Dryad integration available. U
   and attach RSpace exports or documents to that submission.
 system.property.description.dmptool.available=Makes DMPTool integration available.
 system.property.description.dmponline.available=Makes DMPonline integration available.
-system.property.description.digital_commons_data.available=Makes DigitalCommonsData integration available.
+system.property.description.digitalCommonsData.available=Makes DigitalCommonsData integration available.
 system.property.description.argos.available=Makes Argos integration available.
 system.property.description.zenodo.available=Makes Zenodo intergration available.
 system.property.description.github.available=Makes Github integration available. After enabling, user can add links \

diff --git a/src/main/resources/sqlUpdates/changeLog-rsdev-271.xml b/src/main/resources/sqlUpdates/changeLog-rsdev-271.xml
@@ -10,20 +10,20 @@
         <insert tableName="PropertyDescriptor">
             <column name="id" type="NUMERIC" value="NULL"/>
             <column name="defaultValue" type="STRING" value="ALLOWED"/>
-            <column name="name" type="STRING" value="digital_commons_data.available"/>
+            <column name="name" type="STRING" value="digitalCommonsData.available"/>
             <column name="type" type="NUMERIC" value="3"/>
         </insert>
         <insert tableName="SystemProperty">
             <column name="id" type="NUMERIC" value="NULL"/>
             <column name="dependent_id" type="NUMERIC" value="NULL"/>
             <column name="descriptor_id" type="NUMERIC"
-                    valueComputed="(select id from PropertyDescriptor where name ='digital_commons_data.available')"/>
+                    valueComputed="(select id from PropertyDescriptor where name ='digitalCommonsData.available')"/>
         </insert>
         <insert tableName="SystemPropertyValue">
             <column name="id" type="NUMERIC" value="NULL"/>
             <column name="value" type="String" value="DENIED"/>
             <column name="property_id" type="NUMERIC"
-                    valueComputed="(select sp.id from SystemProperty sp inner join PropertyDescriptor pd on sp.descriptor_id=pd.id where pd.name='digital_commons_data.available')"/>
+                    valueComputed="(select sp.id from SystemProperty sp inner join PropertyDescriptor pd on sp.descriptor_id=pd.id where pd.name='digitalCommonsData.available')"/>
         </insert>
     </changeSet>
 
@@ -32,7 +32,7 @@
         <insert tableName="App">
             <column name="id" type="NUMERIC" value="NULL" />
             <column name="label" type="STRING" value="Digital Commons Data" />
-            <column name="name" type="STRING" value="app.digital_commons_data" />
+            <column name="name" type="STRING" value="app.digitalCommonsData" />
             <column name="defaultEnabled" type="BOOLEAN" valueBoolean="true" />
         </insert>
     </changeSet>

diff --git a/src/test/java/com/researchspace/service/RepositoryDepositHandlerTest.java b/src/test/java/com/researchspace/service/RepositoryDepositHandlerTest.java
@@ -98,7 +98,7 @@ public void testGetDigitalCommonsDataConfigSuccessfully() throws MalformedURLExc
         SystemPropertyTestFactory.createAnyAppWithConfigElements(
             anyUser, App.APP_DIGITAL_COMMONS_DATA);
     mockGetSessionUser();
-    String DIGITAL_COMMONS_DATA_REPO = "digital_commons_dataRepository";
+    String DIGITAL_COMMONS_DATA_REPO = "digitalCommonsDataRepository";
     setUpRepoExpectations(DIGITAL_COMMONS_DATA_REPO);
 
     RepoUIConfigInfo returnedInfo =

diff --git a/src/test/java/com/researchspace/service/impl/IntegrationsHandlerTest.java b/src/test/java/com/researchspace/service/impl/IntegrationsHandlerTest.java
@@ -304,7 +304,7 @@ public void getSlackOptions() {
 
   @Test
   public void getDigitalCommonsDataOptions() {
-    String DIGITAL_COMMONS_DATA_AVAILABLE = "digital_commons_data.available";
+    String DIGITAL_COMMONS_DATA_AVAILABLE = "digitalCommonsData.available";
     SystemPropertyValue digitalCommonsDataAvailable =
         getSystemPropertyValueAllowed(DIGITAL_COMMONS_DATA_AVAILABLE);