Skip to content

Commit eecaf97

Browse files
committed
Added static class declarations where possible. Relates to github #2026
1 parent 48a3213 commit eecaf97

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

mls/src/main/java/org/bouncycastle/mls/client/MLSClientImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
public class MLSClientImpl
4848
extends MLSClientGrpc.MLSClientImplBase
4949
{
50-
class CachedGroup
50+
static class CachedGroup
5151
{
5252
Group group;
5353
boolean encryptHandshake;
@@ -70,7 +70,7 @@ public void resetPending()
7070
}
7171
}
7272

73-
class CachedJoin
73+
static class CachedJoin
7474
{
7575
KeyPackageWithSecrets kpSecrets;
7676
Map<Secret, byte[]> externalPsks;
@@ -82,7 +82,7 @@ public CachedJoin(KeyPackageWithSecrets kpSecrets)
8282
}
8383
}
8484

85-
class CachedReinit
85+
static class CachedReinit
8686
{
8787
KeyPackageWithSecrets kpSk;
8888
Group.Tombstone tombstone;
@@ -1423,7 +1423,7 @@ private void reInitCommitImpl(CachedGroup entry, MlsClient.CommitRequest request
14231423
LeafNode leaf = entry.group.getTree().getLeafNode(entry.group.getIndex());
14241424
byte[] identity = leaf.getCredential().getIdentity();
14251425
KeyPackageWithSecrets kpSk = newKeyPackage(twm.getSuite(), identity);
1426-
;
1426+
14271427
int reinitID = storeReinit(kpSk, twm, entry.encryptHandshake);
14281428
byte[] commitBytes = MLSOutputStream.encode(twm.getMessage());
14291429

mls/src/main/java/org/bouncycastle/mls/protocol/Group.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public CommitOptions(List<Proposal> extraProposals, boolean inlineTree, boolean
312312
}
313313
}
314314

315-
class JoinersWithPSKS
315+
static class JoinersWithPSKS
316316
{
317317
List<LeafIndex> joiners;
318318
List<KeyScheduleEpoch.PSKWithSecret> psks;
@@ -324,7 +324,7 @@ public JoinersWithPSKS(List<LeafIndex> joiners, List<KeyScheduleEpoch.PSKWithSec
324324
}
325325
}
326326

327-
public class EpochRef
327+
public static class EpochRef
328328
{
329329
byte[] id;
330330
long epoch;
@@ -1184,7 +1184,7 @@ else if (commitOptions != null && commitOptions.extraProposals.size() == 1)
11841184
return new TombstoneWithMessage(gwm.group, reinit, gwm.message);
11851185
}
11861186

1187-
static public MLSMessage newMemberAdd(byte[] groupID, long epoch, KeyPackage newMember, AsymmetricCipherKeyPair sigSk)
1187+
public static MLSMessage newMemberAdd(byte[] groupID, long epoch, KeyPackage newMember, AsymmetricCipherKeyPair sigSk)
11881188
throws Exception
11891189
{
11901190
MlsCipherSuite suite = newMember.getSuite();

0 commit comments

Comments
 (0)