SSDM-3511: reformatted

SVN: 36339

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiJsonServer.java

@@ -54,11 +54,12 @@ public class ApplicationServerApiJsonServer extends AbstractApiJsonServiceExport
     }
 
     @RequestMapping(
-            { IApplicationServerApi.JSON_SERVICE_URL, "/openbis" + IApplicationServerApi.JSON_SERVICE_URL })
+    { IApplicationServerApi.JSON_SERVICE_URL, "/openbis" + IApplicationServerApi.JSON_SERVICE_URL })
     @Override
     public void handleRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException,
-            IOException {
+            IOException
+    {
         super.handleRequest(request, response);
     }
 }

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiServer.java

@@ -47,10 +47,11 @@ public class ApplicationServerApiServer extends AbstractApiServiceExporter
     }
 
     @RequestMapping(
-            { IApplicationServerApi.SERVICE_URL, "/openbis" + IApplicationServerApi.SERVICE_URL, "/openbis/openbis" + IApplicationServerApi.SERVICE_URL })
+    { IApplicationServerApi.SERVICE_URL, "/openbis" + IApplicationServerApi.SERVICE_URL, "/openbis/openbis" + IApplicationServerApi.SERVICE_URL })
     @Override
     public void handleRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
+            throws ServletException, IOException
+    {
         super.handleRequest(request, response);
-    }            
+    }
 }

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCache.java

@@ -38,19 +38,18 @@ public class SearchCache<CRITERIA, FETCH_OPTIONS, OBJECT> implements ISearchCach
 
     @Autowired
     private CacheManager cacheManager;
-    
+
     private RuntimeCache<SearchCacheKey<CRITERIA, FETCH_OPTIONS>, SearchCacheEntry<OBJECT>> runtimeCache;
-    
+
     public SearchCache()
     {
     }
-    
+
     public SearchCache(RuntimeCache<SearchCacheKey<CRITERIA, FETCH_OPTIONS>, SearchCacheEntry<OBJECT>> runtimeCache)
     {
         this.runtimeCache = runtimeCache;
     }
 
-
     @Override
     public SearchCacheEntry<OBJECT> get(SearchCacheKey<CRITERIA, FETCH_OPTIONS> key)
     {

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/CodeMatcher.java

@@ -19,8 +19,6 @@ package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common;
 import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public class CodeMatcher<OBJECT extends ICodeHolder> extends StringFieldMatcher<OBJECT>

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/TechIdStringIdentifierRecord.java

@@ -17,12 +17,11 @@
 package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public class TechIdStringIdentifierRecord
 {
     public Long id;
+
     public String identifier;
 }

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypeExecutor.java

@@ -21,8 +21,6 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.ISearchObject
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface ISearchDataSetTypeExecutor extends ISearchObjectExecutor<EntityTypeSearchCriteria, DataSetTypePE>

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypeExecutor.java

@@ -23,8 +23,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 @Component

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSearchEntityTypeExecutor.java

@@ -29,8 +29,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public abstract class AbstractSearchEntityTypeExecutor<ENTITY_TYPE_PE extends EntityTypePE>
@@ -42,7 +40,7 @@ public abstract class AbstractSearchEntityTypeExecutor<ENTITY_TYPE_PE extends En
     {
         this.entityKind = entityKind;
     }
-    
+
     @Override
     protected List<ENTITY_TYPE_PE> listAll()
     {

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypeExecutor.java

@@ -21,8 +21,6 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.ISearchObject
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface ISearchExperimentTypeExecutor extends ISearchObjectExecutor<EntityTypeSearchCriteria, ExperimentTypePE>

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypeExecutor.java

@@ -23,8 +23,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 @Component

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialTechIdByIdExecutor.java

@@ -19,10 +19,7 @@ package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IMapObjectByIdExecutor;
 
-
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface IMapMaterialTechIdByIdExecutor extends IMapObjectByIdExecutor<IMaterialId, Long>

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypeExecutor.java

@@ -21,8 +21,6 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.ISearchObject
 import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialTypePE;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface ISearchMaterialTypeExecutor extends ISearchObjectExecutor<EntityTypeSearchCriteria, MaterialTypePE>

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ListMaterialsTechIdByPermId.java

@@ -31,11 +31,9 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.helper.common.AbstractListTec
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
-public class ListMaterialsTechIdByPermId  extends AbstractListTechIdById<MaterialPermId>
+public class ListMaterialsTechIdByPermId extends AbstractListTechIdById<MaterialPermId>
 {
 
     @Override

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialQuery.java

@@ -26,15 +26,13 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.entity.common.Obje
 import ch.systemsx.cisd.common.db.mapper.StringArrayMapper;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface MaterialQuery extends ObjectQuery
 {
     @Select(sql = "select m.id, m.code as identifier from materials m join material_types t on m.maty_id = t.id "
             + "where t.code = ?{1} and m.code = any(?{2})", parameterBindings =
-        { TypeMapper.class, StringArrayMapper.class }, fetchSize = FETCH_SIZE)
+    { TypeMapper.class, StringArrayMapper.class }, fetchSize = FETCH_SIZE)
     public List<TechIdStringIdentifierRecord> listMaterialTechIdsByCodes(String typeCode, String[] codes);
 
 }

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypeExecutor.java

@@ -23,8 +23,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 @Component

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SetMaterialTypeExecutor.java

@@ -37,7 +37,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
  * @author Jakub Straszewski
  */
 @Component
-public class SetMaterialTypeExecutor extends AbstractSetEntityToOneRelationExecutor<MaterialCreation, MaterialPE, IEntityTypeId, EntityTypePE> implements
+public class SetMaterialTypeExecutor extends AbstractSetEntityToOneRelationExecutor<MaterialCreation, MaterialPE, IEntityTypeId, EntityTypePE>
+        implements
         ISetMaterialTypeExecutor
 {
 

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/AbstractIdSearchMethodExecutor.java

@@ -26,12 +26,9 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.ISearchObject
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
-public abstract class AbstractIdSearchMethodExecutor<OBJECT, OBJECT_PE extends IIdHolder, 
-            CRITERIA extends AbstractSearchCriteria, FETCH_OPTIONS extends FetchOptions<OBJECT>>
+public abstract class AbstractIdSearchMethodExecutor<OBJECT, OBJECT_PE extends IIdHolder, CRITERIA extends AbstractSearchCriteria, FETCH_OPTIONS extends FetchOptions<OBJECT>>
         extends AbstractSearchMethodExecutor<OBJECT, Long, CRITERIA, FETCH_OPTIONS>
 {
 
@@ -53,7 +50,7 @@ public abstract class AbstractIdSearchMethodExecutor<OBJECT, OBJECT_PE extends I
                 }
             };
     }
-    
+
     protected abstract List<OBJECT_PE> searchPEs(IOperationContext context, CRITERIA criteria);
-    
+
 }

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ExecuteCustomASServiceMethodExecutor.java

@@ -28,8 +28,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.ICustomASServiceExecu
 import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context.CustomASServiceContext;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 @Component

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/IExecuteCustomASServiceMethodExecutor.java

@@ -20,8 +20,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASServiceExecution
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.id.ICustomASServiceId;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public interface IExecuteCustomASServiceMethodExecutor

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ISearchCustomASServiceMethodExecutor.java

@@ -21,11 +21,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions.CustomASSer
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.search.CustomASServiceSearchCriteria;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
-public interface ISearchCustomASServiceMethodExecutor extends ISearchMethodExecutor<CustomASService, CustomASServiceSearchCriteria, CustomASServiceFetchOptions>
+public interface ISearchCustomASServiceMethodExecutor extends
+        ISearchMethodExecutor<CustomASService, CustomASServiceSearchCriteria, CustomASServiceFetchOptions>
 {
 
 }