Rename array and set categories

Sources/OpenVPNAdapter/NSArray+Empty.m

@@ -1,16 +0,0 @@
-//
-//  NSArray+Empty.m
-//  OpenVPNAdapter
-//
-//  Created by Sergey Abramchuk on 16/10/2018.
-//
-
-#import "NSArray+Empty.h"
-
-@implementation NSArray (Empty)
-
-- (BOOL)isNotEmpty {
-    return (self.count > 0) ? YES : NO;
-}
-
-@end

Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.h

@@ -1,5 +1,5 @@
 //
-//  NSSet+Empty.h
+//  NSArray+OpenVPNAdditions.h
 //  OpenVPNAdapter
 //
 //  Created by Sergey Abramchuk on 16/10/2018.
@@ -9,9 +9,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface NSSet (Empty)
+@interface NSArray (OpenVPNEmptyArray)
 
-@property (nonatomic, readonly) BOOL isNotEmpty;
+@property (nonatomic, readonly) BOOL ovpn_isNotEmpty;
 
 @end
 

Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.m

@@ -0,0 +1,16 @@
+//
+//  NSArray+OpenVPNAdditions.m
+//  OpenVPNAdapter
+//
+//  Created by Sergey Abramchuk on 16/10/2018.
+//
+
+#import "NSArray+OpenVPNAdditions.h"
+
+@implementation NSArray (OpenVPNEmptyArray)
+
+- (BOOL)ovpn_isNotEmpty {
+    return (self.count > 0) ? YES : NO;
+}
+
+@end

Sources/OpenVPNAdapter/NSSet+Empty.m

@@ -1,16 +0,0 @@
-//
-//  NSSet+Empty.m
-//  OpenVPNAdapter
-//
-//  Created by Sergey Abramchuk on 16/10/2018.
-//
-
-#import "NSSet+Empty.h"
-
-@implementation NSSet (Empty)
-
-- (BOOL)isNotEmpty {
-    return (self.count > 0) ? YES : NO;
-}
-
-@end

Sources/OpenVPNAdapter/NSSet+OpenVPNAdditions.h

@@ -1,5 +1,5 @@
 //
-//  NSArray+Empty.h
+//  NSSet+OpenVPNAdditions.h
 //  OpenVPNAdapter
 //
 //  Created by Sergey Abramchuk on 16/10/2018.
@@ -9,9 +9,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface NSArray (Empty)
+@interface NSSet (OpenVPNEmptySet)
 
-@property (nonatomic, readonly) BOOL isNotEmpty;
+@property (nonatomic, readonly) BOOL ovpn_isNotEmpty;
 
 @end
 

Sources/OpenVPNAdapter/NSSet+OpenVPNAdditions.m

@@ -0,0 +1,16 @@
+//
+//  NSSet+OpenVPNAdditions.m
+//  OpenVPNAdapter
+//
+//  Created by Sergey Abramchuk on 16/10/2018.
+//
+
+#import "NSSet+OpenVPNAdditions.h"
+
+@implementation NSSet (OpenVPNEmptySet)
+
+- (BOOL)ovpn_isNotEmpty {
+    return (self.count > 0) ? YES : NO;
+}
+
+@end

Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.m

@@ -9,8 +9,8 @@
 
 #import <NetworkExtension/NetworkExtension.h>
 
-#import "NSArray+Empty.h"
-#import "NSSet+Empty.h"
+#import "NSArray+OpenVPNAdditions.h"
+#import "NSSet+OpenVPNAdditions.h"
 
 @interface OpenVPNNetworkSettingsBuilder ()
 
@@ -42,7 +42,7 @@
     
     NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress];
     
-    if (self.ipv4LocalAddresses.isNotEmpty) {
+    if (self.ipv4LocalAddresses.ovpn_isNotEmpty) {
         NSAssert(self.ipv4LocalAddresses.count == self.ipv4SubnetMasks.count, @"Number of IPv4 addresses is not equal to number of IPv4 subnet masks.");
         
         NEIPv4Settings *ipv4Settings = [[NEIPv4Settings alloc] initWithAddresses:self.ipv4LocalAddresses
@@ -54,7 +54,7 @@
         networkSettings.IPv4Settings = ipv4Settings;
     }
     
-    if (self.ipv6LocalAddresses.isNotEmpty) {
+    if (self.ipv6LocalAddresses.ovpn_isNotEmpty) {
         NSAssert(self.ipv6LocalAddresses.count == self.ipv6NetworkPrefixLengths.count, @"Number of IPv6 addresses is not equal to number of IPv6 prefixes.");
         
         NEIPv6Settings *ipv6Settings = [[NEIPv6Settings alloc] initWithAddresses:self.ipv6LocalAddresses
@@ -66,7 +66,7 @@
         networkSettings.IPv6Settings = ipv6Settings;
     }
     
-    if (self.dnsServers.isNotEmpty) {
+    if (self.dnsServers.ovpn_isNotEmpty) {
         NEDNSSettings *dnsSettings = [[NEDNSSettings alloc] initWithServers:self.dnsServers.allObjects];
         dnsSettings.searchDomains = self.searchDomains.allObjects;
         networkSettings.DNSSettings = dnsSettings;