Skip to content

Commit 31d4caa

Browse files
committed
https://java.net/jira/browse/JAVAMONEY-77
Replaced create() with of() in builders. Removed exposure of BuildableCurrencyUnit and DefaultExchangeRate in RI by refactoring builder pattern similar to RI.
1 parent 3207c6d commit 31d4caa

21 files changed

+1577
-1694
lines changed

pom.xml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<jdkVersion>1.8</jdkVersion>
5151
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
5252
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
53-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53+
<project.create.sourceEncoding>UTF-8</project.create.sourceEncoding>
5454
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5555
<moduleDir>.</moduleDir>
5656
<basedir>.</basedir>
@@ -318,7 +318,7 @@
318318
</dependency>
319319
</dependencies>
320320

321-
<build>
321+
<create>
322322
<defaultGoal>install</defaultGoal>
323323

324324
<extensions>
@@ -364,18 +364,18 @@
364364
<verbose>true</verbose>
365365
<source>${maven.compile.sourceLevel}</source>
366366
<target>${maven.compile.targetLevel}</target>
367-
<encoding>${project.build.sourceEncoding}</encoding>
367+
<encoding>${project.create.sourceEncoding}</encoding>
368368
</configuration>
369369
</plugin>
370370
<plugin>
371371
<groupId>org.apache.maven.plugins</groupId>
372372
<artifactId>maven-surefire-plugin</artifactId>
373373
<configuration>
374374
<testFailureIgnore>true</testFailureIgnore>
375-
<testClassesDirectory>${build.directory}/classes</testClassesDirectory>
376-
<additionalClasspathElements>
377-
<additionalClasspathElement>${build.directory}/test-classes</additionalClasspathElement>
378-
</additionalClasspathElements>
375+
<testClassesDirectory>${create.directory}/classes</testClassesDirectory>
376+
<additionalClasspathElements>
377+
<additionalClasspathElement>${create.directory}/test-classes</additionalClasspathElement>
378+
</additionalClasspathElements>
379379
</configuration>
380380
</plugin>
381381

@@ -411,7 +411,7 @@
411411
</executions>
412412
</plugin>
413413
</plugins>
414-
</build>
414+
</create>
415415

416416
<profiles>
417417
<profile>
@@ -422,7 +422,7 @@
422422
<value>true</value>
423423
</property>
424424
</activation>
425-
<build>
425+
<create>
426426
<pluginManagement>
427427
<plugins>
428428
<plugin>
@@ -436,7 +436,8 @@
436436
</processors>
437437
<outputClassDirectory>${basedir}/target/classes</outputClassDirectory>
438438
<compilerArguments>
439-
-AauditXml=${basedir}/test-audit.xml -AoutputDir=${basedir}/target/coverage-report -source ${jdkVersion} -target ${jdkVersion}
439+
-AauditXml=${basedir}/test-audit.xml -AoutputDir=${basedir}/target/coverage-report
440+
-source ${jdkVersion} -target ${jdkVersion}
440441
</compilerArguments>
441442
</configuration>
442443
<executions>
@@ -457,7 +458,7 @@
457458
<artifactId>maven-processor-plugin</artifactId>
458459
</plugin>
459460
</plugins>
460-
</build>
461+
</create>
461462
</profile>
462463
<profile>
463464
<id>release-sign-artifacts</id>
@@ -467,7 +468,7 @@
467468
<value>true</value>
468469
</property>
469470
</activation>
470-
<build>
471+
<create>
471472
<pluginManagement>
472473
<plugins>
473474
<plugin>
@@ -497,7 +498,7 @@
497498
</executions>
498499
</plugin>
499500
</plugins>
500-
</build>
501+
</create>
501502
</profile>
502503

503504
<profile>
@@ -508,7 +509,7 @@
508509
<value>true</value>
509510
</property>
510511
</activation>
511-
<build>
512+
<create>
512513
<pluginManagement>
513514
<plugins>
514515
<!-- ======================================================= -->
@@ -550,7 +551,7 @@
550551
</executions>
551552
</plugin>
552553
</plugins>
553-
</build>
554+
</create>
554555
</profile>
555556
</profiles>
556557

src/main/java/org/javamoney/tck/TestUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public static String getWarnings(){
230230
}
231231

232232
public static MonetaryAmount createAmountWithScale(int scale){
233-
MonetaryAmountFactoryQuery tgtContext = MonetaryAmountFactoryQueryBuilder.create().setMaxScale(scale).build();
233+
MonetaryAmountFactoryQuery tgtContext = MonetaryAmountFactoryQueryBuilder.of().setMaxScale(scale).build();
234234
MonetaryAmountFactory<?> exceedingFactory;
235235
try{
236236
exceedingFactory = MonetaryAmounts.getAmountFactory(tgtContext);
@@ -245,8 +245,7 @@ public static MonetaryAmount createAmountWithScale(int scale){
245245
}
246246

247247
public static MonetaryAmount createAmountWithPrecision(int precision){
248-
MonetaryAmountFactoryQuery tgtContext =
249-
MonetaryAmountFactoryQueryBuilder.create().setPrecision(precision).build();
248+
MonetaryAmountFactoryQuery tgtContext = MonetaryAmountFactoryQueryBuilder.of().setPrecision(precision).build();
250249
MonetaryAmountFactory<?> exceedingFactory;
251250
try{
252251
exceedingFactory = MonetaryAmounts.getAmountFactory(tgtContext);

0 commit comments

Comments
 (0)