Java 7-ness

alt236 · alt236 · commit 4fcbc7c468b2 · 2015-07-03T16:53:20.000+01:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,17 +1,22 @@
 apply plugin: 'com.android.library'
 
-def versionMajor = 0
-def versionMinor = 0
-def versionPatch = 2
-def androidVersionCode = 2
+final def versionMajor = 0
+final def versionMinor = 0
+final def versionPatch = 2
+final def androidVersionCode = 2
 
-def targetSdk = rootProject.targetSdkVersion;
-def minSdkRed = rootProject.minSdkVersion;
+final def targetSdk = rootProject.targetSdkVersion;
+final def minSdkRed = rootProject.minSdkVersion;
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     defaultConfig {
         minSdkVersion minSdkRed
         targetSdkVersion targetSdk
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java
@@ -7,7 +7,6 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.Map;
 
 import uk.co.alt236.bluetoothlelib.device.adrecord.AdRecordStore;
@@ -71,7 +70,7 @@ public BluetoothLeDevice(final BluetoothDevice device, final int rssi, final byt
         mFirstTimestamp = timestamp;
         mRecordStore = new AdRecordStore(AdRecordUtils.parseScanRecordAsSparseArray(scanRecord));
         mScanRecord = scanRecord;
-        mRssiLog = new LimitedLinkHashMap<Long, Integer>(MAX_RSSI_LOG_SIZE);
+        mRssiLog = new LimitedLinkHashMap<>(MAX_RSSI_LOG_SIZE);
         updateRssiReading(timestamp, rssi);
     }
 
@@ -279,17 +278,12 @@ public double getRunningAverageRssi() {
         int count = 0;
 
         synchronized (mRssiLog) {
-            final Iterator<Long> it1 = mRssiLog.keySet().iterator();
 
-            while (it1.hasNext()) {
+            for (final Long aLong : mRssiLog.keySet()) {
                 count++;
-                sum += mRssiLog.get(it1.next());
+                sum += mRssiLog.get(aLong);
             }
         }
-        //		for(final Map.Entry<Long,Integer> e : mRssiLog.entrySet()){
-        //        	count ++;
-        //        	sum += e.getValue();
-        //	    }
 
         if (count > 0) {
             return sum / count;
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java
@@ -148,7 +148,7 @@ public void writeToParcel(final Parcel parcel, final int arg1) {
     public static <C> Collection<C> asList(final SparseArray<C> sparseArray) {
         if (sparseArray == null) return null;
 
-        final Collection<C> arrayList = new ArrayList<C>(sparseArray.size());
+        final Collection<C> arrayList = new ArrayList<>(sparseArray.size());
         for (int i = 0; i < sparseArray.size(); i++) {
             arrayList.add(sparseArray.valueAt(i));
         }
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java
@@ -324,7 +324,7 @@ public static String getCompanyName(final int companyId, final String fallback)
     }
 
     private static SparseArray<String> populateCompanyNameMap() {
-        final SparseArray<String> map = new SparseArray<String>();
+        final SparseArray<String> map = new SparseArray<>();
 
         map.put(ERICSSON_TECHNOLOGY_LICENSING, "Ericsson Technology Licensing");
         map.put(NOKIA_MOBILE_PHONES, "Nokia Mobile Phones");
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
@@ -198,7 +198,7 @@ public static String getAttributeName(final String uuid, final String fallback)
     }
 
     private static Map<String, String> populateGattAttributesMap() {
-        final Map<String, String> map = new HashMap<String, String>();
+        final Map<String, String> map = new HashMap<>();
 
         map.put(BASE_GUID, "Service Discovery Protocol (SDP)");
         map.put(SERVICE_DISCOVERY_PROTOCOL_SDP, "User Datagram Protocol (UDP)");
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java
@@ -50,7 +50,7 @@ public static int getServiceDataUuid(final AdRecord serviceData) {
      * Read out all the AD structures from the raw scan record
      */
     public static List<AdRecord> parseScanRecordAsList(final byte[] scanRecord) {
-        final List<AdRecord> records = new ArrayList<AdRecord>();
+        final List<AdRecord> records = new ArrayList<>();
 
         int index = 0;
         while (index < scanRecord.length) {
@@ -76,7 +76,7 @@ public static List<AdRecord> parseScanRecordAsList(final byte[] scanRecord) {
 
     @SuppressLint("UseSparseArrays")
     public static Map<Integer, AdRecord> parseScanRecordAsMap(final byte[] scanRecord) {
-        final Map<Integer, AdRecord> records = new HashMap<Integer, AdRecord>();
+        final Map<Integer, AdRecord> records = new HashMap<>();
 
         int index = 0;
         while (index < scanRecord.length) {
@@ -101,7 +101,7 @@ public static Map<Integer, AdRecord> parseScanRecordAsMap(final byte[] scanRecor
     }
 
     public static SparseArray<AdRecord> parseScanRecordAsSparseArray(final byte[] scanRecord) {
-        final SparseArray<AdRecord> records = new SparseArray<AdRecord>();
+        final SparseArray<AdRecord> records = new SparseArray<>();
 
         int index = 0;
         while (index < scanRecord.length) {
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
@@ -82,7 +82,7 @@ public static int getIntFrom2ByteArray(final byte[] input) {
      * @return the int from byte
      */
     public static int getIntFromByte(final byte bite) {
-        return Integer.valueOf(bite & 0xFF);
+        return bite & 0xFF;
     }
 
     /**
diff --git a/sample_app/build.gradle b/sample_app/build.gradle
@@ -1,17 +1,22 @@
 apply plugin: 'com.android.application'
 
-def versionMajor = 0
-def versionMinor = 0
-def versionPatch = 3
-def androidVersionCode = 3
+final def versionMajor = 0
+final def versionMinor = 0
+final def versionPatch = 3
+final def androidVersionCode = 3
 
-def targetSdk = rootProject.targetSdkVersion;
-def minSdkRed = rootProject.minSdkVersion;
+final def targetSdk = rootProject.targetSdkVersion;
+final def minSdkRed = rootProject.minSdkVersion;
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     defaultConfig {
         minSdkVersion minSdkRed
         targetSdkVersion targetSdk
diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java
@@ -73,7 +73,7 @@ public class DeviceControlActivity extends Activity {
     TextView mDataAsArray;
     private BluetoothGattCharacteristic mNotifyCharacteristic;
     private BluetoothLeService mBluetoothLeService;
-    private List<List<BluetoothGattCharacteristic>> mGattCharacteristics = new ArrayList<List<BluetoothGattCharacteristic>>();
+    private List<List<BluetoothGattCharacteristic>> mGattCharacteristics = new ArrayList<>();
     // If a given GATT characteristic is selected, check for supported features.  This sample
     // demonstrates 'Read' and 'Notify' features.  See
     // http://d.android.com/reference/android/bluetooth/BluetoothGatt.html for the complete
@@ -177,26 +177,26 @@ private void displayGattServices(final List<BluetoothGattService> gattServices)
         String uuid = null;
         final String unknownServiceString = getResources().getString(R.string.unknown_service);
         final String unknownCharaString = getResources().getString(R.string.unknown_characteristic);
-        final List<Map<String, String>> gattServiceData = new ArrayList<Map<String, String>>();
-        final List<List<Map<String, String>>> gattCharacteristicData = new ArrayList<List<Map<String, String>>>();
-        mGattCharacteristics = new ArrayList<List<BluetoothGattCharacteristic>>();
+        final List<Map<String, String>> gattServiceData = new ArrayList<>();
+        final List<List<Map<String, String>>> gattCharacteristicData = new ArrayList<>();
+        mGattCharacteristics = new ArrayList<>();
 
         // Loops through available GATT Services.
         for (final BluetoothGattService gattService : gattServices) {
-            final Map<String, String> currentServiceData = new HashMap<String, String>();
+            final Map<String, String> currentServiceData = new HashMap<>();
             uuid = gattService.getUuid().toString();
             currentServiceData.put(LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownServiceString));
             currentServiceData.put(LIST_UUID, uuid);
             gattServiceData.add(currentServiceData);
 
-            final List<Map<String, String>> gattCharacteristicGroupData = new ArrayList<Map<String, String>>();
+            final List<Map<String, String>> gattCharacteristicGroupData = new ArrayList<>();
             final List<BluetoothGattCharacteristic> gattCharacteristics = gattService.getCharacteristics();
-            final List<BluetoothGattCharacteristic> charas = new ArrayList<BluetoothGattCharacteristic>();
+            final List<BluetoothGattCharacteristic> charas = new ArrayList<>();
 
             // Loops through available Characteristics.
             for (final BluetoothGattCharacteristic gattCharacteristic : gattCharacteristics) {
                 charas.add(gattCharacteristic);
-                final Map<String, String> currentCharaData = new HashMap<String, String>();
+                final Map<String, String> currentCharaData = new HashMap<>();
                 uuid = gattCharacteristic.getUuid().toString();
                 currentCharaData.put(LIST_NAME, GattAttributeResolver.getAttributeName(uuid, unknownCharaString));
                 currentCharaData.put(LIST_UUID, uuid);
diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java b/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
@@ -29,7 +29,7 @@ public class BluetoothLeDeviceStore {
 
 
     public BluetoothLeDeviceStore() {
-        mDeviceMap = new HashMap<String, BluetoothLeDevice>();
+        mDeviceMap = new HashMap<>();
     }
 
     public void addDevice(final BluetoothLeDevice device) {
@@ -45,14 +45,14 @@ public void clear() {
     }
 
     public EasyObjectCursor<BluetoothLeDevice> getDeviceCursor() {
-        return new EasyObjectCursor<BluetoothLeDevice>(
+        return new EasyObjectCursor<>(
                 BluetoothLeDevice.class,
                 getDeviceList(),
                 "address");
     }
 
     public List<BluetoothLeDevice> getDeviceList() {
-        final List<BluetoothLeDevice> methodResult = new ArrayList<BluetoothLeDevice>(mDeviceMap.values());
+        final List<BluetoothLeDevice> methodResult = new ArrayList<>(mDeviceMap.values());
 
         Collections.sort(methodResult, new Comparator<BluetoothLeDevice>() {
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public void writeToParcel(final Parcel parcel, final int arg1) {`
`148`	`148`	`public static <C> Collection<C> asList(final SparseArray<C> sparseArray) {`
`149`	`149`	`if (sparseArray == null) return null;`
`150`	`150`
`151`		`- final Collection<C> arrayList = new ArrayList<C>(sparseArray.size());`
	`151`	`+ final Collection<C> arrayList = new ArrayList<>(sparseArray.size());`
`152`	`152`	`for (int i = 0; i < sparseArray.size(); i++) {`
`153`	`153`	`arrayList.add(sparseArray.valueAt(i));`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public static String getCompanyName(final int companyId, final String fallback)`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`private static SparseArray<String> populateCompanyNameMap() {`
`327`		`- final SparseArray<String> map = new SparseArray<String>();`
	`327`	`+ final SparseArray<String> map = new SparseArray<>();`
`328`	`328`
`329`	`329`	`map.put(ERICSSON_TECHNOLOGY_LICENSING, "Ericsson Technology Licensing");`
`330`	`330`	`map.put(NOKIA_MOBILE_PHONES, "Nokia Mobile Phones");`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public static String getAttributeName(final String uuid, final String fallback)`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`private static Map<String, String> populateGattAttributesMap() {`
`201`		`- final Map<String, String> map = new HashMap<String, String>();`
	`201`	`+ final Map<String, String> map = new HashMap<>();`
`202`	`202`
`203`	`203`	`map.put(BASE_GUID, "Service Discovery Protocol (SDP)");`
`204`	`204`	`map.put(SERVICE_DISCOVERY_PROTOCOL_SDP, "User Datagram Protocol (UDP)");`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static int getIntFrom2ByteArray(final byte[] input) {`
`82`	`82`	`* @return the int from byte`
`83`	`83`	`*/`
`84`	`84`	`public static int getIntFromByte(final byte bite) {`
`85`		`- return Integer.valueOf(bite & 0xFF);`
	`85`	`+ return bite & 0xFF;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`