Made changes according to code review

1)Added copyright header 2)Imported classes based on the style 3)Fixed few failing tests
killbill · Nov 7, 2016 · 0e338e7 · 0e338e7
1 parent 9212a6e
commit 0e338e7
Show file tree

Hide file tree

Showing 34 changed files with 638 additions and 171 deletions.
diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultBlock.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultBlock.java
@@ -17,6 +17,14 @@
 
 package org.killbill.billing.catalog;
 
+import java.math.BigDecimal;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+
 import org.killbill.billing.ErrorCode;
 import org.killbill.billing.catalog.api.Block;
 import org.killbill.billing.catalog.api.BlockType;
@@ -29,13 +37,6 @@
 import org.killbill.xmlloader.ValidationError;
 import org.killbill.xmlloader.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-import java.math.BigDecimal;
-
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultBlock extends ValidatingConfig<StandaloneCatalog> implements Block {
 

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultBlockPriceOverride.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultBlockPriceOverride.java
@@ -1,12 +1,26 @@
-package org.killbill.billing.catalog;
+/*
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
 
-import org.killbill.billing.catalog.api.BlockPriceOverride;
+package org.killbill.billing.catalog;
-import org.killbill.billing.catalog.api.BlockType;
-import org.killbill.billing.catalog.api.InternationalPrice;
-import org.killbill.billing.catalog.api.Unit;
 
 import java.math.BigDecimal;
 
+import org.killbill.billing.catalog.api.BlockPriceOverride;
+
 public class DefaultBlockPriceOverride implements BlockPriceOverride {
 
     private String unitName;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultInternationalPrice.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultInternationalPrice.java
@@ -16,6 +16,14 @@
 
 package org.killbill.billing.catalog;
 
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.Arrays;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
 import org.killbill.billing.ErrorCode;
 import org.killbill.billing.catalog.api.CatalogApiException;
 import org.killbill.billing.catalog.api.Currency;
@@ -26,13 +34,6 @@
 import org.killbill.xmlloader.ValidatingConfig;
 import org.killbill.xmlloader.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.Arrays;
-
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultInternationalPrice extends ValidatingConfig<StandaloneCatalog> implements InternationalPrice {
 

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlanPhase.java
@@ -18,8 +18,16 @@
 
 package org.killbill.billing.catalog;
 
-import com.google.common.base.Predicate;
+import java.net.URI;
-import com.google.common.collect.Iterables;
+import java.util.Arrays;
+
+import javax.annotation.Nullable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+
 import org.killbill.billing.ErrorCode;
 import org.killbill.billing.catalog.api.CatalogApiException;
 import org.killbill.billing.catalog.api.Duration;
@@ -35,14 +43,8 @@
 import org.killbill.xmlloader.ValidationError;
 import org.killbill.xmlloader.ValidationErrors;
 
-import javax.annotation.Nullable;
+import com.google.common.base.Predicate;
-import javax.xml.bind.annotation.XmlAccessType;
+import com.google.common.collect.Iterables;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import java.net.URI;
-import java.util.Arrays;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implements PlanPhase {

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultTier.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultTier.java
@@ -17,8 +17,13 @@
 
 package org.killbill.billing.catalog;
 
-import com.google.common.base.Predicate;
+import java.util.Arrays;
-import com.google.common.collect.Iterables;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+
 import org.killbill.billing.catalog.api.BillingMode;
 import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.catalog.api.InternationalPrice;
@@ -32,11 +37,10 @@
 import org.killbill.xmlloader.ValidationError;
 import org.killbill.xmlloader.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
+import com.google.common.base.Predicate;
-import javax.xml.bind.annotation.XmlAccessorType;
+import com.google.common.collect.Iterables;
-import javax.xml.bind.annotation.XmlElement;
+
-import javax.xml.bind.annotation.XmlElementWrapper;
+
-import java.util.Arrays;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultTier extends ValidatingConfig<StandaloneCatalog> implements Tier {

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultTierPriceOverride.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultTierPriceOverride.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.killbill.billing.catalog;
 
 import org.killbill.billing.catalog.api.TierPriceOverride;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultTieredBlockPriceOverride.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultTieredBlockPriceOverride.java
@@ -1,13 +1,27 @@
-package org.killbill.billing.catalog;
+/*
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
 
-import org.killbill.billing.catalog.api.BlockType;
+package org.killbill.billing.catalog;
-import org.killbill.billing.catalog.api.InternationalPrice;
-import org.killbill.billing.catalog.api.TieredBlockPriceOverride;
-import org.killbill.billing.catalog.api.Unit;
 
 import java.math.BigDecimal;
 
-public class DefaultTieredBlockPriceOverride extends DefaultBlockPriceOverride implements TieredBlockPriceOverride{
+import org.killbill.billing.catalog.api.TieredBlockPriceOverride;
+
+public class DefaultTieredBlockPriceOverride extends DefaultBlockPriceOverride implements TieredBlockPriceOverride {
 
     private Double max;
 
@@ -21,5 +35,4 @@ public DefaultTieredBlockPriceOverride(String unitName, Double size, BigDecimal
         this.max = max;
     }
 
-
 }
diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsage.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsage.java
@@ -17,8 +17,17 @@
 
 package org.killbill.billing.catalog;
 
-import com.google.common.base.Predicate;
+import java.net.URI;
-import com.google.common.collect.Iterables;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlID;
+
 import org.killbill.billing.catalog.api.BillingMode;
 import org.killbill.billing.catalog.api.BillingPeriod;
 import org.killbill.billing.catalog.api.Block;
@@ -37,15 +46,9 @@
 import org.killbill.xmlloader.ValidationError;
 import org.killbill.xmlloader.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
+import com.google.common.base.Predicate;
-import javax.xml.bind.annotation.XmlAccessorType;
+import com.google.common.collect.Iterables;
-import javax.xml.bind.annotation.XmlAttribute;
+
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlID;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultUsage extends ValidatingConfig<StandaloneCatalog> implements Usage {
@@ -118,12 +121,13 @@ public boolean apply(final TierPriceOverride input) {
                                  String unitName = blockDef.getUnitName();
                                  Double max = blockDef.getMax();
                                  Double size = blockDef.getSize();
-                                 for (TieredBlock curTieredBlock : curTieredBlocks)
+                                 for (TieredBlock curTieredBlock : curTieredBlocks) {
                                      if (unitName.equals(curTieredBlock.getUnit().getName()) &&
                                              Double.compare(size, curTieredBlock.getSize()) == 0 &&
                                              Double.compare(max, curTieredBlock.getMax()) == 0) {
                                          return true;
                                      }
+                                 }
                                }
                             }
                             return false;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsagePriceOverride.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultUsagePriceOverride.java
@@ -1,12 +1,28 @@
+/*
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.killbill.billing.catalog;
 
-import org.killbill.billing.catalog.api.BillingMode;
+import java.util.List;
+
 import org.killbill.billing.catalog.api.TierPriceOverride;
 import org.killbill.billing.catalog.api.UsagePriceOverride;
 import org.killbill.billing.catalog.api.UsageType;
 
-import java.util.List;
-
 public class DefaultUsagePriceOverride implements UsagePriceOverride {
 
     String name;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheOverriddenPlanCache.java b/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheOverriddenPlanCache.java
@@ -17,8 +17,12 @@
 
 package org.killbill.billing.catalog.caching;
 
-import com.google.common.base.Predicate;
+import java.util.ArrayList;
-import com.google.common.collect.Iterables;
+import java.util.List;
+import java.util.regex.Matcher;
+
+import javax.inject.Inject;
+
 import org.killbill.billing.ErrorCode;
 import org.killbill.billing.ObjectType;
 import org.killbill.billing.callcontext.InternalTenantContext;
@@ -51,10 +55,8 @@
 import org.killbill.billing.util.cache.CacheLoaderArgument;
 import org.killbill.billing.util.cache.OverriddenPlanCacheLoader.LoaderCallback;
 
-import javax.inject.Inject;
+import com.google.common.base.Predicate;
-import java.util.ArrayList;
+import com.google.common.collect.Iterables;
-import java.util.List;
-import java.util.regex.Matcher;
 
 public class EhCacheOverriddenPlanCache implements OverriddenPlanCache {
 
@@ -119,12 +121,13 @@ public boolean apply(final CatalogOverridePhaseDefinitionModelDao input) {
                 }
             }).orNull();
 
-            if(overriddenPhase != null){
+            if(overriddenPhase != null) {
               List<UsagePriceOverride> usagePriceOverrides =  getUsagePriceOverrides(curPhase, overriddenPhase, context);
               result[i] = new DefaultPlanPhasePriceOverride(curPhase.getName(), Currency.valueOf(overriddenPhase.getCurrency()), overriddenPhase.getFixedPrice(), overriddenPhase.getRecurringPrice(), usagePriceOverrides);
             }
-            else
+            else {
-              result[i] = null;
+                result[i] = null;
+            }
         }
         return result;
     }
@@ -169,12 +172,13 @@ public boolean apply(final CatalogOverrideTierDefinitionModelDao input) {
                          Double max = blockDef.getMax();
                          Double size = blockDef.getSize();
 
-                         for(TieredBlock curTieredBlock : curTieredBlocks)
+                         for(TieredBlock curTieredBlock : curTieredBlocks) {
                              if (unitName.equals(curTieredBlock.getUnit().getName()) &&
                                      Double.compare(size, curTieredBlock.getSize()) == 0 &&
                                      Double.compare(max, curTieredBlock.getMax()) == 0) {
                                  return true;
                              }
+                         }
                      }
                     return false;
                 }
@@ -206,8 +210,9 @@ public boolean apply(final CatalogOverrideBlockDefinitionModelDao input) {
                 }
             }).orNull();
 
-            if(overriddenTierBlock != null)
+            if(overriddenTierBlock != null) {
                 blockPriceOverrides.add(new DefaultTieredBlockPriceOverride(overriddenTierBlock.getParentUnitName(), overriddenTierBlock.getSize(), overriddenTierBlock.getPrice(), overriddenTierBlock.getMax()));
+            }
         }
         return blockPriceOverrides;
     }