Skip to content

Commit 5241eeb

Browse files
committed
Use @SettingsBuilder replace of @Builder
1 parent ce32384 commit 5241eeb

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Entity.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ package org.grails.datastore.mapping.config
1616

1717
import groovy.transform.CompileDynamic
1818
import groovy.transform.CompileStatic
19-
import groovy.transform.builder.Builder
20-
import groovy.transform.builder.SimpleStrategy
2119

2220
import org.grails.datastore.mapping.core.connections.ConnectionSource
2321
import org.grails.datastore.mapping.model.config.GormProperties
@@ -29,7 +27,7 @@ import org.grails.datastore.mapping.model.config.GormProperties
2927
* @since 1.1.9
3028
*/
3129
@CompileStatic
32-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
30+
@SettingsBuilder
3331
class Entity<P extends Property> {
3432

3533
/**

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Property.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import jakarta.persistence.FetchType
2121

2222
import groovy.transform.CompileDynamic
2323
import groovy.transform.CompileStatic
24-
import groovy.transform.builder.Builder
25-
import groovy.transform.builder.SimpleStrategy
2624
import org.springframework.beans.MutablePropertyValues
2725
import org.springframework.validation.DataBinder
2826

@@ -33,7 +31,7 @@ import org.springframework.validation.DataBinder
3331
* @since 1.0
3432
*/
3533
@CompileStatic
36-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
34+
@SettingsBuilder
3735
class Property implements Cloneable {
3836

3937
/**

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/document/config/Attribute.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
package org.grails.datastore.mapping.document.config
1616

1717
import groovy.transform.CompileStatic
18-
import groovy.transform.builder.Builder
19-
import groovy.transform.builder.SimpleStrategy
2018

2119
import org.grails.datastore.mapping.config.Property
20+
import org.grails.datastore.mapping.config.SettingsBuilder
2221

2322
/**
2423
* Configures how a Java property maps to a Document attribute
2524
*
2625
* @author Graeme Rocher
2726
*/
2827
@CompileStatic
29-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
28+
@SettingsBuilder
3029
class Attribute extends Property {
3130

3231
void setAttr(String name) {

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/document/config/Collection.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
package org.grails.datastore.mapping.document.config
1616

1717
import groovy.transform.CompileStatic
18-
import groovy.transform.builder.Builder
19-
import groovy.transform.builder.SimpleStrategy
2018

2119
import org.grails.datastore.mapping.config.Entity
20+
import org.grails.datastore.mapping.config.SettingsBuilder
2221

2322
/**
2423
* Configures how an entity is mapped onto a Document collection
2524
*
2625
* @author Graeme Rocher
2726
*/
2827
@CompileStatic
29-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
28+
@SettingsBuilder
3029
class Collection extends Entity<Attribute> {
3130

3231
/**

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/keyvalue/mapping/config/Family.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
package org.grails.datastore.mapping.keyvalue.mapping.config
1616

1717
import groovy.transform.CompileStatic
18-
import groovy.transform.builder.Builder
19-
import groovy.transform.builder.SimpleStrategy
2018

2119
import org.grails.datastore.mapping.config.Entity
20+
import org.grails.datastore.mapping.config.SettingsBuilder
2221

2322
/**
2423
* <p>A Family is a grouping of KeyValue pairs and is typically composed
@@ -33,7 +32,7 @@ import org.grails.datastore.mapping.config.Entity
3332
* @since 1.0
3433
*/
3534
@CompileStatic
36-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
35+
@SettingsBuilder
3736
class Family extends Entity<KeyValue> {
3837

3938
String keyspace

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/multitenancy/MultiTenancySettings.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package org.grails.datastore.mapping.multitenancy
22

3-
import groovy.transform.builder.Builder
4-
import groovy.transform.builder.SimpleStrategy
53
import org.springframework.beans.BeanUtils
64

5+
import org.grails.datastore.mapping.config.SettingsBuilder
76
import org.grails.datastore.mapping.core.connections.ConnectionSource
87
import org.grails.datastore.mapping.multitenancy.resolvers.NoTenantResolver
98

109
/**
1110
* Represents the multi tenancy settings
1211
*/
13-
@Builder(builderStrategy = SimpleStrategy, prefix = '')
12+
@SettingsBuilder
1413
class MultiTenancySettings {
1514

1615
TenantResolver tenantResolver

0 commit comments

Comments
 (0)