Skip to content

Commit 4ca399a

Browse files
committed
And more
1 parent c34a5fd commit 4ca399a

39 files changed

+158
-122
lines changed

kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedTraefikSecurityYaml.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/**
1313
* Parses a generated
14-
* weblogic-domain-traefik-security-inputs.LegalNames.toDNS1123LegalName(getClusterName()).yaml file
14+
* weblogic-domain-traefik-security-inputs.LegalNames.toDns1123LegalName(getClusterName()).yaml file
1515
* into a set of typed k8s java objects
1616
*/
1717
public class ParsedTraefikSecurityYaml extends ParsedKubernetesYaml {
@@ -45,6 +45,6 @@ private String getTraefikScope() {
4545
}
4646

4747
private String getClusterScope() {
48-
return inputs.getDomainUID() + "-" + LegalNames.toDNS1123LegalName(inputs.getClusterName());
48+
return inputs.getDomainUID() + "-" + LegalNames.toDns1123LegalName(inputs.getClusterName());
4949
}
5050
}

kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedTraefikYaml.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/**
1515
* Parses a generated
16-
* weblogic-domain-traefik-inputs.LegalNames.toDNS1123LegalName(getClusterName()).yaml file into a
16+
* weblogic-domain-traefik-inputs.LegalNames.toDns1123LegalName(getClusterName()).yaml file into a
1717
* set of typed k8s java objects
1818
*/
1919
public class ParsedTraefikYaml extends ParsedKubernetesYaml {
@@ -59,6 +59,6 @@ private String getTraefikScope() {
5959
}
6060

6161
private String getClusterScope() {
62-
return inputs.getDomainUID() + "-" + LegalNames.toDNS1123LegalName(inputs.getClusterName());
62+
return inputs.getDomainUID() + "-" + LegalNames.toDns1123LegalName(inputs.getClusterName());
6363
}
6464
}

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public interface DomainProcessorDelegate {
3737
boolean isNamespaceRunning(String namespace);
3838

3939
/**
40-
* Returns the version of the Kubernetes environment in which the operator is running
40+
* Returns the version of the Kubernetes environment in which the operator is running.
4141
*
4242
* @return an object that represents the Kubernetes version
4343
*/
@@ -51,7 +51,7 @@ public interface DomainProcessorDelegate {
5151
FiberGate createFiberGate();
5252

5353
/**
54-
* Runs a chain of steps
54+
* Runs a chain of steps.
5555
*
5656
* @param firstStep the first step to run
5757
*/

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private V1ObjectMeta getMetadata(V1Pod pod) {
180180

181181
public void dispatchServiceWatch(Watch.Response<V1Service> item) {
182182
V1Service service = item.object;
183-
String domainUid = ServiceHelper.getServiceDomainUID(service);
183+
String domainUid = ServiceHelper.getServiceDomainUid(service);
184184
if (domainUid == null) return;
185185

186186
DomainPresenceInfo info =

operator/src/main/java/oracle/kubernetes/operator/Main.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1ServiceList> callRespo
598598

599599
if (result != null) {
600600
for (V1Service service : result.getItems()) {
601-
String domainUid = ServiceHelper.getServiceDomainUID(service);
601+
String domainUid = ServiceHelper.getServiceDomainUid(service);
602602
if (domainUid != null) {
603603
DomainPresenceInfo info =
604604
dpis.computeIfAbsent(domainUid, k -> new DomainPresenceInfo(ns, domainUid));
@@ -671,7 +671,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1PodList> callResponse)
671671

672672
if (result != null) {
673673
for (V1Pod pod : result.getItems()) {
674-
String domainUid = PodHelper.getPodDomainUID(pod);
674+
String domainUid = PodHelper.getPodDomainUid(pod);
675675
String serverName = PodHelper.getPodServerName(pod);
676676
if (domainUid != null && serverName != null) {
677677
DomainPresenceInfo info =

operator/src/main/java/oracle/kubernetes/operator/OperatorReady.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import java.io.File;
88
import java.io.IOException;
99

10-
/** This task creates the "readiness" indicator so that Kubernetes knows the Operator is ready */
10+
/**
11+
* This task creates the "readiness" indicator so that Kubernetes knows the Operator is ready.
12+
*/
1113
public class OperatorReady {
1214

1315
private static final File readinessFile = new File("/operator/.ready");

operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public class ServerStatusReader {
4848
private static KubernetesExecFactory EXEC_FACTORY = new KubernetesExecFactoryImpl();
4949
private static Function<Step, Step> STEP_FACTORY = ReadHealthStep::createReadHealthStep;
5050

51-
private ServerStatusReader() {}
51+
private ServerStatusReader() {
52+
}
5253

5354
static Step createDomainStatusReaderStep(
5455
DomainPresenceInfo info, long timeoutSeconds, Step next) {

operator/src/main/java/oracle/kubernetes/operator/Watcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ private void handleErrorResponse(Watch.Response<T> item) {
201201
// The kubernetes client parsing logic can mistakenly parse a status as a type
202202
// with similar fields, such as V1ConfigMap. In this case, the actual status is
203203
// not available to our layer, so respond defensively by resetting resource version.
204-
resourceVersion = 0l;
204+
resourceVersion = 0L;
205205
} else if (status.getCode() == HTTP_GONE) {
206206
resourceVersion = computeNextResourceVersionFromMessage(status);
207207
}
@@ -221,7 +221,7 @@ private long computeNextResourceVersionFromMessage(V1Status status) {
221221
}
222222
}
223223
}
224-
return 0l;
224+
return 0L;
225225
}
226226

227227
/**

operator/src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ <T> WatchI<T> createWatch(
4747
throws ApiException;
4848
}
4949

50-
public WatchBuilder() {}
50+
public WatchBuilder() {
51+
}
5152

5253
private static Type getType(Class<?> responseBodyType) {
5354
return new ParameterizedType() {

operator/src/main/java/oracle/kubernetes/operator/helpers/ConflictRetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public interface ConflictRetry<T> {
1616

1717
/**
1818
* @return The latest version of the kubernetes object for passing to the kubernetes API, or null
19-
* if the API should not be retried
19+
* if the API should not be retried.
2020
*/
2121
T getUpdatedObject();
2222
}

0 commit comments

Comments
 (0)