Skip to content

Commit 4a422cd

Browse files
filip26filip26
authored
Merge pull request #91 from filip26/patch/base-name
v1.1.0
2 parents b9643e1 + c8c1dd0 commit 4a422cd

6 files changed

Lines changed: 63 additions & 58 deletions

File tree

‎.github/maven-central-settings.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/workflows/java8-publish.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616
with:
1717
java-version: 8
1818
distribution: 'temurin'
19-
20-
- name: Import GPG Key
21-
uses: crazy-max/ghaction-import-gpg@v6
22-
with:
23-
gpg_private_key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
24-
passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
25-
19+
cache: 'maven'
20+
server-id: central
21+
server-username: CENTRAL_TOKEN_ID
22+
server-password: CENTRAL_TOKEN_SECRET
23+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
24+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2625
- name: Publish package
27-
run: mvn -B -Pmaven-central -Dgpg.passphrase=${{secrets.MAVEN_GPG_PASSPHRASE}} -s maven-central-settings.xml deploy
26+
run: mvn -B -Pmaven-central deploy
2827
env:
29-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
30-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
28+
CENTRAL_TOKEN_ID: ${{ secrets.CENTRAL_TOKEN_ID }}
29+
CENTRAL_TOKEN_SECRET: ${{ secrets.CENTRAL_TOKEN_SECRET }}
30+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
31+
MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
32+

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var decoder = MultibaseDecorer.getInstance(mybase, ...);
7474
<dependency>
7575
<groupId>com.apicatalog</groupId>
7676
<artifactId>copper-multibase</artifactId>
77-
<version>1.0.0</version>
77+
<version>1.1.0</version>
7878
</dependency>
7979
```
8080

‎_config.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pom.xml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>com.apicatalog</groupId>
99
<artifactId>copper-multibase</artifactId>
10-
<version>1.0.0</version>
10+
<version>1.1.0</version>
1111
<packaging>jar</packaging>
1212

1313
<name>Copper Multibase</name>
@@ -163,26 +163,18 @@
163163
</execution>
164164
</executions>
165165
</plugin>
166-
<plugin>
167-
<groupId>org.sonatype.plugins</groupId>
168-
<artifactId>nexus-staging-maven-plugin</artifactId>
169-
<version>1.7.0</version>
170-
<extensions>true</extensions>
171-
<configuration>
172-
<serverId>ossrh</serverId>
173-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
174-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
175-
</configuration>
166+
<plugin>
167+
<groupId>org.sonatype.central</groupId>
168+
<artifactId>central-publishing-maven-plugin</artifactId>
169+
<version>0.8.0</version>
170+
<extensions>true</extensions>
171+
<configuration>
172+
<publishingServerId>central</publishingServerId>
173+
<autoPublish>true</autoPublish>
174+
</configuration>
176175
</plugin>
177176
</plugins>
178177
</build>
179-
180-
<distributionManagement>
181-
<snapshotRepository>
182-
<id>ossrh</id>
183-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
184-
</snapshotRepository>
185-
</distributionManagement>
186178
</profile>
187179

188180
<profile>

‎src/main/java/com/apicatalog/multibase/Multibase.java‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,77 +14,80 @@
1414
*/
1515
public class Multibase {
1616

17-
public static final Multibase BASE_2 = new Multibase('0', 2,
17+
public static final Multibase BASE_2 = new Multibase("base2", '0', 2,
1818
Base2::decode,
1919
Base2::encode);
2020

21-
public static final Multibase BASE_16 = new Multibase('f', 16,
21+
public static final Multibase BASE_16 = new Multibase("base16", 'f', 16,
2222
Base16::decode,
2323
d -> Base16.encode(d, Base16.ALPHABET_LOWER));
2424

25-
public static final Multibase BASE_16_UPPER = new Multibase('F', 16,
25+
public static final Multibase BASE_16_UPPER = new Multibase("base16upper", 'F', 16,
2626
Base16::decode,
2727
d -> Base16.encode(d, Base16.ALPHABET_UPPER));
2828

29-
public static final Multibase BASE_32_HEX = new Multibase('v', 32,
29+
public static final Multibase BASE_32_HEX = new Multibase("base32hex", 'v', 32,
3030
e -> Base32.decode(e, Base32::charToCodeHex, false),
3131
d -> Base32.encode(d, Base32.ALPHABET_HEX_LOWER, false));
3232

33-
public static final Multibase BASE_32_HEX_UPPER = new Multibase('V', 32,
33+
public static final Multibase BASE_32_HEX_UPPER = new Multibase("base32hexupper", 'V', 32,
3434
e -> Base32.decode(e, Base32::charToCodeHex, false),
3535
d -> Base32.encode(d, Base32.ALPHABET_HEX_UPPER, false));
3636

37-
public static final Multibase BASE_32_HEX_PAD = new Multibase('t', 32,
37+
public static final Multibase BASE_32_HEX_PAD = new Multibase("base32hexpad", 't', 32,
3838
e -> Base32.decode(e, Base32::charToCodeHex, true),
3939
d -> Base32.encode(d, Base32.ALPHABET_LOWER, true));
4040

41-
public static final Multibase BASE_32_HEX_PAD_UPPER = new Multibase('T', 32,
41+
public static final Multibase BASE_32_HEX_PAD_UPPER = new Multibase("base32hexpadupper", 'T', 32,
4242
e -> Base32.decode(e, Base32::charToCodeHex, true),
4343
d -> Base32.encode(d, Base32.ALPHABET_UPPER, true));
4444

45-
public static final Multibase BASE_32 = new Multibase('b', 32,
45+
public static final Multibase BASE_32 = new Multibase("base32", 'b', 32,
4646
e -> Base32.decode(e, Base32::charToCode, false),
4747
d -> Base32.encode(d, Base32.ALPHABET_LOWER, false));
4848

49-
public static final Multibase BASE_32_UPPER = new Multibase('B', 32,
49+
public static final Multibase BASE_32_UPPER = new Multibase("base32upper", 'B', 32,
5050
e -> Base32.decode(e, Base32::charToCode, false),
5151
d -> Base32.encode(d, Base32.ALPHABET_UPPER, false));
5252

53-
public static final Multibase BASE_32_PAD = new Multibase('c', 32,
53+
public static final Multibase BASE_32_PAD = new Multibase("base32pad", 'c', 32,
5454
e -> Base32.decode(e, Base32::charToCode, true),
5555
d -> Base32.encode(d, Base32.ALPHABET_LOWER, true));
5656

57-
public static final Multibase BASE_32_PAD_UPPER = new Multibase('C', 32,
57+
public static final Multibase BASE_32_PAD_UPPER = new Multibase("base32padupper", 'C', 32,
5858
e -> Base32.decode(e, Base32::charToCode, true),
5959
d -> Base32.encode(d, Base32.ALPHABET_UPPER, true));
6060

61-
public static final Multibase BASE_64 = new Multibase('m', 64,
61+
public static final Multibase BASE_64 = new Multibase("base64", 'm', 64,
6262
Base64.getDecoder()::decode,
6363
Base64.getEncoder().withoutPadding()::encodeToString);
6464

65-
public static final Multibase BASE_64_PAD = new Multibase('M', 64,
65+
public static final Multibase BASE_64_PAD = new Multibase("base32pad", 'M', 64,
6666
Base64.getMimeDecoder()::decode,
6767
Base64.getMimeEncoder()::encodeToString);
6868

69-
public static final Multibase BASE_64_URL = new Multibase('u', 64,
69+
public static final Multibase BASE_64_URL = new Multibase("base32url", 'u', 64,
7070
Base64.getUrlDecoder()::decode,
7171
Base64.getUrlEncoder().withoutPadding()::encodeToString);
7272

73-
public static final Multibase BASE_64_URL_PAD = new Multibase('U', 64,
73+
public static final Multibase BASE_64_URL_PAD = new Multibase("base32urlpad", 'U', 64,
7474
Base64.getUrlDecoder()::decode,
7575
Base64.getUrlEncoder()::encodeToString);
7676

77-
public static final Multibase BASE_58_BTC = new Multibase('z', 58,
77+
public static final Multibase BASE_58_BTC = new Multibase("base58btc", 'z', 58,
7878
Base58::decode,
7979
Base58::encode);
8080

81+
protected final String name;
82+
8183
protected final char prefix;
8284
protected final int length;
8385

8486
protected final Function<String, byte[]> decode;
8587
protected final Function<byte[], String> encode;
8688

8789
public Multibase(
90+
String name,
8891
char prefix,
8992
int length,
9093
Function<String, byte[]> decode,
@@ -93,8 +96,29 @@ public Multibase(
9396
this.length = length;
9497
this.decode = decode;
9598
this.encode = encode;
99+
this.name = name;
96100
}
97101

102+
public Multibase(
103+
char prefix,
104+
int length,
105+
Function<String, byte[]> decode,
106+
Function<byte[], String> encode) {
107+
this.prefix = prefix;
108+
this.length = length;
109+
this.decode = decode;
110+
this.encode = encode;
111+
this.name = "" + prefix;
112+
}
113+
114+
/**
115+
* A unique codec name, all lower case, only <code>ALPHA+ALPHANUM*</code>
116+
* @return
117+
*/
118+
public String name() {
119+
return name;
120+
}
121+
98122
/**
99123
* A unique prefix identifying base encoding in encoded value.
100124
*

0 commit comments

Comments
 (0)
⚡