Merge pull request #13 from flipkart-incubator/checks

yasirmhd · web-flow · commit 0a04c8399943 · 2018-08-28T09:34:45.000+05:30
code cleanup, added precondition check class
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/inline-youtube-view/build.gradle b/inline-youtube-view/build.gradle
@@ -29,9 +29,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
diff --git a/inline-youtube-view/gradle/wrapper/gradle-wrapper.properties b/inline-youtube-view/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/YouTubePlayerView.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/YouTubePlayerView.java
@@ -42,6 +42,7 @@
 import com.flipkart.youtubeview.listener.YouTubeEventListener;
 import com.flipkart.youtubeview.models.ImageLoader;
 import com.flipkart.youtubeview.models.YouTubePlayerType;
+import com.flipkart.youtubeview.util.$Precondition$Check;
 import com.flipkart.youtubeview.util.ServiceUtil;
 
 public class YouTubePlayerView extends FrameLayout {
@@ -82,7 +83,6 @@ public YouTubePlayerView(Context context, AttributeSet attrs, int defStyleAttr)
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
         int newWidth;
         int newHeight;
         newWidth = getMeasuredWidth();
@@ -103,19 +103,12 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     @MainThread
     public void initPlayer(@NonNull String apiKey, @NonNull String videoId, @Nullable String webViewUrl, @YouTubePlayerType int playerType,
                            @Nullable YouTubeEventListener listener, @NonNull Fragment fragment, @NonNull ImageLoader imageLoader) {
-        if (TextUtils.isEmpty(videoId) || TextUtils.isEmpty(apiKey)) {
-            throw new IllegalArgumentException("Video Id or key cannot be null");
-        }
-
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(apiKey), "apiKey cannot be null");
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(videoId), "videoId cannot be null");
         //noinspection ConstantConditions
-        if (fragment == null) {
-            throw new IllegalArgumentException("Fragment cannot be null");
-        }
-
+        $Precondition$Check.checkArgument(fragment != null, "Fragment cannot be null");
         //noinspection ConstantConditions
-        if (imageLoader == null) {
-            throw new IllegalArgumentException("ImageLoader cannot be null");
-        }
+        $Precondition$Check.checkArgument(imageLoader != null, "ImageLoader cannot be null");
 
         this.key = apiKey;
         this.videoId = videoId;
@@ -204,9 +197,7 @@ private void attachPlayer(boolean isNative) {
                 }
                 youtubePlayerFragment = webViewFragment;
             }
-
             youtubePlayerFragment.setYouTubeEventListener(listener);
-
             this.fragment.getChildFragmentManager().beginTransaction().add(R.id.youtubeFragmentContainer, (Fragment) youtubePlayerFragment, TAG)
                     .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
                     .commit();
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/activity/YouTubeActivity.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/activity/YouTubeActivity.java
@@ -37,6 +37,7 @@
 import com.flipkart.youtubeview.R;
 import com.flipkart.youtubeview.listener.YouTubeEventListener;
 import com.flipkart.youtubeview.models.PlayerStateList;
+import com.flipkart.youtubeview.util.$Precondition$Check;
 import com.flipkart.youtubeview.util.ServiceUtil;
 import com.flipkart.youtubeview.webview.YouTubePlayerWebView;
 import com.google.android.youtube.player.YouTubeBaseActivity;
@@ -86,9 +87,8 @@ protected void onCreate(Bundle savedInstanceState) {
          * In case videoId or apiKey is null, throw IllegalStateException as apiKey and videoId is mandatory to run
          * youtube activity.
          */
-        if (TextUtils.isEmpty(videoId) || TextUtils.isEmpty(apiKey)) {
-            throw new IllegalStateException("VideoId and ApiKey cannot be null.");
-        }
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(videoId), " videoId cannot be null");
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(apiKey), " apiKey cannot be null");
 
         /*
          * In case of YouTube Service not available, fallback to WebView implementation.
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/fragment/YouTubeFragment.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/fragment/YouTubeFragment.java
@@ -26,6 +26,7 @@
 
 import com.flipkart.youtubeview.listener.YouTubeEventListener;
 import com.flipkart.youtubeview.models.PlayerStateList;
+import com.flipkart.youtubeview.util.$Precondition$Check;
 import com.google.android.youtube.player.YouTubeInitializationResult;
 import com.google.android.youtube.player.YouTubePlayer;
 import com.google.android.youtube.player.YouTubePlayerSupportFragment;
@@ -43,15 +44,14 @@ public final class YouTubeFragment extends YouTubePlayerSupportFragment implemen
     private YouTubePlayer youTubePlayer;
 
     public static YouTubeFragment newInstance(@NonNull String apiKey, @NonNull final String videoId) {
-        if (TextUtils.isEmpty(apiKey) || TextUtils.isEmpty(videoId)) {
-            throw new IllegalStateException("VideoId and ApiKey cannot be null.");
-        }
-        YouTubeFragment youTubeFragment = new YouTubeFragment();
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(apiKey), "apiKey cannot be null");
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(videoId), "videoId cannot be null");
+        YouTubeFragment fragment = new YouTubeFragment();
         Bundle bundle = new Bundle();
         bundle.putString(ARG_VIDEO_ID, videoId);
         bundle.putString(ARG_API_KEY, apiKey);
-        youTubeFragment.setArguments(bundle);
-        return youTubeFragment;
+        fragment.setArguments(bundle);
+        return fragment;
     }
 
     @Override
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/fragment/YouTubeWebViewFragment.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/fragment/YouTubeWebViewFragment.java
@@ -41,12 +41,12 @@ public final class YouTubeWebViewFragment extends Fragment implements YouTubeEve
     private YouTubeEventListener youTubeEventListener;
 
     public static YouTubeWebViewFragment newInstance(@NonNull String webViewUrl, @NonNull String videoId) {
-        YouTubeWebViewFragment youTubeWebViewFragment = new YouTubeWebViewFragment();
+        YouTubeWebViewFragment fragment = new YouTubeWebViewFragment();
         Bundle bundle = new Bundle();
         bundle.putString(WEB_VIEW_URL, webViewUrl);
         bundle.putString(VIDEO_ID, videoId);
-        youTubeWebViewFragment.setArguments(bundle);
-        return youTubeWebViewFragment;
+        fragment.setArguments(bundle);
+        return fragment;
     }
 
     @Override
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/util/$Precondition$Check.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/util/$Precondition$Check.java
@@ -0,0 +1,23 @@
+package com.flipkart.youtubeview.util;
+
+public final class $Precondition$Check {
+    public static void checkArgument(boolean expression) {
+        if (!expression) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    /**
+     * Ensures that an expression checking an argument is true.
+     *
+     * @param expression   the expression to check
+     * @param errorMessage the exception message to use if the check fails; will
+     *                     be converted to a string using {@link String#valueOf(Object)}
+     * @throws IllegalArgumentException if {@code expression} is false
+     */
+    public static void checkArgument(boolean expression, final Object errorMessage) {
+        if (!expression) {
+            throw new IllegalArgumentException(String.valueOf(errorMessage));
+        }
+    }
+}
diff --git a/inline-youtube-view/src/main/java/com/flipkart/youtubeview/webview/YouTubePlayerWebView.java b/inline-youtube-view/src/main/java/com/flipkart/youtubeview/webview/YouTubePlayerWebView.java
@@ -37,6 +37,7 @@
 import com.flipkart.youtubeview.BuildConfig;
 import com.flipkart.youtubeview.listener.YouTubeEventListener;
 import com.flipkart.youtubeview.models.PlayerStateList;
+import com.flipkart.youtubeview.util.$Precondition$Check;
 
 public class YouTubePlayerWebView extends WebView {
 
@@ -76,10 +77,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     }
 
     public void initialize(@NonNull String webViewUrl) {
-        if (TextUtils.isEmpty(webViewUrl)) {
-            throw new IllegalArgumentException("WebView url cannot be empty");
-        }
-
+        $Precondition$Check.checkArgument(!TextUtils.isEmpty(webViewUrl), "WebView url cannot be empty");
         if (!isPlayerReady) {
             initWebView(webViewUrl);
         }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.1.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ buildscript {`
`29`	`29`	`google()`
`30`	`30`	`}`
`31`	`31`	`dependencies {`
`32`		`- classpath 'com.android.tools.build:gradle:3.1.1'`
`33`		`- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`34`		`- classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'`
	`32`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
	`33`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
	`34`	`+ classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'`
`35`	`35`	`classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'`
`36`	`36`	`}`
`37`	`37`	`}`