Skip to content

Commit 5965990

Browse files
doxiaodoxiao
authored
Various code cleanup (#3551)
* Code cleanup * Enabled disabled unit test cases * Fix some IntelliJ warnings
1 parent 6bd6f7f commit 5965990

26 files changed

+76
-93
lines changed

‎operator/src/main/java/oracle/kubernetes/operator/CoreDelegateImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
public class CoreDelegateImpl implements CoreDelegate {
3131

32-
protected String buildVersion;
33-
protected SemanticVersion productVersion;
34-
protected KubernetesVersion kubernetesVersion;
35-
protected Engine engine;
32+
protected final String buildVersion;
33+
protected final SemanticVersion productVersion;
34+
protected final KubernetesVersion kubernetesVersion;
35+
protected final Engine engine;
3636
protected final String deploymentImpl;
3737
protected final String deploymentBuildTime;
3838

‎operator/src/main/java/oracle/kubernetes/operator/WebhookMain.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class WebhookMain extends BaseMain {
4141

4242
private final WebhookMainDelegate conversionWebhookMainDelegate;
4343
private boolean warnedOfCrdAbsence;
44-
private AtomicInteger crdPresenceCheckCount = new AtomicInteger(0);
44+
private final AtomicInteger crdPresenceCheckCount = new AtomicInteger(0);
4545
private final RestConfig restConfig = new RestConfigImpl(new Certificates(delegate));
4646
@SuppressWarnings({"FieldMayBeFinal", "CanBeFinal"})
4747
private static NextStepFactory nextStepFactory = WebhookMain::createInitializeWebhookIdentityStep;

‎operator/src/main/java/oracle/kubernetes/operator/authentication/Helpers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected V1ServiceAccount findServiceAccount(String serviceAccountName, String
9898
*/
9999
protected V1ServiceAccountList getAllServiceAccounts() throws ApiException {
100100

101-
V1ServiceAccountList serviceAccountList = null;
101+
V1ServiceAccountList serviceAccountList;
102102

103103
String cont = "";
104104

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_INIT_CONTAINER_NAME_PREFIX;
3636
import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_INIT_CONTAINER_WRAPPER_SCRIPT;
3737
import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_TARGET_PATH;
38+
import static oracle.kubernetes.common.CommonConstants.COMPATIBILITY_MODE;
3839
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_MOUNTS_PATH;
3940
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_VOLUME;
4041
import static oracle.kubernetes.common.helpers.AuxiliaryImageEnvVars.AUXILIARY_IMAGE_PATHS;
@@ -161,6 +162,17 @@ protected List<V1EnvVar> createEnv(AuxiliaryImage auxiliaryImage, String name) {
161162
return vars;
162163
}
163164

165+
protected List<V1EnvVar> createEnv(V1Container c) {
166+
List<V1EnvVar> initContainerEnvVars = new ArrayList<>();
167+
Optional.ofNullable(c.getEnv()).ifPresent(initContainerEnvVars::addAll);
168+
if (!c.getName().startsWith(COMPATIBILITY_MODE)) {
169+
getEnvironmentVariables()
170+
.forEach(envVar -> addIfMissing(initContainerEnvVars,
171+
envVar.getName(), envVar.getValue(), envVar.getValueFrom()));
172+
}
173+
return initContainerEnvVars;
174+
}
175+
164176
protected V1ResourceRequirements createResources() {
165177
V1ResourceRequirements resources = getServerSpec().getResources();
166178
V1ResourceRequirements resourceRequirements = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ private List<ClusterResource> getClusters(Packet packet) {
265265
.or(() -> Optional.ofNullable((List<ClusterResource>) packet.get(CLUSTERS))).orElse(Collections.emptyList());
266266
}
267267

268+
@SuppressWarnings("unchecked")
268269
private List<ClusterResource> getClustersInNamespace(Packet packet) {
269270
return Optional.ofNullable((List<ClusterResource>) packet.get(CLUSTERS)).orElse(Collections.emptyList());
270271
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ private void clearNamespaceStartingFlag() {
271271
}
272272

273273
private class ReplaceEventResponseStep extends ResponseStep<CoreV1Event> {
274-
Step replaceEventStep;
275-
CoreV1Event existingEvent;
274+
final Step replaceEventStep;
275+
final CoreV1Event existingEvent;
276276

277277
ReplaceEventResponseStep(Step replaceEventStep, CoreV1Event existingEvent, Step next) {
278278
super(next);
@@ -1202,8 +1202,8 @@ public NextAction onSuccess(Packet packet, CallResponse<CoreV1Event> callRespons
12021202
}
12031203

12041204
private class ReplaceClusterResourceEventResponseStep extends ResponseStep<CoreV1Event> {
1205-
Step replaceClusterEventStep;
1206-
CoreV1Event existingClusterEvent;
1205+
final Step replaceClusterEventStep;
1206+
final CoreV1Event existingClusterEvent;
12071207

12081208
ReplaceClusterResourceEventResponseStep(Step replaceClusterEventStep, CoreV1Event existingClusterEvent,
12091209
Step next) {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,7 @@ private static void addFluentdContainerEnvItem(FluentdSpecification fluentdSpeci
268268
private static void addFluentdContainerELSCredEnv(FluentdSpecification fluentdSpecification,
269269
V1Container fluentdContainer, String envName, String keyName) {
270270
if (!hasFluentdContainerEnv(fluentdSpecification, envName)) {
271-
boolean isOptional = false;
272-
if (envName.equals("ELASTICSEARCH_USER") || envName.equals("ELASTICSEARCH_PASSWORD")) {
273-
isOptional = true;
274-
}
271+
boolean isOptional = envName.equals("ELASTICSEARCH_USER") || envName.equals("ELASTICSEARCH_PASSWORD");
275272
V1SecretKeySelector keySelector = new V1SecretKeySelector()
276273
.key(keyName)
277274
.optional(isOptional)

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,17 +384,6 @@ private void addInitContainers(List<V1Container> initContainers, List<AuxiliaryI
384384
initContainers.add(createInitContainerForAuxiliaryImage(auxiliaryImages.get(idx), idx)));
385385
}
386386

387-
protected List<V1EnvVar> createEnv(V1Container c) {
388-
List<V1EnvVar> initContainerEnvVars = new ArrayList<>();
389-
Optional.ofNullable(c.getEnv()).ifPresent(initContainerEnvVars::addAll);
390-
if (!c.getName().startsWith(COMPATIBILITY_MODE)) {
391-
getEnvironmentVariables()
392-
.forEach(envVar -> addIfMissing(initContainerEnvVars,
393-
envVar.getName(), envVar.getValue(), envVar.getValueFrom()));
394-
}
395-
return initContainerEnvVars;
396-
}
397-
398387
@Override
399388
protected V1PodSpec createPodSpec() {
400389
V1PodSpec podSpec = super.createPodSpec()
@@ -431,7 +420,7 @@ protected V1PodSpec createPodSpec() {
431420
addWdtSecretVolume(podSpec);
432421
}
433422

434-
if (podSpec.getAffinity().equals(getDefaultAntiAffinity())) {
423+
if (getDefaultAntiAffinity().equals(podSpec.getAffinity())) {
435424
podSpec.affinity(null);
436425
}
437426
return podSpec;

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

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public abstract class PodStepContext extends BasePodStepContext {
115115
private static final String LIVENESS_PROBE = "/weblogic-operator/scripts/livenessProbe.sh";
116116

117117
private static final String READINESS_PATH = "/weblogic/ready";
118+
private static final String WLS_EXPORTER = "/wls-exporter";
118119

119120
private static String productVersion;
120121
protected final ExporterContext exporterContext;
@@ -271,12 +272,6 @@ Integer getLocalAdminProtocolChannelPort() {
271272
.getLocalAdminProtocolChannelPort();
272273
}
273274

274-
boolean isDomainWideAdminPortEnabled() {
275-
return domainTopology
276-
.getServerConfig(domainTopology.getAdminServerName())
277-
.isAdminPortEnabled();
278-
}
279-
280275
private String getDataHome() {
281276
String dataHome = getDomain().getDataHome();
282277
return dataHome != null && !dataHome.isEmpty() ? dataHome + File.separator + getDomainUid() : null;
@@ -493,7 +488,7 @@ private boolean isRecentOperator(String operatorVersion) {
493488
}
494489

495490
private void addLegacyPrometheusAnnotationsFrom31(V1Pod pod) {
496-
AnnotationHelper.annotateForPrometheus(pod.getMetadata(), "/wls-exporter", getMetricsPort());
491+
AnnotationHelper.annotateForPrometheus(pod.getMetadata(), WLS_EXPORTER, getMetricsPort());
497492
}
498493

499494
private Integer getMetricsPort() {
@@ -709,16 +704,6 @@ protected void getAuxiliaryImageInitContainers(List<AuxiliaryImage> auxiliaryIma
709704
initContainers.add(createInitContainerForAuxiliaryImage(cl.get(idx), idx))));
710705
}
711706

712-
private List<V1EnvVar> createEnv(V1Container c) {
713-
List<V1EnvVar> initContainerEnvVars = new ArrayList<>();
714-
Optional.ofNullable(c.getEnv()).ifPresent(initContainerEnvVars::addAll);
715-
if (!c.getName().startsWith(COMPATIBILITY_MODE)) {
716-
getEnvironmentVariables().forEach(envVar ->
717-
addIfMissing(initContainerEnvVars, envVar.getName(), envVar.getValue(), envVar.getValueFrom()));
718-
}
719-
return initContainerEnvVars;
720-
}
721-
722707
// ---------------------- model methods ------------------------------
723708

724709
private List<V1PodReadinessGate> getReadinessGates() {
@@ -1170,7 +1155,7 @@ private String adjustedHash(V1Pod currentPod, List<BiConsumer<V1Pod, V1Pod>> adj
11701155
}
11711156

11721157
private void addLegacyPrometheusAnnotationsFrom30(V1Pod pod) {
1173-
AnnotationHelper.annotateForPrometheus(pod.getMetadata(), "/wls-exporter", getOldMetricsPort());
1158+
AnnotationHelper.annotateForPrometheus(pod.getMetadata(), WLS_EXPORTER, getOldMetricsPort());
11741159
}
11751160

11761161
private boolean canAdjustLegacyHashToMatch(V1Pod currentPod, String requiredHash) {
@@ -1260,17 +1245,13 @@ private void restoreLegacyIstioPortsConfig(V1Pod recipePod, V1Pod currentPod) {
12601245
currentPod.getSpec().getContainers().stream().filter(c -> "istio-proxy".equals(c.getName()))
12611246
.findFirst().map(V1Container::getEnv);
12621247

1263-
if (!envVars.isEmpty()) {
1264-
Optional<V1Probe> currentProbe = weblogicContainer.map(V1Container::getReadinessProbe);
1265-
if (currentProbe.isPresent()) {
1266-
resetIstioPodRecipeAfterUpgrade(recipePodSpec, weblogicContainer, envVars.get(), currentProbe.get());
1267-
}
1268-
}
1248+
envVars.ifPresent(v1EnvVars -> weblogicContainer.map(V1Container::getReadinessProbe)
1249+
.ifPresent(v1Probe -> resetIstioPodRecipeAfterUpgrade(recipePodSpec, weblogicContainer.get(), v1EnvVars)));
12691250
}
12701251

1271-
@SuppressWarnings("java:S112")
1272-
private void resetIstioPodRecipeAfterUpgrade(V1PodSpec recipePodSpec, Optional<V1Container> weblogicContainer,
1273-
List<V1EnvVar> envVars, V1Probe currentProbe) {
1252+
@SuppressWarnings({"java:S112", "unchecked"})
1253+
private void resetIstioPodRecipeAfterUpgrade(V1PodSpec recipePodSpec, V1Container wlContainer,
1254+
List<V1EnvVar> envVars) {
12741255

12751256
for (V1EnvVar envVar : envVars) {
12761257
if ("ISTIO_KUBE_APP_PROBERS".equals(envVar.getName())) {
@@ -1303,11 +1284,11 @@ private void resetIstioPodRecipeAfterUpgrade(V1PodSpec recipePodSpec, Optional<V
13031284
}
13041285

13051286
// copy the ports over for calculating hash
1306-
Optional<List<V1ContainerPort>> currentContainerPorts = weblogicContainer.map(V1Container::getPorts);
1287+
List<V1ContainerPort> currentContainerPorts = wlContainer.getPorts();
13071288
if (currentContainerPorts.isEmpty()) {
13081289
recipeContainer.ifPresent(c -> c.setPorts(new ArrayList<>()));
13091290
} else {
1310-
recipeContainer.ifPresent(c -> c.setPorts(weblogicContainer.map(V1Container::getPorts).get()));
1291+
recipeContainer.ifPresent(c -> c.setPorts(currentContainerPorts));
13111292
}
13121293
} catch (JsonProcessingException e) {
13131294
throw new RuntimeException(e);
@@ -1563,7 +1544,7 @@ int getPort() {
15631544

15641545
@Override
15651546
String getBasePath() {
1566-
return "/wls-exporter";
1547+
return WLS_EXPORTER;
15671548
}
15681549

15691550
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ static V1Service createExternalServiceModel(Packet packet) {
184184
}
185185

186186
static String getAppProtocol(String protocol) {
187-
List<String> httpProtocols = new ArrayList<>(Arrays.asList(PROTOCOL_HTTP));
188-
List<String> httpsProtocols = new ArrayList<>(Arrays.asList(PROTOCOL_HTTPS));
187+
List<String> httpProtocols = new ArrayList<>(List.of(PROTOCOL_HTTP));
188+
List<String> httpsProtocols = new ArrayList<>(List.of(PROTOCOL_HTTPS));
189189
List<String> tlsProtocols = new ArrayList<>(Arrays.asList("t3s", "ldaps", "iiops", "cbts", "sips", PROTOCOL_ADMIN));
190190

191191
String appProtocol = PROTOCOL_TCP;

0 commit comments

Comments
 (0)