Refactoring WlsServerConfig constructor to include adminPort and adminPortEnabled

Author: swapnanitin

operator/src/main/java/oracle/kubernetes/operator/utils/WlsDomainConfigSupport.java

@@ -107,7 +107,7 @@ static class ServerConfigBuilder {
     }
 
     WlsServerConfig build() {
-      return new WlsServerConfig(name, null, null, null, false, null, null);
+      return new WlsServerConfig(name, null, null, null, false, null, null, null, false);
     }
   }
 

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsDynamicServerConfig.java

@@ -104,7 +104,9 @@ private WlsDynamicServerConfig(
         sslListenPort,
         sslPortEnabled,
         machineName,
-        networkAccessPoints);
+        networkAccessPoints,
+        null,
+        false);
   }
 
   /**

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsServerConfig.java

@@ -150,10 +150,12 @@ static WlsServerConfig create(Map<String, Object> serverConfigMap) {
         (String) serverConfigMap.get("listenAddress"),
         sslListenPort,
         sslPortEnabled,
-        (Integer) serverConfigMap.get("adminPort"),
-        (boolean) serverConfigMap.get("adminPortEnabled"),
+        /*(Integer) serverConfigMap.get("adminPort"),
+        (boolean) serverConfigMap.get("adminPortEnabled"),*/
         getMachineNameFromJsonMap(serverConfigMap),
-        networkAccessPoints);
+        networkAccessPoints,
+        null,
+        false);
   }
 
   /**
@@ -164,30 +166,29 @@ static WlsServerConfig create(Map<String, Object> serverConfigMap) {
    * @param listenAddress Configured listen address for this WLS server
    * @param sslListenPort Configured SSL listen port for this WLS server
    * @param sslPortEnabled boolean indicating whether the SSL listen port should be enabled
-   * @param adminPort Configured domain wide administration port
-   * @param adminPortEnabled boolean indicating whether administration port should be enabled
    * @param machineName Configured machine name for this WLS server
    * @param networkAccessPoints List of NetworkAccessPoint containing channels configured for this
-   *     WLS server
+   * @param adminPort Configured domain wide administration port
+   * @param adminPortEnabled boolean indicating whether administration port should be enabled
    */
   public WlsServerConfig(
       String name,
       Integer listenPort,
       String listenAddress,
       Integer sslListenPort,
       boolean sslPortEnabled,
-      Integer adminPort,
-      boolean adminPortEnabled,
       String machineName,
-      List<NetworkAccessPoint> networkAccessPoints) {
+      List<NetworkAccessPoint> networkAccessPoints,
+      Integer adminPort,
+      boolean adminPortEnabled) {
     this.name = name;
     this.listenPort = listenPort;
     this.listenAddress = listenAddress;
     this.networkAccessPoints = networkAccessPoints;
     this.sslListenPort = sslListenPort;
     this.sslPortEnabled = sslPortEnabled;
-    this.adminPort = adminPort;
-    this.adminPortEnabled = adminPortEnabled;
+    this.adminPort = this.adminPort;
+    this.adminPortEnabled = this.adminPortEnabled;
     this.machineName = machineName;
   }
 

operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java

@@ -61,7 +61,8 @@ public void augmentPacket() {
   }
 
   private WlsServerConfig createServerConfig() {
-    return new WlsServerConfig(SERVER_NAME, LISTEN_PORT, null, null, false, null, null);
+    return new WlsServerConfig(
+        SERVER_NAME, LISTEN_PORT, null, null, false, null, null, null, false);
   }
 
   @Override

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsClusterConfigTest.java

@@ -663,7 +663,7 @@ public void verifyGetMachineNamesReturnsUndefinedMachineNamesEvenWithSameTargetS
   static WlsDynamicServersConfig createDynamicServersConfig(
       int clusterSize, int maxClusterSize, String serverNamePrefix, String clusterName) {
     WlsServerConfig serverTemplate =
-        new WlsServerConfig("serverTemplate1", 7001, "host1", 7002, false, null, null);
+        new WlsServerConfig("serverTemplate1", 7001, "host1", 7002, false, null, null, null, false);
     List<String> serverNames = new ArrayList<>();
     final int startingServerNameIndex = 1;
     for (int i = 0; i < clusterSize; i++) {

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsDynamicServerConfigTest.java

@@ -19,7 +19,8 @@ public void testCreateWithFixedPorts() {
     List<NetworkAccessPoint> networkAccessPointList = new ArrayList<>();
     networkAccessPointList.add(networkAccessPoint);
     WlsServerConfig template =
-        new WlsServerConfig("template1", 1000, null, 2000, true, null, networkAccessPointList);
+        new WlsServerConfig(
+            "template1", 1000, null, 2000, true, null, networkAccessPointList, null, false);
 
     WlsServerConfig wlsServerConfig =
         WlsDynamicServerConfig.create("server1", 2, "cluster1", "domain1", false, template);
@@ -37,7 +38,8 @@ public void testCreateWithNullPorts() {
     List<NetworkAccessPoint> networkAccessPointList = new ArrayList<>();
     networkAccessPointList.add(networkAccessPoint);
     WlsServerConfig template =
-        new WlsServerConfig("template1", null, null, null, true, null, networkAccessPointList);
+        new WlsServerConfig(
+            "template1", null, null, null, true, null, networkAccessPointList, null, false);
 
     WlsServerConfig wlsServerConfig =
         WlsDynamicServerConfig.create("server1", 2, "cluster1", "domain1", false, template);
@@ -55,7 +57,8 @@ public void testCreateWithCalculatedPorts() {
     List<NetworkAccessPoint> networkAccessPointList = new ArrayList<>();
     networkAccessPointList.add(networkAccessPoint);
     WlsServerConfig template =
-        new WlsServerConfig("template1", 1000, null, 2000, true, null, networkAccessPointList);
+        new WlsServerConfig(
+            "template1", 1000, null, 2000, true, null, networkAccessPointList, null, false);
 
     WlsServerConfig wlsServerConfig =
         WlsDynamicServerConfig.create("server1", 2, "cluster1", "domain1", true, template);
@@ -73,7 +76,8 @@ public void testCreateWithCalculatedDefaultPorts() {
     List<NetworkAccessPoint> networkAccessPointList = new ArrayList<>();
     networkAccessPointList.add(networkAccessPoint);
     WlsServerConfig template =
-        new WlsServerConfig("template1", null, null, null, true, null, networkAccessPointList);
+        new WlsServerConfig(
+            "template1", null, null, null, true, null, networkAccessPointList, null, false);
 
     WlsServerConfig wlsServerConfig =
         WlsDynamicServerConfig.create("server1", 2, "cluster1", "domain1", true, template);