Skip to content

Commit 332675e

Browse files
mjpt777mjpt777
committed
[Java] Don't provide default values for EPOCH and TIME_UNIT unless provided in the schema. Issue #554.
1 parent 4f6e7be commit 332675e

File tree

5 files changed

+76
-76
lines changed

5 files changed

+76
-76
lines changed

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecDecoder.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public static String irIdMetaAttribute(final MetaAttribute metaAttribute)
110110
{
111111
switch (metaAttribute)
112112
{
113-
case EPOCH: return "unix";
114-
case TIME_UNIT: return "nanosecond";
113+
case EPOCH: return "";
114+
case TIME_UNIT: return "";
115115
case SEMANTIC_TYPE: return "";
116116
case PRESENCE: return "required";
117117
}
@@ -164,8 +164,8 @@ public static String irVersionMetaAttribute(final MetaAttribute metaAttribute)
164164
{
165165
switch (metaAttribute)
166166
{
167-
case EPOCH: return "unix";
168-
case TIME_UNIT: return "nanosecond";
167+
case EPOCH: return "";
168+
case TIME_UNIT: return "";
169169
case SEMANTIC_TYPE: return "";
170170
case PRESENCE: return "required";
171171
}
@@ -218,8 +218,8 @@ public static String schemaVersionMetaAttribute(final MetaAttribute metaAttribut
218218
{
219219
switch (metaAttribute)
220220
{
221-
case EPOCH: return "unix";
222-
case TIME_UNIT: return "nanosecond";
221+
case EPOCH: return "";
222+
case TIME_UNIT: return "";
223223
case SEMANTIC_TYPE: return "";
224224
case PRESENCE: return "required";
225225
}
@@ -550,18 +550,18 @@ public StringBuilder appendTo(final StringBuilder builder)
550550
}
551551
builder.append(BLOCK_LENGTH);
552552
builder.append("):");
553-
//Token{signal=BEGIN_FIELD, name='irId', referencedName='null', description='null', id=1, version=0, deprecated=0, encodedLength=0, offset=0, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
554-
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=0, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
553+
//Token{signal=BEGIN_FIELD, name='irId', referencedName='null', description='null', id=1, version=0, deprecated=0, encodedLength=0, offset=0, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
554+
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=0, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
555555
builder.append("irId=");
556556
builder.append(irId());
557557
builder.append('|');
558-
//Token{signal=BEGIN_FIELD, name='irVersion', referencedName='null', description='null', id=2, version=0, deprecated=0, encodedLength=0, offset=4, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
559-
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=4, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
558+
//Token{signal=BEGIN_FIELD, name='irVersion', referencedName='null', description='null', id=2, version=0, deprecated=0, encodedLength=0, offset=4, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
559+
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=4, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
560560
builder.append("irVersion=");
561561
builder.append(irVersion());
562562
builder.append('|');
563-
//Token{signal=BEGIN_FIELD, name='schemaVersion', referencedName='null', description='null', id=3, version=0, deprecated=0, encodedLength=0, offset=8, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
564-
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=8, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='unix', timeUnit=nanosecond, semanticType='null'}}
563+
//Token{signal=BEGIN_FIELD, name='schemaVersion', referencedName='null', description='null', id=3, version=0, deprecated=0, encodedLength=0, offset=8, componentTokenCount=3, encoding=Encoding{presence=REQUIRED, primitiveType=null, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
564+
//Token{signal=ENCODING, name='int32', referencedName='null', description='null', id=-1, version=0, deprecated=0, encodedLength=4, offset=8, componentTokenCount=1, encoding=Encoding{presence=REQUIRED, primitiveType=INT32, byteOrder=LITTLE_ENDIAN, minValue=null, maxValue=null, nullValue=null, constValue=null, characterEncoding='null', epoch='null', timeUnit=null, semanticType='null'}}
565565
builder.append("schemaVersion=");
566566
builder.append(schemaVersion());
567567
builder.append('|');

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecEncoder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public static String irIdMetaAttribute(final MetaAttribute metaAttribute)
118118
{
119119
switch (metaAttribute)
120120
{
121-
case EPOCH: return "unix";
122-
case TIME_UNIT: return "nanosecond";
121+
case EPOCH: return "";
122+
case TIME_UNIT: return "";
123123
case SEMANTIC_TYPE: return "";
124124
case PRESENCE: return "required";
125125
}
@@ -173,8 +173,8 @@ public static String irVersionMetaAttribute(final MetaAttribute metaAttribute)
173173
{
174174
switch (metaAttribute)
175175
{
176-
case EPOCH: return "unix";
177-
case TIME_UNIT: return "nanosecond";
176+
case EPOCH: return "";
177+
case TIME_UNIT: return "";
178178
case SEMANTIC_TYPE: return "";
179179
case PRESENCE: return "required";
180180
}
@@ -228,8 +228,8 @@ public static String schemaVersionMetaAttribute(final MetaAttribute metaAttribut
228228
{
229229
switch (metaAttribute)
230230
{
231-
case EPOCH: return "unix";
232-
case TIME_UNIT: return "nanosecond";
231+
case EPOCH: return "";
232+
case TIME_UNIT: return "";
233233
case SEMANTIC_TYPE: return "";
234234
case PRESENCE: return "required";
235235
}

0 commit comments

Comments
 (0)