Skip to content

Fixing default config values not written to output config file. #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Cleanups and log capturing in `ExtEvDataServiceSpec` [#1320](https://github.com/ie3-institute/simona/issues/1320)
- Fix tolerance in `ThermalGridIT` [#1345](https://github.com/ie3-institute/simona/issues/1345)
- Fix startingState of `ThermalHouse` and `ThermalStorage` [#1347](https://github.com/ie3-institute/simona/issues/1347)
- Fix default config values not written to output config file [#1355](https://github.com/ie3-institute/simona/issues/1355)

### Removed
- Removed `SimonaListerner` and related code [#1205](https://github.com/ie3-institute/simona/issues/1205)
Expand Down
14 changes: 12 additions & 2 deletions src/main/scala/edu/ie3/simona/config/SimonaConfig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

package edu.ie3.simona.config

import com.typesafe.config.Config
import com.typesafe.config.{Config, ConfigValue}
import edu.ie3.simona.config.SimonaConfig.writer
import edu.ie3.simona.exceptions.CriticalFailureException
import pureconfig._
import pureconfig.error._
Expand All @@ -18,13 +19,22 @@ import scala.language.implicitConversions

final case class SimonaConfig(
simona: SimonaConfig.Simona
)
) {

/** Returns the default config values.
*/
def defaults: ConfigValue = writer.to(this)
}

object SimonaConfig {
// pure config start
implicit def productHint[T]: ProductHint[T] =
ProductHint[T](ConfigFieldMapping(CamelCase, CamelCase))

/** Returns a writer for [[SimonaConfig]].
*/
private def writer: ConfigWriter[SimonaConfig] = ConfigWriter[SimonaConfig]

def apply(typeSafeConfig: Config): SimonaConfig =
apply(ConfigSource.fromConfig(typeSafeConfig))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ object ResultFileHierarchy extends LazyLogging {
bw.write(
config
.root()
.withFallback(simonaConfig.defaults)
.render(
ConfigRenderOptions
.defaults()
Expand Down