Skip to content

Commit d9bc108

Browse files
committed
feat!: update sdk, absorb changes
Signed-off-by: Todd Baert <[email protected]>
1 parent 77a7226 commit d9bc108

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Diff for: pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<!-- provided -->
3030
<groupId>dev.openfeature</groupId>
3131
<artifactId>javasdk</artifactId>
32-
<!-- 0.1.0 or greater -->
33-
<version>[0.1,)</version>
32+
<!-- 0.2.0 or greater -->
33+
<version>[0.2,)</version>
3434
<!-- use the version provided at runtime -->
3535
<scope>provided</scope>
3636
</dependency>

Diff for: providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ public ProviderEvaluation<Integer> getIntegerEvaluation(String key, Integer defa
145145
}
146146

147147
@Override
148-
public ProviderEvaluation<Structure> getObjectEvaluation(String key, Structure defaultValue,
148+
public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultValue,
149149
EvaluationContext ctx) {
150150
ResolveObjectRequest request = ResolveObjectRequest.newBuilder()
151151
.setFlagKey(key)
152152
.setContext(this.convertContext(ctx))
153153
.build();
154154
ResolveObjectResponse r = this.serviceStub.resolveObject(request);
155-
return ProviderEvaluation.<Structure>builder()
155+
return ProviderEvaluation.<Value>builder()
156156
.value(this.convertObjectResponse(r.getValue()))
157157
.variant(r.getVariant())
158158
.reason(this.mapReason(r.getReason()))
@@ -174,10 +174,10 @@ private Reason mapReason(String flagDreason) {
174174
}
175175

176176
/**
177-
* Recursively convert protobuf structure to openfeature structure.
177+
* Recursively convert protobuf structure to openfeature value.
178178
*/
179-
private Structure convertObjectResponse(com.google.protobuf.Struct protobuf) {
180-
return new Structure(this.convertProtobufMap(protobuf.getFieldsMap()).asStructure().asMap());
179+
private Value convertObjectResponse(com.google.protobuf.Struct protobuf) {
180+
return this.convertProtobufMap(protobuf.getFieldsMap());
181181
}
182182

183183
/**
@@ -268,9 +268,7 @@ private com.google.protobuf.Value convertPrimitive(Value value) {
268268
builder.setBoolValue(value.asBoolean());
269269
} else if (value.isString()) {
270270
builder.setStringValue(value.asString());
271-
} else if (value.isInteger()) {
272-
builder.setNumberValue(Double.valueOf(value.asInteger()));
273-
} else if (value.isDouble()) {
271+
} else if (value.isNumber()) {
274272
builder.setNumberValue(value.asDouble());
275273
} else {
276274
builder.setNullValue(null);
@@ -290,7 +288,7 @@ private Value convertPrimitive(com.google.protobuf.Value protobuf) {
290288
} else if (protobuf.hasNumberValue()) {
291289
value = new Value(protobuf.getNumberValue());
292290
} else {
293-
value = new Value((Boolean) null);
291+
value = new Value();
294292
}
295293
return value;
296294
}

Diff for: providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdProviderTest.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ void resolvers_call_grpc_service_and_return_details() {
121121
assertEquals(DOUBLE_VARIANT, floatDetails.getVariant());
122122
assertEquals(DEFAULT, floatDetails.getReason());
123123

124-
FlagEvaluationDetails<Structure> objectDetails = api.getClient().getObjectDetails(FLAG_KEY, new Structure());
125-
assertEquals(INNER_STRUCT_VALUE, objectDetails.getValue().asMap().get(INNER_STRUCT_KEY).asString());
124+
FlagEvaluationDetails<Value> objectDetails = api.getClient().getObjectDetails(FLAG_KEY, new Value());
125+
assertEquals(INNER_STRUCT_VALUE, objectDetails.getValue().asStructure()
126+
.asMap().get(INNER_STRUCT_KEY).asString());
126127
assertEquals(OBJECT_VARIANT, objectDetails.getVariant());
127128
assertEquals(DEFAULT, objectDetails.getReason());
128129
}
@@ -196,7 +197,8 @@ void reason_mapped_correctly_if_unknown() {
196197

197198
OpenFeatureAPI.getInstance().setProvider(new FlagdProvider(serviceBlockingStubMock));
198199

199-
FlagEvaluationDetails<Boolean> booleanDetails = api.getClient().getBooleanDetails(FLAG_KEY, false, new EvaluationContext());
200+
FlagEvaluationDetails<Boolean> booleanDetails = api.getClient()
201+
.getBooleanDetails(FLAG_KEY, false, new EvaluationContext());
200202
assertEquals(Reason.UNKNOWN, booleanDetails.getReason()); // reason should be converted to UNKNOWN
201203
}
202204
}

0 commit comments

Comments
 (0)