Skip to content

Commit 20a10b3

Browse files
mkleenemkleene
committed
do not document generated code
1 parent fc81bf1 commit 20a10b3

7 files changed

Lines changed: 57 additions & 52 deletions

File tree

‎sdk/buf.gen.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ managed:
1010
module: buf.build/grpc-ecosystem/grpc-gateway
1111
override:
1212
- file_option: java_package_prefix
13-
value: io.opentdf.platform
13+
value: io.opentdf.platform.generated
1414
plugins:
1515
- remote: buf.build/protocolbuffers/java:v25.3
1616
out: ./
@@ -19,6 +19,4 @@ plugins:
1919
- remote: buf.build/connectrpc/kotlin
2020
out: ./
2121
opt:
22-
- generateCallbackMethods=true
23-
- generateCoroutineMethods=true
2422
- generateBlockingUnaryMethods=true

‎sdk/pom.xml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,9 @@
337337
<groupId>org.apache.maven.plugins</groupId>
338338
<artifactId>maven-javadoc-plugin</artifactId>
339339
<version>3.8.0</version>
340+
<configuration>
341+
<sourceFileIncludes>${project.basedir}/src/main/**/*.java</sourceFileIncludes>
342+
</configuration>
340343
<executions>
341344
<execution>
342345
<id>attach-javadocs</id>
@@ -412,25 +415,25 @@
412415
</executions>
413416
</plugin>
414417
<!-- Add Generate Sources Directory -->
415-
<!-- <plugin>-->
416-
<!-- <groupId>org.codehaus.mojo</groupId>-->
417-
<!-- <artifactId>build-helper-maven-plugin</artifactId>-->
418-
<!-- <version>3.5.0</version>-->
419-
<!-- <executions>-->
420-
<!-- <execution>-->
421-
<!-- <id>add-source</id>-->
422-
<!-- <phase>generate-sources</phase>-->
423-
<!-- <goals>-->
424-
<!-- <goal>add-source</goal>-->
425-
<!-- </goals>-->
426-
<!-- <configuration>-->
427-
<!-- <sources>-->
428-
<!-- <source>target/generated-sources</source>-->
429-
<!-- </sources>-->
430-
<!-- </configuration>-->
431-
<!-- </execution>-->
432-
<!-- </executions>-->
433-
<!-- </plugin>-->
418+
<plugin>
419+
<groupId>org.codehaus.mojo</groupId>
420+
<artifactId>build-helper-maven-plugin</artifactId>
421+
<version>3.5.0</version>
422+
<executions>
423+
<execution>
424+
<id>add-source</id>
425+
<phase>generate-sources</phase>
426+
<goals>
427+
<goal>add-source</goal>
428+
</goals>
429+
<configuration>
430+
<sources>
431+
<source>target/generated-sources</source>
432+
</sources>
433+
</configuration>
434+
</execution>
435+
</executions>
436+
</plugin>
434437
<plugin>
435438
<groupId>org.jacoco</groupId>
436439
<artifactId>jacoco-maven-plugin</artifactId>

‎sdk/src/main/java/io/opentdf/platform/sdk/Autoconfigure.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package io.opentdf.platform.sdk;
22

3-
import com.connectrpc.ResponseMessage;
43
import com.connectrpc.ResponseMessageKt;
5-
import io.opentdf.platform.policy.Attribute;
6-
import io.opentdf.platform.policy.AttributeRuleTypeEnum;
7-
import io.opentdf.platform.policy.AttributeValueSelector;
8-
import io.opentdf.platform.policy.KasPublicKey;
9-
import io.opentdf.platform.policy.KasPublicKeyAlgEnum;
10-
import io.opentdf.platform.policy.KeyAccessServer;
11-
import io.opentdf.platform.policy.Value;
12-
import io.opentdf.platform.policy.attributes.AttributesServiceClient;
13-
import io.opentdf.platform.policy.attributes.GetAttributeValuesByFqnsRequest;
14-
import io.opentdf.platform.policy.attributes.GetAttributeValuesByFqnsResponse;
15-
import io.opentdf.platform.policy.attributes.GetAttributeValuesByFqnsResponse.AttributeAndValue;
4+
import io.opentdf.platform.generated.policy.Attribute;
5+
import io.opentdf.platform.generated.policy.AttributeRuleTypeEnum;
6+
import io.opentdf.platform.generated.policy.AttributeValueSelector;
7+
import io.opentdf.platform.generated.policy.KasPublicKey;
8+
import io.opentdf.platform.generated.policy.KasPublicKeyAlgEnum;
9+
import io.opentdf.platform.generated.policy.KeyAccessServer;
10+
import io.opentdf.platform.generated.policy.Value;
11+
import io.opentdf.platform.generated.policy.attributes.AttributesServiceClient;
12+
import io.opentdf.platform.generated.policy.attributes.GetAttributeValuesByFqnsRequest;
13+
import io.opentdf.platform.generated.policy.attributes.GetAttributeValuesByFqnsResponse;
1614
import org.slf4j.Logger;
1715
import org.slf4j.LoggerFactory;
1816

@@ -690,7 +688,7 @@ public static Granter newGranterFromAttributes(Value... attrValues) throws AutoC
690688
if (!v.hasAttribute()) {
691689
throw new AutoConfigureException("tried to use an attribute that is not initialized");
692690
}
693-
return AttributeAndValue.newBuilder()
691+
return GetAttributeValuesByFqnsResponse.AttributeAndValue.newBuilder()
694692
.setValue(v)
695693
.setAttribute(v.getAttribute())
696694
.build();
@@ -713,8 +711,8 @@ public static Granter newGranterFromService(AttributesServiceClient as, KASKeyCa
713711
return getGranter(keyCache, new ArrayList<>(av.getFqnAttributeValuesMap().values()));
714712
}
715713

716-
private static Granter getGranter(@Nullable KASKeyCache keyCache, List<AttributeAndValue> values) {
717-
Granter grants = new Granter(values.stream().map(AttributeAndValue::getValue).map(Value::getFqn).map(AttributeValueFQN::new).collect(Collectors.toList()));
714+
private static Granter getGranter(@Nullable KASKeyCache keyCache, List<GetAttributeValuesByFqnsResponse.AttributeAndValue> values) {
715+
Granter grants = new Granter(values.stream().map(GetAttributeValuesByFqnsResponse.AttributeAndValue::getValue).map(Value::getFqn).map(AttributeValueFQN::new).collect(Collectors.toList()));
718716

719717
for (var attributeAndValue: values) {
720718
var val = attributeAndValue.getValue();

‎sdk/src/main/java/io/opentdf/platform/sdk/Config.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.opentdf.platform.sdk;
22

3+
import io.opentdf.platform.generated.policy.Value;
34
import io.opentdf.platform.sdk.Autoconfigure.AttributeValueFQN;
45
import io.opentdf.platform.sdk.nanotdf.ECCMode;
56
import io.opentdf.platform.sdk.nanotdf.Header;
67
import io.opentdf.platform.sdk.nanotdf.NanoTDFType;
78
import io.opentdf.platform.sdk.nanotdf.SymmetricAndPayloadConfig;
89

9-
import io.opentdf.platform.policy.Value;
10-
1110
import java.util.*;
1211
import java.util.function.Consumer;
1312

‎sdk/src/main/java/io/opentdf/platform/sdk/KASClient.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import com.nimbusds.jwt.SignedJWT;
1212
import io.grpc.StatusRuntimeException;
1313
import io.grpc.Status;
14-
import io.opentdf.platform.kas.AccessServiceClient;
15-
import io.opentdf.platform.kas.PublicKeyRequest;
16-
import io.opentdf.platform.kas.PublicKeyResponse;
17-
import io.opentdf.platform.kas.RewrapRequest;
18-
import io.opentdf.platform.kas.RewrapResponse;
14+
import io.opentdf.platform.generated.kas.AccessServiceClient;
15+
import io.opentdf.platform.generated.kas.PublicKeyRequest;
16+
import io.opentdf.platform.generated.kas.PublicKeyResponse;
17+
import io.opentdf.platform.generated.kas.RewrapRequest;
18+
import io.opentdf.platform.generated.kas.RewrapResponse;
1919
import io.opentdf.platform.sdk.Config.KASInfo;
2020
import io.opentdf.platform.sdk.nanotdf.ECKeyPair;
2121
import io.opentdf.platform.sdk.nanotdf.NanoTDFType;
@@ -31,6 +31,7 @@
3131
import java.security.NoSuchAlgorithmException;
3232
import java.time.Duration;
3333
import java.time.Instant;
34+
import java.util.Collections;
3435
import java.util.Date;
3536
import java.util.HashMap;
3637
import java.util.function.Function;
@@ -71,6 +72,12 @@ public KASClient(Function<String, AccessServiceClient> clientFactory, RSAKey dpo
7172
this.kasKeyCache = new KASKeyCache();
7273
}
7374

75+
public KASClient(Function<String, AccessServiceClient> channelFactory, boolean usePlaintext, RSASSASigner signer) {
76+
this.channelFactory = channelFactory;
77+
this.usePlaintext = usePlaintext;
78+
this.signer = signer;
79+
}
80+
7481
@Override
7582
public KASInfo getECPublicKey(Config.KASInfo kasInfo, NanoTDFType.ECCurve curve) {
7683
var req = PublicKeyRequest.newBuilder().setAlgorithm(format("ec:%s", curve.toString())).build();
@@ -221,7 +228,7 @@ public byte[] unwrap(Manifest.KeyAccess keyAccess, String policy, KeyType sessi
221228
.build();
222229
RewrapResponse response;
223230
try {
224-
var req = getStub(keyAccess.url).rewrapBlocking(request, MapsKt.mapOf()).execute();
231+
var req = getStub(keyAccess.url).rewrapBlocking(request, Collections.emptyMap()).execute();
225232
try {
226233
response = getOrThrow(req);
227234
} catch (Exception e) {
@@ -290,7 +297,7 @@ public byte[] unwrapNanoTDF(NanoTDFType.ECCurve curve, String header, String kas
290297
.setSignedRequestToken(jwt.serialize())
291298
.build();
292299

293-
var request = getStub(keyAccess.url).rewrapBlocking(req, MapsKt.mapOf()).execute();
300+
var request = getStub(keyAccess.url).rewrapBlocking(req, Collections.emptyMap()).execute();
294301
RewrapResponse response;
295302
try {
296303
response = getOrThrow(request);

‎sdk/src/main/java/io/opentdf/platform/sdk/SDKBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
2727
import io.grpc.Status;
2828
import io.grpc.StatusRuntimeException;
29-
import io.opentdf.platform.kas.AccessServiceClient;
30-
import io.opentdf.platform.wellknownconfiguration.GetWellKnownConfigurationRequest;
31-
import io.opentdf.platform.wellknownconfiguration.GetWellKnownConfigurationResponse;
32-
import io.opentdf.platform.wellknownconfiguration.WellKnownServiceClient;
29+
import io.opentdf.platform.generated.kas.AccessServiceClient;
30+
import io.opentdf.platform.generated.wellknownconfiguration.GetWellKnownConfigurationRequest;
31+
import io.opentdf.platform.generated.wellknownconfiguration.GetWellKnownConfigurationResponse;
32+
import io.opentdf.platform.generated.wellknownconfiguration.WellKnownServiceClient;
3333
import nl.altindag.ssl.SSLFactory;
3434
import nl.altindag.ssl.pem.util.PemUtils;
3535
import okhttp3.OkHttpClient;

‎sdk/src/main/java/io/opentdf/platform/sdk/TDF.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.google.gson.GsonBuilder;
55
import com.nimbusds.jose.*;
66

7-
import io.opentdf.platform.policy.Value;
8-
import io.opentdf.platform.policy.attributes.AttributesServiceClient;
7+
import io.opentdf.platform.generated.policy.Value;
8+
import io.opentdf.platform.generated.policy.attributes.AttributesServiceClient;
99
import io.opentdf.platform.sdk.Config.TDFConfig;
1010
import io.opentdf.platform.sdk.Autoconfigure.AttributeValueFQN;
1111
import io.opentdf.platform.sdk.Config.KASInfo;

0 commit comments

Comments
 (0)