updating rocketlawyer master to latest killbill master #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

dconcha wants to merge 163 commits into rocketlawyer:master from dconcha:master

.travis.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,16 +32,6 @@ matrix: @@
           jdk: oraclejdk7
         - env: PHASE="-Pmysql,jdk18"
           jdk: oraclejdk8
-        - env: PHASE="-Ppostgresql"
-          jdk: openjdk7
-        - env: PHASE="-Ppostgresql"
-          jdk: oraclejdk7
-        - env: PHASE="-Ppostgresql,jdk17"
-          jdk: openjdk7
-        - env: PHASE="-Ppostgresql,jdk17"
-          jdk: oraclejdk7
-        - env: PHASE="-Ppostgresql,jdk18"
-          jdk: oraclejdk8
         - env: PHASE="-Ptravis"
           jdk: openjdk7
         - env: PHASE="-Ptravis"
@@ Expand Down @@

NEWS

-Original file line number
+Diff line change
@@ -1,3 +1,15 @@
+.15.6
+        See https://github.com/killbill/killbill/releases/tag/killbill-0.15.6
+.15.5
+        Fix with issue with payment combo call where default account fields are not part of the request
+.15.4
+        See https://github.com/killbill/killbill/issues?q=milestone%3ARelease-0.15.4+is%3Aclosed
+.15.3
+        Release for milestone 0.15.3: https://github.com/killbill/killbill/issues?q=is%3Aissue+milestone%3ARelease-0.15.3+is%3Aclosed
 .15.2
         See https://github.com/killbill/killbill/issues?q=milestone%3ARelease-0.15.2+is%3Aclosed
@@ Expand Down @@

account/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
         <parent>
             <artifactId>killbill</artifactId>
             <groupId>org.kill-bill.billing</groupId>
-            <version>0.15.3-SNAPSHOT</version>
+            <version>0.15.7-SNAPSHOT</version>
             <relativePath>../pom.xml</relativePath>
         </parent>
         <artifactId>killbill-account</artifactId>
@@ Expand Down @@

account/src/main/java/org/killbill/billing/account/api/DefaultAccount.java

-Original file line number
+Diff line change
@@ Expand Up @@
                 accountData.setCurrency(currentAccount.getCurrency());
             }
-            if (billCycleDayLocal != null && billCycleDayLocal != DEFAULT_BILLING_CYCLE_DAY_LOCAL && currentAccount.getBillCycleDayLocal() != null && currentAccount.getBillCycleDayLocal() != DEFAULT_BILLING_CYCLE_DAY_LOCAL && !billCycleDayLocal.equals(currentAccount.getBillCycleDayLocal())) {
-                throw new IllegalArgumentException(String.format("Killbill doesn't support updating the account BCD yet: new=%s, current=%s",
-                                                                 billCycleDayLocal, currentAccount.getBillCycleDayLocal()));
-            } else if (billCycleDayLocal != null && billCycleDayLocal != DEFAULT_BILLING_CYCLE_DAY_LOCAL) {
-                // Junction sets it
+            if (currentAccount.getBillCycleDayLocal() != DEFAULT_BILLING_CYCLE_DAY_LOCAL && // There is already a BCD set
+                billCycleDayLocal != null && // and the proposed date is not null
+                billCycleDayLocal != DEFAULT_BILLING_CYCLE_DAY_LOCAL && // and the proposed date is not 0
+                !currentAccount.getBillCycleDayLocal().equals(billCycleDayLocal)) { // and it does not match we we have
+                throw new IllegalArgumentException(String.format("Killbill doesn't support updating the account BCD yet: new=%s, current=%s", billCycleDayLocal, currentAccount.getBillCycleDayLocal()));
+            } else if (currentAccount.getBillCycleDayLocal() == DEFAULT_BILLING_CYCLE_DAY_LOCAL && // There is *not* already a BCD set
+                       billCycleDayLocal != null && // and the value proposed is not null
+                       billCycleDayLocal != DEFAULT_BILLING_CYCLE_DAY_LOCAL) {  // and the proposed date is not 0
                 accountData.setBillCycleDayLocal(billCycleDayLocal);
             } else {
-                // Default to current value
-                accountData.setBillCycleDayLocal(currentAccount.getBillCycleDayLocal() == null ? DEFAULT_BILLING_CYCLE_DAY_LOCAL : currentAccount.getBillCycleDayLocal());
+                accountData.setBillCycleDayLocal(currentAccount.getBillCycleDayLocal());
             }
             // Set all updatable fields with the new values if non null, otherwise defaults to the current values
@@ Expand Down Expand Up @@
             return new DefaultAccount(currentAccount.getId(), accountData);
         }
+        public ImmutableAccountData toImmutableAccountData() {
+            return new DefaultImmutableAccountData(this);
+        }
         @Override
         public String toString() {
             return "DefaultAccount [externalKey=" + externalKey +
@@ Expand Down @@

account/src/main/java/org/killbill/billing/account/api/DefaultImmutableAccountData.java

-Original file line number
+Diff line change
@@ -0,0 +1,62 @@
+    /*
+     * 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.account.api;
+    import java.util.UUID;
+    import org.joda.time.DateTimeZone;
+    import org.killbill.billing.catalog.api.Currency;
+    public class DefaultImmutableAccountData implements ImmutableAccountData {
+        private final UUID id;
+        private final String externalKey;
+        private final Currency currency;
+        private final DateTimeZone dateTimeZone;
+        public DefaultImmutableAccountData(final UUID id, final String externalKey, final Currency currency, final DateTimeZone dateTimeZone) {
+            this.id = id;
+            this.externalKey = externalKey;
+            this.currency = currency;
+            this.dateTimeZone = dateTimeZone;
+        }
+        public DefaultImmutableAccountData(final Account account) {
+            this(account.getId(), account.getExternalKey(), account.getCurrency(), account.getTimeZone());
+        }
+        @Override
+        public UUID getId() {
+            return id;
+        }
+        @Override
+        public String getExternalKey() {
+            return externalKey;
+        }
+        @Override
+        public Currency getCurrency() {
+            return currency;
+        }
+        @Override
+        public DateTimeZone getTimeZone() {
+            return dateTimeZone;
+        }
+    }

0 ...ccount/api/DefaultMutableAccountData.java → ...ccount/api/DefaultMutableAccountData.java

File renamed without changes.

account/src/main/java/org/killbill/billing/account/api/svcs/DefaultAccountInternalApi.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -22,65 +22,95 @@
  
    import javax.inject.Inject;

    import org.killbill.billing.ErrorCode;

    import org.killbill.billing.ObjectType;

    import org.killbill.billing.account.api.Account;

    import org.killbill.billing.account.api.AccountApiException;

    import org.killbill.billing.account.api.AccountData;

    import org.killbill.billing.account.api.AccountEmail;

    import org.killbill.billing.account.api.AccountInternalApi;

    import org.killbill.billing.account.api.DefaultAccount;

    import org.killbill.billing.account.api.DefaultAccountEmail;

    import org.killbill.billing.account.api.DefaultImmutableAccountData;

    import org.killbill.billing.account.api.DefaultMutableAccountData;

    import org.killbill.billing.account.api.ImmutableAccountData;

    import org.killbill.billing.account.api.MutableAccountData;

    import org.killbill.billing.account.api.user.DefaultAccountApiBase;

    import org.killbill.billing.account.dao.AccountDao;

    import org.killbill.billing.account.dao.AccountEmailModelDao;

    import org.killbill.billing.account.dao.AccountModelDao;

    import org.killbill.billing.callcontext.InternalCallContext;

    import org.killbill.billing.callcontext.InternalTenantContext;

    import org.killbill.billing.util.entity.DefaultPagination;

    import org.killbill.billing.util.entity.Pagination;

    import org.killbill.billing.util.cache.AccountBCDCacheLoader;

    import org.killbill.billing.util.cache.Cachable.CacheType;

    import org.killbill.billing.util.cache.CacheController;

    import org.killbill.billing.util.cache.CacheControllerDispatcher;

    import org.killbill.billing.util.cache.CacheLoaderArgument;

    import org.killbill.billing.util.cache.ImmutableAccountCacheLoader.LoaderCallback;

    import org.killbill.billing.util.dao.NonEntityDao;

    import com.google.common.base.Function;

    import com.google.common.collect.Collections2;

    import com.google.common.collect.ImmutableList;

    import com.google.common.collect.Iterators;

    public class DefaultAccountInternalApi implements AccountInternalApi {

    public class DefaultAccountInternalApi extends DefaultAccountApiBase implements AccountInternalApi {

        private final AccountDao accountDao;

        private final CacheControllerDispatcher cacheControllerDispatcher;

        private final CacheController accountCacheController;

        private final CacheController bcdCacheController;

        private final NonEntityDao nonEntityDao;

        @Inject

        public DefaultAccountInternalApi(final AccountDao accountDao) {

        public DefaultAccountInternalApi(final AccountDao accountDao,

                                         final NonEntityDao nonEntityDao,

                                         final CacheControllerDispatcher cacheControllerDispatcher) {

            super(accountDao, nonEntityDao, cacheControllerDispatcher);

            this.accountDao = accountDao;

            this.nonEntityDao = nonEntityDao;

            this.cacheControllerDispatcher = cacheControllerDispatcher;

            this.accountCacheController = cacheControllerDispatcher.getCacheController(CacheType.ACCOUNT_IMMUTABLE);

            this.bcdCacheController = cacheControllerDispatcher.getCacheController(CacheType.ACCOUNT_BCD);

        }

        @Override

        public Account getAccountById(final UUID accountId, final InternalTenantContext context) throws AccountApiException {

            final AccountModelDao account = accountDao.getById(accountId, context);

            if (account == null) {

                throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_ID, accountId);

            }

            return new DefaultAccount(account);

            return super.getAccountById(accountId, context);

        }

        @Override

        public Account getAccountByKey(final String key, final InternalTenantContext context) throws AccountApiException {

            return super.getAccountByKey(key, context);

        }

        @Override

        public Account getAccountByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {

            final AccountModelDao accountModelDao = getAccountModelDaoByRecordId(recordId, context);

            return new DefaultAccount(accountModelDao);

            return super.getAccountByRecordId(recordId, context);

        }

        @Override

        public void updateAccount(final String externalKey, final AccountData accountData,

                                  final InternalCallContext context) throws AccountApiException {

        public void updateBCD(final String externalKey, final int bcd,

                              final InternalCallContext context) throws AccountApiException {

            final Account currentAccount = getAccountByKey(externalKey, context);

            if (currentAccount == null) {

                throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_KEY, externalKey);

            }

            if (currentAccount.getBillCycleDayLocal() != DefaultMutableAccountData.DEFAULT_BILLING_CYCLE_DAY_LOCAL) {

                throw new AccountApiException(ErrorCode.ACCOUNT_UPDATE_FAILED);

            }

            // Set unspecified (null) fields to their current values

            final Account updatedAccount = new DefaultAccount(currentAccount.getId(), accountData);

            final AccountModelDao accountToUpdate = new AccountModelDao(currentAccount.getId(), updatedAccount.mergeWithDelegate(currentAccount));

            final MutableAccountData mutableAccountData = currentAccount.toMutableAccountData();

            mutableAccountData.setBillCycleDayLocal(bcd);

            final AccountModelDao accountToUpdate = new AccountModelDao(currentAccount.getId(), mutableAccountData);

            bcdCacheController.remove(currentAccount.getId());

            bcdCacheController.putIfAbsent(currentAccount.getId(), new Integer(bcd));

            accountDao.update(accountToUpdate, context);

        }

        @Override

        public int getBCD(final UUID accountId, final InternalTenantContext context) throws AccountApiException {

            final CacheLoaderArgument arg = createBCDCacheLoaderArgument(context);

            final Integer result = (Integer) bcdCacheController.get(accountId, arg);

            return result != null ? result : DefaultMutableAccountData.DEFAULT_BILLING_CYCLE_DAY_LOCAL;

        }

        @Override

        public List<AccountEmail> getEmails(final UUID accountId,

                                            final InternalTenantContext context) {

    @@ -93,15 +123,6 @@ public AccountEmail apply(final AccountEmailModelDao input) {
  
                                                                             }));

        }

        @Override

        public Account getAccountByKey(final String key, final InternalTenantContext context) throws AccountApiException {

            final AccountModelDao accountModelDao = accountDao.getAccountByKey(key, context);

            if (accountModelDao == null) {

                throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_KEY, key);

            }

            return new DefaultAccount(accountModelDao);

        }

        @Override

        public void removePaymentMethod(final UUID accountId, final InternalCallContext context) throws AccountApiException {

            updatePaymentMethod(accountId, null, context);

    @@ -119,11 +140,56 @@ public UUID getByRecordId(final Long recordId, final InternalTenantContext conte
  
            return accountModelDao.getId();

        }

        @Override

        public ImmutableAccountData getImmutableAccountDataById(final UUID accountId, final InternalTenantContext context) throws AccountApiException {

            final Long recordId = nonEntityDao.retrieveRecordIdFromObject(accountId, ObjectType.ACCOUNT, cacheControllerDispatcher.getCacheController(CacheType.RECORD_ID));

            return getImmutableAccountDataByRecordId(recordId, context);

        }

        @Override

        public ImmutableAccountData getImmutableAccountDataByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {

            final CacheLoaderArgument arg = createImmutableAccountCacheLoaderArgument(context);

            return (ImmutableAccountData) accountCacheController.get(recordId, arg);

        }

        private AccountModelDao getAccountModelDaoByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {

            final AccountModelDao accountModelDao = accountDao.getByRecordId(recordId, context);

            if (accountModelDao == null) {

                throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_RECORD_ID, recordId);

            }

            return accountModelDao;

        }

        private int getBCDInternal(final UUID accountId, final InternalTenantContext context) {

            final Integer bcd = accountDao.getAccountBCD(accountId, context);

            return bcd != null ? bcd : DefaultMutableAccountData.DEFAULT_BILLING_CYCLE_DAY_LOCAL;

        }

        private CacheLoaderArgument createImmutableAccountCacheLoaderArgument(final InternalTenantContext context) {

            final LoaderCallback loaderCallback = new LoaderCallback() {

                @Override

                public Object loadAccount(final Long recordId, final InternalTenantContext context) {

                    final Account account = getAccountByRecordIdInternal(recordId, context);

                    return account != null ? new DefaultImmutableAccountData(account) : null;

                }

            };

            final Object[] args = new Object[1];

            args[0] = loaderCallback;

            final ObjectType irrelevant = null;

            return new CacheLoaderArgument(irrelevant, args, context);

        }

        private CacheLoaderArgument createBCDCacheLoaderArgument(final InternalTenantContext context) {

            final AccountBCDCacheLoader.LoaderCallback loaderCallback = new AccountBCDCacheLoader.LoaderCallback() {

                @Override

                public Object loadAccountBCD(final UUID accountId, final InternalTenantContext context) {

                    int bcd = getBCDInternal(accountId, context);

                    return new Integer(bcd);

                }

            };

            final Object[] args = new Object[1];

            args[0] = loaderCallback;

            final ObjectType irrelevant = null;

            return new CacheLoaderArgument(irrelevant, args, context);

        }

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

updating rocketlawyer master to latest killbill master #10

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

updating rocketlawyer master to latest killbill master #10

Are you sure you want to change the base?

Uh oh!

updating rocketlawyer master to latest killbill master #10

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!