From b5fa21f2b22a97fb5e43bfd02b77827c158d02f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Wed, 15 Jan 2020 01:24:27 +0100 Subject: Fix value query serialization --- .../pl/edu/mimuw/cloudatlas/model/ValueQuery.java | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/model') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java index 95f826a..e577c13 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java @@ -28,27 +28,27 @@ public class ValueQuery extends Value { * * @param query the code of the query */ - public ValueQuery(String query) throws Exception { - this.code = query; - if (!query.isEmpty()) { - Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); - this.query = (new parser(lex)).pProgram(); - } - this.signature = null; - this.timestamp = System.currentTimeMillis(); - this.installed = true; - } - - public ValueQuery(String query, byte[] querySignature) throws Exception { - this.code = query; - if (!query.isEmpty()) { - Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); - this.query = (new parser(lex)).pProgram(); - } - this.signature = querySignature; - this.timestamp = System.currentTimeMillis(); - this.installed = true; - } +// public ValueQuery(String query) throws Exception { +// this.code = query; +// if (!query.isEmpty()) { +// Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); +// this.query = (new parser(lex)).pProgram(); +// } +// this.signature = null; +// this.timestamp = System.currentTimeMillis(); +// this.installed = true; +// } + +// public ValueQuery(String query, byte[] querySignature) throws Exception { +// this.code = query; +// if (!query.isEmpty()) { +// Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); +// this.query = (new parser(lex)).pProgram(); +// } +// this.signature = querySignature; +// this.timestamp = System.currentTimeMillis(); +// this.installed = true; +// } public ValueQuery(QueryData queryData) throws Exception { this.code = queryData.getCode(); @@ -57,7 +57,7 @@ public class ValueQuery extends Value { this.query = (new parser(lex)).pProgram(); } this.signature = queryData.getSignature(); - this.timestamp = System.currentTimeMillis(); + this.timestamp = queryData.getTimestamp(); this.installed = queryData.isInstalled(); } -- cgit v1.2.3 From 5096d5fdc1a550a53511ca4478394f778cef10be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Wed, 15 Jan 2020 01:58:07 +0100 Subject: Fix tests --- .../pl/edu/mimuw/cloudatlas/model/ValueQuery.java | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/model') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java index e577c13..2ca0c38 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java @@ -28,27 +28,27 @@ public class ValueQuery extends Value { * * @param query the code of the query */ -// public ValueQuery(String query) throws Exception { -// this.code = query; -// if (!query.isEmpty()) { -// Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); -// this.query = (new parser(lex)).pProgram(); -// } -// this.signature = null; -// this.timestamp = System.currentTimeMillis(); -// this.installed = true; -// } - -// public ValueQuery(String query, byte[] querySignature) throws Exception { -// this.code = query; -// if (!query.isEmpty()) { -// Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); -// this.query = (new parser(lex)).pProgram(); -// } -// this.signature = querySignature; -// this.timestamp = System.currentTimeMillis(); -// this.installed = true; -// } + public ValueQuery(String query) throws Exception { + this.code = query; + if (!query.isEmpty()) { + Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); + this.query = (new parser(lex)).pProgram(); + } + this.signature = null; + this.timestamp = System.currentTimeMillis(); + this.installed = true; + } + + public ValueQuery(String query, byte[] querySignature) throws Exception { + this.code = query; + if (!query.isEmpty()) { + Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes())); + this.query = (new parser(lex)).pProgram(); + } + this.signature = querySignature; + this.timestamp = System.currentTimeMillis(); + this.installed = true; + } public ValueQuery(QueryData queryData) throws Exception { this.code = queryData.getCode(); -- cgit v1.2.3