TH2-4267 split common by fiodar-r · Pull Request #232 · th2-net/th2-common-j

fiodar-r · 2022-10-04T11:00:07Z

No description provided.

# Conflicts: # build.gradle

OptimumCode · 2022-10-04T11:05:39Z

build.gradle


 repositories {
    mavenCentral()
+    mavenLocal()


Should be the last repo in the list

I don't agree. I think it will be first or won't be because if you build project via clean build pTML gradle publishes artifact as release.
If we want to write mavenLocal() in the build.gradle script it should be first otherwise we shouldn't be specified

build.gradle

src/main/kotlin/com/exactpro/th2/common/module/provider/FileConfigurationProviderFactory.kt

src/main/kotlin/com/exactpro/th2/common/schema/configuration/ConfigurationManager.kt

src/main/java/com/exactpro/th2/common/module/FileConfigurationProviderFactoryShim.java

src/main/java/com/exactpro/th2/common/schema/factory/CommonFactory.java

… via reflection

src/main/kotlin/com/exactpro/th2/common/module/provider/FileConfigurationProviderFactory.kt

OptimumCode · 2022-12-06T07:35:36Z

src/main/kotlin/com/exactpro/th2/common/schema/configuration/ConfigurationManager.kt

+        ServiceLoader.load(ModuleFactory::class.java).forEach { moduleFactory ->
+            modulesFactoryMapping[moduleFactory.moduleType] = moduleFactory
+        }


Why modules are in the configuration manager? Shouldn't they be in the factory?

This class has already cached configurations, so I think it's better to put all caching in one place

Maybe move this cache into an abstract part of ~~ConfigurationProvider~~ CommonFactory to avoid new entities

After discussion with @Xanclry we have decided to rename ConfigurationManager to ModuleManager

src/test/kotlin/com/exactpro/th2/common/schema/TestJsonConfiguration.kt

Nikita-Smirnov-Exactpro · 2022-12-07T08:43:48Z

README.md

+
+ Dynamic structure of common
+  + Extracted common/cassandra to separate module
+  + Implemented api for dynamic loading of modules and configurations


Suggested change

+ Implemented api for dynamic loading of modules and configurations

+ Implemented the API for dynamic loading of modules and configurations

Also we should describe module API and how it works in a real project

src/main/java/com/exactpro/th2/common/schema/factory/AbstractCommonFactory.java

src/main/java/com/exactpro/th2/common/schema/factory/CommonFactory.java

Nikita-Smirnov-Exactpro · 2022-12-07T08:57:38Z

src/main/kotlin/com/exactpro/th2/common/cli/CommonFactoryArgs.kt

+    @Parameter(names = ["-c", "--configs"])
+    lateinit var config: String
+
+    @Parameter(names = ["--rabbitConfiguration"])
+    lateinit var rabbitConfiguration: String
+
+    @Parameter(names = ["--messageRouterConfiguration"])
+    lateinit var messageRouterConfiguration: String
+
+    @Parameter(names = ["--grpcRouterConfiguration"])
+    lateinit var grpcRouterConfiguration: String
+
+    @Parameter(names = ["--grpcConfiguration"])
+    lateinit var grpcConfiguration: String
+
+    @Parameter(names = ["--grpcRouterConfig"])
+    lateinit var grpcRouterConfig: String
+
+    @Parameter(names = ["--customConfiguration"])
+    lateinit var customConfiguration: String
+
+    @Parameter(names = ["--dictionariesDir"])
+    lateinit var dictionariesDir: String
+
+    @Parameter(names = ["--prometheusConfiguration"])
+    lateinit var prometheusConfiguration: String
+
+    @Parameter(names = ["--boxConfiguration"])
+    lateinit var boxConfiguration: String


Remove these properties, please use hard coded names for them

src/main/kotlin/com/exactpro/th2/common/module/provider/FileConfigurationProvider.kt

Nikita-Smirnov-Exactpro · 2022-12-07T09:03:18Z

src/main/kotlin/com/exactpro/th2/common/schema/configuration/ConfigurationManager.kt

+        ServiceLoader.load(ModuleFactory::class.java).forEach { moduleFactory ->
+            modulesFactoryMapping[moduleFactory.moduleType] = moduleFactory
+        }


Maybe move this cache into an abstract part of ~~ConfigurationProvider~~ CommonFactory to avoid new entities

src/main/kotlin/com/exactpro/th2/common/util/CommandLineUtils.kt

src/test/kotlin/com/exactpro/th2/common/schema/TestModuleConfiguration.kt

fiodar.rekish added 3 commits September 30, 2022 21:36

[TH2-1436] dynamic config and module loading

4293919

Merge branch 'master' into th2-1436-split-common

c64c481

# Conflicts: # build.gradle

[TH2-1436] version update, small changes

fb7afa6

fiodar-r requested review from Nikita-Smirnov-Exactpro and OptimumCode October 4, 2022 11:00

[TH2-1436] using jcommander for cli parsing

7b8c635

OptimumCode suggested changes Nov 30, 2022

View reviewed changes

fiodar.rekish added 2 commits December 1, 2022 13:00

[TH2-1436] modules caching, creating config for ConfigurationProvider…

ed81c24

… via reflection

[TH2-1436] added kapt plugin

07dc700

fiodar-r requested a review from OptimumCode December 5, 2022 12:31

OptimumCode reviewed Dec 6, 2022

View reviewed changes

Nikita-Smirnov-Exactpro requested changes Dec 7, 2022

View reviewed changes

	+ Implemented api for dynamic loading of modules and configurations
	+ Implemented the API for dynamic loading of modules and configurations

Conversation

fiodar-r commented Oct 4, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nikita-Smirnov-Exactpro Dec 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Nikita-Smirnov-Exactpro Dec 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Nikita-Smirnov-Exactpro Dec 7, 2022 •

edited

Loading

Nikita-Smirnov-Exactpro Dec 7, 2022 •

edited

Loading