Code format and fix for lookup uri.

Author: dnkoutso

picasso/src/main/java/com/squareup/picasso/ContactsPhotoBitmapHunter.java

@@ -33,28 +33,23 @@
 import static com.squareup.picasso.Picasso.LoadedFrom.DISK;
 
 class ContactsPhotoBitmapHunter extends BitmapHunter {
-  /**
-   a lookup uri (e.g. content://com.android.contacts/contacts/lookup/3570i61d948d30808e537 )
-  */
+  /** A lookup uri (e.g. content://com.android.contacts/contacts/lookup/3570i61d948d30808e537) */
   private static final int ID_LOOKUP = 1;
-  /**
-   a contact thumbnail uri (e.g. content://com.android.contacts/contacts/38/photo)
-   */
+  /** A contact thumbnail uri (e.g. content://com.android.contacts/contacts/38/photo) */
   private static final int ID_THUMBNAIL = 2;
-  /**
-   a contact uri (e.g. content://com.android.contacts/contacts/38)
-   */
+  /** A contact uri (e.g. content://com.android.contacts/contacts/38) */
   private static final int ID_CONTACT = 3;
   /**
-   a contact display photo (high resolution) uri
-   (e.g. content://com.android.contacts/display_photo/5)
+   * A contact display photo (high resolution) uri
+   * (e.g. content://com.android.contacts/display_photo/5)
    */
   private static final int ID_DISPLAY_PHOTO = 4;
 
-  static final UriMatcher matcher;
+  private static final UriMatcher matcher;
 
   static {
     matcher = new UriMatcher(UriMatcher.NO_MATCH);
+    matcher.addURI(ContactsContract.AUTHORITY, "contacts/lookup/*/#", ID_LOOKUP);
     matcher.addURI(ContactsContract.AUTHORITY, "contacts/lookup/*", ID_LOOKUP);
     matcher.addURI(ContactsContract.AUTHORITY, "contacts/#/photo", ID_THUMBNAIL);
     matcher.addURI(ContactsContract.AUTHORITY, "contacts/#", ID_CONTACT);
@@ -69,8 +64,7 @@ a contact display photo (high resolution) uri
     this.context = context;
   }
 
-  @Override Bitmap decode(Request data)
-      throws IOException {
+  @Override Bitmap decode(Request data) throws IOException {
     InputStream is = null;
     try {
       is = getInputStream();
@@ -90,7 +84,7 @@ private InputStream getInputStream() throws IOException {
     switch (matcher.match(uri)) {
       case ID_LOOKUP:
         uri = ContactsContract.Contacts.lookupContact(contentResolver, uri);
-        if (null == uri) {
+        if (uri == null) {
           return null;
         }
         // Resolved the uri to a contact uri, intentionally fall through to process the resolved uri

picasso/src/test/java/com/squareup/picasso/UtilsTest.java

@@ -23,13 +23,15 @@
 
 import static com.squareup.picasso.TestUtils.URI_1;
 import static com.squareup.picasso.Utils.createKey;
+import static com.squareup.picasso.Utils.isWebPFile;
 import static com.squareup.picasso.Utils.parseResponseSourceHeader;
 import static org.fest.assertions.api.Assertions.assertThat;
 
-@RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class UtilsTest {
 
-  @Test public void matchingRequestsHaveSameKey() {
+  @Test public void matchingRequestsHaveSameKey() throws Exception {
     Request request = new Request.Builder(URI_1).build();
     String key1 = createKey(request);
     String key2 = createKey(request);
@@ -66,7 +68,7 @@ public class UtilsTest {
     assertThat(order1).isNotEqualTo(order2);
   }
 
-  @Test public void loadedFromCache() {
+  @Test public void loadedFromCache() throws Exception {
     assertThat(parseResponseSourceHeader(null)).isFalse();
     assertThat(parseResponseSourceHeader("CACHE 200")).isTrue();
     assertThat(parseResponseSourceHeader("STREAM 200")).isFalse();
@@ -78,10 +80,11 @@ public class UtilsTest {
   }
 
   @Test public void detectedWebPFile() throws Exception {
-    assertThat(Utils.isWebPFile(new ByteArrayInputStream("RIFFxxxxWEBP".getBytes("US-ASCII")))).isTrue();
-    assertThat(Utils.isWebPFile(new ByteArrayInputStream("RIFFxxxxxWEBP".getBytes("US-ASCII")))).isFalse();
-    assertThat(Utils.isWebPFile(new ByteArrayInputStream("ABCDxxxxWEBP".getBytes("US-ASCII")))).isFalse();
-    assertThat(Utils.isWebPFile(new ByteArrayInputStream("RIFFxxxxABCD".getBytes("US-ASCII")))).isFalse();
-    assertThat(Utils.isWebPFile(new ByteArrayInputStream("RIFFxxWEBP".getBytes("US-ASCII")))).isFalse();
+    assertThat(isWebPFile(new ByteArrayInputStream("RIFFxxxxWEBP".getBytes("US-ASCII")))).isTrue();
+    assertThat(
+        isWebPFile(new ByteArrayInputStream("RIFFxxxxxWEBP".getBytes("US-ASCII")))).isFalse();
+    assertThat(isWebPFile(new ByteArrayInputStream("ABCDxxxxWEBP".getBytes("US-ASCII")))).isFalse();
+    assertThat(isWebPFile(new ByteArrayInputStream("RIFFxxxxABCD".getBytes("US-ASCII")))).isFalse();
+    assertThat(isWebPFile(new ByteArrayInputStream("RIFFxxWEBP".getBytes("US-ASCII")))).isFalse();
   }
 }