Optimized imports and javadoc

Author: mibo

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/JanosService.java

@@ -18,13 +18,13 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.api;
 
-import java.util.Collection;
-
+import org.apache.olingo.odata2.api.ODataService;
+import org.apache.olingo.odata2.api.exception.ODataException;
 import org.apache.olingo.odata2.janos.processor.api.datasource.DataSource;
 import org.apache.olingo.odata2.janos.processor.api.datasource.DataStoreManager;
 import org.apache.olingo.odata2.janos.processor.api.datasource.ValueAccess;
-import org.apache.olingo.odata2.api.ODataService;
-import org.apache.olingo.odata2.api.exception.ODataException;
+
+import java.util.Collection;
 
 /**
  * AnnotationServiceFactory which provides an AnnotationService which handles java beans (classes)

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/datasource/DataSource.java

@@ -18,17 +18,16 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.api.datasource;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmException;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
 import org.apache.olingo.odata2.api.exception.ODataApplicationException;
 import org.apache.olingo.odata2.api.exception.ODataNotFoundException;
 import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>This interface is intended to make it easier to implement an OData
  * service in cases where all data for each entity set can be provided as a {@link List} of objects from which all

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/datasource/DataStoreException.java

@@ -15,9 +15,10 @@
  */
 package org.apache.olingo.odata2.janos.processor.api.datasource;
 
-import java.util.Locale;
 import org.apache.olingo.odata2.api.exception.ODataApplicationException;
 
+import java.util.Locale;
+
 /**
  *
  */

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/datasource/DataStoreManager.java

@@ -41,16 +41,18 @@ public interface DataStoreManager {
    * @throws DataStoreException
    */
   <T> DataStore<T> createDataStore(Class<T> clz) throws DataStoreException;
+
   /**
    * Create a DataStore without managing (keeping a reference to it).
    *
    * @param clz class for which the DataStore is created
    * @param <T> type of class for which the DataStore is created
    * @param properties properties for creation
    * @return the created (and not managed) DataStore
-   * @throws DataStoreException
+   * @throws DataStoreException if something goes wrong
    */
   <T> DataStore<T> createDataStore(Class<T> clz, Map<String, String> properties) throws DataStoreException;
+
   /**
    * Create a DataStore and managing it (keeping a reference to it).
    * If a DataStore with given name already exists this will be returned.
@@ -59,9 +61,10 @@ public interface DataStoreManager {
    * @param clz class for which the DataStore is created
    * @param <T> type of class for which the DataStore is created
    * @return the created (and managed) DataStore
-   * @throws DataStoreException
+   * @throws DataStoreException if something goes wrong
    */
   <T> DataStore<T> grantDataStore(String name, Class<T> clz) throws DataStoreException;
+
   /**
    * Create a DataStore and managing it (keeping a reference to it).
    * If a DataStore with given name already exists this will be returned.
@@ -71,25 +74,26 @@ public interface DataStoreManager {
    * @param <T> type of class for which the DataStore is created
    * @param properties properties for creation
    * @return the created (and managed) DataStore
-   * @throws DataStoreException
+   * @throws DataStoreException if something goes wrong
    */
   <T> DataStore<T> grantDataStore(String name, Class<T> clz, Map<String, String> properties) throws DataStoreException;
+
   /**
    * Get a reference to an already existing (managed) DataStore.
    *
    * @param <T> type of class for which the DataStore is created
    * @param name name of the DataStore which is requested
    * @param clz class for which the DataStore is created
    * @return the created (and managed) DataStore or <code>NULL</code> if no according DataStore exists
-   * @throws DataStoreException
+   * @throws DataStoreException if something goes wrong
    */
   <T> DataStore<T> getDataStore(String name, Class<T> clz) throws DataStoreException;
+
   /**
    * Get a reference to an already existing (managed) DataStore.
    *
    * @param name name of the DataStore which is requested
    * @return the created (and managed) DataStore or <code>NULL</code> if no according DataStore exists
-   * @throws DataStoreException
    */
   DataStore<Object> getDataStore(String name);
 }

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/AbstractRefJsonTest.java

@@ -18,11 +18,10 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import org.junit.Ignore;
-
 import com.google.gson.Gson;
 import com.google.gson.internal.StringMap;
 import com.google.gson.reflect.TypeToken;
+import org.junit.Ignore;
 
 /**
  *  

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/AbstractRefTest.java

@@ -18,37 +18,29 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPatch;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
 import org.apache.log4j.Logger;
-import org.apache.olingo.odata2.janos.processor.api.JanosService;
 import org.apache.olingo.odata2.api.ODataService;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
 import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.testutil.data.JanosSampleDataGenerator;
+import org.apache.olingo.odata2.janos.processor.api.JanosService;
 import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
 /**
  * Abstract base class for tests employing the reference scenario.
  * 

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/AbstractRefXmlTest.java

@@ -18,13 +18,6 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.http.HttpResponse;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.edm.Edm;
@@ -35,6 +28,13 @@
 import org.junit.Ignore;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
+
 /**
  * Abstract base class for tests employing the reference scenario reading or writing XML.
  * 

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/EntryJsonCreateTest.java

@@ -18,19 +18,16 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.UUID;
-
+import com.google.gson.internal.StringMap;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
 import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.junit.Test;
 
-import com.google.gson.internal.StringMap;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
 
 /**
  *  

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/ServiceJsonTest.java

@@ -18,13 +18,7 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import junit.framework.Assert;
-
 import org.apache.http.HttpResponse;
 import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -34,6 +28,11 @@
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
+
 /**
  * Tests employing the reference scenario reading the service document in JSON format.
  * 

janos-it/src/test/java/org/apache/olingo/odata2/janos/processor/ref/ServiceXmlTest.java

@@ -18,11 +18,6 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.janos.processor.ref;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
-import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-
-import java.io.IOException;
-
 import org.apache.http.HttpResponse;
 import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -31,6 +26,11 @@
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+
+import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
+import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
+
 /**
  * Tests employing the reference scenario reading the service document in XML format
  */