Merge pull request #49 from yahoo/cleanup-javadoc

Cleanup

elide-core/src/main/java/com/yahoo/elide/core/EntityBinding.java

@@ -219,8 +219,8 @@ private void bindAttrOrRelation(Class<?> cls, AccessibleObject fieldOrMethod) {
 
     /**
      * Returns name of field whether public member or method
-     * @param fieldOrMethod
-     * @return
+     * @param fieldOrMethod field or method
+     * @return field or method name
      */
     private static String getFieldName(AccessibleObject fieldOrMethod) {
         if (fieldOrMethod instanceof Field) {
@@ -242,8 +242,8 @@ private static String getFieldName(AccessibleObject fieldOrMethod) {
 
     /**
      * Returns type of field whether public member or method
-     * @param fieldOrMethod
-     * @return
+     * @param fieldOrMethod field or method
+     * @return field type
      */
     private static Class<?> getFieldType(AccessibleObject fieldOrMethod) {
         if (fieldOrMethod instanceof Field) {

elide-core/src/main/java/com/yahoo/elide/core/EntityDictionary.java

@@ -494,7 +494,7 @@ public String getId(Object value) {
     /**
      * Returns type of id field
      * @param entityClass the entity class
-     * @return
+     * @return ID type
      */
     public Class<?> getIdType(Class<?> entityClass) {
         return entityBinding(entityClass).getIdType();

elide-core/src/main/java/com/yahoo/elide/extensions/JsonApiPatch.java

@@ -40,7 +40,7 @@
  * See: http://jsonapi.org/extensions/jsonpatch/
  */
 public class JsonApiPatch {
-    private class PatchAction {
+    private static class PatchAction {
         public final Patch patch;
 
         // Failure

elide-core/src/main/java/com/yahoo/elide/utils/coerse/CoerceUtil.java

@@ -30,7 +30,7 @@ public class CoerceUtil {
      * Convert value to target class
      * @param value value to convert
      * @param cls class to convert to
-     * @return
+     * @return coerced value
      */
     public static Object coerce(Object value, Class<?> cls) {
 

elide-core/src/main/java/com/yahoo/elide/utils/coerse/converters/ToEnumConverter.java

@@ -17,8 +17,8 @@ public class ToEnumConverter implements Converter {
      * Convert value to Enum
      * @param cls enum to convert to
      * @param value value to convert
-     * @param <T>
-     * @return
+     * @param <T> enum type
+     * @return enum
      */
     @Override
     public <T> T convert(Class<T> cls, Object value) {
@@ -41,9 +41,9 @@ public <T> T convert(Class<T> cls, Object value) {
      * Convert digit to enum
      * @param cls enum to convert to
      * @param value value to convert
-     * @param <T>
-     * @return
-     * @throws ReflectiveOperationException
+     * @param <T> enum type
+     * @return enum
+     * @throws ReflectiveOperationException reflection exception
      */
     private <T> T intToEnum(Class<?> cls, Integer value) throws ReflectiveOperationException {
         Object[] values = (Object[]) cls.getMethod("values").invoke(null, (Object[]) null);
@@ -54,8 +54,8 @@ private <T> T intToEnum(Class<?> cls, Integer value) throws ReflectiveOperationE
      * Convert string to enum
      * @param cls enum to convert to
      * @param value value to convert
-     * @param <T>
-     * @return
+     * @param <T> enum type
+     * @return enum
      */
     private <T> T stringToEnum(Class<?> cls, String value) {
         Enum e = Enum.valueOf((Class<Enum>) cls, value);

elide-core/src/test/java/com/yahoo/elide/security/UserTest.java

@@ -22,7 +22,7 @@ public class UserTest {
     private final EntityDictionary dictionary = new EntityDictionary();
     private final Logger testLogger = new TestLogger();
 
-    public class CounterCheck implements Check {
+    public static class CounterCheck implements Check {
         public int callCounter = 0;
         @Override
         public boolean ok(PersistentResource resource) {

elide-datastore/elide-datastore-inmemorydb/src/main/java/com/yahoo/elide/datastore/InMemory/InMemoryDB.java

@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -111,8 +112,8 @@ public void commit() {
         @Override
         public <T> T createObject(Class<T> entityClass) {
             if (database.get(entityClass) == null) {
-                database.put(entityClass, new ConcurrentHashMap<>());
-                TYPEIDS.put(entityClass, new AtomicLong(1));
+                database.putIfAbsent(entityClass, new ConcurrentHashMap<>());
+                TYPEIDS.putIfAbsent(entityClass, new AtomicLong(1));
             }
             AtomicLong idValue = TYPEIDS.get(entityClass);
             String id = String.valueOf(idValue.getAndIncrement());
@@ -261,10 +262,10 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("Database contents ");
         for (Class<?> cls : database.keySet()) {
-            sb.append("\n Table " + cls + " contents \n");
+            sb.append("\n Table ").append(cls).append(" contents \n");
             ConcurrentHashMap<String, Object> data = database.get(cls);
-            for (String id : data.keySet()) {
-                sb.append(" Id: " + id + " Value: " + data.get(id.toString()));
+            for (Entry<String, Object> e : data.entrySet()) {
+                sb.append(" Id: ").append(e.getKey()).append(" Value: ").append(e.getValue());
             }
         }
         return sb.toString();