Spring Boot Cloud Config #1230

lony2003 · 2025-03-04T02:32:03Z

Description

A new library that implement a backend of Spring Cloud Config.

Originally from https://github.com/fangkehou-team/dapr-spring, this library created a backend of SpringCloudConfig just like SpringCloudVault.
The original library only uses secret store as config store api is not stable at that time.
As the configuration api is stable now, the config loader using that api has been implemented, but subscription of configuration has not implemented, just for reservation.

Issue reference

this PR will close: #1225

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

Code compiles correctly
Created/updated tests
Extended the documentation

salaboy · 2025-03-04T08:52:00Z

@lony2003 first of all, thanks so so much for contributing back with this. This is highly appreciated.. I will start adding comments in the PR with small details that we need to fix and questions about how this would work.

It will be great if you can add as part of this PR an example on the spring-boot-examples/ directory showing how this functionality would work. We probably also need tests inside sdk-tests to demonstrate that this works from a client point of view. You will notice that we are heavily relying on Testcontainers for all of this, so it will be quite cool to see if the testcontainers integration is missing something to support this functionality.

...ain/java/io/dapr/spring/boot/cloudconfig/autoconfigure/DaprCloudConfigAutoConfiguration.java

salaboy · 2025-03-04T08:53:46Z

.../java/io/dapr/spring/boot/cloudconfig/config/CloudConfigPropertiesDaprConnectionDetails.java

+import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
+import io.dapr.spring.boot.autoconfigure.client.DaprConnectionDetails;
+
+class CloudConfigPropertiesDaprConnectionDetails implements DaprConnectionDetails {


@lony2003 do we need to duplicate the DaprConnectionDetails, why are these different for the normal DaprConnectionDetails?

No difference, just because the PropertyDaprConnectionDetails is protected and can't be used in another package.

@artur-ciocanu should we change the PropertyDaprConnectionDetails visibility so it can be reused?

@lony2003 there is a pending PR #1341 I hope to get this in so you could use it. Once the PR is merged, I don't think we need this class.

...onfig/src/main/java/io/dapr/spring/boot/cloudconfig/config/DaprCloudConfigClientManager.java

...udconfig/src/main/java/io/dapr/spring/boot/cloudconfig/config/DaprCloudConfigProperties.java

lony2003 · 2025-03-04T09:40:58Z

@lony2003 first of all, thanks so so much for contributing back with this. This is highly appreciated.. I will start adding comments in the PR with small details that we need to fix and questions about how this would work.

It will be great if you can add as part of this PR an example on the spring-boot-examples/ directory showing how this functionality would work. We probably also need tests inside sdk-tests to demonstrate that this works from a client point of view. You will notice that we are heavily relying on Testcontainers for all of this, so it will be quite cool to see if the testcontainers integration is missing something to support this functionality.

Thanks. the code is not completed currently, I created this pull request is for the problems in issue #1225 , I think we need a schema for cloud config url, and have some other things to be discussed😊😊😊

lony2003 · 2025-03-05T05:09:38Z

Cloud Config Import Schemas

Secret Store Component

url structure

dapr:secret:<store-name>[/<secret-name>][?<paramters>]

paramters

parameter	description	default	available
type	value type	`value`	`value`/`doc`
doc-type	type of doc	`properties`	`yaml`/`properties`/`or any file extensions you want`

when type = value, if secret-name is specified, will treat secret as the value of property, and secret-name as the key of property; if none secret-name is specified, will get bulk secret and treat every value of secret as the value of property, and every key of secret as the key of property.
when type = doc, if secret-name is specified, will treat secret as a bunch of property, and load it with property or yaml loader; if none secret-name is specified, will get bulk secret and and treat every value of secret as bunches of property, and load them with property or yaml loader.
secret store with multiValud = true must specify nestedSeparator = ".", and using type = doc is not recommanded

demo

multiValued = false:

store content(file secret store as example)

{
	"dapr.spring.demo-config-secret.singlevalue": "testvalue",
	"multivalue-properties": "dapr.spring.demo-config-secret.multivalue.v1=spring\ndapr.spring.demo-config-secret.multivalue.v2=dapr",
	"multivalue-yaml": "dapr:\n  spring:\n    demo-config-secret:\n      multivalue:\n        v3: cloud"
}

valid demo url

dapr:secret:democonfig/multivalue-properties?type=doc&doc-type=properties
dapr:secret:democonfig/multivalue-yaml?type=doc&doc-type=yaml
dapr:secret:democonfig/dapr.spring.demo-config.singlevalue?type=value
dapr:secret:democonfig?type=value
dapr:secret:democonfig?type=doc

multiValued = true, nestedSeparator = ".":

store content(file secret store as example)

{
	"value1": {
		"dapr": {
			"spring": {
				"demo-config-secret": {
					"multivalue": {
						"v4": "config"
					}
				}
			}
		}
	}
}

will be read as

{
	"value1": {
		"dapr.spring.demo-config-secret.multivalue.v4": "config"
	}
}

valid demo url

dapr:secret:demo-config-multi/value1?type=value
dapr:secret:demo-config-multi?type=value

Configuration Component

url structure

dapr:config:<store-name>[/<key>][?<paramters>]

paramters

parameter	description	default	available
type	value type	`value`	`doc`/`value`
doc-type	type of doc	`properties`	`yaml`/`properties`/`or any file extensions you want`
subscribe	subscribe this configuration	`false`	`true`/`false`

when subscribe = true, will subscribe update for the configuration.
when type = value, if key is specified, will treat config value as the value of property, and key as the key of property; if none key is specified, will get all key and value in the config-name and treat every config value as the value of property, and every key as the key of property.
when type = doc, if key is specified, will treat config value as a bunch of property, and load it with property or yaml loader; if none key is specified, will get all key and value in the config-name and treat every config value as bunches of property, and load them with property or yaml loader.

Demo

store content(table as example)

key	value
dapr.spring.demo-config-config.singlevalue	testvalue
multivalue-properties	`dapr.spring.demo-config-config.multivalue.v1=spring\ndapr.spring.demo-config-config.multivalue.v2=dapr`
multivalue-yaml	`dapr:\n spring:\n demo-config-config:\n multivalue:\n v3: cloud`

valid demo url

dapr:config:democonfigconf/dapr.spring.demo-config-config.singlevalue?type=value
dapr:config:democonfigconf/multivalue-properties?type=doc&doc-type=properties
dapr:config:democonfigconf/multivalue-yaml?type=doc&doc-type=yaml
dapr:config:democonfigconf?type=doc
dapr:config:democonfigconf?type=value

lony2003 · 2025-03-09T09:39:55Z

All jobs have done, waiting for review. Note that subscription of configuration api is not implemented, just as a reservation.

dapr-spring/dapr-spring-cloudconfig/pom.xml

...ng-cloudconfig/src/test/java/io/dapr/spring/boot/cloudconfig/CloudConfigTestApplication.java

dapr-spring/dapr-spring-cloudconfig/src/test/resources/application.yaml

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

lony2003 · 2025-03-27T05:27:46Z

I have checked the error, and it seems that jacoco coverage throws the error. I have add a test of bulk secret to coverage more situation in DaprSecretStoreConfigDataLoader.java listed in the first line of codeconv report. Not sure if it's the cause of jacoco coverage failed, but I can't add more coverage as it's a little difficult to test error situation in bootstrap stage (springboot application will crash and test will be failed)

salaboy · 2025-03-29T08:25:18Z

@lony2003 this is amazing! thank so much for all the work that you put on this PR!
I really appreciate the demo application in the spring boot examples, but I have one more ask. Can you make sure that this also works on Kubernetes?
I want to make sure that people can understand how this will work on Kubernetes when compared with the local version.. Following something like this: https://github.com/dapr/java-sdk/tree/master/spring-boot-examples/kubernetes
what are the steps that people will need to perform on a cluster to configure Spring Cloud Config inside Kubernetes, assuming that the config parameters are in Kubernetes ConfigMaps or Secrets. Does this make sense?

Signed-off-by: lony2003 <[email protected]>

…porter Implemented the configuration importer using dapr client configuration api also done a style check Signed-off-by: lony2003 <[email protected]>

Signed-off-by: lony2003 <[email protected]>

Springboot‘s PropertySourceLoader will return a invalid source if it doesn't support that instead of throw errors. So we have to clear that what kind of loader we want to use, that is , that kind of resource it is. Signed-off-by: lony2003 <[email protected]>

Enum of Config Type has lack of file extension suport, reimplement it as class Signed-off-by: lony2003 <[email protected]>

… and config store Signed-off-by: lony2003 <[email protected]>

…fig store (try1) Signed-off-by: lony2003 <[email protected]>

…cloudconfig Signed-off-by: lony2003 <[email protected]>

Signed-off-by: lony2003 <[email protected]>

add a test of Dapr Secret getBulkSecret method Signed-off-by: lony2003 <[email protected]>

Signed-off-by: lony2003 <[email protected]>

Fix the example doc to make cloud config demo works both local and kubernetes, and pass the mm doc validate Signed-off-by: lony2003 <[email protected]>

(cherry picked from commit 31a47f5) Signed-off-by: lony2003 <[email protected]>

Fix the example doc to make cloud config demo works both local and kubernetes Signed-off-by: lony2003 <[email protected]>

Signed-off-by: lony2003 <[email protected]>

salaboy

LGTM

codecov · 2025-05-07T08:42:32Z

Codecov Report

Attention: Patch coverage is 73.65591% with 98 lines in your changes missing coverage. Please review.

Project coverage is 75.31%. Comparing base (d759c53) to head (70d4eea).
Report is 138 commits behind head on master.

Files with missing lines	Patch %	Lines
...igdata/secret/DaprSecretStoreConfigDataLoader.java	68.25%	15 Missing and 5 partials ⚠️
...g/DaprConfigurationConfigDataLocationResolver.java	70.68%	10 Missing and 7 partials ⚠️
...data/config/DaprConfigurationConfigDataLoader.java	68.08%	10 Missing and 5 partials ⚠️
...oudconfig/config/DaprCloudConfigClientManager.java	48.00%	7 Missing and 6 partials ⚠️
...ret/DaprSecretStoreConfigDataLocationResolver.java	85.71%	5 Missing and 3 partials ⚠️
...onfig/configdata/DaprCloudConfigParserHandler.java	85.00%	3 Missing and 3 partials ⚠️
...ta/config/DaprConfigurationConfigDataResource.java	60.00%	6 Missing ⚠️
...data/secret/DaprSecretStoreConfigDataResource.java	57.14%	6 Missing ⚠️
.../cloudconfig/config/DaprCloudConfigProperties.java	76.47%	4 Missing ⚠️
...t/examples/cloudconfig/CloudConfigApplication.java	33.33%	2 Missing ⚠️
... and 1 more

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #1230      +/-   ##
============================================
- Coverage     76.91%   75.31%   -1.60%     
- Complexity     1592     1707     +115     
============================================
  Files           145      211      +66     
  Lines          4843     5473     +630     
  Branches        562      594      +32     
============================================
+ Hits           3725     4122     +397     
- Misses          821     1004     +183     
- Partials        297      347      +50

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

salaboy · 2025-05-11T19:12:02Z

@dapr/maintainers-java-sdk I believe that we can merge this PR, we will incrementally improve the quality of this PR, but I want this module to be present in the SDK. Please approve, we can fix any findings in smaller PRs.

artur-ciocanu

@lony2003 thanks a lot for your contribution! I have reviewed the PR and I have left quite a few comments.

The main issue that I want to highlight is that we need to make sure that we can leverage ConfigurableBootstrapContext and BootstrapRegistryInitializer to ensure we create the DaprClient and DaprClientProperties beans. As far as I saw a lot of complexity is related to the fact that we try to jump through the hoops just to get the right instances so we could load the data.

While I have mentioned DaprClient and DaprClientProperties beans, all the other dependencies like parse handler should be registered with the ConfigurableBootstrapContext as well, so we could look them up when needed.

Using the aforementioned approach will allow us to simplify the code and be able to expand in the future without a lot of effort.

artur-ciocanu · 2025-05-12T17:51:49Z

...toconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java

@@ -16,8 +16,10 @@
 import io.dapr.spring.data.DaprKeyValueAdapterResolver;
 import org.springframework.boot.context.properties.ConfigurationProperties;



I would prefer using a simple string prefix like "dapr.client"

artur-ciocanu · 2025-05-12T17:56:22Z

dapr-spring/dapr-spring-cloudconfig/pom.xml

+    <description>Dapr Spring Cloud Config</description>
+    <packaging>jar</packaging>
+
+    <dependencies>


As far as I can tell ONLY dapr-spring-boot-autoconfigure dependency should be required all the others seems to be copy-pasted from other POM.

Could we please make sure that ONLY the required dependencies are used.

dapr-spring/dapr-spring-cloudconfig/pom.xml

artur-ciocanu · 2025-05-12T17:59:49Z

.../java/io/dapr/spring/boot/cloudconfig/config/CloudConfigPropertiesDaprConnectionDetails.java

+import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
+import io.dapr.spring.boot.autoconfigure.client.DaprConnectionDetails;
+
+class CloudConfigPropertiesDaprConnectionDetails implements DaprConnectionDetails {


@lony2003 there is a pending PR #1341 I hope to get this in so you could use it. Once the PR is merged, I don't think we need this class.

artur-ciocanu · 2025-05-12T20:09:56Z

...nfig-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/DaprConfigurationStores.java

@@ -0,0 +1,9 @@
+package io.dapr.springboot.examples.cloudconfig;
+
+public class DaprConfigurationStores {


Can we have this extracted to src/test/resources

artur-ciocanu · 2025-05-12T20:22:34Z

...loud-config-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/DaprSecretStores.java

@@ -0,0 +1,23 @@
+package io.dapr.springboot.examples.cloudconfig;
+
+public class DaprSecretStores {


Can we extract this to src/test/resources

artur-ciocanu · 2025-05-12T20:22:48Z

...loud-config-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/DaprSecretStores.java

+      "  \"multivalue-properties\": \"dapr.spring.demo-config-secret.multivalue.v1=spring\\ndapr.spring.demo-config-secret.multivalue.v2=dapr\",\n" +
+      "  \"multivalue-yaml\": \"dapr:\\n  spring:\\n    demo-config-secret:\\n      multivalue:\\n        v3: cloud\"\n" +
+      "}";
+


Can we extract this to src/test/resources

artur-ciocanu · 2025-05-12T20:23:32Z

...g-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/TestCloudConfigApplication.java

+
+@SpringBootApplication
+public class TestCloudConfigApplication {
+


Can we move this to main() method?

artur-ciocanu · 2025-05-12T20:23:55Z

spring-boot-examples/kubernetes/secrets/kubernates-secrets-multivalue.yaml

+  name: dapr.spring.demo-config-secret.singlevalue
+type: Opaque
+stringData:
+  dapr.spring.demo-config-secret.singlevalue: "testvalue"


Could you please add new line

artur-ciocanu · 2025-05-12T20:31:11Z

@lony2003 also could you please sync your branch withmaster branch, your branch is out of date.

lony2003 · 2025-05-13T05:27:27Z

@artur-ciocanu I am working on my graduation currently, once I have time, I‘ll resolve them.

@salaboy Thank you for approving this.

salaboy · 2025-05-13T21:11:31Z

@lony2003 as soon as you have the changes done please let me know

salaboy · 2025-05-13T21:11:47Z

@artur-ciocanu thank so much for all the reviews and unblocking

lony2003 requested review from a team as code owners March 4, 2025 02:32

lony2003 force-pushed the development-cloudconfig branch 3 times, most recently from 25b3e33 to 2b4022b Compare March 4, 2025 03:14

salaboy reviewed Mar 4, 2025

View reviewed changes

...ain/java/io/dapr/spring/boot/cloudconfig/autoconfigure/DaprCloudConfigAutoConfiguration.java Outdated Show resolved Hide resolved

salaboy reviewed Mar 4, 2025

View reviewed changes

...onfig/src/main/java/io/dapr/spring/boot/cloudconfig/config/DaprCloudConfigClientManager.java Outdated Show resolved Hide resolved

salaboy reviewed Mar 4, 2025

View reviewed changes

...udconfig/src/main/java/io/dapr/spring/boot/cloudconfig/config/DaprCloudConfigProperties.java Show resolved Hide resolved

cicoyle assigned lony2003 Mar 6, 2025

cicoyle added this to the v1.15 milestone Mar 6, 2025

lony2003 force-pushed the development-cloudconfig branch 7 times, most recently from 383a076 to 034baad Compare March 8, 2025 16:57

lony2003 changed the title ~~[WIP] Spring Boot Cloud Config~~ [All jobs done] Spring Boot Cloud Config Mar 9, 2025

salaboy reviewed Mar 10, 2025

View reviewed changes

dapr-spring/dapr-spring-cloudconfig/pom.xml Outdated Show resolved Hide resolved

salaboy reviewed Mar 10, 2025

View reviewed changes

...ng-cloudconfig/src/test/java/io/dapr/spring/boot/cloudconfig/CloudConfigTestApplication.java Show resolved Hide resolved

salaboy reviewed Mar 10, 2025

View reviewed changes

dapr-spring/dapr-spring-cloudconfig/src/test/resources/application.yaml Outdated Show resolved Hide resolved

salaboy reviewed Mar 10, 2025

View reviewed changes

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md Outdated Show resolved Hide resolved

lony2003 requested a review from salaboy March 28, 2025 10:43

lony2003 and others added 20 commits April 3, 2025 17:59

style(springboot cloudconfig): update file header

3b55b4c

Signed-off-by: lony2003 <[email protected]>

style(springboot cloudconfig): change code style to match checkstyle

c318d8b

Signed-off-by: lony2003 <[email protected]>

feat(springboot cloudconfig): Implement Configuration Cloud Config Im…

3fb8cab

…porter Implemented the configuration importer using dapr client configuration api also done a style check Signed-off-by: lony2003 <[email protected]>

fix(springboot cloudconfig): Update version of dapr-spring-parent

6724b46

Signed-off-by: lony2003 <[email protected]>

feat(springboot cloudconfig): test cases for cloud config

49c1ab6

Signed-off-by: lony2003 <[email protected]>

feat(springboot cloudconfig): Change the behavior of Config Type

3359473

Enum of Config Type has lack of file extension suport, reimplement it as class Signed-off-by: lony2003 <[email protected]>

test(springboot cloudconfig): Implemented integration test for secret…

b7e660e

… and config store Signed-off-by: lony2003 <[email protected]>

test(springboot cloudconfig): fix integration test for secret and con…

653bb12

…fig store (try1) Signed-off-by: lony2003 <[email protected]>

docs(springboot cloudconfig): Write examples and docs for springboot …

1169c54

…cloudconfig Signed-off-by: lony2003 <[email protected]>

style(springboot cloudconfig): Clean comments

f5fab34

Signed-off-by: lony2003 <[email protected]>

docs(springboot cloudconfig): Fix typo of import

852d459

Signed-off-by: lony2003 <[email protected]>

test(springboot cloudconfig): Fix test coverage

29fa755

add a test of Dapr Secret getBulkSecret method Signed-off-by: lony2003 <[email protected]>

docs(cloud-config-demo): enhence Kubernetes cluster usages

74e36d4

Signed-off-by: lony2003 <[email protected]>

docs(cloud-config-demo): enhence Kubernetes cluster usages

716ecb7

Signed-off-by: lony2003 <[email protected]>

docs(cloud-config-demo): enhence Kubernetes cluster usages

ffc43d3

Signed-off-by: lony2003 <[email protected]>

docs(springboot cloudconfig): A fix of example docs.

186b1bb

Fix the example doc to make cloud config demo works both local and kubernetes, and pass the mm doc validate Signed-off-by: lony2003 <[email protected]>

Update springboot to latest minor.patch version. (dapr#826)

15fefb1

(cherry picked from commit 31a47f5) Signed-off-by: lony2003 <[email protected]>

docs(springboot cloudconfig): A fix of example docs.

a31ce67

Fix the example doc to make cloud config demo works both local and kubernetes Signed-off-by: lony2003 <[email protected]>

docs(springboot cloudconfig): A fix of example docs.

70d4eea

Signed-off-by: lony2003 <[email protected]>

lony2003 force-pushed the development-cloudconfig branch from 2bed2a2 to 70d4eea Compare April 3, 2025 10:06

salaboy approved these changes May 7, 2025

View reviewed changes

artur-ciocanu mentioned this pull request May 12, 2025

Renaming and exposing connection details #1341

Merged

3 tasks

artur-ciocanu requested changes May 12, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spring Boot Cloud Config #1230

Spring Boot Cloud Config #1230

lony2003 commented Mar 4, 2025 •

edited

Loading

salaboy commented Mar 4, 2025

salaboy Mar 4, 2025

lony2003 Mar 4, 2025

salaboy Mar 10, 2025

artur-ciocanu May 12, 2025

lony2003 commented Mar 4, 2025

lony2003 commented Mar 5, 2025 •

edited

Loading

lony2003 commented Mar 9, 2025

lony2003 commented Mar 27, 2025 •

edited

Loading

salaboy commented Mar 29, 2025

salaboy left a comment

codecov bot commented May 7, 2025

salaboy commented May 11, 2025

artur-ciocanu left a comment

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu May 12, 2025

artur-ciocanu commented May 12, 2025

lony2003 commented May 13, 2025

salaboy commented May 13, 2025

salaboy commented May 13, 2025

		@@ -16,8 +16,10 @@
		import io.dapr.spring.data.DaprKeyValueAdapterResolver;
		import org.springframework.boot.context.properties.ConfigurationProperties;

		@@ -0,0 +1,9 @@
		package io.dapr.springboot.examples.cloudconfig;

		public class DaprConfigurationStores {

		@@ -0,0 +1,23 @@
		package io.dapr.springboot.examples.cloudconfig;

		public class DaprSecretStores {


		@SpringBootApplication
		public class TestCloudConfigApplication {

Spring Boot Cloud Config #1230

Are you sure you want to change the base?

Spring Boot Cloud Config #1230

Conversation

lony2003 commented Mar 4, 2025 • edited Loading

Description

Issue reference

Checklist

salaboy commented Mar 4, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lony2003 commented Mar 4, 2025

lony2003 commented Mar 5, 2025 • edited Loading

Cloud Config Import Schemas

Secret Store Component

url structure

paramters

demo

multiValued = false:

store content(file secret store as example)

valid demo url

multiValued = true, nestedSeparator = ".":

store content(file secret store as example)

valid demo url

Configuration Component

url structure

paramters

Demo

store content(table as example)

valid demo url

lony2003 commented Mar 9, 2025

lony2003 commented Mar 27, 2025 • edited Loading

salaboy commented Mar 29, 2025

salaboy left a comment

Choose a reason for hiding this comment

codecov bot commented May 7, 2025

Codecov Report

salaboy commented May 11, 2025

artur-ciocanu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

artur-ciocanu commented May 12, 2025

lony2003 commented May 13, 2025

salaboy commented May 13, 2025

salaboy commented May 13, 2025

lony2003 commented Mar 4, 2025 •

edited

Loading

lony2003 commented Mar 5, 2025 •

edited

Loading

lony2003 commented Mar 27, 2025 •

edited

Loading