Fix method name

vanitasvitae · vanitasvitae · commit d7b75d40aaa4 · 2024-11-16T01:46:28.000+01:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/BcOpenPGPImplementation.java b/pg/src/main/java/org/bouncycastle/openpgp/api/BcOpenPGPImplementation.java
@@ -34,7 +34,7 @@ public class BcOpenPGPImplementation
         extends OpenPGPImplementation
 {
     @Override
-    public PGPObjectFactory objectFactory(InputStream inputStream)
+    public PGPObjectFactory pgpObjectFactory(InputStream inputStream)
     {
         return new BcPGPObjectFactory(inputStream);
     }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/JcaOpenPGPImplementation.java b/pg/src/main/java/org/bouncycastle/openpgp/api/JcaOpenPGPImplementation.java
@@ -52,7 +52,7 @@ public JcaOpenPGPImplementation(Provider provider, SecureRandom secureRandom)
     }
 
     @Override
-    public PGPObjectFactory objectFactory(InputStream inputStream)
+    public PGPObjectFactory pgpObjectFactory(InputStream inputStream)
     {
         return new JcaPGPObjectFactory(inputStream);
     }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPImplementation.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPImplementation.java
@@ -8,7 +8,6 @@
 import org.bouncycastle.openpgp.PGPSessionKey;
 import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
 import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator;
-import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptorBuilder;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptorBuilderProvider;
 import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
 import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
@@ -22,7 +21,7 @@
 
 public abstract class OpenPGPImplementation
 {
-    public abstract PGPObjectFactory objectFactory(InputStream inputStream);
+    public abstract PGPObjectFactory pgpObjectFactory(InputStream inputStream);
 
     public abstract PGPContentVerifierBuilderProvider pgpContentVerifierBuilderProvider();
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageProcessor.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageProcessor.java
@@ -93,7 +93,7 @@ public InputStream process(InputStream messageIn)
         int depth = 0;
         do
         {
-            PGPObjectFactory objectFactory = implementation.objectFactory(packetInputStream);
+            PGPObjectFactory objectFactory = implementation.pgpObjectFactory(packetInputStream);
             Object o = objectFactory.nextObject();
 
             // TODO: This is a brittle prototype implementation. Implement properly!

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class BcOpenPGPImplementation`
`34`	`34`	`extends OpenPGPImplementation`
`35`	`35`	`{`
`36`	`36`	`@Override`
`37`		`- public PGPObjectFactory objectFactory(InputStream inputStream)`
	`37`	`+ public PGPObjectFactory pgpObjectFactory(InputStream inputStream)`
`38`	`38`	`{`
`39`	`39`	`return new BcPGPObjectFactory(inputStream);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public JcaOpenPGPImplementation(Provider provider, SecureRandom secureRandom)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public PGPObjectFactory objectFactory(InputStream inputStream)`
	`55`	`+ public PGPObjectFactory pgpObjectFactory(InputStream inputStream)`
`56`	`56`	`{`
`57`	`57`	`return new JcaPGPObjectFactory(inputStream);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public InputStream process(InputStream messageIn)`
`93`	`93`	`int depth = 0;`
`94`	`94`	`do`
`95`	`95`	`{`
`96`		`- PGPObjectFactory objectFactory = implementation.objectFactory(packetInputStream);`
	`96`	`+ PGPObjectFactory objectFactory = implementation.pgpObjectFactory(packetInputStream);`
`97`	`97`	`Object o = objectFactory.nextObject();`
`98`	`98`
`99`	`99`	`// TODO: This is a brittle prototype implementation. Implement properly!`