Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update java chaincode to be compatible with doc and other implementations #149

Merged
merged 3 commits into from
Apr 7, 2020
Merged

Update java chaincode to be compatible with doc and other implementations #149

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e72a24
Use numbers without leading zeroes for key
obermeier Apr 3, 2020
04bdd1d
Update chaincode to be compatible with doc.
obermeier Apr 3, 2020
1ada9a7
Clean up
obermeier Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions ...ncode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/CarQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* SPDX-License-Identifier: Apache-2.0
*/

package org.hyperledger.fabric.samples.fabcar;

import java.util.Objects;

import org.hyperledger.fabric.contract.annotation.DataType;
import org.hyperledger.fabric.contract.annotation.Property;

import com.owlike.genson.annotation.JsonProperty;

/**
* CarQueryResult structure used for handling result of query
*
*/
@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;
}

public String getKey() {
return key;
}

public Car getRecord() {
return record;
}

@Override
lehors marked this conversation as resolved.
Show resolved Hide resolved
public boolean equals(final Object obj) {
if (this == obj) {
return true;
}

if ((obj == null) || (getClass() != obj.getClass())) {
return false;
}

CarQueryResult other = (CarQueryResult) obj;

Boolean recordsAreEquals = this.getRecord().equals(other.getRecord());
Boolean keysAreEquals = this.getKey().equals(other.getKey());

return recordsAreEquals && keysAreEquals;
}

@Override
public int hashCode() {
return Objects.hash(this.getKey(), this.getRecord());
}

@Override
public String toString() {
return "{\"Key\":\"" + key + "\"" + "\"Record\":{\"" + record + "}\"}";
}
lehors marked this conversation as resolved.
Show resolved Hide resolved

}

16 changes: 8 additions & 8 deletions chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void initLedger(final Context ctx) {
};

for (int i = 0; i < carData.length; i++) {
String key = String.format("CAR%03d", i);
String key = String.format("CAR%d", i);

Car car = genson.deserialize(carData[i], Car.class);
String carState = genson.serialize(car);
Expand Down Expand Up @@ -140,21 +140,21 @@ public Car createCar(final Context ctx, final String key, final String make, fin
* @return array of Cars found on the ledger
*/
@Transaction()
public Car[] queryAllCars(final Context ctx) {
public CarQueryResult[] queryAllCars(final Context ctx) {
ChaincodeStub stub = ctx.getStub();

final String startKey = "CAR0";
final String endKey = "CAR999";
List<Car> cars = new ArrayList<Car>();

List<CarQueryResult> queryResults = new ArrayList<CarQueryResult>();
lehors marked this conversation as resolved.
Show resolved Hide resolved
QueryResultsIterator<KeyValue> results = stub.getStateByRange(startKey, endKey);

lehors marked this conversation as resolved.
Show resolved Hide resolved
for (KeyValue result: results) {

Car car = genson.deserialize(result.getStringValue(), Car.class);
cars.add(car);
queryResults.add(new CarQueryResult(result.getKey(), car));
}

Car[] response = cars.toArray(new Car[cars.size()]);
CarQueryResult[] response = queryResults.toArray(new CarQueryResult[queryResults.size()]);

return response;
}
Expand Down
76 changes: 38 additions & 38 deletions chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ private final class MockCarResultsIterator implements QueryResultsIterator<KeyVa

carList = new ArrayList<KeyValue>();

carList.add(new MockKeyValue("CAR000",
carList.add(new MockKeyValue("CAR0",
"{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}"));
carList.add(new MockKeyValue("CAR001",
carList.add(new MockKeyValue("CAR1",
"{\"color\":\"red\",\"make\":\"Ford\",\"model\":\"Mustang\",\"owner\":\"Brad\"}"));
carList.add(new MockKeyValue("CAR002",
carList.add(new MockKeyValue("CAR2",
"{\"color\":\"green\",\"make\":\"Hyundai\",\"model\":\"Tucson\",\"owner\":\"Jin Soo\"}"));
carList.add(new MockKeyValue("CAR007",
carList.add(new MockKeyValue("CAR7",
"{\"color\":\"violet\",\"make\":\"Fiat\",\"model\":\"Punto\",\"owner\":\"Pari\"}"));
carList.add(new MockKeyValue("CAR009",
carList.add(new MockKeyValue("CAR9",
"{\"color\":\"brown\",\"make\":\"Holden\",\"model\":\"Barina\",\"owner\":\"Shotaro\"}"));
}

Expand Down Expand Up @@ -112,10 +112,10 @@ public void whenCarExists() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");

Car car = contract.queryCar(ctx, "CAR000");
Car car = contract.queryCar(ctx, "CAR0");

assertThat(car).isEqualTo(new Car("Toyota", "Prius", "blue", "Tomoko"));
}
Expand All @@ -126,14 +126,14 @@ public void whenCarDoesNotExist() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");

Throwable thrown = catchThrowable(() -> {
contract.queryCar(ctx, "CAR000");
contract.queryCar(ctx, "CAR0");
});

assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 does not exist");
.hasMessage("Car CAR0 does not exist");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_NOT_FOUND".getBytes());
}
}
Expand All @@ -148,25 +148,25 @@ void invokeInitLedgerTransaction() {
contract.initLedger(ctx);

InOrder inOrder = inOrder(stub);
inOrder.verify(stub).putStringState("CAR000",
inOrder.verify(stub).putStringState("CAR0",
"{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");
inOrder.verify(stub).putStringState("CAR001",
inOrder.verify(stub).putStringState("CAR1",
"{\"color\":\"red\",\"make\":\"Ford\",\"model\":\"Mustang\",\"owner\":\"Brad\"}");
inOrder.verify(stub).putStringState("CAR002",
inOrder.verify(stub).putStringState("CAR2",
"{\"color\":\"green\",\"make\":\"Hyundai\",\"model\":\"Tucson\",\"owner\":\"Jin Soo\"}");
inOrder.verify(stub).putStringState("CAR003",
inOrder.verify(stub).putStringState("CAR3",
"{\"color\":\"yellow\",\"make\":\"Volkswagen\",\"model\":\"Passat\",\"owner\":\"Max\"}");
inOrder.verify(stub).putStringState("CAR004",
inOrder.verify(stub).putStringState("CAR4",
"{\"color\":\"black\",\"make\":\"Tesla\",\"model\":\"S\",\"owner\":\"Adrian\"}");
inOrder.verify(stub).putStringState("CAR005",
inOrder.verify(stub).putStringState("CAR5",
"{\"color\":\"purple\",\"make\":\"Peugeot\",\"model\":\"205\",\"owner\":\"Michel\"}");
inOrder.verify(stub).putStringState("CAR006",
inOrder.verify(stub).putStringState("CAR6",
"{\"color\":\"white\",\"make\":\"Chery\",\"model\":\"S22L\",\"owner\":\"Aarav\"}");
inOrder.verify(stub).putStringState("CAR007",
inOrder.verify(stub).putStringState("CAR7",
"{\"color\":\"violet\",\"make\":\"Fiat\",\"model\":\"Punto\",\"owner\":\"Pari\"}");
inOrder.verify(stub).putStringState("CAR008",
inOrder.verify(stub).putStringState("CAR8",
"{\"color\":\"indigo\",\"make\":\"Tata\",\"model\":\"nano\",\"owner\":\"Valeria\"}");
inOrder.verify(stub).putStringState("CAR009",
inOrder.verify(stub).putStringState("CAR9",
"{\"color\":\"brown\",\"make\":\"Holden\",\"model\":\"Barina\",\"owner\":\"Shotaro\"}");
}

Expand All @@ -179,15 +179,15 @@ public void whenCarExists() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");

Throwable thrown = catchThrowable(() -> {
contract.createCar(ctx, "CAR000", "Nissan", "Leaf", "green", "Siobhán");
contract.createCar(ctx, "CAR0", "Nissan", "Leaf", "green", "Siobhán");
});

assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 already exists");
.hasMessage("Car CAR0 already exists");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_ALREADY_EXISTS".getBytes());
}

Expand All @@ -197,9 +197,9 @@ public void whenCarDoesNotExist() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");

Car car = contract.createCar(ctx, "CAR000", "Nissan", "Leaf", "green", "Siobhán");
Car car = contract.createCar(ctx, "CAR0", "Nissan", "Leaf", "green", "Siobhán");

assertThat(car).isEqualTo(new Car("Nissan", "Leaf", "green", "Siobhán"));
}
Expand All @@ -213,14 +213,14 @@ void invokeQueryAllCarsTransaction() {
when(ctx.getStub()).thenReturn(stub);
when(stub.getStateByRange("CAR0", "CAR999")).thenReturn(new MockCarResultsIterator());

Car[] cars = contract.queryAllCars(ctx);
CarQueryResult[] cars = contract.queryAllCars(ctx);

final List<Car> expectedCars = new ArrayList<Car>();
expectedCars.add(new Car("Toyota", "Prius", "blue", "Tomoko"));
expectedCars.add(new Car("Ford", "Mustang", "red", "Brad"));
expectedCars.add(new Car("Hyundai", "Tucson", "green", "Jin Soo"));
expectedCars.add(new Car("Fiat", "Punto", "violet", "Pari"));
expectedCars.add(new Car("Holden", "Barina", "brown", "Shotaro"));
final List<CarQueryResult> expectedCars = new ArrayList<CarQueryResult>();
expectedCars.add(new CarQueryResult("CAR0", new Car("Toyota", "Prius", "blue", "Tomoko")));
expectedCars.add(new CarQueryResult("CAR1", new Car("Ford", "Mustang", "red", "Brad")));
expectedCars.add(new CarQueryResult("CAR2", new Car("Hyundai", "Tucson", "green", "Jin Soo")));
expectedCars.add(new CarQueryResult("CAR7", new Car("Fiat", "Punto", "violet", "Pari")));
expectedCars.add(new CarQueryResult("CAR9", new Car("Holden", "Barina", "brown", "Shotaro")));

assertThat(cars).containsExactlyElementsOf(expectedCars);
}
Expand All @@ -234,12 +234,12 @@ public void whenCarExists() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");

Car car = contract.changeCarOwner(ctx, "CAR000", "Dr Evil");
Car car = contract.changeCarOwner(ctx, "CAR0", "Dr Evil");

assertThat(car).isEqualTo(new Car("Toyota", "Prius", "blue", "Dr Evil"));
assertThat(car).isEqualTo(new CarQueryResult("CAR0", new Car("Toyota", "Prius", "blue", "Dr Evil")));
}

@Test
Expand All @@ -248,14 +248,14 @@ public void whenCarDoesNotExist() {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");

Throwable thrown = catchThrowable(() -> {
contract.changeCarOwner(ctx, "CAR000", "Dr Evil");
contract.changeCarOwner(ctx, "CAR0", "Dr Evil");
});

assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 does not exist");
.hasMessage("Car CAR0 does not exist");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_NOT_FOUND".getBytes());
}
}
Expand Down