Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / util / NetMask.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java b/cadi/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
index 2a3d75f..9910598 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
@@ -7,9 +7,9 @@
  * 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.
@@ -21,10 +21,10 @@
 
 package org.onap.aaf.cadi.util;
 
-/* 
+/*
  * NetMask - a class to quickly validate whether a given IP is part of a mask, as defined by bytes or standard String format.
- * 
- * Needs the IPV6 Mask Builder. 
+ *
+ * Needs the IPV6 Mask Builder.
  */
 public class NetMask {
     private long mask;
@@ -32,16 +32,16 @@ public class NetMask {
     public NetMask(byte[] inBytes) {
         mask = derive(inBytes);
     }
-    
+
     public NetMask(String string) throws MaskFormatException {
         mask = derive(string,true);
     }
-    
+
     public boolean isInNet(byte[] inBytes) {
         long addr = derive(inBytes);
         return (mask & addr) == addr;
     }
-    
+
     public boolean isInNet(String str) {
         long addr;
         try {
@@ -56,7 +56,7 @@ public class NetMask {
     public static long derive(byte[] inBytes) {
         long addr = 0L;
         int offset = inBytes.length*8;
-        for(int i=0;i<inBytes.length;++i) {
+        for (int i=0;i<inBytes.length;++i) {
             addr&=(inBytes[i]<<offset);
             offset-=8;
         }
@@ -68,22 +68,22 @@ public class NetMask {
         int idx=str.indexOf(':');
         int slash = str.indexOf('/');
 
-        if(idx<0) { // Not IPV6, so it's IPV4... Is there a mask of 123/254?
+        if (idx<0) { // Not IPV6, so it's IPV4... Is there a mask of 123/254?
             idx=str.indexOf('.');
             int offset = 24;
             int end = slash>=0?slash:str.length();
             int bits = slash>=0?Integer.parseInt(str.substring(slash+1)):32;
-            if(check && bits>32) {
+            if (check && bits>32) {
                 throw new MaskFormatException("Invalid Mask Offset in IPV4 Address");
             }
             int prev = 0;
             long lbyte;
-            while(prev<end) {
-                if(idx<0) {
+            while (prev<end) {
+                if (idx<0) {
                     idx = end;
                 }
                 lbyte = Long.parseLong(str.substring(prev, idx));
-                if(check && (lbyte>255 || lbyte<0)) {
+                if (check && (lbyte>255 || lbyte<0)) {
                     throw new MaskFormatException("Invalid Byte in IPV4 Address");
                 }
                 rv|=lbyte<<offset;