=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java 2014-09-21 08:45:17 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java 2014-12-18 17:08:59 +0000 @@ -28,7 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.google.common.base.Objects; +import java.util.Date; +import java.util.TimeZone; + +import javax.validation.constraints.NotNull; + import org.joda.time.Chronology; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -36,9 +40,7 @@ import org.joda.time.LocalDateTime; import org.joda.time.chrono.ISOChronology; -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.TimeZone; +import com.google.common.base.MoreObjects; /** * Class representing a specific calendar date. @@ -421,7 +423,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "year", year ) .add( "month", month ) .add( "day", day ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-11-10 17:02:36 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-12-18 17:08:59 +0000 @@ -28,11 +28,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.google.common.base.Objects; +import java.io.Serializable; +import java.util.Date; + import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DxfNamespaces; import org.hisp.dhis.common.ImportableObject; @@ -40,8 +38,11 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import java.io.Serializable; -import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.google.common.base.MoreObjects; /** * @author Lars Helge Overland @@ -277,7 +278,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "dataSet", dataSet ) .add( "period", period ) .add( "source", source ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java 2014-10-13 05:01:18 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java 2014-12-18 17:08:59 +0000 @@ -28,15 +28,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.ArrayList; +import java.util.List; + +import org.hisp.dhis.common.DxfNamespaces; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.google.common.base.Objects; -import org.hisp.dhis.common.DxfNamespaces; - -import java.util.ArrayList; -import java.util.List; +import com.google.common.base.MoreObjects; /** * @author Morten Olav Hansen @@ -66,7 +67,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "completeDataSetRegistrations", completeDataSetRegistrations ) .toString(); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java 2014-10-02 08:22:56 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java 2014-12-18 17:08:59 +0000 @@ -28,16 +28,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE */ -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import org.hisp.dhis.node.exception.InvalidTypeException; import org.hisp.dhis.node.types.SimpleNode; import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** * @author Morten Olav Hansen @@ -230,7 +232,7 @@ @Override public String toString() { - return com.google.common.base.Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "name", name ) .add( "nodeType", nodeType ) .add( "parent", (parent != null ? parent.getName() : null) ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java 2014-12-08 00:33:34 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java 2014-12-18 17:08:59 +0000 @@ -28,16 +28,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.lang.reflect.Method; + +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.NameableObject; +import org.springframework.core.Ordered; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.NameableObject; -import org.springframework.core.Ordered; - -import java.lang.reflect.Method; /** * @author Morten Olav Hansen @@ -526,7 +528,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "klass", klass ) .add( "itemKlass", itemKlass ) .add( "getterMethod", getterMethod ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2014-11-11 04:15:29 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2014-12-18 17:08:59 +0000 @@ -28,21 +28,23 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.List; +import java.util.Map; + +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.NameableObject; +import org.springframework.core.Ordered; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.NameableObject; -import org.springframework.core.Ordered; - -import java.util.List; -import java.util.Map; /** * @author Morten Olav Hansen @@ -412,7 +414,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "klass", klass ) .add( "identifiableObject", identifiableObject ) .add( "nameableObject", nameableObject ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2014-12-04 09:28:27 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2014-12-18 17:08:59 +0000 @@ -28,13 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DimensionType; import org.hisp.dhis.common.DimensionalObject; @@ -49,10 +47,12 @@ import org.hisp.dhis.dataset.DataSet; import org.springframework.util.StringUtils; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * @author Nguyen Hong Duc === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/CsvEventDataValue.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/CsvEventDataValue.java 2014-10-08 06:15:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/CsvEventDataValue.java 2014-12-18 17:08:59 +0000 @@ -28,11 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.Objects; + +import org.springframework.util.Assert; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import org.springframework.util.Assert; - -import java.util.Objects; +import com.google.common.base.MoreObjects; /** * @author Morten Olav Hansen @@ -294,7 +296,7 @@ @Override public String toString() { - return com.google.common.base.Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "event", event ) .add( "status", status ) .add( "program", program ) === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/FieldMap.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/FieldMap.java 2014-06-25 13:32:36 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/FieldMap.java 2014-12-18 17:08:59 +0000 @@ -28,13 +28,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE */ -import com.google.common.base.Objects; +import java.util.Map; + +import org.hisp.dhis.node.LinearNodePipeline; +import org.hisp.dhis.node.NodePropertyConverter; + +import com.google.common.base.MoreObjects; import com.google.common.collect.ForwardingMap; import com.google.common.collect.Maps; -import org.hisp.dhis.node.LinearNodePipeline; -import org.hisp.dhis.node.NodePropertyConverter; - -import java.util.Map; /** * @author Morten Olav Hansen @@ -76,7 +77,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "map", standardToString() ) .add( "nodePropertyConverter", nodePropertyConverter ) .toString(); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java 2014-10-14 10:55:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java 2014-12-18 17:08:59 +0000 @@ -28,12 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.common.DxfNamespaces; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.google.common.base.Objects; -import org.hisp.dhis.common.DxfNamespaces; +import com.google.common.base.MoreObjects; /** * @author Morten Olav Hansen @@ -173,7 +174,7 @@ @Override public String toString() { - return Objects.toStringHelper( this ) + return MoreObjects.toStringHelper( this ) .add( "status", status ) .add( "code", code ) .add( "httpStatusCode", httpStatusCode ) === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUserGroupAccess.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUserGroupAccess.java 2014-11-14 13:19:13 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUserGroupAccess.java 2014-12-18 17:08:59 +0000 @@ -29,7 +29,7 @@ */ import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * @author Morten Olav Hansen @@ -81,7 +81,7 @@ public String toString() { - return Objects.toStringHelper( this ). + return MoreObjects.toStringHelper( this ). add( "id", id ).add( "name", name ).add( "access", access ).toString(); } }