PR review - make code clearer

Author: krdzo

src/main/java/org/prebid/server/bidder/ogury/OguryBidder.java

@@ -70,15 +70,17 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
             }
         }
 
-        if (isAppRequest(bidRequest)) {
-            if (!isValidAppRequestKeys(impsWithOguryParams)) {
+        if (CollectionUtils.isEmpty(impsWithOguryParams)) {
+            if (bidRequest.getApp() != null) {
                 errors.add(BidderError.badInput("Invalid request. assetKey/adUnitId required"));
                 return Result.withErrors(errors);
             }
-        } else if (!isValidSiteRequestKeys(bidRequest, impsWithOguryParams)) {
-            errors.add(BidderError.badInput(
-                    "Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
-            return Result.withErrors(errors);
+            // for "site" request we can serve ads with just publisher.id
+            if (!hasPublisherId(bidRequest)) {
+                errors.add(BidderError.badInput(
+                        "Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
+                return Result.withErrors(errors);
+            }
         }
 
         final BidRequest modifiedBidRequest = bidRequest.toBuilder()
@@ -142,16 +144,8 @@ private boolean hasOguryParams(Imp imp) {
                 && impExtBidderHoist.has(PREBID_FIELD_ADUNIT_ID);
     }
 
-    private boolean isAppRequest(BidRequest request) {
-        return Optional.ofNullable(request.getApp()).isPresent();
-    }
-
-    private boolean isValidAppRequestKeys(List<Imp> impsWithOguryParams) {
-        return !CollectionUtils.isEmpty(impsWithOguryParams);
-    }
-
-    private boolean isValidSiteRequestKeys(BidRequest request, List<Imp> impsWithOguryParams) {
-        return !CollectionUtils.isEmpty(impsWithOguryParams) || Optional.ofNullable(request.getSite())
+    private boolean hasPublisherId(BidRequest request) {
+        return Optional.ofNullable(request.getSite())
                 .map(Site::getPublisher)
                 .map(Publisher::getId)
                 .isPresent();