/*
 * Copyright (c) 2004-2019, University of Oslo
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * Neither the name of the HISP project nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.hisp.dhis.android.core.arch.repositories.filters;

import android.support.annotation.NonNull;

import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory;
import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
import org.hisp.dhis.android.core.period.DatePeriod;
import org.hisp.dhis.android.core.period.InPeriodQueryHelper;
import org.hisp.dhis.android.core.period.Period;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

public final class DateFilterConnector<R extends ReadOnlyCollectionRepository<?>> extends BaseFilterConnector<R, Date> {

    DateFilterConnector(CollectionRepositoryFactory<R> repositoryFactory,
                        RepositoryScope scope,
                        String key) {
        super(repositoryFactory, scope, key);
    }

    public R before(Date value) {
        return newWithWrappedScope("<", value);
    }

    public R after(Date value) {
        return newWithWrappedScope(">", value);
    }

    public R inDatePeriods(@NonNull List<DatePeriod> datePeriods) {
        return newWithWrappedScope(InPeriodQueryHelper.buildInPeriodsQuery(key, datePeriods));
    }

    public R inPeriods(@NonNull List<Period> periods) {
        List<DatePeriod> datePeriods = new ArrayList<>();
        for (Period period : periods) {
            datePeriods.add(DatePeriod.builder().startDate(period.startDate()).endDate(period.endDate()).build());
        }
        return newWithWrappedScope(InPeriodQueryHelper.buildInPeriodsQuery(key, datePeriods));
    }

    protected String wrapValue(Date value) {
        return "'" + BaseIdentifiableObject.DATE_FORMAT.format(value) + "'";
    }
}
@@ -3202,73 +3202,22 @@
 urn 
-newWithWrappedScope(InPeriodQueryHelper.buildInPeriodsQuery(key, 
+inDatePeriods(
 date
@@ -3216,33 +3216,32 @@
 ods(datePeriods)
-)
 ;%0A    %7D%0A%0A    pro

Improve code in DateFilterConnector