Skip to content

Commit 282be5d

Browse files
committed
Remove unnecessary diffs
1 parent f63cf6b commit 282be5d

File tree

3 files changed

+14
-48
lines changed

3 files changed

+14
-48
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ private Step getCallStep(DomainResource oldDomain, DomainStatus status) {
522522
.withMetadata(oldDomain.getMetadata())
523523
.withSpec(null)
524524
.withStatus(status);
525+
525526
return RequestBuilder.DOMAIN.updateStatus(newDomain, DomainResource::getStatus,
526527
domainStatusUpdaterStep.createResponseStep(this));
527528
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import oracle.kubernetes.operator.MakeRightDomainOperation;
3838
import oracle.kubernetes.operator.ProcessingConstants;
3939
import oracle.kubernetes.operator.WebLogicConstants;
40-
import oracle.kubernetes.operator.logging.LoggingFacade;
41-
import oracle.kubernetes.operator.logging.LoggingFactory;
4240
import oracle.kubernetes.operator.logging.ThreadLoggingContext;
4341
import oracle.kubernetes.operator.processing.EffectiveClusterSpec;
4442
import oracle.kubernetes.operator.processing.EffectiveServerSpec;
@@ -68,8 +66,6 @@
6866
* including the scan and the Pods and Services for servers.
6967
*/
7068
public class DomainPresenceInfo extends ResourcePresenceInfo {
71-
public static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
72-
7369
private final String domainUid;
7470
private final AtomicReference<DomainResource> domain;
7571
private final AtomicBoolean isDeleting = new AtomicBoolean(false);

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

Lines changed: 13 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -208,37 +208,6 @@ private static class IntrospectionStartStep extends Step {
208208

209209
}
210210

211-
private static String printJob(V1Job job) {
212-
StringBuilder sb = new StringBuilder();
213-
if (job != null) {
214-
V1ObjectMeta metadata = job.getMetadata();
215-
if (metadata != null) {
216-
sb.append("name: ");
217-
sb.append(metadata.getName());
218-
sb.append(", creation: ");
219-
sb.append(metadata.getCreationTimestamp());
220-
sb.append(", generation: ");
221-
sb.append(metadata.getGeneration());
222-
sb.append(", resourceVersion: ");
223-
sb.append(metadata.getResourceVersion());
224-
} else {
225-
sb.append("no metadata");
226-
}
227-
V1JobSpec spec = job.getSpec();
228-
if (spec != null) {
229-
spec.getTemplate().getSpec().getContainers().forEach(c -> {
230-
sb.append(", image: ");
231-
sb.append(c.getImage());
232-
});
233-
} else {
234-
sb.append("no spec");
235-
}
236-
} else {
237-
sb.append("null");
238-
}
239-
return sb.toString();
240-
}
241-
242211
private static class IntrospectorJobStepContext extends JobStepContext {
243212

244213
IntrospectorJobStepContext(Packet packet) {
@@ -310,7 +279,7 @@ private boolean hasAuxiliaryImageChanged(@Nonnull V1Job job) {
310279

311280
private boolean hasIntrospectVersionChanged(@Nonnull V1Job job) {
312281
return !Objects.equals(getIntrospectVersionLabelFromJob(job),
313-
getIntrospectVersionLabelFromJob(getJobModel()));
282+
getIntrospectVersionLabelFromJob(getJobModel()));
314283
}
315284

316285
String getImageFromJob(V1Job job) {
@@ -327,21 +296,21 @@ Stream<String> getAuxiliaryImagesFromJob(V1Job job) {
327296

328297
Optional<V1PodSpec> getPodSpecFromJob(V1Job job) {
329298
return Optional.ofNullable(job)
330-
.map(V1Job::getSpec)
331-
.map(V1JobSpec::getTemplate)
332-
.map(V1PodTemplateSpec::getSpec);
299+
.map(V1Job::getSpec)
300+
.map(V1JobSpec::getTemplate)
301+
.map(V1PodTemplateSpec::getSpec);
333302
}
334303

335304
@Nullable
336305
String getImageFromPodSpec(@Nonnull V1PodSpec pod) {
337306
return getContainer(pod)
338-
.map(V1Container::getImage)
339-
.orElse(null);
307+
.map(V1Container::getImage)
308+
.orElse(null);
340309
}
341310

342311
Stream<String> getAuxiliaryImagesFromPodSpec(@Nonnull V1PodSpec pod) {
343312
return getAuxiliaryContainers(pod)
344-
.map(V1Container::getImage);
313+
.map(V1Container::getImage);
345314
}
346315

347316
@Nullable
@@ -355,17 +324,17 @@ List<String> getSortedJobModelPodSpecAuxiliaryImages() {
355324

356325
Stream<String> getJobModelPodSpecAuxiliaryImages() {
357326
return Optional.ofNullable(getJobModelPodSpec())
358-
.map(this::getAuxiliaryImagesFromPodSpec)
359-
.orElse(Stream.empty());
327+
.map(this::getAuxiliaryImagesFromPodSpec)
328+
.orElse(Stream.empty());
360329
}
361330

362331
@Nullable
363332
String getIntrospectVersionLabelFromJob(V1Job job) {
364333
return Optional.ofNullable(job)
365-
.map(V1Job::getMetadata)
366-
.map(V1ObjectMeta::getLabels)
367-
.map(m -> m.get(INTROSPECTION_STATE_LABEL))
368-
.orElse(null);
334+
.map(V1Job::getMetadata)
335+
.map(V1ObjectMeta::getLabels)
336+
.map(m -> m.get(INTROSPECTION_STATE_LABEL))
337+
.orElse(null);
369338
}
370339

371340
private boolean isIntrospectionNeeded(Packet packet) {

0 commit comments

Comments
 (0)