/*
 * Copyright (c) 2017, 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.dataset;

import android.support.annotation.NonNull;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.auto.value.AutoValue;

import org.hisp.dhis.android.core.common.ObjectWithUid;
import org.hisp.dhis.android.core.data.api.Fields;
import org.hisp.dhis.android.core.data.api.NestedField;

@AutoValue
public abstract class DataSetElements {
    private final static String DATA_ELEMENT = "dataElement";

    public static final NestedField<DataSetElements, ObjectWithUid> dataElement =
            NestedField.create(DATA_ELEMENT);

    public static final Fields<DataSetElements> allFields =
            Fields.<DataSetElements>builder().fields(dataElement.with(ObjectWithUid.uid)).build();

    @NonNull
    @JsonProperty(DATA_ELEMENT)
    public abstract ObjectWithUid dataElement();

    @JsonCreator
    public static DataSetElements create(
            @JsonProperty(DATA_ELEMENT) ObjectWithUid dataElement) {

        return new AutoValue_DataSetElements(dataElement);
    }
}

@@ -1633,16 +1633,60 @@
 NonNull;
+%0Aimport android.support.annotation.Nullable;
 %0A%0Aimport
@@ -2103,16 +2103,82 @@
 lement%22;
+%0A    private final static String CATEGORY_COMBO = %22categoryCombo%22;
 %0A%0A    pu
@@ -2296,24 +2296,157 @@
 _ELEMENT);%0A%0A
+    public static final NestedField%3CDataSetElements, ObjectWithUid%3E categoryCombo =%0A            NestedField.create(CATEGORY_COMBO);%0A%0A
     public s
@@ -2581,16 +2581,75 @@
 Uid.uid)
+,%0A                    categoryCombo.with(ObjectWithUid.uid)
 ).build(
@@ -2743,24 +2743,124 @@
 Element();%0A%0A
+    @Nullable%0A    @JsonProperty(CATEGORY_COMBO)%0A    public abstract ObjectWithUid categoryCombo();%0A%0A
     @JsonCre
@@ -2971,16 +2971,87 @@
 aElement
+,%0A            @JsonProperty(CATEGORY_COMBO) ObjectWithUid categoryCombo
 ) %7B%0A%0A   
@@ -3103,16 +3103,31 @@
 aElement
+, categoryCombo
 );%0A    %7D
@@ -3128,9 +3128,8 @@
 %0A    %7D%0A%7D
-%0A

Add categoryCombo field to DataSetElements