This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 8dd66bba0 API cleanup
8dd66bba0 is described below
commit 8dd66bba0bb3cfb8cd82d8eca26bb2d76f1fdde4
Author: Andrus Adamchik <[email protected]>
AuthorDate: Tue Jul 21 18:05:18 2026 +0200
API cleanup
---
README.md | 2 +-
UPGRADE.md | 4 +--
ai-plugin/references/project-layout.md | 2 +-
ai-plugin/references/runtime-api.md | 4 +--
ai-plugin/skills/cayenne-runtime/SKILL.md | 2 +-
.../invalidation/CacheInvalidationFilter.java | 6 ++--
.../cache/invalidation/CacheInvalidationCase.java | 2 +-
.../apache/cayenne/crypto/Runtime_AES128_Base.java | 2 +-
.../value/DefaultValueTransformerFactoryIT.java | 2 +-
.../cayenne/lifecycle/id/EntityIdCoderTest.java | 2 +-
.../apache/cayenne/lifecycle/id/IdCoderTest.java | 2 +-
.../cayenne/lifecycle/id/StringIdQueryTest.java | 2 +-
.../ObjectIdRelationshipHandlerTest.java | 2 +-
.../configuration/server/ServerRuntime.java | 8 ++---
.../org/apache/cayenne/runtime/CayenneRuntime.java | 36 ++++++++++++++++------
.../commitlog/unit/AuditableRuntimeCase.java | 2 +-
.../commitlog/unit/FlattenedRuntimeCase.java | 2 +-
.../apache/cayenne/runtime/CayenneRuntimeTest.java | 2 +-
.../org/apache/cayenne/unit/CayenneTestsEnv.java | 2 +-
.../org/apache/cayenne/unit/DbSchemaManager.java | 2 +-
.../asciidoc/_cayenne-guide/part2/commitLog.adoc | 2 +-
.../asciidoc/_cayenne-guide/part2/customize.adoc | 6 ++--
.../asciidoc/_cayenne-guide/part2/lifecycle.adoc | 4 +--
.../asciidoc/_cayenne-guide/part2/starting.adoc | 6 ++--
.../_cayenne-guide/part5/cacheInvalidation.adoc | 2 +-
.../docs/asciidoc/_cayenne-guide/part5/crypto.adoc | 8 ++---
.../docs/asciidoc/_cayenne-guide/part5/jCache.adoc | 6 ++--
.../_getting-started-db-first/part4-java-code.adoc | 2 +-
.../_getting-started-guide/object-context.adoc | 2 +-
.../java/org/apache/cayenne/tutorial/Main.java | 2 +-
30 files changed, 73 insertions(+), 55 deletions(-)
diff --git a/README.md b/README.md
index a0a4eec38..c0ef8c20c 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ compile cayenne.dependency('server')
#### Create Cayenne Runtime
```java
-CayenneRuntime cayenneRuntime = CayenneRuntime.builder()
+CayenneRuntime cayenneRuntime = CayenneRuntime.of()
.addConfig("cayenne-demo.xml")
.dataSource(CayenneDataSource
.of("jdbc:mysql://localhost:3306/cayenne_demo")
diff --git a/UPGRADE.md b/UPGRADE.md
index 4e2401587..7974bc634 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -180,7 +180,7 @@ solution may be changing to "joint" prefetches.
extensions. If you encounter those, change how you configure the modules,
following this general pattern
(using `CacheInvalidationModule` as an example):
```java
- CayenneRuntime.builder(..)
+ CayenneRuntime.of(..)
.addModule(b ->
CacheInvalidationModule.extend(b).addHandler(MyHandler.class))
.build();
```
@@ -208,7 +208,7 @@ solution may be changing to "joint" prefetches.
* Per [CAY-2826](https://issues.apache.org/jira/browse/CAY-2826)
`ServerModule` renamed to `CoreModule`. The new builder pattern combining both
changes:
```java
- CayenneRuntime runtime = CayenneRuntime.builder()
+ CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.module(b -> CoreModule.extend(b).setProperty("some_property",
"some_value"))
.build();
diff --git a/ai-plugin/references/project-layout.md
b/ai-plugin/references/project-layout.md
index 1adcf189d..aaf54bca2 100644
--- a/ai-plugin/references/project-layout.md
+++ b/ai-plugin/references/project-layout.md
@@ -50,7 +50,7 @@ Filter out `target/`, `build/`, and any test-resource paths
unless the user is e
If multiple `cayenne-*.xml` files exist, identify the one the application
actually uses:
-- Search the Java code for `CayenneRuntime.builder().addConfig("...")` — the
string argument is the descriptor file name (e.g. `"cayenne-mydb.xml"`).
+- Search the Java code for `CayenneRuntime.of().addConfig("...")` — the string
argument is the descriptor file name (e.g. `"cayenne-mydb.xml"`).
- Or look for `addConfigs("...")` for multi-config setups.
- If none is found, the runtime may rely on auto-loading
(`cayenne-project.xml` is *not* a Cayenne convention — Cayenne does not
auto-load by a default name).
diff --git a/ai-plugin/references/runtime-api.md
b/ai-plugin/references/runtime-api.md
index 30e510a84..6e062209c 100644
--- a/ai-plugin/references/runtime-api.md
+++ b/ai-plugin/references/runtime-api.md
@@ -34,7 +34,7 @@ Two creation paths:
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-mydb.xml")
.url("jdbc:postgresql://localhost:5432/mydb")
.jdbcDriver("org.postgresql.Driver")
@@ -52,7 +52,7 @@ import javax.sql.DataSource;
DataSource ds = ...; // created elsewhere in your app
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-mydb.xml")
.dataSource(ds)
.build();
diff --git a/ai-plugin/skills/cayenne-runtime/SKILL.md
b/ai-plugin/skills/cayenne-runtime/SKILL.md
index 21488f027..e4d13d19f 100644
--- a/ai-plugin/skills/cayenne-runtime/SKILL.md
+++ b/ai-plugin/skills/cayenne-runtime/SKILL.md
@@ -41,7 +41,7 @@ Where does the user's app construct `CayenneRuntime`? Common
patterns:
If none exists yet, create one. Apply `runtime-api.md` patterns:
```java
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-mydb.xml")
.dataSource(externalDataSource) // or
.url(...).jdbcDriver(...).user(...).password(...)
.build();
diff --git
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
index cce157db0..51776a57f 100644
---
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
+++
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
@@ -49,8 +49,10 @@ import java.util.function.Function;
* To enable the invalidation filter, just include
"cayenne-cache-invalidation" module in your project. To add
* custom invalidation handlers, use CacheInvalidationModule "extender" API:
* <pre>
- * CayenneRuntime.builder("cayenne-project.xml")
- * .addModule(b ->
CacheInvalidationModule.extend(b).addHandler(MyHandler.class).build());
+ * CayenneRuntime.of()
+ * .addConfig("cayenne-project.xml")
+ * .addModule(b ->
CacheInvalidationModule.extend(b).addHandler(MyHandler.class))
+ * .build();
* </pre>
* </p>
*
diff --git
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
index 45701ad78..de2e5bf23 100644
---
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
+++
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
@@ -57,7 +57,7 @@ public abstract class CacheInvalidationCase {
}
protected CayenneRuntimeBuilder configureCayenne() {
- return CayenneRuntime.builder()
+ return CayenneRuntime.of()
.addModule(b -> extend(CacheInvalidationModule.extend(b)))
.addModule(buildCustomModule())
.addConfig("cayenne-lifecycle.xml");
diff --git
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
index 7a9b776d5..94be3ac93 100644
---
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
+++
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
@@ -60,7 +60,7 @@ public class Runtime_AES128_Base {
}
protected CayenneRuntime createRuntime(Module crypto) {
- return
CayenneRuntime.builder().addConfig("cayenne-crypto.xml").addModule(crypto).build();
+ return
CayenneRuntime.of().addConfig("cayenne-crypto.xml").addModule(crypto).build();
}
protected Module createCryptoModule(boolean compress, boolean useHMAC) {
diff --git
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
index 4c2e99bf9..e0d5f7647 100644
---
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
+++
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
@@ -53,7 +53,7 @@ public class DefaultValueTransformerFactoryIT {
@BeforeAll
public static void beforeClass() throws Exception {
- CayenneRuntime runtime =
CayenneRuntime.builder().addConfig("cayenne-crypto.xml").build();
+ CayenneRuntime runtime =
CayenneRuntime.of().addConfig("cayenne-crypto.xml").build();
t1 = runtime.getChannel().getEntityResolver().getDbEntity("TABLE1");
t2 = runtime.getChannel().getEntityResolver().getDbEntity("TABLE2");
t3 = runtime.getChannel().getEntityResolver().getDbEntity("TABLE3");
diff --git
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java
index 48397befc..67c9a8855 100644
---
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java
+++
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java
@@ -42,7 +42,7 @@ public class EntityIdCoderTest {
@BeforeEach
public void setUp() throws Exception {
- runtime =
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build();
+ runtime =
CayenneRuntime.of().addConfig("cayenne-lifecycle.xml").build();
}
@AfterEach
diff --git
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java
index 1b62d972e..12a3aad0b 100644
---
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java
+++
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java
@@ -33,7 +33,7 @@ public class IdCoderTest {
@BeforeEach
public void setUp() throws Exception {
- runtime =
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build();
+ runtime =
CayenneRuntime.of().addConfig("cayenne-lifecycle.xml").build();
}
@AfterEach
diff --git
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java
index f7d7ace01..b4bf28f74 100644
---
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java
+++
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java
@@ -43,7 +43,7 @@ public class StringIdQueryTest {
@BeforeEach
public void setUp() {
- runtime =
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build();
+ runtime =
CayenneRuntime.of().addConfig("cayenne-lifecycle.xml").build();
DbHelper dbHelper = new
DbHelper(runtime.getDataSource("lifecycle-db"));
e1Helper = new TableHelper(dbHelper, "E1", "ID");
e2Helper = new TableHelper(dbHelper, "E2", "ID");
diff --git
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java
index 399e5c8f9..25f0e4e67 100644
---
a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java
+++
b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java
@@ -44,7 +44,7 @@ public class ObjectIdRelationshipHandlerTest {
@BeforeEach
public void setUp() throws Exception {
- runtime =
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build();
+ runtime =
CayenneRuntime.of().addConfig("cayenne-lifecycle.xml").build();
// a filter is required to invalidate root objects after commit
ObjectIdRelationshipFilter filter = new ObjectIdRelationshipFilter();
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
index e471f7235..ad1a33ca0 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
@@ -44,12 +44,12 @@ public class ServerRuntime extends CayenneRuntime {
*
* @return a builder of CayenneRuntime.
* @since 4.0
- * @deprecated use {@link CayenneRuntime#builder()} instead
+ * @deprecated use {@link CayenneRuntime#of()} instead
*/
@Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder() {
LOGGER.warn("ServerRuntime is deprecated, use CayenneRuntime instead");
- return CayenneRuntime.builder();
+ return CayenneRuntime.of();
}
/**
@@ -57,12 +57,12 @@ public class ServerRuntime extends CayenneRuntime {
*
* @param name optional symbolic name of the created runtime.
* @return a named builder of CayenneRuntime.
- * @deprecated use {@link CayenneRuntime#builder(String)} instead
+ * @deprecated use {@link CayenneRuntime#of(String)} instead
*/
@Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder(String name) {
LOGGER.warn("ServerRuntime is deprecated, use CayenneRuntime instead");
- return CayenneRuntime.builder(name);
+ return CayenneRuntime.of(name);
}
private ServerRuntime() {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
index 6f07b0867..0770f5d17 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
@@ -42,17 +42,17 @@ import java.util.Objects;
* dependency injection (DI) container.
* In fact implementation-wise, Runtime object is just a convenience thin
wrapper around a DI {@link Injector}.
* <p>
- * To create CayenneRuntime use builder available with one of the {@link
#builder()} methods:
+ * To create CayenneRuntime use builder available with one of the {@link
#of()} methods:
* <pre>
* {@code
- * CayenneRuntime cayenneRuntime = CayenneRuntime.builder()
+ * CayenneRuntime cayenneRuntime = CayenneRuntime.of()
* .addConfig("cayenne-project.xml")
* .build();
* }
* </pre>
*
- * @see #builder()
- * @see #builder(String)
+ * @see #of()
+ * @see #of(String)
* @see CayenneRuntimeBuilder
* @since 3.1 is introduced
* @since 5.0 is repurposed as a single implementation of Cayenne runtime and
moved to {@link org.apache.cayenne.runtime} package.
@@ -95,11 +95,9 @@ public class CayenneRuntime {
* Creates a builder of CayenneRuntime.
*
* @return a builder of CayenneRuntime.
- * @see #builder(String)
- * @see CayenneRuntimeBuilder
* @since 5.0
*/
- public static CayenneRuntimeBuilder builder() {
+ public static CayenneRuntimeBuilder of() {
return new CayenneRuntimeBuilder(null);
}
@@ -108,14 +106,32 @@ public class CayenneRuntime {
*
* @param name optional symbolic name of the created runtime.
* @return a named builder of CayenneRuntime.
- * @see #builder()
- * @see CayenneRuntimeBuilder
* @since 5.0
*/
- public static CayenneRuntimeBuilder builder(String name) {
+ public static CayenneRuntimeBuilder of(String name) {
return new CayenneRuntimeBuilder(name);
}
+ /**
+ * Creates a builder of CayenneRuntime.
+ *
+ * @deprecated use {@link #of()} instead
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ public static CayenneRuntimeBuilder builder() {
+ return of();
+ }
+
+ /**
+ * Creates a builder of CayenneRuntime.
+ *
+ * @deprecated use {@link #of(String)} instead
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ public static CayenneRuntimeBuilder builder(String name) {
+ return of(name);
+ }
+
/**
* Creates a runtime configuring it with a standard set of services
* contained in {@link
org.apache.cayenne.configuration.runtime.CoreModule}. CoreModule is created with
diff --git
a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
index ab006130f..6a79a866f 100644
---
a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
+++
b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
@@ -89,7 +89,7 @@ public abstract class AuditableRuntimeCase {
}
protected CayenneRuntimeBuilder configureCayenne() {
- return
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml");
+ return CayenneRuntime.of().addConfig("cayenne-lifecycle.xml");
}
@AfterEach
diff --git
a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
index 4980ac85c..2d74afea3 100644
---
a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
+++
b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
@@ -49,7 +49,7 @@ public class FlattenedRuntimeCase {
}
protected CayenneRuntimeBuilder configureCayenne() {
- return
CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml");
+ return CayenneRuntime.of().addConfig("cayenne-lifecycle.xml");
}
@AfterEach
diff --git
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
index 947632a6e..4ef797cdc 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
@@ -55,7 +55,7 @@ public class CayenneRuntimeTest {
Module module = binder ->
binder.bind(TransactionFactory.class).toInstance(txFactory);
- CayenneRuntime runtime =
CayenneRuntime.builder().addConfig("xxxx").addModule(module).build();
+ CayenneRuntime runtime =
CayenneRuntime.of().addConfig("xxxx").addModule(module).build();
try {
final Object expectedResult = new Object();
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
index 0b71a3184..554b1f2a4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -150,7 +150,7 @@ public class CayenneTestsEnv implements BeforeEachCallback,
AfterEachCallback {
modules.add(b ->
b.bind(DataNodeFactory.class).to(TelemetricDataNodeFactory.class));
Collections.addAll(modules, extraModules);
- return CayenneRuntime.builder()
+ return CayenneRuntime.of()
.addConfig(project)
.addModules(modules)
.dataSource(COMMON_SCHEMA.dataSource())
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
index ae4f5973a..ef4b8cc97 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
@@ -72,7 +72,7 @@ public class DbSchemaManager {
this.dataSourceDescriptor = dataSourceDescriptor;
this.dataSource = dataSource;
- this.domain = CayenneRuntime.builder()
+ this.domain = CayenneRuntime.of()
.addConfig(project)
.dataSource(dataSource)
.build()
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc
index 5f56136cc..c47fda904 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc
@@ -86,7 +86,7 @@ Multiple listeners may be registered; all receive identical
change data for the
[source,java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.addModule(binder -> CoreModule.extend(binder)
.addCommitLogListener(AuditListener.class))
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
index b55c53742..3b5c19c93 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
@@ -203,7 +203,7 @@ public class MyExtensionsModule implements Module {
[source, Java]
----
Module extensions = new MyExtensionsModule();
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("com/example/cayenne-mydomain.xml")
.addModule(extensions)
.build();
@@ -327,7 +327,7 @@ Last step is to register this new type in `CayenneRuntime`:
[source, Java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.addModule(binder ->
CoreModule.extend(binder)
@@ -419,7 +419,7 @@ public class DoubleArrayType implements ExtendedType {
[source, Java]
----
// add DoubleArrayType to list of user types
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.addModule(binder ->
CoreModule.contributeUserTypes(binder)
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
index 493ee6cfa..dc9ce640f 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
@@ -148,7 +148,7 @@ Ignore the annotations for a minute. The important point
here is that the listen
[source,Java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
// ..
.addModule(binder ->
CoreModule.extend(bidner)
@@ -272,7 +272,7 @@ Now since this is both a filter and a listener, it needs to
be registered as suc
[source, Java]
----
// this will also add filter as a listener
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
// ..
.addModule(b ->
CoreModule.extend(b)
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
index 6b3c0c4c1..7e5adf7e7 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
@@ -20,7 +20,7 @@ In runtime Cayenne is accessed via
`org.apache.cayenne.runtime.CayenneRuntime`.
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("com/example/cayenne-project.xml")
.build();
----
@@ -34,7 +34,7 @@ CayenneRuntime encapsulates a single Cayenne stack. Most
applications will just
Module extensions = binder ->
CoreModule.extend(binder).setProperty(Constants.EXTERNAL_TX_PROPERTY,
"true");
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("com/example/cayenne-project.xml")
.addModule(extensions)
.build();
@@ -55,7 +55,7 @@ CayenneRuntime requires at least one mapping project to run.
But it can also tak
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addConfig("com/example/cayenne-project.xml")
.addConfig("org/foo/cayenne-library1.xml")
.addConfig("org/foo/cayenne-library2.xml")
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc
index c2c66cd59..35c4216b7 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc
@@ -74,7 +74,7 @@ Now we'll set up it's usage by `CayenneRuntime`:
[source, java]
----
-CayenneRuntime.builder()
+CayenneRuntime.of()
.addModule(binder -> CacheInvalidationModule.extend(binder)
// optionally you can disable @CacheGroups annotation
processing
.noCacheGroupsHandler()
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc
index 6652153d0..169e09e16 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc
@@ -56,7 +56,7 @@ strategy by injecting you own implementation of
`o.a.c.crypto.map.ColumnMapper`
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> CryptoModule.extend(binder)
.columnMapper(MyColumnMapper.class));
----
@@ -72,7 +72,7 @@ KeyStore.
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> CryptoModule.extend(binder)
.keyStore(this.getClass().getResource("keystore.jcek"),
"my-password".toCharArray(), "my-key-alias"));
----
@@ -84,7 +84,7 @@ compression and `HMAC` usage (later will ensure integrity of
data).
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> CryptoModule.extend(binder)
.compress()
.useHMAC());
@@ -95,7 +95,7 @@ implement `o.a.c.crypto.transformer.value.BytesConverter`
interface that will co
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> CryptoModule.extend(binder)
.objectToBytesConverter(MyClass.class, new
MyClassBytesConverter()));
----
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
index 78363789c..cb7229ab8 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
@@ -46,7 +46,7 @@ For advanced configuration and management please use provider
specific options a
JCache module supports custom configuration files for cache managers.
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> JCacheModule.extend(binder)
.setJCacheProviderConfig("cache-config.xml"));
----
@@ -55,7 +55,7 @@ Also JCache module supports contribution of pre-configured
cache manager.
[source, java]
----
-CayenneRuntime.builder()
+CayenneRuntime.of()
.addModule(binder ->
binder.bind(CacheManager.class).toInstance(customCacheManager));
----
@@ -81,7 +81,7 @@ If you need custom configuration you can contribute
configuration file to JCache
[source, java]
----
-CayenneRuntime runtime = CayenneRuntime.builder()
+CayenneRuntime runtime = CayenneRuntime.of()
.addModule(binder -> JCacheModule.extend(binder)
.setJCacheProviderConfig("file:/ehcache.xml"));
----
diff --git
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
index ad1ef0e1b..a38cb0037 100644
---
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
+++
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
@@ -44,7 +44,7 @@ import org.apache.cayenne.runtime.CayenneRuntime;
public class Main {
public static void main(String[] args) {
- CayenneRuntime cayenneRuntime = CayenneRuntime.builder()
+ CayenneRuntime cayenneRuntime = CayenneRuntime.of()
.dataSource(CayenneDataSource
.of("jdbc:mysql://127.0.0.1:3306/cayenne_demo")
.userName("root") // TODO: change to your actual username
and password
diff --git
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc
index b04f99dab..331c962d7 100644
---
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc
+++
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc
@@ -44,7 +44,7 @@ import org.apache.cayenne.runtime.CayenneRuntime;
public class Main {
public static void main(String[] args) {
- CayenneRuntime cayenneRuntime = CayenneRuntime.builder()
+ CayenneRuntime cayenneRuntime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.build();
ObjectContext context = cayenneRuntime.newContext();
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
b/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
index 4860833f8..7e22a30b2 100644
--- a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
+++ b/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
@@ -33,7 +33,7 @@ public class Main {
public static void main(String[] args) {
// starting Cayenne
- CayenneRuntime cayenneRuntime = CayenneRuntime.builder()
+ CayenneRuntime cayenneRuntime = CayenneRuntime.of()
.addConfig("cayenne-project.xml")
.build();
