Commit 1759db89 authored by Grégory Mantelet's avatar Grégory Mantelet
Browse files

[TAP] Fix Javadoc

parent 8af5a319

src/tap/ServiceConnection.java

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import uws.service.file.UWSFileManager; 
 * </p>

 *

 * @author Gr&eacute;gory Mantelet (CDS;ARI)

 * @version 2.3 (03/2019)

 * @version 2.3 (04/2019)

 */

public interface ServiceConnection {
@@ -52,7 +52,7 @@ public interface ServiceConnection { 
	 * List of possible limit units.

	 *

	 * @author Gr&eacute;gory Mantelet (CDS;ARI)

	 * @version 2.0 (01/2015)

	 * @version 2.3 (04/2019)

	 */

	public static enum LimitUnit {

		rows("row"), bytes("byte"), kilobytes("kilobyte"), megabytes("megabyte"), gigabytes("gigabyte");
@@ -120,12 +120,12 @@ public interface ServiceConnection { 
		 *

		 * @throws TAPException If the two given units are not compatible.

		 *

		 * @see #compare(long, LimitUnit, long, LimitUnit)

		 * @see #compare(long, tap.ServiceConnection.LimitUnit, long, tap.ServiceConnection.LimitUnit)

		 *

		 * @since 1.1

		 */

		public static int compare(final int leftLimit, final LimitUnit leftUnit, final int rightLimit, final LimitUnit rightUnit) throws TAPException{

			return compare(leftLimit, leftUnit, rightLimit, rightUnit);

			return compare((long)leftLimit, leftUnit, (long)rightLimit, rightUnit);

		}



		/**

src/tap/config/TAPConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -266,13 +266,13 @@ public final class TAPConfiguration { 
	/** Name/Key of the property specifying the maximum size of all VOTable(s)

	 * uploaded in a query.

	 * @deprecated	Since 2.3, use the property {@value #KEY_MAX_UPLOAD_LIMIT}

	 *            	and {@value #KEY_MAX_REQUEST_LIMIT} instead. */

	 *            	and {@value #KEY_UPLOAD_MAX_REQUEST_SIZE} instead. */

	@Deprecated

	public final static String KEY_UPLOAD_MAX_FILE_SIZE = "upload_max_file_size";

	/** Default value of the property {@value #KEY_UPLOAD_MAX_FILE_SIZE} =

	 * {@value #DEFAULT_UPLOAD_MAX_FILE_SIZE}.

	 * @deprecated	Since 2.3, use the property {@value #KEY_MAX_UPLOAD_LIMIT}

	 *            	and {@value #KEY_MAX_REQUEST_LIMIT} instead. */

	 *            	and {@value #KEY_UPLOAD_MAX_REQUEST_SIZE} instead. */

	@Deprecated

	public final static int DEFAULT_UPLOAD_MAX_FILE_SIZE = Integer.MAX_VALUE;

	/** Name/Key of the property specifying the maximum size of a whole HTTP

src/tap/log/Slf4jTAPLog.java

+5 −3
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ import uws.service.log.Slf4jUWSLog; 
 * 	The ID of the general/root logger is just

 * 	<code>{@value #DEFAULT_ROOT_LOG_ID}</code>. For all the other specific

 * 	loggers, <code>{SUFFIX}</code> is a dot followed by one among

 * 	{@value #UWS_LOG_ID_SUFFIX}, {@value #HTTP_LOG_ID_SUFFIX},

 * 	{@value #JOB_LOG_ID_SUFFIX} and {@value #THREAD_LOG_ID_SUFFIX}. Thus, the

 * 	full ID of the logger for the HTTP requests is:

 * 	{@value uws.service.log.Slf4jUWSLog#UWS_LOG_ID_SUFFIX},

 * 	{@value uws.service.log.Slf4jUWSLog#HTTP_LOG_ID_SUFFIX},

 * 	{@value uws.service.log.Slf4jUWSLog#JOB_LOG_ID_SUFFIX} and

 * 	{@value uws.service.log.Slf4jUWSLog#THREAD_LOG_ID_SUFFIX}. Thus, the full ID

 * 	of the logger for the HTTP requests is:

 * </p>

 * <pre>uws.service.http</pre>

 *