Skip to content

asciidoctor warnings and documentation correction #475

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.

Sign up for GitHub

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
stariy95 merged 2 commits into from
Dec 7, 2021
Merged

asciidoctor warnings and documentation correction #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3410d55
resolving for asciidoctor warnings
OlegKhodokevich Dec 7, 2021
0e56a47
correct gradle documentation part
OlegKhodokevich Dec 7, 2021
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
4 changes: 2 additions & 2 deletions cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static <T> SQLSelect<T> query(Class<T> type, String sql) {

/**
* Creates a query that selects scalar values and uses default routing.
* @deprecated since 4.2. Use {@link #scalarQuery(String, Class<T>)} method.
* @deprecated since 4.2. Use {@link #scalarQuery(String, Class)} method.
*/
@Deprecated
public static <T> SQLSelect<T> scalarQuery(Class<T> type, String sql) {
Expand All @@ -105,7 +105,7 @@ public static <T> SQLSelect<T> scalarQuery(Class<T> type, String sql) {
/**
* Creates a query that selects scalar values and uses routing based on the
* provided DataMap name.
* @deprecated since 4.2. Use {@link #scalarQuery(String, String, Class<T>)} method.
* @deprecated since 4.2. Use {@link #scalarQuery(String, String, Class)} method.
*/
@Deprecated
public static <T> SQLSelect<T> scalarQuery(Class<T> type, String dataMapName, String sql) {
Expand Down
4 changes: 2 additions & 2 deletions docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ Cayenne supports three PK generation strategies:
1. *Cayenne Generated*.
This is default strategy. Cayenne will use special table `AUTO_PK_SUPPORT` for managing primary keys.

1. *Database Generated*.
2. *Database Generated*.
Cayenne will delegate PK generation to database (e.g. auto increment fields on MySQL or `serial` type on PostgreSQL)

1. *Custom Sequence*. In this case Cayenne will use provided sequence to generate primary keys.
3. *Custom Sequence*. In this case Cayenne will use provided sequence to generate primary keys.

Strategy should be set per each `DbEntity` independently.

Expand Down
4 changes: 2 additions & 2 deletions ...idoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include::../var.adoc[]

Creates services for the server side of an <<rop,ROP>> application.

===== Maven
==== Maven

[source, XML,subs="verbatim,attributes"]
----
Expand All @@ -30,7 +30,7 @@ Creates services for the server side of an <<rop,ROP>> application.
</dependency>
----

===== Gradle
==== Gradle

[source, Groovy,subs="verbatim,attributes"]
----
Expand Down
8 changes: 4 additions & 4 deletions ...sciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ cgen {
client = false
mode = 'all'
overwrite = true
createPropertiesNames = true
createPropertyNames = true
}
----

Expand All @@ -82,9 +82,9 @@ example of configuration for cdbimport task:
----
cdbimport {
// map can be skipped if it is defined in cayenne.defaultDataMap
map 'datamap.map.xml'
map 'src/main/resources/datamap.map.xml'
// optional project file, will be created if missing
cayenneProject 'cayenne-project.xml'
cayenneProject 'src/main/resources/cayenne-project.xml'

dataSource {
driver 'com.mysql.cj.jdbc.Driver'
Expand All @@ -93,7 +93,7 @@ cdbimport {
password ''
}

dbImport
dbImport {
// additional settings
usePrimitives false
defaultPackage 'org.apache.cayenne.test'
Expand Down