Skip to content

Commit 63c5519

Browse files
rjeberhardrjeberhard
committed
Version update and Javadoc fixes
1 parent 8d890db commit 63c5519

File tree

15 files changed

+59
-53
lines changed

15 files changed

+59
-53
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN mkdir /operator/lib
2020
ENV PATH=$PATH:/operator
2121

2222
COPY src/scripts/* /operator/
23-
COPY operator/target/weblogic-kubernetes-operator-1.0.jar /operator/weblogic-kubernetes-operator.jar
23+
COPY operator/target/weblogic-kubernetes-operator-1.1.jar /operator/weblogic-kubernetes-operator.jar
2424
COPY operator/target/lib/*.jar /operator/lib/
2525

2626
HEALTHCHECK --interval=1m --timeout=10s \

‎integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<parent>
99
<groupId>oracle.kubernetes</groupId>
1010
<artifactId>operator-parent</artifactId>
11-
<version>1.0</version>
11+
<version>1.1</version>
1212
</parent>
1313

1414
<groupId>oracle.kubernetes</groupId>
1515
<artifactId>operator-integration-tests</artifactId>
16-
<version>1.0</version>
16+
<version>1.1</version>
1717

1818
<description>Oracle Weblogic Server Kubernetes Operator</description>
1919
<name>operator-integration-tests</name>

‎model/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>oracle.kubernetes</groupId>
9-
<artifactId>operator-parent</artifactId>
10-
<version>1.0</version>
11-
</parent>
7+
<parent>
8+
<groupId>oracle.kubernetes</groupId>
9+
<artifactId>operator-parent</artifactId>
10+
<version>1.1</version>
11+
</parent>
1212

1313
<groupId>oracle.kubernetes</groupId>
1414
<artifactId>operator-model</artifactId>
15-
<version>1.0</version>
15+
<version>1.1</version>
1616

1717
<description>Oracle Weblogic Server Kubernetes Operator</description>
1818
<name>operator-model</name>

‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/Cluster.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public Map<String, ClusteredServer> getServers() {
8585
* <li>If not, then use the default value for the property.
8686
* </ol>
8787
*
88-
* @param clusters clusters
88+
* @param servers servers
8989
*/
9090
public void setServers(Map<String, ClusteredServer> servers) {
9191
this.servers = servers;
@@ -110,7 +110,7 @@ public void setServers(Map<String, ClusteredServer> servers) {
110110
* <li>If not, then use the default value for the property.
111111
* </ol>
112112
*
113-
* @param clusters clusters
113+
* @param servers servers
114114
* @return this
115115
*/
116116
public Cluster withServers(Map<String, ClusteredServer> servers) {
@@ -137,8 +137,8 @@ public Cluster withServers(Map<String, ClusteredServer> servers) {
137137
* <li>If not, then use the default value for the property.
138138
* </ol>
139139
*
140-
* @param name cluster name
141-
* @param cluster cluster
140+
* @param name server name
141+
* @param server server
142142
*/
143143
public void setServer(String name, ClusteredServer server) {
144144
this.servers.put(name, server);
@@ -164,7 +164,7 @@ public void setServer(String name, ClusteredServer server) {
164164
* </ol>
165165
*
166166
* @param name name
167-
* @param cluster cluster
167+
* @param server server
168168
* @return this
169169
*/
170170
public Cluster withServer(String name, ClusteredServer server) {

‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ public Map<String, NonClusteredServer> getServers() {
788788
* <li>If not, then use the default value for the property.
789789
* </ol>
790790
*
791-
* @param clusters clusters
791+
* @param servers servers
792792
*/
793793
public void setServers(Map<String, NonClusteredServer> servers) {
794794
this.servers = servers;
@@ -809,7 +809,7 @@ public void setServers(Map<String, NonClusteredServer> servers) {
809809
* <li>If not, then use the default value for the property.
810810
* </ol>
811811
*
812-
* @param clusters clusters
812+
* @param servers servers
813813
* @return this
814814
*/
815815
public DomainSpec withServers(Map<String, NonClusteredServer> servers) {
@@ -833,7 +833,7 @@ public DomainSpec withServers(Map<String, NonClusteredServer> servers) {
833833
* </ol>
834834
*
835835
* @param name cluster name
836-
* @param cluster cluster
836+
* @param server server
837837
*/
838838
public void setServer(String name, NonClusteredServer server) {
839839
this.servers.put(name, server);
@@ -855,7 +855,7 @@ public void setServer(String name, NonClusteredServer server) {
855855
* </ol>
856856
*
857857
* @param name name
858-
* @param cluster cluster
858+
* @param server server
859859
* @return this
860860
*/
861861
public DomainSpec withServer(String name, NonClusteredServer server) {
@@ -924,7 +924,7 @@ public Map<String, Cluster> getClusters() {
924924
* <li>If not, then use the default value for the property.
925925
* </ol>
926926
*
927-
* @param servers servers
927+
* @param clusters clusters
928928
*/
929929
public void setClusters(Map<String, Cluster> clusters) {
930930
this.clusters = clusters;
@@ -943,7 +943,7 @@ public void setClusters(Map<String, Cluster> clusters) {
943943
* <li>If not, then use the default value for the property.
944944
* </ol>
945945
*
946-
* @param servers servers
946+
* @param clusters clusters
947947
* @return this
948948
*/
949949
public DomainSpec withClusters(Map<String, Cluster> clusters) {
@@ -965,7 +965,7 @@ public DomainSpec withClusters(Map<String, Cluster> clusters) {
965965
* </ol>
966966
*
967967
* @param name server name
968-
* @param server server
968+
* @param cluster cluster
969969
*/
970970
public void setCluster(String name, Cluster cluster) {
971971
this.clusters.put(name, cluster);
@@ -985,7 +985,7 @@ public void setCluster(String name, Cluster cluster) {
985985
* </ol>
986986
*
987987
* @param name name
988-
* @param server server
988+
* @param cluster cluster
989989
* @return this
990990
*/
991991
public DomainSpec withCluster(String name, Cluster cluster) {

‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/Server.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ public void setNodePort(Integer nodePort) {
309309
* <p>By default, the server will not be exposed outside the Kubernetes cluster.
310310
*
311311
* @param nodePort node port
312+
* @return this
312313
*/
313314
public Server withNodePort(Integer nodePort) {
314315
this.nodePort = nodePort;
@@ -443,7 +444,7 @@ public List<V1LocalObjectReference> getImagePullSecrets() {
443444
* An optional list of references to secrets in the same namespace to use for pulling the WebLogic
444445
* Docker image.
445446
*
446-
* @param image pull secrets
447+
* @param imagePullSecrets image pull secrets
447448
*/
448449
public void setImagePullSecrets(List<V1LocalObjectReference> imagePullSecrets) {
449450
this.imagePullSecrets = imagePullSecrets;
@@ -453,7 +454,7 @@ public void setImagePullSecrets(List<V1LocalObjectReference> imagePullSecrets) {
453454
* An optional list of references to secrets in the same namespace to use for pulling the WebLogic
454455
* Docker image.
455456
*
456-
* @param image pull secrets
457+
* @param imagePullSecrets image pull secrets
457458
* @return this
458459
*/
459460
public Server withImagePullSecrets(List<V1LocalObjectReference> imagePullSecrets) {
@@ -555,7 +556,7 @@ public Boolean getGracefulShutdownIgnoreSessions() {
555556
*
556557
* <p>Defaults to false.
557558
*
558-
* @parama gracefulShutdownIgnoreSessions graceful shutdown ignore sessions
559+
* @param gracefulShutdownIgnoreSessions graceful shutdown ignore sessions
559560
*/
560561
public void setGracefulShutdownIgnoreSessions(Boolean gracefulShutdownIgnoreSessions) {
561562
this.gracefulShutdownIgnoreSessions = gracefulShutdownIgnoreSessions;
@@ -567,7 +568,7 @@ public void setGracefulShutdownIgnoreSessions(Boolean gracefulShutdownIgnoreSess
567568
*
568569
* <p>Defaults to false.
569570
*
570-
* @parama gracefulShutdownIgnoreSessions graceful shutdown ignore sessions
571+
* @param gracefulShutdownIgnoreSessions graceful shutdown ignore sessions
571572
* @return this
572573
*/
573574
public Server withGracefulShutdownIgnoreSessions(Boolean gracefulShutdownIgnoreSessions) {

‎operator/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>oracle.kubernetes</groupId>
9-
<artifactId>operator-parent</artifactId>
10-
<version>1.0</version>
11-
</parent>
7+
<parent>
8+
<groupId>oracle.kubernetes</groupId>
9+
<artifactId>operator-parent</artifactId>
10+
<version>1.1</version>
11+
</parent>
1212

13+
<groupId>oracle.kubernetes</groupId>
1314
<artifactId>weblogic-kubernetes-operator</artifactId>
15+
<version>1.1</version>
1416

1517
<description>Oracle Weblogic Server Kubernetes Operator</description>
1618
<name>operator-runtime</name>

‎operator/src/main/java/oracle/kubernetes/operator/helpers/ClusterConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ClusterConfig {
1717
private int maxReplicas;
1818
private int minReplicas;
1919
private String clusterName;
20-
private Map<String, ClusteredServerConfig> servers = new HashMap();
20+
private Map<String, ClusteredServerConfig> servers = new HashMap<>();
2121

2222
/**
2323
* Gets cluster's name.
@@ -92,7 +92,7 @@ public int getMinReplicas() {
9292
*
9393
* @param minReplicas min replicas
9494
*/
95-
public void setMinReplicas(int replicas) {
95+
public void setMinReplicas(int minReplicas) {
9696
this.minReplicas = minReplicas;
9797
}
9898

@@ -122,7 +122,7 @@ public int getMaxReplicas() {
122122
*
123123
* @param maxReplicas max replicas
124124
*/
125-
public void setMaxReplicas(int replicas) {
125+
public void setMaxReplicas(int maxReplicas) {
126126
this.maxReplicas = maxReplicas;
127127
}
128128

‎operator/src/main/java/oracle/kubernetes/operator/helpers/DomainConfig.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
/** DomainConfig describes the desired state of a domain. */
1414
public class DomainConfig {
1515

16-
private Map<String, NonClusteredServerConfig> servers = new HashMap();
17-
private Map<String, ClusterConfig> clusters = new HashMap();
16+
private Map<String, NonClusteredServerConfig> servers = new HashMap<>();
17+
private Map<String, ClusterConfig> clusters = new HashMap<>();
1818

1919
/**
2020
* Gets the configurations of the non-clustered servers in this domain.
@@ -59,6 +59,7 @@ public void setServer(String serverName, NonClusteredServerConfig server) {
5959
* Sets the configuration of a non-clustered server in this domain.
6060
*
6161
* @param serverName server name
62+
* @param server server
6263
* @return this
6364
*/
6465
public DomainConfig withServer(String serverName, NonClusteredServerConfig server) {
@@ -90,7 +91,7 @@ public void setClusters(Map<String, ClusterConfig> clusters) {
9091
* @param clusters clusters
9192
* @return this
9293
*/
93-
public DomainConfig withClusters(Map<String, ClusterConfig> servers) {
94+
public DomainConfig withClusters(Map<String, ClusterConfig> clusters) {
9495
this.clusters = clusters;
9596
return this;
9697
}

‎operator/src/main/java/oracle/kubernetes/operator/helpers/HealthCheckHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ private HealthCheckHelper() {}
106106
* Verify Access.
107107
*
108108
* @param version Kubernetes version
109+
* @param operatorNamespace operator namespace
110+
* @param ns target namespace
109111
*/
110112
public static void performSecurityChecks(
111113
KubernetesVersion version, String operatorNamespace, String ns) {

0 commit comments

Comments
 (0)