Updated Branches: refs/pull/18/head 8781eaf76 -> e3f8bba53 refs/pull/18/merge 4b2e18791 -> 2709c964e (forced update)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java index 265c1ae..7a0eb5d 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java @@ -1,10 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.entity; import java.util.UUID; - import org.apache.usergrid.persistence.model.field.value.EntityObject; - import com.google.common.base.Preconditions; @@ -27,7 +43,6 @@ public class Entity extends EntityObject { private UUID version; - /** * Create an entity with the given type and id. Should be used for all update operations to an existing entity */ @@ -47,7 +62,6 @@ public class Entity extends EntityObject { } - /** * Do not use! This is only for serialization. */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Id.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Id.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Id.java index 3a9d49b..d456325 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Id.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Id.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.entity; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java index 08ae920..e894891 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.entity; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java index cb5f45d..1e45884 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java @@ -1,27 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; +/** + * A marker to signal array handling. Just delegates to list field for easier handling internally + */ +public class ArrayField extends ListField { -import java.util.ArrayList; -import java.util.List; - - -/** A marker to signal array handling. Just delegates to list field for easier handling internally */ -public class ArrayField extends ListField -{ - - /** Contructor that intializes with an empty set for adding to later */ - public ArrayField( String name ) - { - super(name); + /** + * Contructor that intializes with an empty set for adding to later + */ + public ArrayField( String name ) { + super( name ); } - public ArrayField(){ + public ArrayField() { super(); } - /** Add the value to the list */ - public void add( Field field ) - { + /** + * Add the value to the list + */ + public void add( Field field ) { value.add( field ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/BooleanField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/BooleanField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/BooleanField.java index 63097e0..fed011d 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/BooleanField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/BooleanField.java @@ -18,9 +18,7 @@ package org.apache.usergrid.persistence.model.field; /** - * * @author: tnine - * */ public class BooleanField extends AbstractField<Boolean> { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteBufferField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteBufferField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteBufferField.java index 2dbc193..29dcb6b 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteBufferField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteBufferField.java @@ -1,28 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import java.nio.ByteBuffer; +/** + * A field for storing byte buffers + */ +public class ByteBufferField extends AbstractField<ByteBuffer> { -/** A field for storing byte buffers */ -public class ByteBufferField extends AbstractField<ByteBuffer> -{ - - - /** Creates an immutable copy of the byte buffer */ - public ByteBufferField( String name, ByteBuffer value ) - { + /** + * Creates an immutable copy of the byte buffer + */ + public ByteBufferField( String name, ByteBuffer value ) { //always return a duplicate so we don't mess with the markers super( name, value.duplicate() ); } public ByteBufferField() { - } + } @Override - public ByteBuffer getValue() - { + public ByteBuffer getValue() { //always return a duplicate so we don't mess with the markers return value.duplicate(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DoubleField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DoubleField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DoubleField.java index 07f847c..2f358bd 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DoubleField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DoubleField.java @@ -18,9 +18,7 @@ package org.apache.usergrid.persistence.model.field; /** - * * @author: tnine - * */ public class DoubleField extends AbstractField<Double> { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java index d44ba2f..7739291 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java @@ -1,20 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import org.apache.usergrid.persistence.model.field.value.EntityObject; +/** + * An object field + */ +public class EntityObjectField extends AbstractField<EntityObject> { -/** An object field */ -public class EntityObjectField extends AbstractField<EntityObject> -{ - - - public EntityObjectField( String name, EntityObject value ) - { + public EntityObjectField( String name, EntityObject value ) { super( name, value ); } public EntityObjectField() { - } + } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/Field.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/Field.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/Field.java index 4f5a917..460ca9e 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/Field.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/Field.java @@ -1,12 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import java.io.Serializable; - /** - * Interface for fields. All fields must implement this method The T is the type of field (in the java runtime) The V - * is the value of the field + * Interface for fields. All fields must implement this method The T is the type of field + * (in the java runtime) The V is the value of the field * @param <T> */ public interface Field<T> extends Serializable { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/IntegerField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/IntegerField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/IntegerField.java index 6a311e6..6412b35 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/IntegerField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/IntegerField.java @@ -18,9 +18,7 @@ package org.apache.usergrid.persistence.model.field; /** - * * @author: tnine - * */ public class IntegerField extends AbstractField<Integer> { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java index 0795201..cb0e297 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java @@ -1,28 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import java.util.ArrayList; import java.util.List; +/** + * An object field that represents a list of objects. This can also be used to represent arrays + */ +public class ListField extends AbstractField<List<Field>> { -/** An object field that represents a list of objects. This can also be used to represent arrays */ -public class ListField extends AbstractField<List<Field>> -{ - - /** Contructor that intializes with an empty set for adding to later */ - public ListField( String name ) - { + /** + * Contructor that intializes with an empty set for adding to later + */ + public ListField( String name ) { super( name, new ArrayList<Field>() ); } - public ListField(){ + public ListField() { super(); } - - /** Add the value to the list */ - public void add( Field field ) - { + /** + * Add the value to the list + */ + public void add( Field field ) { value.add( field ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java index 76d1094..29e3169 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java @@ -1,20 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import org.apache.usergrid.persistence.model.field.value.Location; +/** + * Basic field for storing location data + */ +public class LocationField extends AbstractField<Location> { -/** Basic field for storing location data */ -public class LocationField extends AbstractField<Location> -{ - - /** Create a location field with the given point */ - public LocationField( String name, Location value ) - { + /** + * Create a location field with the given point + */ + public LocationField( String name, Location value ) { super( name, value ); } public LocationField() { - } + } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java index f28b5ec..329289c 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java @@ -1,28 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field; - import java.util.LinkedHashSet; import java.util.Set; +/** + * An object field that represents a set of objects + */ +public class SetField extends AbstractField<Set<Field>> { -/** An object field that represents a set of objects */ -public class SetField extends AbstractField<Set<Field>> -{ - - - /** Contructor that intializes with an empty set for adding to later */ - public SetField( String name ) - { + /** + * Contructor that intializes with an empty set for adding to later + */ + public SetField( String name ) { super( name, new LinkedHashSet<Field>() ); } public SetField() { - } + } - /** Add an entry to the set */ - public void addEntry( Field field ) - { + /** + * Add an entry to the set + */ + public void addEntry( Field field ) { value.add( field ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java index fb69afb..e898392 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java @@ -1,6 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field.value; - import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -8,33 +25,34 @@ import java.util.Map; import org.apache.usergrid.persistence.model.field.Field; +/** + * Simple wrapper for holding nested objects + */ +public class EntityObject implements Serializable { -/** Simple wrapper for holding nested objects */ -public class EntityObject implements Serializable -{ - - - /** Fields the users can set */ - private Map<String, Field> fields = new HashMap<String, Field>(); + /** + * Fields the users can set + */ + private final Map<String, Field> fields = new HashMap<String, Field>(); - - /** Add the field, return the old one if it existed */ - public <T extends java.lang.Object> Field<T> setField( Field<T> value ) - { + /** + * Add the field, return the old one if it existed + */ + public <T extends java.lang.Object> Field<T> setField( Field<T> value ) { return fields.put( value.getName(), value ); } - - /** Get the field by name the user has set into the entity */ - public <T extends java.lang.Object> Field<T> getField( String name ) - { + /** + * Get the field by name the user has set into the entity + */ + public <T extends java.lang.Object> Field<T> getField( String name ) { return fields.get( name ); } - - /** Get all fields in the entity */ - public Collection<Field> getFields() - { + /** + * Get all fields in the entity + */ + public Collection<Field> getFields() { return fields.values(); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java index 083f211..224c750 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java @@ -1,32 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.field.value; - import java.io.Serializable; - -/** Geographic point. Should be used when we want to store geo information */ -public class Location implements Serializable -{ +/** + * Geographic point. Should be used when we want to store geo information + */ +public class Location implements Serializable { private final double latitude; private final double longtitude; - - public Location( double latitude, double longtitude ) - { + public Location( double latitude, double longtitude ) { this.latitude = latitude; this.longtitude = longtitude; } - - public double getLatitude() - { + public double getLatitude() { return latitude; } - - public double getLongtitude() - { + public double getLongtitude() { return longtitude; } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1aba6206/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/Verify.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/Verify.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/Verify.java index c7dd642..c6616ed 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/Verify.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/Verify.java @@ -1,6 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.usergrid.persistence.model.util; - /** * Class to help with input verification */ @@ -15,7 +32,6 @@ public class Verify { if(value != null){ throw new IllegalArgumentException(message ); } - } @@ -33,5 +49,4 @@ public class Verify { throw new IllegalArgumentException( message ); } } - }
