Skip to content

Commit

Permalink
Merge pull request #85 from hyperledger-labs/feature/acapy-0.8.0
Browse files Browse the repository at this point in the history
acapy 0.8.0 update
  • Loading branch information
etschelp authored Nov 18, 2023
2 parents 152740b + b1368d1 commit 381e351
Show file tree
Hide file tree
Showing 55 changed files with 517 additions and 253 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# needed for the license header check
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ Convenience library based on okhttp and gson to interact with [aries cloud agent
| DELETE | /mediation/requests/{mediation_id} | :white_check_mark: |
| POST | /mediation/requests/{mediation_id}/deny | :white_check_mark: |
| POST | /mediation/requests/{mediation_id}/grant | :white_check_mark: |
| POST | /mediation/update-keylist/{conn_id} | :white_check_mark: |
| PUT | /mediation/{mediation_id}/default-mediator | :white_check_mark: |
| | **multitenancy** | |
| POST | /multitenancy/wallet | :white_check_mark: |
Expand Down Expand Up @@ -202,6 +203,7 @@ Convenience library based on okhttp and gson to interact with [aries cloud agent
| GET | /revocation/credential-record | :white_check_mark: |
| POST | /revocation/publish-revocations | :white_check_mark: |
| GET | /revocation/registries/created | :white_check_mark: |
| DELETE | /revocation/registry/delete-tails-file | :white_check_mark: |
| GET | /revocation/registry/{rev_reg_id} | :white_check_mark: |
| PATCH | /revocation/registry/{rev_reg_id} | :white_check_mark: |
| POST | /revocation/registry/{rev_reg_id}/definition | :white_check_mark: |
Expand Down
64 changes: 32 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>network.idu.acapy</groupId>
<artifactId>aries-client-python</artifactId>
<version>0.7.34-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -53,19 +53,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.passphrase>empty</gpg.passphrase>
<!-- Plugin Versions -->
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
<maven.surefire.version>3.0.0-M9</maven.surefire.version>
<license-maven-plugin.version>4.3</license-maven-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven.surefire.version>3.1.2</maven.surefire.version>
<!-- Dependency Versions -->
<jackson.version>2.14.2</jackson.version>
<jackson.databind.version>2.14.2</jackson.databind.version>
<junit.jupiter.api.version>5.9.2</junit.jupiter.api.version>
<kotlin.version>1.8.10</kotlin.version>
<lombok.version>1.18.26</lombok.version>
<jackson.version>2.15.3</jackson.version>
<jackson.databind.version>2.15.3</jackson.databind.version>
<junit.jupiter.api.version>5.10.1</junit.jupiter.api.version>
<kotlin.version>1.9.20</kotlin.version>
<lombok.version>1.18.30</lombok.version>
<lombok.maven.plugin.version>1.18.20.0</lombok.maven.plugin.version>
<okhttp.version>4.10.0</okhttp.version>
<pmd.version>6.54.0</pmd.version>
<testcontainers.version>1.17.6</testcontainers.version>
<okhttp.version>4.12.0</okhttp.version>
<pmd.version>6.55.0</pmd.version>
<testcontainers.version>1.19.2</testcontainers.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -93,12 +93,12 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.5.3</version>
<version>3.5.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.6</version>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand All @@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -138,7 +138,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.9</version>
<version>1.6.12</version>
</dependency>
<!-- Scope Test -->
<dependency>
Expand Down Expand Up @@ -186,7 +186,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.5</version>
<version>1.3.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -201,7 +201,7 @@
<!-- aca-py still uses v2 definition file -->
<configuration>
<skip>true</skip>
<inputSpec>${project.basedir}/swagger/0_7_5.json</inputSpec>
<inputSpec>${project.basedir}/swagger/0_8_0.json</inputSpec>
<generatorName>java</generatorName>
<output>${project.basedir}</output>
<generateApis>false</generateApis>
Expand Down Expand Up @@ -237,7 +237,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.22.0</version>
<version>2.23.0</version>
<configuration>
<includes>
<include>org/hyperledger/acy_py/generated/</include>
Expand All @@ -256,7 +256,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<release>${jdk.version}</release>
<source>${jdk.version}</source>
Expand Down Expand Up @@ -298,7 +298,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.2</version>
<configuration>
<excludePackageNames>*.generated</excludePackageNames>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
Expand All @@ -315,7 +315,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -341,7 +341,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.13.0</version>
<version>2.0.1</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -368,7 +368,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.3.0</version>
<version>4.8.1.0</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
Expand All @@ -393,13 +393,13 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>4.7.3</version>
<version>4.8.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.2</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
Expand Down Expand Up @@ -432,7 +432,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.1.0</version>
<version>8.4.3</version>
<configuration>
<failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
<skip>true</skip>
Expand All @@ -448,7 +448,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.11</version>
<configuration>
<excludes>
<exclude>**/generated/model/**</exclude>
Expand Down Expand Up @@ -539,11 +539,11 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -556,7 +556,7 @@
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -577,7 +577,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.2</version>
<version>3.4.5</version>
<reportSets>
<reportSet>
<reports>
Expand Down
50 changes: 1 addition & 49 deletions src/main/java/org/hyperledger/acy_py/generated/model/DID.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,57 +83,9 @@ public KeyTypeEnum read(final JsonReader jsonReader) throws IOException {
public static final String SERIALIZED_NAME_KEY_TYPE = "key_type";
@SerializedName(SERIALIZED_NAME_KEY_TYPE)
private KeyTypeEnum keyType;

/**
* Did method associated with the DID
*/
@JsonAdapter(MethodEnum.Adapter.class)
public enum MethodEnum {
SOV("sov"),

KEY("key");

private String value;

MethodEnum(String value) {
this.value = value;
}

public String getValue() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static MethodEnum fromValue(String value) {
for (MethodEnum b : MethodEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}

public static class Adapter extends TypeAdapter<MethodEnum> {
@Override
public void write(final JsonWriter jsonWriter, final MethodEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
}

@Override
public MethodEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return MethodEnum.fromValue(value);
}
}
}

public static final String SERIALIZED_NAME_METHOD = "method";
@SerializedName(SERIALIZED_NAME_METHOD)
private MethodEnum method;
private String method;

/**
* Whether DID is current public DID, posted to ledger but not current public DID, or local to the wallet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@

package org.hyperledger.acy_py.generated.model;

import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;

import java.io.IOException;

/**
* DIDCreate
Expand All @@ -29,57 +23,13 @@
@lombok.NoArgsConstructor
@lombok.Builder
public class DIDCreate {
/**
* Gets or Sets method
*/
@JsonAdapter(MethodEnum.Adapter.class)
public enum MethodEnum {
KEY("key"),

SOV("sov");

private String value;

MethodEnum(String value) {
this.value = value;
}

public String getValue() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static MethodEnum fromValue(String value) {
for (MethodEnum b : MethodEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}

public static class Adapter extends TypeAdapter<MethodEnum> {
@Override
public void write(final JsonWriter jsonWriter, final MethodEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
}

@Override
public MethodEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return MethodEnum.fromValue(value);
}
}
}

public static final String SERIALIZED_NAME_METHOD = "method";
@SerializedName(SERIALIZED_NAME_METHOD)
private MethodEnum method;
private String method;
public static final String SERIALIZED_NAME_OPTIONS = "options";
@SerializedName(SERIALIZED_NAME_OPTIONS)
private DIDCreateOptions options;
public static final String SERIALIZED_NAME_SEED = "seed";
@SerializedName(SERIALIZED_NAME_SEED)
private String seed;
}
Loading

0 comments on commit 381e351

Please sign in to comment.