killbill-memoizeit

payment: lower logging level Also, change DefaultNoOpPaymentProviderPlugin

6/3/2013 6:17:01 PM

Details

diff --git a/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java b/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
index 463aa9c..164ef18 100644
--- a/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
+++ b/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
@@ -285,7 +285,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
             pluginPms = pluginApi.getPaymentMethods(account.getId(), true, context.toCallContext());
             // The method should never return null by convention, but let's not trust the plugin...
             if (pluginPms == null) {
-                log.warn("No payment methods defined on the account {} for plugin {}", account.getId(), pluginName);
+                log.debug("No payment methods defined on the account {} for plugin {}", account.getId(), pluginName);
                 return ImmutableList.<PaymentMethod>of();
             }
         } catch (PaymentPluginApiException e) {
diff --git a/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java b/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
index 6808bc6..c64f72c 100644
--- a/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
+++ b/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
@@ -28,9 +28,9 @@ import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.payment.api.PaymentMethodPlugin;
 import com.ning.billing.payment.plugin.api.NoOpPaymentPluginApi;
 import com.ning.billing.payment.plugin.api.PaymentInfoPlugin;
-import com.ning.billing.payment.plugin.api.PaymentPluginStatus;
 import com.ning.billing.payment.plugin.api.PaymentMethodInfoPlugin;
 import com.ning.billing.payment.plugin.api.PaymentPluginApiException;
+import com.ning.billing.payment.plugin.api.PaymentPluginStatus;
 import com.ning.billing.payment.plugin.api.RefundInfoPlugin;
 import com.ning.billing.payment.plugin.api.RefundPluginStatus;
 import com.ning.billing.util.callcontext.CallContext;
@@ -151,7 +151,7 @@ public class DefaultNoOpPaymentProviderPlugin implements NoOpPaymentPluginApi {
 
     @Override
     public List<PaymentMethodInfoPlugin> getPaymentMethods(final UUID kbAccountId, final boolean refreshFromGateway, final CallContext context) {
-        return null;
+        return ImmutableList.<PaymentMethodInfoPlugin>of();
     }
 
     @Override