Skip to content

Commit aff6458

Browse files
committed
Merge branch 'master' of https://github.com/kubernetes-client/java into metrics-label-selector
2 parents e614ea8 + 4534922 commit aff6458

File tree

2,407 files changed

+172917
-93130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,407 files changed

+172917
-93130
lines changed

examples/examples-release-20/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.amazonaws</groupId>
6565
<artifactId>aws-java-sdk-sts</artifactId>
66-
<version>1.12.788</version>
66+
<version>1.12.791</version>
6767
</dependency>
6868

6969
</dependencies>

fluent/src/main/java/io/kubernetes/client/fluent/Visitable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public void visit(V element) {
3131
});
3232
}
3333

34-
default T accept(io.kubernetes.client.fluent.Visitor... visitors) {
34+
default T accept(Visitor... visitors) {
3535
return accept(Collections.emptyList(), visitors);
3636
}
3737

38-
default T accept(List<Entry<String,Object>> path,io.kubernetes.client.fluent.Visitor... visitors) {
38+
default T accept(List<Entry<String,Object>> path,Visitor... visitors) {
3939
return accept(path, "", visitors);
4040
}
4141

42-
default T accept(List<Entry<String,Object>> path,String currentKey,io.kubernetes.client.fluent.Visitor... visitors) {
42+
default T accept(List<Entry<String,Object>> path,String currentKey,Visitor... visitors) {
4343
List<Visitor> sortedVisitor = new ArrayList<>();
4444
for (Visitor visitor : visitors) {
4545
visitor = VisitorListener.wrap(visitor);

fluent/src/main/java/io/kubernetes/client/fluent/Visitors.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private static Class<?> getClass(Type type) {
101101
}
102102
}
103103

104-
private static <T>Optional<Type> getMatchingInterface(Class<?> targetInterface,java.lang.reflect.Type... candidates) {
104+
private static <T>Optional<Type> getMatchingInterface(Class<?> targetInterface,Type... candidates) {
105105
if (candidates == null || candidates.length == 0) {
106106
return Optional.empty();
107107
}

fluent/src/main/java/io/kubernetes/client/openapi/models/AbstractOpenApiSchemaFluent.java

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package io.kubernetes.client.openapi.models;
22

3+
import java.lang.StringBuilder;
34
import java.lang.SuppressWarnings;
45
import io.kubernetes.client.fluent.BaseFluent;
6+
import java.util.Objects;
57
import java.lang.Object;
68
import java.lang.String;
79
import java.lang.Boolean;
@@ -10,7 +12,7 @@
1012
* Generated
1113
*/
1214
@SuppressWarnings("unchecked")
13-
public class AbstractOpenApiSchemaFluent<A extends AbstractOpenApiSchemaFluent<A>> extends BaseFluent<A>{
15+
public class AbstractOpenApiSchemaFluent<A extends io.kubernetes.client.openapi.models.AbstractOpenApiSchemaFluent<A>> extends BaseFluent<A>{
1416
public AbstractOpenApiSchemaFluent() {
1517
}
1618

@@ -22,8 +24,8 @@ public AbstractOpenApiSchemaFluent(AbstractOpenApiSchema instance) {
2224

2325
protected void copyInstance(AbstractOpenApiSchema instance) {
2426
if (instance != null) {
25-
this.withSchemaType(instance.getSchemaType());
26-
}
27+
this.withSchemaType(instance.getSchemaType());
28+
}
2729
}
2830

2931
public Boolean getIsNullable() {
@@ -53,24 +55,41 @@ public boolean hasSchemaType() {
5355
}
5456

5557
public boolean equals(Object o) {
56-
if (this == o) return true;
57-
if (o == null || getClass() != o.getClass()) return false;
58-
if (!super.equals(o)) return false;
58+
if (this == o) {
59+
return true;
60+
}
61+
if (o == null || this.getClass() != o.getClass()) {
62+
return false;
63+
}
64+
if (!(super.equals(o))) {
65+
return false;
66+
}
5967
AbstractOpenApiSchemaFluent that = (AbstractOpenApiSchemaFluent) o;
60-
if (!java.util.Objects.equals(isNullable, that.isNullable)) return false;
61-
if (!java.util.Objects.equals(schemaType, that.schemaType)) return false;
68+
if (!(Objects.equals(isNullable, that.isNullable))) {
69+
return false;
70+
}
71+
if (!(Objects.equals(schemaType, that.schemaType))) {
72+
return false;
73+
}
6274
return true;
6375
}
6476

6577
public int hashCode() {
66-
return java.util.Objects.hash(isNullable, schemaType, super.hashCode());
78+
return Objects.hash(isNullable, schemaType);
6779
}
6880

6981
public String toString() {
7082
StringBuilder sb = new StringBuilder();
7183
sb.append("{");
72-
if (isNullable != null) { sb.append("isNullable:"); sb.append(isNullable + ","); }
73-
if (schemaType != null) { sb.append("schemaType:"); sb.append(schemaType); }
84+
if (!(isNullable == null)) {
85+
sb.append("isNullable:");
86+
sb.append(isNullable);
87+
sb.append(",");
88+
}
89+
if (!(schemaType == null)) {
90+
sb.append("schemaType:");
91+
sb.append(schemaType);
92+
}
7493
sb.append("}");
7594
return sb.toString();
7695
}

fluent/src/main/java/io/kubernetes/client/openapi/models/AdmissionregistrationV1ServiceReferenceBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.kubernetes.client.openapi.models;
22

33
import io.kubernetes.client.fluent.VisitableBuilder;
4+
import java.lang.Object;
45
public class AdmissionregistrationV1ServiceReferenceBuilder extends AdmissionregistrationV1ServiceReferenceFluent<AdmissionregistrationV1ServiceReferenceBuilder> implements VisitableBuilder<AdmissionregistrationV1ServiceReference,AdmissionregistrationV1ServiceReferenceBuilder>{
56
public AdmissionregistrationV1ServiceReferenceBuilder() {
67
this(new AdmissionregistrationV1ServiceReference());

fluent/src/main/java/io/kubernetes/client/openapi/models/AdmissionregistrationV1ServiceReferenceFluent.java

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package io.kubernetes.client.openapi.models;
22

33
import java.lang.Integer;
4+
import java.lang.StringBuilder;
45
import java.lang.SuppressWarnings;
56
import io.kubernetes.client.fluent.BaseFluent;
7+
import java.util.Objects;
68
import java.lang.Object;
79
import java.lang.String;
810

911
/**
1012
* Generated
1113
*/
1214
@SuppressWarnings("unchecked")
13-
public class AdmissionregistrationV1ServiceReferenceFluent<A extends AdmissionregistrationV1ServiceReferenceFluent<A>> extends BaseFluent<A>{
15+
public class AdmissionregistrationV1ServiceReferenceFluent<A extends io.kubernetes.client.openapi.models.AdmissionregistrationV1ServiceReferenceFluent<A>> extends BaseFluent<A>{
1416
public AdmissionregistrationV1ServiceReferenceFluent() {
1517
}
1618

@@ -23,13 +25,13 @@ public AdmissionregistrationV1ServiceReferenceFluent(AdmissionregistrationV1Serv
2325
private Integer port;
2426

2527
protected void copyInstance(AdmissionregistrationV1ServiceReference instance) {
26-
instance = (instance != null ? instance : new AdmissionregistrationV1ServiceReference());
28+
instance = instance != null ? instance : new AdmissionregistrationV1ServiceReference();
2729
if (instance != null) {
28-
this.withName(instance.getName());
29-
this.withNamespace(instance.getNamespace());
30-
this.withPath(instance.getPath());
31-
this.withPort(instance.getPort());
32-
}
30+
this.withName(instance.getName());
31+
this.withNamespace(instance.getNamespace());
32+
this.withPath(instance.getPath());
33+
this.withPort(instance.getPort());
34+
}
3335
}
3436

3537
public String getName() {
@@ -85,28 +87,57 @@ public boolean hasPort() {
8587
}
8688

8789
public boolean equals(Object o) {
88-
if (this == o) return true;
89-
if (o == null || getClass() != o.getClass()) return false;
90-
if (!super.equals(o)) return false;
90+
if (this == o) {
91+
return true;
92+
}
93+
if (o == null || this.getClass() != o.getClass()) {
94+
return false;
95+
}
96+
if (!(super.equals(o))) {
97+
return false;
98+
}
9199
AdmissionregistrationV1ServiceReferenceFluent that = (AdmissionregistrationV1ServiceReferenceFluent) o;
92-
if (!java.util.Objects.equals(name, that.name)) return false;
93-
if (!java.util.Objects.equals(namespace, that.namespace)) return false;
94-
if (!java.util.Objects.equals(path, that.path)) return false;
95-
if (!java.util.Objects.equals(port, that.port)) return false;
100+
if (!(Objects.equals(name, that.name))) {
101+
return false;
102+
}
103+
if (!(Objects.equals(namespace, that.namespace))) {
104+
return false;
105+
}
106+
if (!(Objects.equals(path, that.path))) {
107+
return false;
108+
}
109+
if (!(Objects.equals(port, that.port))) {
110+
return false;
111+
}
96112
return true;
97113
}
98114

99115
public int hashCode() {
100-
return java.util.Objects.hash(name, namespace, path, port, super.hashCode());
116+
return Objects.hash(name, namespace, path, port);
101117
}
102118

103119
public String toString() {
104120
StringBuilder sb = new StringBuilder();
105121
sb.append("{");
106-
if (name != null) { sb.append("name:"); sb.append(name + ","); }
107-
if (namespace != null) { sb.append("namespace:"); sb.append(namespace + ","); }
108-
if (path != null) { sb.append("path:"); sb.append(path + ","); }
109-
if (port != null) { sb.append("port:"); sb.append(port); }
122+
if (!(name == null)) {
123+
sb.append("name:");
124+
sb.append(name);
125+
sb.append(",");
126+
}
127+
if (!(namespace == null)) {
128+
sb.append("namespace:");
129+
sb.append(namespace);
130+
sb.append(",");
131+
}
132+
if (!(path == null)) {
133+
sb.append("path:");
134+
sb.append(path);
135+
sb.append(",");
136+
}
137+
if (!(port == null)) {
138+
sb.append("port:");
139+
sb.append(port);
140+
}
110141
sb.append("}");
111142
return sb.toString();
112143
}

fluent/src/main/java/io/kubernetes/client/openapi/models/AdmissionregistrationV1WebhookClientConfigBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.kubernetes.client.openapi.models;
22

33
import io.kubernetes.client.fluent.VisitableBuilder;
4+
import java.lang.Object;
45
public class AdmissionregistrationV1WebhookClientConfigBuilder extends AdmissionregistrationV1WebhookClientConfigFluent<AdmissionregistrationV1WebhookClientConfigBuilder> implements VisitableBuilder<AdmissionregistrationV1WebhookClientConfig,AdmissionregistrationV1WebhookClientConfigBuilder>{
56
public AdmissionregistrationV1WebhookClientConfigBuilder() {
67
this(new AdmissionregistrationV1WebhookClientConfig());

0 commit comments

Comments
 (0)