From 1ada9a7ca354c9a3dcfe23e1e209ac333ac54dba Mon Sep 17 00:00:00 2001 From: Stefan Obermeier Date: Mon, 6 Apr 2020 23:32:55 +0200 Subject: [PATCH] Clean up Use always whitespaces to indent the start of the line Remove unnecessary whitespaces Signed-off-by: Stefan Obermeier --- .../fabric/samples/fabcar/CarQueryResult.java | 49 +++++++++---------- .../fabric/samples/fabcar/FabCar.java | 6 +-- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/CarQueryResult.java b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/CarQueryResult.java index 60b792cb..74cb6944 100644 --- a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/CarQueryResult.java +++ b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/CarQueryResult.java @@ -17,26 +17,26 @@ import com.owlike.genson.annotation.JsonProperty; */ @DataType() public final class CarQueryResult { - @Property() - private final String key; - - @Property() - private final Car record; - - public CarQueryResult(@JsonProperty("Key") final String key, @JsonProperty("Record") final Car record) { - this.key = key; - this.record = record; - } - + @Property() + private final String key; + + @Property() + private final Car record; + + public CarQueryResult(@JsonProperty("Key") final String key, @JsonProperty("Record") final Car record) { + this.key = key; + this.record = record; + } + public String getKey() { - return key; - } + return key; + } - public Car getRecord() { - return record; - } + public Car getRecord() { + return record; + } - @Override + @Override public boolean equals(final Object obj) { if (this == obj) { return true; @@ -50,7 +50,7 @@ public final class CarQueryResult { Boolean recordsAreEquals = this.getRecord().equals(other.getRecord()); Boolean keysAreEquals = this.getKey().equals(other.getKey()); - + return recordsAreEquals && keysAreEquals; } @@ -58,11 +58,10 @@ public final class CarQueryResult { public int hashCode() { return Objects.hash(this.getKey(), this.getRecord()); } - - @Override - public String toString() { - return "{\"Key\":\"" + key + "\"" + "\"Record\":{\"" + record + "}\"}"; - } - -} + @Override + public String toString() { + return "{\"Key\":\"" + key + "\"" + "\"Record\":{\"" + record + "}\"}"; + } + +} diff --git a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java index 3fe6a2ab..b267d801 100644 --- a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java +++ b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java @@ -146,14 +146,14 @@ public final class FabCar implements ContractInterface { final String startKey = "CAR0"; final String endKey = "CAR999"; List queryResults = new ArrayList(); - + QueryResultsIterator results = stub.getStateByRange(startKey, endKey); - + for (KeyValue result: results) { - Car car = genson.deserialize(result.getStringValue(), Car.class); queryResults.add(new CarQueryResult(result.getKey(), car)); } + CarQueryResult[] response = queryResults.toArray(new CarQueryResult[queryResults.size()]); return response;