Fixed arabic stuff

Author: rijnb

pom.xml

@@ -8,7 +8,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.3.0</version>
 
     <name>Mapcode Java Library</name>
     <description>

src/main/java/com/mapcode/DataModel.java

@@ -170,11 +170,9 @@ public static DataModel getInstance() {
                         i += 4;
                     }
                 } finally {
-                    //noinspection ThrowFromFinallyBlock
                     outputStream.close();
                 }
             } finally {
-                //noinspection ThrowFromFinallyBlock
                 inputStream.close();
             }
         } catch (final IOException e) {

src/main/java/com/mapcode/Decoder.java

@@ -925,6 +925,7 @@ private static String convertFromAbjad(final String mapcode) {
         return prefix + Encoder.aeuPack(newstr, false) + postfix;
     }
 
+    @SuppressWarnings("NumericCastThatLosesPrecision")
     private static String convertToAbjad(final String mapcode) {
         String str;
         final String rest;

src/main/java/com/mapcode/Encoder.java

@@ -57,7 +57,6 @@ static List<Mapcode> encode(
     private final static char[] ENCODE_CHARS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'B', 'C', 'D', 'F',
             'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z', 'A', 'E', 'U'};
 
-    @SuppressWarnings("ConstantConditions")
     @Nonnull
     private static List<Mapcode> encode(final double argLatDeg, final double argLonDeg,
                                         @Nullable final Territory territory, final boolean limitToOneResult,

src/main/java/com/mapcode/Mapcode.java

@@ -421,14 +421,14 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(@Nullable final Object o) {
-        if (this == o) {
+    public boolean equals(@Nullable final Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (!(o instanceof Mapcode)) {
+        if (!(obj instanceof Mapcode)) {
             return false;
         }
-        final Mapcode that = (Mapcode) o;
+        final Mapcode that = (Mapcode) obj;
         return this.territory.equals(that.territory) &&
             this.codePrecision8.equals(that.codePrecision8);
     }

src/main/java/com/mapcode/Point.java

@@ -225,14 +225,14 @@ public int hashCode() {
 
     @SuppressWarnings("NonFinalFieldReferenceInEquals")
     @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (!(o instanceof Point)) {
+        if (!(obj instanceof Point)) {
             return false;
         }
-        final Point that = (Point) o;
+        final Point that = (Point) obj;
         return (this.latMicroDeg == that.latMicroDeg) &&
                 (this.lonMicroDeg == that.lonMicroDeg) &&
                 (this.latFractionOnlyDeg == that.latFractionOnlyDeg) &&

src/main/java/com/mapcode/Territory.java

@@ -912,7 +912,6 @@ private Territory(
      * @return Territory.
      * @throws UnknownTerritoryException Thrown if the territory is not found.
      */
-    @SuppressWarnings("TailRecursion")
     @Nonnull
     private static Territory createFromString(
             @Nonnull final String alphaCode,

src/main/java/com/mapcode/UnknownAlphabetException.java

@@ -25,11 +25,8 @@
 public final class UnknownAlphabetException extends IllegalArgumentException {
     private static final long serialVersionUID = 1L;
 
-    private final Integer code;
-
     public UnknownAlphabetException(@Nonnull final String message) {
         super(message);
         assert message != null;
-        this.code = null;
     }
 }

src/main/java/com/mapcode/UnknownPrecisionFormatException.java

@@ -25,11 +25,8 @@
 public final class UnknownPrecisionFormatException extends IllegalArgumentException {
     private static final long serialVersionUID = 1L;
 
-    private final Integer precision;
-
     public UnknownPrecisionFormatException(@Nonnull final String message) {
         super(message);
         assert message != null;
-        this.precision = null;
     }
 }

src/test/java/com/mapcode/DataModelTest.java

@@ -21,45 +21,40 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
-
-import static org.junit.Assert.assertEquals;
-
-@SuppressWarnings({"OverlyBroadThrowsClause", "ProhibitedExceptionDeclared"})
 public class DataModelTest {
     private static final Logger LOG = LoggerFactory.getLogger(DataModelTest.class);
 
     public void testFileOK() {
         LOG.info("testFileOK");
         final DataModel dataModel = new DataModel("/com/mapcode/mminfo_ok.dat");
-        Assert.assertTrue(dataModel != null);
+        Assert.assertNotNull(dataModel);
     }
 
     @Test(expected = IncorrectDataModelException.class)
     public void testFileTooShort() {
         LOG.info("testFileTooShort");
         final DataModel dataModel = new DataModel("/com/mapcode/mminfo_too_short.dat");
-        Assert.assertTrue(false);
+        Assert.assertNull(dataModel);
     }
 
     @Test(expected = IncorrectDataModelException.class)
     public void testFileEndsEarly() {
         LOG.info("testFileEndsEarly");
         final DataModel dataModel = new DataModel("/com/mapcode/mminfo_ends_early.dat");
-        Assert.assertTrue(false);
+        Assert.assertNull(dataModel);
     }
 
     @Test(expected = IncorrectDataModelException.class)
     public void testFileNoHeader() {
         LOG.info("testFileNoHeader");
         final DataModel dataModel = new DataModel("/com/mapcode/mminfo_no_header.dat");
-        Assert.assertTrue(false);
+        Assert.assertNull(dataModel);
     }
 
     @Test(expected = IncorrectDataModelException.class)
     public void testFileWrongversion() {
         LOG.info("testFileWrongversion");
         final DataModel dataModel = new DataModel("/com/mapcode/mminfo_wrong_version.dat");
-        Assert.assertTrue(false);
+        Assert.assertNull(dataModel);
     }
 }