* Remove user-specific configuration

* Harmonise datasource properties with MySQL setup file
dmkeen · Sep 28, 2023 · 1c6dceb · 1c6dceb
1 parent 5fe336d
commit 1c6dceb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -3,15 +3,15 @@
 app.current-power.sample-rate-ms=1000
 
 # Hostname or IP of the inverter REST API
-app.inverter.host=192.168.1.166
+app.inverter.host=
 
 # Solcast API properties
 # Ref: https://docs.solcast.com.au/#introduction
 # Hobby account is limited to 20 API calls per day.
 #
 app.solcast.base-url=https://api.solcast.com.au
-app.solcast.api-key=***REMOVED***
-app.solcast.site-id=4f6d-b20d-5b0d-8032
+app.solcast.api-key=
+app.solcast.site-id=
 # Cron expression for when to retrieve forecasts
 # Due to API rate limit, retrieve hourly between 6am and 4pm
 app.solcast.forecast-retrieval-cron=0 0 6,7,8,9,10,11,12,13,14,15,16 * * ?
@@ -24,8 +24,8 @@ app.solcast.measurement-upload-cron=0 0 21 * * ?
 # Setting platform tells Spring to look for a file 'schema-{platform}.sql' to use for db initialisation.
 spring.sql.init.platform=mysql
 spring.datasource.url=jdbc:mysql://localhost:3306/solar?serverTimezone=Australia/Melbourne
-spring.datasource.username=webapp
-spring.datasource.password=password
+spring.datasource.username=solarapp
+spring.datasource.password=put-your-password-here
 spring.datasource.hikari.pool-name=MySQLPool
 
 # Logging

diff --git a/src/test/java/org/keen/solar/forecast/solcast/ForecastPersisterTest.java b/src/test/java/org/keen/solar/forecast/solcast/ForecastPersisterTest.java
diff --git a/src/test/java/org/keen/solar/forecast/solcast/ForecastRetrieverTest.java b/src/test/java/org/keen/solar/forecast/solcast/ForecastRetrieverTest.java
diff --git a/src/test/resources/application-test-mysql.properties b/src/test/resources/application-test-mysql.properties
@@ -3,15 +3,15 @@
 app.current-power.sample-rate-ms=1000
 
 # Hostname or IP of the inverter REST API
-app.inverter.host=192.168.1.166
+app.inverter.host=
 
 # Solcast API properties
 # Ref: https://docs.solcast.com.au/#introduction
 # Hobby account is limited to 20 API calls per day.
 #
 app.solcast.base-url=https://api.solcast.com.au
-app.solcast.api-key=***REMOVED***
-app.solcast.site-id=4f6d-b20d-5b0d-8032
+app.solcast.api-key=
+app.solcast.site-id=
 # Cron expression for when to retrieve forecasts
 # Due to API rate limit, schedule to retrieve 4 times every day: 6AM, 9AM, 12PM, 3PM
 app.solcast.forecast-retrieval-cron=0 0 6,9,12,15 * * ?

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -3,14 +3,15 @@
 app.current-power.sample-rate-ms=1000
 
 # Hostname or IP of the inverter REST API
-app.inverter.host=192.168.1.166
+app.inverter.host=
 
 # Solcast API properties
 # Ref: https://docs.solcast.com.au/#introduction
+# Hobby account is limited to 20 API calls per day.
 #
 app.solcast.base-url=https://api.solcast.com.au
-app.solcast.api-key=***REMOVED***
-app.solcast.site-id=4f6d-b20d-5b0d-8032
+app.solcast.api-key=
+app.solcast.site-id=test-site-id
 # Cron expression for when to retrieve forecasts
 # Due to API rate limit, retrieve hourly between 6am and 4pm
 app.solcast.forecast-retrieval-cron=0 0 6,7,8,9,10,11,12,13,14,15,16 * * ?