Skip to content

Commit 06a0636

Browse files
committed
Fix copyrights
1 parent 02e23eb commit 06a0636

File tree

72 files changed

+217
-73
lines changed

Some content is hidden

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

72 files changed

+217
-73
lines changed

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import java.util.ArrayList;
77
import java.util.Collection;
8-
import java.util.LinkedHashMap;
98
import java.util.List;
109
import java.util.ListIterator;
1110
import java.util.Map;
11+
import java.util.TreeMap;
1212
import java.util.concurrent.ConcurrentMap;
1313

1414
import org.joda.time.DateTime;
@@ -124,7 +124,7 @@ public NextAction apply(Packet packet) {
124124
@SuppressWarnings("unchecked")
125125
ConcurrentMap<String, ServerHealth> serverHealth = (ConcurrentMap<String, ServerHealth>) packet.get(ProcessingConstants.SERVER_HEALTH_MAP);
126126

127-
Map<String, ServerStatus> serverStatuses = new LinkedHashMap<>();
127+
Map<String, ServerStatus> serverStatuses = new TreeMap<>();
128128
WlsDomainConfig scan = info.getScan();
129129
if (scan != null) {
130130
for (Map.Entry<String, WlsServerConfig> entry : scan.getServerConfigs().entrySet()) {
@@ -169,12 +169,11 @@ public NextAction apply(Packet packet) {
169169
}
170170

171171
if (existingServerStatuses != null) {
172-
List<ServerStatus> currentServerStatuses = new ArrayList<>(serverStatuses.values());
173-
if (!existingServerStatuses.equals(currentServerStatuses)) {
174-
status.setServers(currentServerStatuses);
172+
if (!compare(existingServerStatuses, serverStatuses)) {
173+
status.setServers(new ArrayList<>(serverStatuses.values()));
175174
madeChange = true;
176175
}
177-
} else {
176+
} else if (!serverStatuses.isEmpty()){
178177
status.setServers(new ArrayList<>(serverStatuses.values()));
179178
madeChange = true;
180179
}
@@ -296,6 +295,21 @@ public NextAction apply(Packet packet) {
296295
return madeChange == true ? doDomainUpdate(dom, info, packet, StatusUpdateStep.this, next) : doNext(packet);
297296
}
298297
}
298+
299+
private static boolean compare(List<ServerStatus> currentServerStatuses, Map<String, ServerStatus> serverStatuses) {
300+
if (currentServerStatuses.size() == serverStatuses.size()) {
301+
for (ServerStatus c : currentServerStatuses) {
302+
String serverName = c.getServerName();
303+
ServerStatus u = serverStatuses.get(serverName);
304+
if (u == null || !c.equals(u)) {
305+
return false;
306+
}
307+
}
308+
return true;
309+
}
310+
311+
return false;
312+
}
299313

300314
/**
301315
* Asynchronous step to set Domain condition to Progressing

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator;
45

56
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator;
45

56
import io.kubernetes.client.ApiException;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.builders;
45

56
import io.kubernetes.client.ProgressRequestBody;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.builders;
45

56
import io.kubernetes.client.ProgressRequestBody;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.builders;
45

56
import io.kubernetes.client.ApiException;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2018 Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.builders;
45

56
import io.kubernetes.client.util.Watch;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2018 Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.builders;
45

56
import io.kubernetes.client.util.Watch;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.helpers;
45

56
import java.util.ArrayList;

src/main/java/oracle/kubernetes/operator/rest/resource/ScaleClusterResource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2017, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3+
34
package oracle.kubernetes.operator.rest.resource;
45

56
import oracle.kubernetes.operator.logging.LoggingFacade;

0 commit comments

Comments
 (0)