Skip to content

Commit b36dc81

Browse files
rjeberhardrjeberhard
committed
Use CamelCase with initial capital letter for checkIfNotExists enum
1 parent ef79813 commit b36dc81

File tree

16 files changed

+45
-45
lines changed

16 files changed

+45
-45
lines changed

‎common/src/main/resources/Operator.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ WLSDO-0061=When ''spec.configuration.initializeDomainOnPV'' is specified, one of
267267
needs to contain the path for domain home ''{0}'', and the ''domainHome'' directory needs to be at least three levels deep \
268268
under the mount path. For example, if the mount path is /shared, ''domainHome'' path can be ''/shared/domains/domain1'', \
269269
or ''/shared/wls/domains/domain1'', but cannot be ''/shared/domain1'', or ''/domain1''.
270-
WLSDO-0062=The ''spec.configuration.initializeDomainOnPV.domain.createIfNotExists'' value of ''domainAndRCU'' is \
270+
WLSDO-0062=The ''spec.configuration.initializeDomainOnPV.domain.createIfNotExists'' value of ''DomainAndRCU'' is \
271271
applicable only for ''JRF'' domains, and therefore, is not allowed when \
272272
''spec.configuration.initializeDomainOnPV.domain.domainType'' is ''WLS''.
273273
WLSDO-0063=The ''spec.configuration.initializeDomainOnPV'' is specified but there is no volume in \

‎documentation/domains/Domain.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,12 @@
320320
"$ref": "#/definitions/Opss"
321321
},
322322
"createIfNotExists": {
323-
"default": "domain",
324-
"description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain.",
323+
"default": "Domain",
324+
"description": "Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain.",
325325
"type": "string",
326326
"enum": [
327-
"domain",
328-
"domainAndRCU"
327+
"Domain",
328+
"DomainAndRCU"
329329
]
330330
}
331331
}

‎documentation/domains/Domain.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
302302

303303
| Name | Type | Description |
304304
| --- | --- | --- |
305-
| `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain. |
305+
| `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain. |
306306
| `domainCreationConfigMap` | string | Name of a ConfigMap containing the WebLogic Deploy Tooling model. |
307307
| `domainCreationImages` | Array of [Domain Creation Image](#domain-creation-image) | Domain creation images containing WebLogic Deploy Tooling model, application archive, and WebLogic Deploy Tooling installation files. These files will be used to create the domain during introspection. This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share the files from the additional images |
308308
| `domainType` | string | WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF. |

‎documentation/site/content/managing-domains/domain-on-pv/jrf-domain.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ In the domain resource YAML file, you can provide two secrets in the `opss` sect
8989
initializeDomainOnPV:
9090
...
9191
domain:
92-
createIfNotExists: domain
92+
createIfNotExists: Domain
9393
domainType: JRF
9494
...
9595
opss:

‎documentation/site/content/managing-domains/domain-on-pv/usage.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ spec:
229229
initializeDomainOnPV:
230230
...
231231
domain:
232-
# domain | domainAndRCU
233-
createIfNotExists: domainAndRCU
232+
# Domain | DomainAndRCU
233+
createIfNotExists: DomainAndRCU
234234
domainCreationImages:
235235
- image: 'myrepo/domain-images:v1'
236236
domainType: JRF
@@ -239,14 +239,14 @@ spec:
239239
walletPasswordSecret: sample-domain1-opss-wallet-password-secret
240240
```
241241
242-
| Field | Notes | Values | Required |
243-
|---------------------------|--------------------------------------------------------------------------------------|-------------------------------------------------------------------------|---------------------------------------------------------------------|
244-
| `domainType` | Type of domain being created. | `JRF` or `WLS` | N (default `WLS`) |
245-
| `createIfNotExists` | Specifies whether the operator should create the RCU schema first, before creating the domain. | `domain` or `domainAndRCU` (drop existing RCU schema and create new RCU schema) | N (default `domain`) |
246-
| `domainCreationImages` | WDT domain images. | An array of images. | Y |
247-
| `domainCreationConfigMap` | Optional ConfigMap containing extra WDT models. | Kubernetes ConfigMap name. | N |
248-
| `osss.walletPasswordSecret` | Password for extracting OPSS wallet for JRF domain. | Kubernetes Secret name with the key `walletPassword`. | Y |
249-
| `osss.walletFileSecret` | Extracted OPSS wallet file. | Kubernetes Secret name with the key `walletFile`. | N (Only needed when recreating the domain during disaster recovery) |
242+
| Field | Notes | Values | Required |
243+
|---------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------|
244+
| `domainType` | Type of domain being created. | `JRF` or `WLS` | N (default `WLS`) |
245+
| `createIfNotExists` | Specifies whether the operator should create the RCU schema first, before creating the domain. | `Domain` or `DomainAndRCU` (drop existing RCU schema and create new RCU schema) | N (default `Domain`) |
246+
| `domainCreationImages` | WDT domain images. | An array of images. | Y |
247+
| `domainCreationConfigMap` | Optional ConfigMap containing extra WDT models. | Kubernetes ConfigMap name. | N |
248+
| `osss.walletPasswordSecret` | Password for extracting OPSS wallet for JRF domain. | Kubernetes Secret name with the key `walletPassword`. | Y |
249+
| `osss.walletFileSecret` | Extracted OPSS wallet file. | Kubernetes Secret name with the key `walletFile`. | N (Only needed when recreating the domain during disaster recovery) |
250250
251251
**After a JRF domain is successfully deployed**: follow the next section, [Best practices](#best-practices), to download and back up the OPSS wallet.
252252
@@ -472,8 +472,8 @@ spec:
472472
requests:
473473
storage: 10Gi
474474
domain:
475-
# domain | domainAndRCU
476-
createIfNotExists: domainAndRCU
475+
# Domain | DomainAndRCU
476+
createIfNotExists: DomainAndRCU
477477
domainCreationImages:
478478
- image: 'myrepo/domain-images:v1'
479479
domainType: JRF

‎integration-tests/src/test/java/oracle/weblogic/domain/CreateIfNotExists.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import com.google.gson.annotations.SerializedName;
77

88
public enum CreateIfNotExists {
9-
@SerializedName("domain")
10-
DOMAIN("domain"),
11-
@SerializedName("domainAndRCU")
12-
DOMAIN_AND_RCU("domainAndRCU");
9+
@SerializedName("Domain")
10+
DOMAIN("Domain"),
11+
@SerializedName("DomainAndRCU")
12+
DOMAIN_AND_RCU("DomainAndRCU");
1313

1414
private final String value;
1515

‎integration-tests/src/test/java/oracle/weblogic/domain/DomainOnPV.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public class DomainOnPV {
1515

1616
@ApiModelProperty("Specifies if the operator should create only the domain or the domain with RCU"
17-
+ " (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain.")
17+
+ " (for JRF-based domains). Legal values: Domain, DomainAndRCU. Defaults to Domain.")
1818
private CreateIfNotExists createIfNotExists = CreateIfNotExists.DOMAIN;
1919

2020
@ApiModelProperty("WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF.")

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPvUserCreateRcu.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ void testFmwDomainOnPvUserCreatesRCUMultiImages() {
665665

666666
/**
667667
* Export the OPSS wallet file secret of Fmw domain from the previous run
668-
* CrateIfNotExists set to domainAndRCU
668+
* CrateIfNotExists set to DomainAndRCU
669669
* Use this OPSS wallet file secret to create Fmw domain on PV to connect to the same database
670670
* Verify Pod is ready and service exists for both admin server and managed servers.
671671
*/

‎kubernetes/crd/domain-crd.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 84402da7f071cbcf0e5933f9f71f58a22199026bb60d7cd6100fde377bd4bb7b
8+
weblogic.sha256: d5bf4792de6093d8414edc6efa477cb911342a195f5def8ed02834b4187ee9f2
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -336,14 +336,14 @@ spec:
336336
type: string
337337
type: object
338338
createIfNotExists:
339-
default: domain
339+
default: Domain
340340
description: 'Specifies if the operator should create
341341
only the domain or the domain with RCU (for JRF-based
342-
domains). Legal values: domain, domainAndRCU. Defaults
343-
to domain.'
342+
domains). Legal values: Domain, DomainAndRCU. Defaults
343+
to Domain.'
344344
enum:
345-
- domain
346-
- domainAndRCU
345+
- Domain
346+
- DomainAndRCU
347347
type: string
348348
type: object
349349
persistentVolumeClaim:

‎kubernetes/samples/scripts/create-weblogic-domain/domain-on-pv/domain-resources/JRF/domain-on-pv-JRF-v1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ spec:
9696
domainType: JRF
9797

9898
# Specifies if the operator should create only the domain or the domain with RCU."
99-
# Legal values: domain, domainAndRCU. Defaults to domain."
100-
createIfNotExists: domainAndRCU
99+
# Legal values: Domain, DomainAndRCU. Defaults to Domain."
100+
createIfNotExists: DomainAndRCU
101101

102102
# Domain creation image(s) containing WDT model, archives, and install.
103103
# `image` - Image location

‎operator/integration-tests/domain-on-pv/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ NOTES:
9292
to 0 that's fine, the test will dynamically find
9393
the actual nodeport.
9494

95-
- Call '-rcu' if `createIfExists` mode is other than `domainAndRCU` and the database is not already RCU initialized.
95+
- Call '-rcu' if `createIfExists` mode is other than `DomainAndRCU` and the database is not already RCU initialized.
9696

9797
- You can run the test in stages. For example:
9898
./run-test.sh -precleanup

‎operator/integration-tests/domain-on-pv/dpv-sample-wrapper/dpv-domain.yaml.template-JRF

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ spec:
9696
domainType: JRF
9797

9898
# Specifies if the operator should create only the domain or the domain with RCU."
99-
# Legal values: domain, domainAndRCU. Defaults to domain."
100-
createIfNotExists: domainAndRCU
99+
# Legal values: Domain, DomainAndRCU. Defaults to Domain."
100+
createIfNotExists: DomainAndRCU
101101

102102
# Domain creation image(s) containing WDT model, archives, and install.
103103
# `image` - Image location

‎operator/src/main/java/oracle/kubernetes/weblogic/domain/model/CreateIfNotExists.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import com.google.gson.annotations.SerializedName;
77

88
public enum CreateIfNotExists {
9-
@SerializedName("domain")
10-
DOMAIN("domain"),
11-
@SerializedName("domainAndRCU")
12-
DOMAIN_AND_RCU("domainAndRCU");
9+
@SerializedName("Domain")
10+
DOMAIN("Domain"),
11+
@SerializedName("DomainAndRCU")
12+
DOMAIN_AND_RCU("DomainAndRCU");
1313

1414
private final String value;
1515

‎operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainOnPV.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
public class DomainOnPV {
2020

2121
@Description("Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains)."
22-
+ " Legal values: domain, domainAndRCU. Defaults to domain.")
23-
@Default(strDefault = "domain")
22+
+ " Legal values: Domain, DomainAndRCU. Defaults to Domain.")
23+
@Default(strDefault = "Domain")
2424
private CreateIfNotExists createIfNotExists = CreateIfNotExists.DOMAIN;
2525

2626
@Description("WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF.")

‎operator/src/main/resources/scripts/createDomainOnPV.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ WDT_CONFIGMAP_ROOT="/weblogic-operator/wdt-config-map"
2626

2727
FATAL_JRF_INTROSPECTOR_ERROR_MSG="Domain On PV domain creation encountered an unrecoverable error.
2828
Please correct the errors and patch the domain resource 'domain.spec.introspectVersion' with a new
29-
value and try again. If the domain type requires RCU and you are not setting 'domainAndRCU' in 'domain.spec.configuration.initializeDomainOnPV.domain.createIfNotExists'
29+
value and try again. If the domain type requires RCU and you are not setting 'DomainAndRCU' in 'domain.spec.configuration.initializeDomainOnPV.domain.createIfNotExists'
3030
then you may have to drop and recreate the RCU schema before retry. Introspection Error: "
3131

3232
export WDT_MODEL_SECRETS_DIRS="/weblogic-operator/config-overrides-secrets"
@@ -212,7 +212,7 @@ createDomainFromWDTModel() {
212212

213213
# Determine run rcu or not
214214

215-
if [ "${INIT_DOMAIN_ON_PV}" == "domainAndRCU" ] && [ "$(required_rcu)" == "1" ]; then
215+
if [ "${INIT_DOMAIN_ON_PV}" == "DomainAndRCU" ] && [ "$(required_rcu)" == "1" ]; then
216216
wdtArgs+=" -run_rcu"
217217
fi
218218
trace "About to call '${WDT_BINDIR}/createDomain.sh ${wdtArgs}'."

‎operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainValidationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ void whenDomainTypeWLSAndCreateIfNotExistsDomainAndRCU_initDomainOnPV_reportErro
15191519

15201520
assertThat(domain.getValidationFailures(resourceLookup),
15211521
contains(stringContainsInOrder("spec.configuration.initializeDomainOnPV.domain.createIfNotExists",
1522-
"domainAndRCU", "WLS")));
1522+
"DomainAndRCU", "WLS")));
15231523
}
15241524

15251525
@Test

0 commit comments

Comments
 (0)