digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

remove two-argument fromIdAndRecord from Java codegen output (#14104)

Browse Source 
CHANGELOG_BEGIN
- [Java codegen] The two-argument overload for ``fromIdAndRecord``,
  deprecated since SDK 0.12.18, has been removed.  Code that still uses
  this should use either ``fromCreatedEvent``, or the remaining overload
  of ``fromIdAndRecord`` if no ``CreatedEvent`` is available.
CHANGELOG_END
This commit is contained in:
Stephen Compall 2022-06-07 08:58:27 -04:00 committed by GitHub
parent 7c23420876
commit 9a086ec225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
language-support/java/bindings/src/main/java/com/daml/ledger/javaapi/data/codegen/ContractCompanion.java
View File

@ -7,7 +7,6 @@ import com.daml.ledger.javaapi.data.CreatedEvent;
import com.daml.ledger.javaapi.data.DamlRecord;
import com.daml.ledger.javaapi.data.Identifier;
import com.daml.ledger.javaapi.data.Value;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
@ -72,16 +71,6 @@ public abstract class ContractCompanion<Ct, Id, Data> extends ContractTypeCompan
return newContract.newContract(id, data, agreementText, signatories, observers);
}
/**
* @deprecated since introduction; only exists to support generated method that has itself been
* deprecated since v0.12.18
*/
@Deprecated
public Ct fromIdAndRecord(String contractId, DamlRecord record$) {
return fromIdAndRecord(
contractId, record$, Optional.empty(), Collections.emptySet(), Collections.emptySet());
}
@Override
public Ct fromCreatedEvent(CreatedEvent event) {
return fromIdAndRecord(
@ -132,21 +121,6 @@ public abstract class ContractCompanion<Ct, Id, Data> extends ContractTypeCompan
return newContract.newContract(id, data, agreementText, key, signatories, observers);
}
/**
* @deprecated since introduction; only exists to support generated method that has itself been
* deprecated since v0.12.18
*/
@Deprecated
public Ct fromIdAndRecord(String contractId, DamlRecord record$) {
return fromIdAndRecord(
contractId,
record$,
Optional.empty(),
Optional.empty(),
Collections.emptySet(),
Collections.emptySet());
}
@Override
public Ct fromCreatedEvent(CreatedEvent event) {
return fromIdAndRecord(

7
language-support/java/codegen/src/it/java/com/daml/TemplateMethodTest.java
View File

@ -58,13 +58,6 @@ public class TemplateMethodTest {
fromRecord, fromSplatted, "CreateAndExerciseCommands from both methods are not the same");
}
@Test
void contractHasDeprecatedFromIdAndRecord() {
SimpleTemplate.Contract contract =
SimpleTemplate.Contract.fromIdAndRecord("SomeId", simpleTemplateRecord);
assertFalse(contract.agreementText.isPresent(), "Field agreementText should not be present");
}
@Test
void contractHasFromIdAndRecord() {
SimpleTemplate.Contract emptyAgreement =

15
language-support/java/codegen/src/main/scala/com/digitalasset/daml/lf/codegen/backend/java/inner/ContractClass.scala
View File

@ -38,9 +38,6 @@ object ContractClass {
contractKeyClassName,
)
)
.addMethod(
Builder.generateFromIdAndRecordDeprecated(contractClassName)
)
.addMethod(
Builder.generateFromCreatedEvent(contractClassName)
)
@ -68,18 +65,6 @@ object ContractClass {
(ClassName get classOf[javaapi.data.CreatedEvent], "event"),
)
// XXX remove; see digital-asset/daml#13773
private def generateFromIdAndRecordDeprecated(
className: ClassName
): MethodSpec =
generateCompanionForwarder(
"fromIdAndRecord",
className,
_.addAnnotation(classOf[Deprecated]),
(ClassName get classOf[String], "contractId"),
(ClassName get classOf[javaapi.data.DamlRecord], "record$"),
)
private[inner] def generateFromIdAndRecord(
className: ClassName,
maybeContractKeyClassName: Option[TypeName],