Skip to content

Commit 6d2c248

Browse files
authored
Merge pull request #613 from oracle/develop-fix-javadoc
Javadoc fixes
2 parents 8f4e94d + fad4d00 commit 6d2c248

File tree

4 files changed

+120
-4
lines changed

4 files changed

+120
-4
lines changed

model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,57 @@ ClusterConfigurator withReadinessProbeSettings(
2828
ClusterConfigurator withLivenessProbeSettings(
2929
Integer initialDelay, Integer timeout, Integer period);
3030

31+
/**
32+
* Add a node label to the Cluster's node selector
33+
*
34+
* @param labelKey the pod label key
35+
* @param labelValue the pod label value
36+
* @return this object
37+
*/
3138
ClusterConfigurator withNodeSelector(String labelKey, String labelValue);
3239

40+
/**
41+
* Add a resource requirement at cluster level. The requests for memory are measured in bytes. You
42+
* can express memory as a plain integer or as a fixed-point integer using one of these suffixes:
43+
* E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
44+
* requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
45+
* same as 0.1
46+
*
47+
* @param resource the resource to be added as requirement cpu or memory
48+
* @param quantity the quantity required for the resource
49+
* @return this object
50+
*/
3351
ClusterConfigurator withRequestRequirement(String resource, String quantity);
3452

53+
/**
54+
* Add a resource limit at cluster level, the requests for memory are measured in bytes. You can
55+
* express memory as a plain integer or as a fixed-point integer using one of these suffixes: E,
56+
* P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
57+
* requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
58+
* same as 0.1
59+
*
60+
* @param resource the resource to be added as requirement cpu or memory
61+
* @param quantity the quantity required for the resource
62+
* @return this object
63+
*/
3564
ClusterConfigurator withLimitRequirement(String resource, String quantity);
3665

66+
/**
67+
* Add security constraints at container level, if the same constraint is also defined at pod
68+
* level then container constraint take precedence
69+
*
70+
* @param containerSecurityContext the security context object
71+
* @return this object
72+
*/
3773
ClusterConfigurator withContainerSecurityContext(V1SecurityContext containerSecurityContext);
3874

75+
/**
76+
* Add security constraints at container level, if the same constraint is also defined at pod
77+
* level then container constraint take precedence
78+
*
79+
* @param podSecurityContext
80+
* @return this object
81+
*/
3982
ClusterConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext);
4083

4184
ClusterConfigurator withAdditionalVolume(String name, String path);
@@ -50,5 +93,17 @@ ClusterConfigurator withLivenessProbeSettings(
5093

5194
ClusterConfigurator withServiceAnnotation(String name, String value);
5295

96+
/**
97+
* Tells the operator whether the customer wants to restart the server pods. The value can be any
98+
* String and it can be defined on domain, cluster or server to restart the different pods. After
99+
* the value is added, the corresponding pods will be terminated and created again. If customer
100+
* modifies the value again after the pods were recreated, then the pods will again be terminated
101+
* and recreated.
102+
*
103+
* @since 2.0
104+
* @param restartVersion If preseent, every time this value is updated the operator will restart
105+
* the required servers
106+
* @return this object
107+
*/
53108
ClusterConfigurator withRestartVersion(String restartVersion);
54109
}

model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,15 @@ public abstract DomainConfigurator withPodSecurityContext(
267267
V1PodSecurityContext podSecurityContext);
268268

269269
/**
270-
* Set the restart version for the Domain
270+
* Tells the operator whether the customer wants to restart the server pods. The value can be any
271+
* String and it can be defined on domain, cluster or server to restart the different pods. After
272+
* the value is added, the corresponding pods will be terminated and created again. If customer
273+
* modifies the value again after the pods were recreated, then the pods will again be terminated
274+
* and recreated.
271275
*
272-
* @param restartVersion
276+
* @since 2.0
277+
* @param restartVersion If preseent, every time this value is updated the operator will restart
278+
* the required servers
273279
* @return this object
274280
*/
275281
public abstract DomainConfigurator withRestartVersion(String restartVersion);

model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,57 @@ ServerConfigurator withLivenessProbeSettings(
2424
ServerConfigurator withReadinessProbeSettings(
2525
Integer initialDelay, Integer timeout, Integer period);
2626

27+
/**
28+
* Add a node label to the Servers's node selector
29+
*
30+
* @param labelKey the pod label key
31+
* @param labelValue the pod label value
32+
* @return this object
33+
*/
2734
ServerConfigurator withNodeSelector(String labelKey, String labelValue);
2835

36+
/**
37+
* Add a resource requirement at server level. The requests for memory are measured in bytes. You
38+
* can express memory as a plain integer or as a fixed-point integer using one of these suffixes:
39+
* E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
40+
* requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
41+
* same as 0.1
42+
*
43+
* @param resource the resource to be added as requirement cpu or memory
44+
* @param quantity the quantity required for the resource
45+
* @return this object
46+
*/
2947
ServerConfigurator withRequestRequirement(String resource, String quantity);
3048

49+
/**
50+
* Add a resource limit at server level, the requests for memory are measured in bytes. You can
51+
* express memory as a plain integer or as a fixed-point integer using one of these suffixes: E,
52+
* P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
53+
* requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
54+
* same as 0.1
55+
*
56+
* @param resource the resource to be added as requirement cpu or memory
57+
* @param quantity the quantity required for the resource
58+
* @return this object
59+
*/
3160
ServerConfigurator withLimitRequirement(String resource, String quantity);
3261

62+
/**
63+
* Add security constraints at container level, if the same constraint is also defined at pod
64+
* level then container constraint take precedence
65+
*
66+
* @param containerSecurityContext the security context object
67+
* @return this object
68+
*/
3369
ServerConfigurator withContainerSecurityContext(V1SecurityContext containerSecurityContext);
3470

71+
/**
72+
* Add security constraints at container level, if the same constraint is also defined at pod
73+
* level then container constraint take precedence
74+
*
75+
* @param podSecurityContext
76+
* @return this object
77+
*/
3578
ServerConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext);
3679

3780
ServerConfigurator withAdditionalVolume(String name, String path);
@@ -46,5 +89,17 @@ ServerConfigurator withReadinessProbeSettings(
4689

4790
ServerConfigurator withServiceAnnotation(String name, String value);
4891

92+
/**
93+
* Tells the operator whether the customer wants to restart the server pods. The value can be any
94+
* String and it can be defined on domain, cluster or server to restart the different pods. After
95+
* the value is added, the corresponding pods will be terminated and created again. If customer
96+
* modifies the value again after the pods were recreated, then the pods will again be terminated
97+
* and recreated.
98+
*
99+
* @since 2.0
100+
* @param restartVersion If preseent, every time this value is updated the operator will restart
101+
* the required servers
102+
* @return this object
103+
*/
49104
ServerConfigurator withRestartVersion(String restartVersion);
50105
}

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ void addServiceAnnotations(String name, String value) {
219219
serverPod.addServiceAnnotations(name, value);
220220
}
221221

222-
public String getRestartVersion() {
222+
String getRestartVersion() {
223223
return restartVersion;
224224
}
225225

226-
public void setRestartVersion(String restartVersion) {
226+
void setRestartVersion(String restartVersion) {
227227
this.restartVersion = restartVersion;
228228
}
229229

0 commit comments

Comments
 (0)