You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/04 12:01:30 UTC
[isis] branch master updated: ISIS-2249: remove references to Money
in fakedata (commented out)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new bf7a329 ISIS-2249: remove references to Money in fakedata (commented out)
bf7a329 is described below
commit bf7a3297aac8d893681ae5996719675a4639ce1e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 4 13:01:22 2020 +0100
ISIS-2249: remove references to Money in fakedata (commented out)
---
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 61 +++++++++-------
...eDataDemoObjectWithAll_update_withFakeData.java | 20 +++---
.../fakedata/dom/services/FakeDataService.java | 18 ++---
.../fakedata/dom/services/IsisMoneys.java | 13 ++--
.../fakedata/dom/services/FakeDataServiceTest.java | 19 +++--
.../fakedata/integtests/tests/Smoke_IntegTest.java | 83 +++++++++++-----------
6 files changed, 110 insertions(+), 104 deletions(-)
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index a670484..e6138e8 100644
--- a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++ b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -16,16 +16,25 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.google.common.collect.Ordering;
-import org.apache.isis.applib.annotation.*;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
+import org.joda.time.LocalDateTime;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
-import org.joda.time.LocalDateTime;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -181,13 +190,13 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
private java.util.UUID someUuid;
- @javax.jdo.annotations.Persistent(defaultFetchGroup="true", columns = {
- @javax.jdo.annotations.Column(name = "someMoneyOptional_amount"),
- @javax.jdo.annotations.Column(name = "someMoneyOptional_currency")
- })
- @Property(optionality = Optionality.OPTIONAL)
- @Getter @Setter
- private Money someMoney;
+// @javax.jdo.annotations.Persistent(defaultFetchGroup="true", columns = {
+// @javax.jdo.annotations.Column(name = "someMoneyOptional_amount"),
+// @javax.jdo.annotations.Column(name = "someMoneyOptional_currency")
+// })
+// @Property(optionality = Optionality.OPTIONAL)
+// @Getter @Setter
+// private Money someMoney;
@Column(allowsNull = "true")
@Getter @Setter
@@ -628,21 +637,21 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
return this;
}
-
- @Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeMoney(@Nullable final Money i) {
- setSomeMoney(i);
- return this;
- }
- public Money default0UpdateSomeMoney() {
- return getSomeMoney();
- }
-
- @Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll resetSomeMoney() {
- setSomeMoney(null);
- return this;
- }
+ //TODO[2249] deprecated
+// @Action(semantics=SemanticsOf.IDEMPOTENT)
+// public FakeDataDemoObjectWithAll updateSomeMoney(@Nullable final Money i) {
+// setSomeMoney(i);
+// return this;
+// }
+// public Money default0UpdateSomeMoney() {
+// return getSomeMoney();
+// }
+//
+// @Action(semantics=SemanticsOf.IDEMPOTENT)
+// public FakeDataDemoObjectWithAll resetSomeMoney() {
+// setSomeMoney(null);
+// return this;
+// }
@Action(semantics=SemanticsOf.IDEMPOTENT)
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 7fbcf6a..4e077bd 100644
--- a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -7,25 +7,24 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.UUID;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import javax.inject.Inject;
+
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
-
import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
+import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import lombok.Getter;
import lombok.Setter;
-import javax.inject.Inject;
-
public class FakeDataDemoObjectWithAll_update_withFakeData extends FixtureScript {
@@ -98,8 +97,8 @@ public class FakeDataDemoObjectWithAll_update_withFakeData extends FixtureScript
@Getter(onMethod = @__( @Programmatic )) @Setter
private UUID someUuid;
- @Getter(onMethod = @__( @Programmatic )) @Setter
- private Money someMoney;
+// @Getter(onMethod = @__( @Programmatic )) @Setter
+// private Money someMoney;
@Getter(onMethod = @__( @Programmatic )) @Setter
private EnumOf3 someEnumOf3;
@@ -138,7 +137,8 @@ public class FakeDataDemoObjectWithAll_update_withFakeData extends FixtureScript
this.defaultParam("someUrl", executionContext, fakeDataService.urls().any());
this.defaultParam("someUuid", executionContext, fakeDataService.uuids().any());
- this.defaultParam("someMoney", executionContext, fakeDataService.isisMoneys().any());
+ //TODO[2249] deprecated
+ //this.defaultParam("someMoney", executionContext, fakeDataService.isisMoneys().any());
this.defaultParam("someEnumOf3", executionContext, fakeDataService.enums().anyOf(EnumOf3.class));
// updates
@@ -185,7 +185,7 @@ public class FakeDataDemoObjectWithAll_update_withFakeData extends FixtureScript
wrap(fakeDataDemoObject).updateSomeUrl(getSomeUrl());
wrap(fakeDataDemoObject).updateSomeUuid(getSomeUuid());
- wrap(fakeDataDemoObject).updateSomeMoney(getSomeMoney());
+ //wrap(fakeDataDemoObject).updateSomeMoney(getSomeMoney());
wrap(fakeDataDemoObject).updateSomeEnumOf3(getSomeEnumOf3());
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
index b38b5ab..89f55b9 100644
--- a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
+++ b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
@@ -1,9 +1,8 @@
package org.apache.isis.extensions.fakedata.dom.services;
-import lombok.extern.log4j.Log4j2;
-
import java.util.Locale;
import java.util.Random;
+
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
@@ -12,20 +11,20 @@ import com.github.javafaker.Faker;
import com.github.javafaker.service.FakeValuesService;
import com.github.javafaker.service.RandomService;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.repository.RepositoryService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.clock.ClockService;
+import org.apache.isis.applib.services.repository.RepositoryService;
+
@Service
@Named("isisExtFakeData.FakeDataService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class FakeDataService {
private final Faker javaFaker;
@@ -264,9 +263,10 @@ public class FakeDataService {
return isisPasswords;
}
- public IsisMoneys isisMoneys() {
- return isisMoneys;
- }
+ //TODO[2249] deprecated
+// public IsisMoneys isisMoneys() {
+// return isisMoneys;
+// }
public IsisBlobs isisBlobs() {
return isisBlobs;
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
index b78ffee..3dfd2fd 100644
--- a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
+++ b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
@@ -1,17 +1,16 @@
package org.apache.isis.extensions.fakedata.dom.services;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.value.Money;
-
+//TODO[2249] deprecated
+@Deprecated
public class IsisMoneys extends AbstractRandomValueGenerator {
public IsisMoneys(final FakeDataService fakeDataService) {
super(fakeDataService);
}
- @Programmatic
- public Money any() {
- return new Money(fake.doubles().any(), fake.collections().anyOf("GBP", "USD", "EUR", "YEN"));
- }
+// @Programmatic
+// public Money any() {
+// return new Money(fake.doubles().any(), fake.collections().anyOf("GBP", "USD", "EUR", "YEN"));
+// }
}
diff --git a/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java b/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
index 28ffe88..84a7486 100644
--- a/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
+++ b/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
@@ -13,22 +13,20 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.services.clock.ClockService;
+import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.assertj.core.api.Assertions.assertThat;
@@ -212,12 +210,13 @@ public class FakeDataServiceTest {
assertThat(pwd.getPassword().length()).isEqualTo(12);
}
- @Test
- public void moneys_any() throws Exception {
- final Money pwd = fakeDataService.isisMoneys().any();
- assertThat(pwd.getAmount()).isNotNull();
- assertThat(pwd.getCurrency()).isNotNull();
- }
+ //TODO[2249] deprecated
+// @Test
+// public void moneys_any() throws Exception {
+// final Money pwd = fakeDataService.isisMoneys().any();
+// assertThat(pwd.getAmount()).isNotNull();
+// assertThat(pwd.getCurrency()).isNotNull();
+// }
@Test
public void jodaDateTimes_any() throws Exception {
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
index 338dff1..4258ddb 100644
--- a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -9,25 +9,24 @@ import java.util.UUID;
import javax.inject.Inject;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.assertj.core.api.Assertions;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
+import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fakedata.dom.FakeDataService;
+import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
-import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
@@ -92,7 +91,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
Assertions.assertThat(fakeDataDemoObject.getSomeUrl()).isNull();
Assertions.assertThat(fakeDataDemoObject.getSomeUuid()).isNull();
- Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNull();
+ //Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNull();
Assertions.assertThat(fakeDataDemoObject.getSomeEnumOf3()).isNull();
}
@@ -169,7 +168,7 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
Assertions.assertThat(fakeDataDemoObject.getSomeUrl()).isNotNull();
Assertions.assertThat(fakeDataDemoObject.getSomeUuid()).isNotNull();
- Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNotNull();
+// Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNotNull();
Assertions.assertThat(fakeDataDemoObject.getSomeEnumOf3()).isNotNull();
}
@@ -833,43 +832,43 @@ public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
Assertions.assertThat(fakeDataDemoObject.getSomeUuid()).isEqualTo(theUuid);
- Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNotNull();
+ //Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNotNull();
Assertions.assertThat(fakeDataDemoObject.getSomeEnumOf3()).isNotNull();
}
- @Test
- public void when_money() throws Exception {
-
- //
- // given
- //
- Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNull();
-
- final Money theMoney = new Money(12345.67, "EUR");
-
-
- //
- // when
- //
- updateScript.setFakeDataDemoObject(fakeDataDemoObject);
- updateScript.setSomeMoney(theMoney);
-
- fixtureScripts.runFixtureScript( updateScript, null);
-
- transactionService.flushTransaction();
-
-
- //
- // then
- //
- fakeDataDemoObject = wrap(fakeDataDemoObjects).listAllDemoObjectsWithAll().get(0);
-
- Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isEqualTo(theMoney);
-
- Assertions.assertThat(fakeDataDemoObject.getSomeEnumOf3()).isNotNull();
-
- }
+// @Test
+// public void when_money() throws Exception {
+//
+// //
+// // given
+// //
+// Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isNull();
+//
+// final Money theMoney = new Money(12345.67, "EUR");
+//
+//
+// //
+// // when
+// //
+// updateScript.setFakeDataDemoObject(fakeDataDemoObject);
+// updateScript.setSomeMoney(theMoney);
+//
+// fixtureScripts.runFixtureScript( updateScript, null);
+//
+// transactionService.flushTransaction();
+//
+//
+// //
+// // then
+// //
+// fakeDataDemoObject = wrap(fakeDataDemoObjects).listAllDemoObjectsWithAll().get(0);
+//
+// Assertions.assertThat(fakeDataDemoObject.getSomeMoney()).isEqualTo(theMoney);
+//
+// Assertions.assertThat(fakeDataDemoObject.getSomeEnumOf3()).isNotNull();
+//
+// }
@Test
public void when_enum() throws Exception {