tagging release 3.261

dxcity · dxcity · commit e7a0ecca6f98 · 2018-06-07T17:41:34.000+03:00
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,3 +1,12 @@
+QDS 3.261:
+
+* [QD-1079] Fix flaky FileWriterTest.testFilesAreReleasedAsTimePasses
+* [QD-1078] dxlib: TimeFormat shall format dates outside 0000-9999 year range as long values
+* [QD-1077] dxFeed API: Mixed content error in Javadoc
+* [QD-1039] [Webservice] Add qds-file.jar into dxfeed-webservice.war
+* [QD-1070] Update jackson to 2.9.4
+* [QD-1012] dxlib: Unescaped text in @Description annotations
+* [QD-1069] dxFeedAPI: Add PrevDayVolume to regional Summary events
 
 QDS 3.260:
 
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-api/pom.xml b/dxfeed-api/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-api/src/main/java/com/dxfeed/event/option/package.html b/dxfeed-api/src/main/java/com/dxfeed/event/option/package.html
@@ -100,7 +100,7 @@ <h4>American options</h4>
 American options.
 
 <script type="text/javascript"
-  src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML">
+        src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML">
 </script>
 </body>
 </html>
diff --git a/dxfeed-bin/pom.xml b/dxfeed-bin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-codegen-verify/pom.xml b/dxfeed-codegen-verify/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-codegen/pom.xml b/dxfeed-codegen/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-codegen/src/main/java/com/dxfeed/api/codegen/ImplCodeGen.java b/dxfeed-codegen/src/main/java/com/dxfeed/api/codegen/ImplCodeGen.java
@@ -181,7 +181,7 @@ public void runForDxfeedImpl() throws IOException {
 			map("DayClosePrice", "DayClose.Price", FieldType.DECIMAL_AS_DOUBLE).optional().
 			map("PrevDayId", "PrevDayId", FieldType.DATE).
 			map("PrevDayClosePrice", "PrevDayClose.Price", FieldType.DECIMAL_AS_DOUBLE).
-			map("PrevDayVolume", "PrevDayVolume", FieldType.DECIMAL_AS_DOUBLE).compositeOnly().optional().
+			map("PrevDayVolume", "PrevDayVolume", FieldType.DECIMAL_AS_DOUBLE).optional().
 			map("OpenInterest", "OpenInterest", FieldType.INT).compositeOnly().optional().
 			map("Flags", "Flags", FieldType.INT).optional().
 			publishable();
diff --git a/dxfeed-impl/pom.xml b/dxfeed-impl/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-impl/src/main/java/com/dxfeed/event/market/MarketFactoryImpl.java b/dxfeed-impl/src/main/java/com/dxfeed/event/market/MarketFactoryImpl.java
@@ -147,6 +147,7 @@ public void buildScheme(SchemeBuilder builder) {
 			builder.addOptionalField(recordName, "DayClose.Price", SerialFieldType.DECIMAL, "Summary", "DayClosePrice", true);
 			builder.addRequiredField(recordName, "PrevDayId", SerialFieldType.DATE);
 			builder.addRequiredField(recordName, "PrevDayClose.Price", SerialFieldType.DECIMAL);
+			builder.addOptionalField(recordName, "PrevDayVolume", SerialFieldType.DECIMAL, "Summary", "PrevDayVolume", true);
 			builder.addOptionalField(recordName, "Flags", SerialFieldType.COMPACT_INT, "Summary", "Flags", true);
 		}
 
diff --git a/dxfeed-ipf-filter/pom.xml b/dxfeed-ipf-filter/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-news/pom.xml b/dxfeed-news/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-ondemand/pom.xml b/dxfeed-ondemand/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-plotter/pom.xml b/dxfeed-plotter/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-promise/pom.xml b/dxfeed-promise/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-samples/pom.xml b/dxfeed-samples/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>dxfeed-samples</artifactId>
-  <version>3.260</version>
+  <version>3.261</version>
 	<packaging>jar</packaging>
 
 	<properties>
diff --git a/dxfeed-tools/pom.xml b/dxfeed-tools/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-viewer-installer/pom.xml b/dxfeed-viewer-installer/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-viewer/pom.xml b/dxfeed-viewer/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxfeed-webservice-impl/pom.xml b/dxfeed-webservice-impl/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/dxfeed-webservice-impl/src/main/java/com/dxfeed/webservice/DXFeedJson.java b/dxfeed-webservice-impl/src/main/java/com/dxfeed/webservice/DXFeedJson.java
@@ -136,11 +136,11 @@ static class PropertiesMapper extends PropertyNamingStrategy {
 		}
 
 		private String getDefaultPropertyName(AnnotatedMethod am) {
-			String s = BeanUtil.okNameForMutator(am, "get");
+			String s = BeanUtil.okNameForMutator(am, "get", true);
 			if (s == null)
-				s = BeanUtil.okNameForMutator(am, "is");
+				s = BeanUtil.okNameForMutator(am, "is", true);
 			if (s == null)
-				s = BeanUtil.okNameForMutator(am, "set");
+				s = BeanUtil.okNameForMutator(am, "set", true);
 			return s != null ? s : am.getName();
 		}
 
diff --git a/dxfeed-webservice-impl/src/main/java/com/dxfeed/webservice/comet/CometDMonitoringMXBean.java b/dxfeed-webservice-impl/src/main/java/com/dxfeed/webservice/comet/CometDMonitoringMXBean.java
@@ -28,7 +28,7 @@ public interface CometDMonitoringMXBean {
 
 	@Description("Dump sessions statistics averaged by total running time")
 	public String dumpSessionsAverage(
-		@Description("Order by column ('id', 'queue', 'read_mps', 'read', 'write_mps', 'write', 'time, 'inactivity')")
+		@Description("Order by column (id, queue, read_mps, read, write_mps, write, time, inactivity)")
 		String sortColumn,
 		@Description("Limit number of sessions")
 		int limit);
@@ -38,7 +38,7 @@ public String dumpSessionsAverage(
 
 	@Description("Dump sessions statistics (total values)")
 	public String dumpSessionsTotal(
-		@Description("Order by column ('id', 'queue', 'read_mps', 'read', 'write_mps', 'write', 'time, 'inactivity')")
+		@Description("Order by column (id, queue, read_mps, read, write_mps, write, time, inactivity)")
 		String sortColumn,
 		@Description("Limit number of sessions")
 		int limit);
diff --git a/dxfeed-webservice/pom.xml b/dxfeed-webservice/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -50,6 +50,11 @@
 			<classifier>javadoc</classifier>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.devexperts.qd</groupId>
+			<artifactId>qds-file</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
 		<!-- external dependencies -->
 		<dependency>
diff --git a/dxlib-qd-sandbox/pom.xml b/dxlib-qd-sandbox/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dxlib/pom.xml b/dxlib/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dxlib/src/main/java/com/devexperts/util/TimeFormat.java b/dxlib/src/main/java/com/devexperts/util/TimeFormat.java
@@ -61,6 +61,10 @@ public static void setDefaultTimeZone(TimeZone timezone) {
 		DEFAULT.formats.setTimeZone(DEFAULT.timezone);
 	}
 
+	// Add 1 extra day to accomodate time zone offset (up to 14 hours)
+	private static final long MIN_TIME = (DayUtil.getDayIdByYearMonthDay(10101) - 1) * TimeUtil.DAY;
+	private static final long MAX_TIME = (DayUtil.getDayIdByYearMonthDay(99991231) + 2) * TimeUtil.DAY;
+
 	private static final char END_CHAR = '$';
 	private static final char DATE_SEPARATOR = '-';
 	private static final char TIME_SEPARATOR = ':';
@@ -471,6 +475,9 @@ private static boolean isDigit(char c) {
 	 *
 	 * <p> When {@code time.getTime() == 0} this method returns string "0".
 	 *
+	 * <p> When {@code time} yyyyMMdd representation is outside [00010101, 99991231] range this method returns string
+	 * representing {@code time.getTime()} long value.
+	 *
 	 * @param time date and time to format.
 	 * @return string representation of data and time.
 	 * @throws NullPointerException if time is null.
@@ -489,11 +496,14 @@ public String format(long time) {
 	}
 
 	private String formatFast(long time) {
+		if (time < MIN_TIME || time > MAX_TIME)
+			return Long.toString(time);
+
 		int timeOffset = format.getTimeZone().getOffset(time);
 		int ymd = DayUtil.getYearMonthDayByDayId((int)MathUtil.div(time + timeOffset, TimeUtil.DAY));
 		int dayTime = (int)MathUtil.rem(time + timeOffset, TimeUtil.DAY);
 		if (ymd < 10101 || ymd > 99991231)
-			throw new IllegalArgumentException("time cannot be formatted " + time);
+			return Long.toString(time);
 
 		char[] chars = new char[format.standardLength];
 		int offset = 0;
diff --git a/dxlib/src/test/java/com/devexperts/util/test/TimeFormatTest.java b/dxlib/src/test/java/com/devexperts/util/test/TimeFormatTest.java
@@ -267,6 +267,17 @@ public void testNoTimeZoneFormat() {
 		assertEquals(GMT.withTimeZone().format(d1), GMT.withTimeZone().format(d2));
 	}
 
+	public void testDateOutsideIsoRangeFormat() {
+		Date d1 = new Date(Long.MIN_VALUE);
+		assertEquals(Long.toString(Long.MIN_VALUE), TimeFormat.GMT.format(d1));
+
+		Date d2 = new Date(Long.MAX_VALUE);
+		assertEquals(Long.toString(Long.MAX_VALUE), TimeFormat.GMT.format(d2));
+
+		Date d3 = new Date(TimeUtil.DAY << 32);
+		assertEquals(Long.toString(d3.getTime()), TimeFormat.GMT.format(d3));
+	}
+
 	public void testIsoFormat() {
 		// Samples from http://www.w3schools.com/schema/schema_dtypes_date.asp
 		// Test parsing
diff --git a/license/pom.xml b/license/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/mars-sample/pom.xml b/mars-sample/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/mars/pom.xml b/mars/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 	<groupId>com.devexperts.qd</groupId>
 	<artifactId>QD</artifactId>
 	<packaging>pom</packaging>
-	<version>3.260</version>
+	<version>3.261</version>
 
 	<inceptionYear>2002</inceptionYear>
 	<organization>
@@ -138,7 +138,7 @@
 		<!-- versions of frameworks and libraries to use -->
 		<log4j.version>1.1.3</log4j.version>
 		<log4j2.version>2.8.1</log4j2.version>
-		<jackson.version>2.4.3</jackson.version>
+		<jackson.version>2.9.4</jackson.version>
 		<jaxb.version>2.2.7</jaxb.version>
 		<cometd.version>3.1.1</cometd.version>
 		<slf4j.version>1.7.22</slf4j.version>
diff --git a/proto-sample/pom.xml b/proto-sample/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/proto-ssl/pom.xml b/proto-ssl/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/proto/pom.xml b/proto/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>QD</artifactId>
         <groupId>com.devexperts.qd</groupId>
-        <version>3.260</version>
+        <version>3.261</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/qd-core/pom.xml b/qd-core/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>QD</artifactId>
 		<groupId>com.devexperts.qd</groupId>
-		<version>3.260</version>
+		<version>3.261</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/qd-dataextractor/pom.xml b/qd-dataextractor/pom.xml
diff --git a/qd-logger/pom.xml b/qd-logger/pom.xml
diff --git a/qd-nio/pom.xml b/qd-nio/pom.xml
diff --git a/qd-rmi/pom.xml b/qd-rmi/pom.xml
diff --git a/qd-sample/pom.xml b/qd-sample/pom.xml
diff --git a/qd-sample/src/test/java/com/devexperts/qd/qtp/file/test/FileWriterTest.java b/qd-sample/src/test/java/com/devexperts/qd/qtp/file/test/FileWriterTest.java
diff --git a/qd-samplecert/pom.xml b/qd-samplecert/pom.xml
diff --git a/qd-servlet/pom.xml b/qd-servlet/pom.xml
diff --git a/qd-stripe/pom.xml b/qd-stripe/pom.xml
diff --git a/qd-tools/pom.xml b/qd-tools/pom.xml
diff --git a/qds-file/pom.xml b/qds-file/pom.xml
diff --git a/qds-file/src/main/java/com/devexperts/qd/qtp/file/FileWriterImpl.java b/qds-file/src/main/java/com/devexperts/qd/qtp/file/FileWriterImpl.java
diff --git a/qds-monitoring/pom.xml b/qds-monitoring/pom.xml
diff --git a/qds-tools/pom.xml b/qds-tools/pom.xml
diff --git a/qds/pom.xml b/qds/pom.xml
diff --git a/rt-api-builder/pom.xml b/rt-api-builder/pom.xml
diff --git a/teamcity-version/pom.xml b/teamcity-version/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ public void buildScheme(SchemeBuilder builder) {`
`147`	`147`	`builder.addOptionalField(recordName, "DayClose.Price", SerialFieldType.DECIMAL, "Summary", "DayClosePrice", true);`
`148`	`148`	`builder.addRequiredField(recordName, "PrevDayId", SerialFieldType.DATE);`
`149`	`149`	`builder.addRequiredField(recordName, "PrevDayClose.Price", SerialFieldType.DECIMAL);`
	`150`	`+ builder.addOptionalField(recordName, "PrevDayVolume", SerialFieldType.DECIMAL, "Summary", "PrevDayVolume", true);`
`150`	`151`	`builder.addOptionalField(recordName, "Flags", SerialFieldType.COMPACT_INT, "Summary", "Flags", true);`
`151`	`152`	`}`
`152`	`153`