Java 8/Junit 5 Migration

.github/workflows/ci.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: 8
-        distribution: adopt
+        java-version: 11
+        distribution: temurin
     - name: Build with Maven
       run: mvn -V -B package --file pom.xml
     - name: Calculate dependency tree

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.tinyradius</groupId>
 	<artifactId>tinyradius</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>TinyRadius Java Radius Library</name>
 	<description>
@@ -43,9 +43,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.8.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -72,6 +72,28 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<showDeprecation>true</showDeprecation>
+					<compilerArgs>-Xlint:unchecked</compilerArgs>
+					<!-- Release directive requires mvn 3.6 and Java 9 or later -->
+					<release>8</release>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<!-- JUnit 5 requires Surefire version 2.22.0 or higher -->
+				<version>2.22.2</version>
+			</plugin>
 		</plugins>
 	</build>
 	<distributionManagement>

src/main/java/org/tinyradius/attribute/IntegerAttribute.java

@@ -56,7 +56,7 @@ public String getAttributeValue() {
 				return name;
 		}
 		// Radius uses only unsigned values....
-		return Long.toString(((long)value & 0xffffffffl));
+		return Long.toString(((long)value & 0xffffffffL));
 	}
 
 	/**
@@ -82,7 +82,7 @@ public void setAttributeValue(String value) {
 		if (at != null) {
 			Integer val = at.getEnumeration(value);
 			if (val != null) {
-				setAttributeValue(val.intValue());
+				setAttributeValue(val);
 				return;
 			}
 		}

src/main/java/org/tinyradius/attribute/IpAttribute.java

@@ -48,7 +48,7 @@ public IpAttribute(int type, long ipNum) {
 	 * @see org.tinyradius.attribute.RadiusAttribute#getAttributeValue()
 	 */
 	public String getAttributeValue() {
-		StringBuffer ip = new StringBuffer();
+		StringBuilder ip = new StringBuilder();
 		byte[] data = getAttributeData();
 		if (data == null || data.length != 4)
 			throw new RuntimeException("ip attribute: expected 4 bytes attribute data");
@@ -107,6 +107,7 @@ public long getIpAsLong() {
 	 * Sets the IP number represented by this IpAttribute
 	 * as a 32 bit unsigned number.
 	 * @param ip
+	 *           ip address
 	 */
 	public void setIpAsLong(long ip) {
 		byte[] data = new byte[4];

src/main/java/org/tinyradius/attribute/Ipv6Attribute.java

@@ -4,7 +4,6 @@
  */
 package org.tinyradius.attribute;
 
-import java.util.StringTokenizer;
 import java.net.Inet6Address;
 import java.net.UnknownHostException;
 

src/main/java/org/tinyradius/attribute/RadiusAttribute.java

@@ -96,8 +96,6 @@ public void setAttributeValue(String value) {
 	 * Gets the value of this attribute as a string.
 	 * 
 	 * @return value
-	 * @exception RadiusException
-	 *                if the value is invalid
 	 */
 	public String getAttributeValue() {
 		return RadiusUtil.getHexString(getAttributeData());
@@ -168,7 +166,7 @@ public byte[] writeAttribute() {
 	/**
 	 * Reads in this attribute from the passed byte array.
 	 * 
-	 * @param data
+	 * @param data  Raw Attribute data
 	 */
 	public void readAttribute(byte[] data, int offset, int length) throws RadiusException {
 		if (length < 2)
@@ -234,7 +232,7 @@ public static RadiusAttribute createRadiusAttribute(Dictionary dictionary, int v
 		AttributeType at = dictionary.getAttributeTypeByCode(vendorId, attributeType);
 		if (at != null && at.getAttributeClass() != null) {
 			try {
-				attribute = (RadiusAttribute) at.getAttributeClass().newInstance();
+				attribute = at.getAttributeClass().getDeclaredConstructor().newInstance();
 			}
 			catch (Exception e) {
 				// error instantiating class - should not occur

src/main/java/org/tinyradius/attribute/StringAttribute.java

@@ -6,7 +6,7 @@
  */
 package org.tinyradius.attribute;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * This class represents a Radius attribute which only
@@ -36,11 +36,7 @@ public StringAttribute(int type, String value) {
 	 * @return a string
 	 */
 	public String getAttributeValue() {
-		try {
-			return new String(getAttributeData(), "UTF-8");
-		} catch (UnsupportedEncodingException uee) {
-			return new String(getAttributeData());
-		}
+		return new String(getAttributeData(), StandardCharsets.UTF_8);
 	}
 
 	/**
@@ -50,11 +46,7 @@ public String getAttributeValue() {
 	public void setAttributeValue(String value) {
 		if (value == null)
 			throw new NullPointerException("string value not set");
-		try {
-			setAttributeData(value.getBytes("UTF-8"));
-		} catch (UnsupportedEncodingException uee) {
-			setAttributeData(value.getBytes());
-		}
+		setAttributeData(value.getBytes(StandardCharsets.UTF_8));
 	}
 
 }

src/main/java/org/tinyradius/attribute/VendorSpecificAttribute.java

@@ -10,8 +10,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import org.tinyradius.dictionary.AttributeType;
 import org.tinyradius.dictionary.Dictionary;
@@ -50,6 +48,7 @@ public VendorSpecificAttribute(int vendorId) {
 	 * Sets the vendor ID of the child attributes.
 	 * 
 	 * @param childVendorId
+	 *           vendor ID of the child attributes
 	 */
 	public void setChildVendorId(int childVendorId) {
 		this.childVendorId = childVendorId;
@@ -73,8 +72,7 @@ public int getChildVendorId() {
 	 */
 	public void setDictionary(Dictionary dictionary) {
 		super.setDictionary(dictionary);
-		for (Iterator i = subAttributes.iterator(); i.hasNext();) {
-			RadiusAttribute attr = (RadiusAttribute) i.next();
+		for (RadiusAttribute attr : subAttributes) {
 			attr.setDictionary(dictionary);
 		}
 	}
@@ -87,7 +85,7 @@ public void setDictionary(Dictionary dictionary) {
 	 */
 	public void addSubAttribute(RadiusAttribute attribute) {
 		if (attribute.getVendorId() != getChildVendorId())
-			throw new IllegalArgumentException("sub attribut has incorrect vendor ID");
+			throw new IllegalArgumentException("sub attribute has incorrect vendor ID");
 
 		subAttributes.add(attribute);
 	}
@@ -137,24 +135,23 @@ public void removeSubAttribute(RadiusAttribute attribute) {
 	 * 
 	 * @return List of RadiusAttribute objects
 	 */
-	public List getSubAttributes() {
+	public List<RadiusAttribute> getSubAttributes() {
 		return subAttributes;
 	}
 
 	/**
-	 * Returns all sub-attributes of this attribut which have the given type.
+	 * Returns all sub-attributes of this attribute which have the given type.
 	 * 
 	 * @param attributeType
 	 *            type of sub-attributes to get
 	 * @return list of RadiusAttribute objects, does not return null
 	 */
-	public List getSubAttributes(int attributeType) {
+	public List<RadiusAttribute> getSubAttributes(int attributeType) {
 		if (attributeType < 1 || attributeType > 255)
 			throw new IllegalArgumentException("sub-attribute type out of bounds");
 
-		LinkedList result = new LinkedList();
-		for (Iterator i = subAttributes.iterator(); i.hasNext();) {
-			RadiusAttribute a = (RadiusAttribute) i.next();
+		ArrayList<RadiusAttribute> result = new ArrayList<>();
+		for (RadiusAttribute a : subAttributes) {
 			if (attributeType == a.getAttributeType())
 				result.add(a);
 		}
@@ -169,17 +166,17 @@ public List getSubAttributes(int attributeType) {
 	 *            sub-attribute type
 	 * @return RadiusAttribute object or null if there is no such sub-attribute
 	 * @throws RuntimeException
-	 *             if there are multiple occurences of the
+	 *             if there are multiple occurrences of the
 	 *             requested sub-attribute type
 	 */
 	public RadiusAttribute getSubAttribute(int type) {
-		List attrs = getSubAttributes(type);
+		List<RadiusAttribute> attrs = getSubAttributes(type);
 		if (attrs.size() > 1)
 			throw new RuntimeException("multiple sub-attributes of requested type " + type);
 		else if (attrs.size() == 0)
 			return null;
 		else
-			return (RadiusAttribute) attrs.get(0);
+			return attrs.get(0);
 	}
 
 	/**
@@ -188,11 +185,10 @@ else if (attrs.size() == 0)
 	 * @param type
 	 *            attribute type name
 	 * @return RadiusAttribute object or null if there is no such attribute
-	 * @throws RadiusException
 	 * @throws RuntimeException
 	 *             if the attribute occurs multiple times
 	 */
-	public RadiusAttribute getSubAttribute(String type) throws RadiusException {
+	public RadiusAttribute getSubAttribute(String type) {
 		if (type == null || type.length() == 0)
 			throw new IllegalArgumentException("type name is empty");
 
@@ -218,7 +214,7 @@ public RadiusAttribute getSubAttribute(String type) throws RadiusException {
 	 * @throws RuntimeException
 	 *             attribute occurs multiple times
 	 */
-	public String getSubAttributeValue(String type) throws RadiusException {
+	public String getSubAttributeValue(String type) {
 		RadiusAttribute attr = getSubAttribute(type);
 		if (attr == null) {
 			return null;
@@ -241,8 +237,7 @@ public byte[] writeAttribute() {
 
 		// write sub-attributes
 		try {
-			for (Iterator i = subAttributes.iterator(); i.hasNext();) {
-				RadiusAttribute a = (RadiusAttribute) i.next();
+			for (RadiusAttribute a : subAttributes) {
 				bos.write(a.writeAttribute());
 			}
 		}
@@ -305,7 +300,7 @@ public void readAttribute(byte[] data, int offset, int length) throws RadiusExce
 		if (pos != vsaLen)
 			throw new RadiusException("Vendor-Specific attribute malformed");
 
-		subAttributes = new ArrayList(count);
+		subAttributes = new ArrayList<>(count);
 		pos = 0;
 		while (pos < vsaLen) {
 			int subtype = data[(offset + 6) + pos] & 0x0ff;
@@ -327,7 +322,7 @@ private static int unsignedByteToInt(byte b) {
 	 * @see org.tinyradius.attribute.RadiusAttribute#toString()
 	 */
 	public String toString() {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("Vendor-Specific: ");
 		int vendorId = getChildVendorId();
 		String vendorName = getDictionary().getVendorName(vendorId);
@@ -341,8 +336,7 @@ public String toString() {
 			sb.append("vendor ID ");
 			sb.append(vendorId);
 		}
-		for (Iterator i = getSubAttributes().iterator(); i.hasNext();) {
-			RadiusAttribute attr = (RadiusAttribute) i.next();
+		for (RadiusAttribute attr : getSubAttributes()) {
 			sb.append("\n");
 			sb.append(attr.toString());
 		}
@@ -352,7 +346,7 @@ public String toString() {
 	/**
 	 * Sub attributes. Only set if isRawData == false.
 	 */
-	private List subAttributes = new ArrayList();
+	private List<RadiusAttribute> subAttributes = new ArrayList<>();
 
 	/**
 	 * Vendor ID of sub-attributes.