Add NetworkInterface.fromJava

Author: mpilquist

js/src/main/scala/com/comcast/ip4s/NetworkInterfacePlatform.scala

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.comcast.ip4s
+
+private[ip4s] trait NetworkInterfaceCompanionPlatform

jvm-native/src/main/scala/com/comcast/ip4s/NetworkInterfacePlatform.scala

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.comcast.ip4s
+
+import java.net.{InterfaceAddress as JInterfaceAddress, NetworkInterface as JNetworkInterface}
+
+import CollectionCompat.*
+
+private[ip4s] trait NetworkInterfaceCompanionPlatform {
+
+  def fromJava(jni: JNetworkInterface): NetworkInterface =
+    NetworkInterface(
+      jni.getName,
+      jni.getDisplayName,
+      Option(jni.getHardwareAddress).flatMap(MacAddress.fromBytes),
+      jni.getInterfaceAddresses.asScala.toList.map(fromJavaInterfaceAddress),
+      jni.isLoopback,
+      jni.isUp
+    )
+
+  private def fromJavaInterfaceAddress(ifa: JInterfaceAddress): Cidr[IpAddress] =
+    Cidr(IpAddress.fromInetAddress(ifa.getAddress), ifa.getNetworkPrefixLength.toInt)
+}

jvm/src/main/scala/com/comcast/ip4s/NetworkInterfacesPlatform.scala

@@ -17,7 +17,7 @@
 package com.comcast.ip4s
 
 import cats.effect.Async
-import java.net.{InterfaceAddress as JInterfaceAddress, NetworkInterface as JNetworkInterface}
+import java.net.NetworkInterface as JNetworkInterface
 
 import CollectionCompat.*
 
@@ -29,21 +29,8 @@ private[ip4s] trait NetworkInterfacesCompanionPlatform {
         F.blocking {
           collection.immutable.ListMap.empty[String, NetworkInterface] ++
             JNetworkInterface.getNetworkInterfaces.asScala.toList.map(jni =>
-              jni.getName -> fromJavaNetworkInterface(jni)
+              jni.getName -> NetworkInterface.fromJava(jni)
             )
         }
-
-      private def fromJavaNetworkInterface(jni: JNetworkInterface): NetworkInterface =
-        NetworkInterface(
-          jni.getName,
-          jni.getDisplayName,
-          Option(jni.getHardwareAddress).flatMap(MacAddress.fromBytes),
-          jni.getInterfaceAddresses.asScala.toList.map(fromJavaInterfaceAddress),
-          jni.isLoopback,
-          jni.isUp
-        )
-
-      private def fromJavaInterfaceAddress(ifa: JInterfaceAddress): Cidr[IpAddress] =
-        Cidr(IpAddress.fromInetAddress(ifa.getAddress), ifa.getNetworkPrefixLength.toInt)
     }
 }

shared/src/main/scala/com/comcast/ip4s/NetworkInterface.scala

@@ -43,7 +43,7 @@ sealed trait NetworkInterface {
   def isUp: Boolean
 }
 
-object NetworkInterface {
+object NetworkInterface extends NetworkInterfaceCompanionPlatform {
 
   def apply(
       name: String,