Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JavaMoney/jsr354-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.8
Choose a base ref
...
head repository: JavaMoney/jsr354-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 17,315 additions and 9,634 deletions.
  1. +58 −0 .circleci/config.yml
  2. +12 −0 .github/FUNDING.yml
  3. +5 −1 .gitignore
  4. +0 −9 .idea/copyright/Spec.xml
  5. +0 −1 LICENSE.html
  6. +202 −0 LICENSE.txt
  7. +29 −0 README.md
  8. +0 −11 README.txt
  9. +21 −0 SECURITY.md
  10. +26 −0 bnd.bnd
  11. +0 −8 checkstyle-suppressions.xml
  12. +0 −124 checkstyle.xml
  13. +1,069 −884 pom.xml
  14. +9 −0 settings.xml
  15. +0 −10 src/etc/header.txt
  16. +0 −20 src/etc/jsr354-api clean install.launch
  17. +14 −0 src/license/asl_2/header.txt
  18. +16 −0 src/license/asl_2/license.txt
  19. +15 −0 src/license/headers.xml
  20. +0 −10 src/license/jcp_spec/header.txt
  21. +0 −63 src/license/jcp_spec/license.txt
  22. +18 −12 src/license/licenses.properties
  23. +3,255 −0 src/main/asciidoc/JavaMoneySpecification.adoc
  24. BIN src/main/asciidoc/images/highlighter.png
  25. +5 −0 src/main/asciidoc/images/icons/README
  26. BIN src/main/asciidoc/images/icons/callouts/1.png
  27. BIN src/main/asciidoc/images/icons/callouts/10.png
  28. BIN src/main/asciidoc/images/icons/callouts/11.png
  29. BIN src/main/asciidoc/images/icons/callouts/12.png
  30. BIN src/main/asciidoc/images/icons/callouts/13.png
  31. BIN src/main/asciidoc/images/icons/callouts/14.png
  32. BIN src/main/asciidoc/images/icons/callouts/15.png
  33. BIN src/main/asciidoc/images/icons/callouts/2.png
  34. BIN src/main/asciidoc/images/icons/callouts/3.png
  35. BIN src/main/asciidoc/images/icons/callouts/4.png
  36. BIN src/main/asciidoc/images/icons/callouts/5.png
  37. BIN src/main/asciidoc/images/icons/callouts/6.png
  38. BIN src/main/asciidoc/images/icons/callouts/7.png
  39. BIN src/main/asciidoc/images/icons/callouts/8.png
  40. BIN src/main/asciidoc/images/icons/callouts/9.png
  41. BIN src/main/asciidoc/images/icons/caution.png
  42. BIN src/main/asciidoc/images/icons/example.png
  43. BIN src/main/asciidoc/images/icons/home.png
  44. BIN src/main/asciidoc/images/icons/important.png
  45. BIN src/main/asciidoc/images/icons/next.png
  46. BIN src/main/asciidoc/images/icons/note.png
  47. BIN src/main/asciidoc/images/icons/prev.png
  48. BIN src/main/asciidoc/images/icons/tip.png
  49. BIN src/main/asciidoc/images/icons/up.png
  50. BIN src/main/asciidoc/images/icons/warning.png
  51. BIN src/main/asciidoc/images/javamoney_cup.jpg
  52. BIN src/main/asciidoc/images/smallnew.png
  53. BIN src/main/asciidoc/images/spi.jpg
  54. BIN src/main/asciidoc/images/tiger.png
  55. +222 −345 src/main/java/javax/money/AbstractContext.java
  56. +228 −0 src/main/java/javax/money/AbstractContextBuilder.java
  57. +84 −0 src/main/java/javax/money/AbstractQuery.java
  58. +113 −0 src/main/java/javax/money/AbstractQueryBuilder.java
  59. +63 −0 src/main/java/javax/money/CurrencyContext.java
  60. +85 −0 src/main/java/javax/money/CurrencyContextBuilder.java
  61. +116 −0 src/main/java/javax/money/CurrencyQuery.java
  62. +111 −0 src/main/java/javax/money/CurrencyQueryBuilder.java
  63. +22 −11 src/main/java/javax/money/CurrencySupplier.java
  64. +75 −63 src/main/java/javax/money/CurrencyUnit.java
  65. +88 −0 src/main/java/javax/money/DefaultMonetaryCurrenciesSingletonSpi.java
  66. +185 −0 src/main/java/javax/money/DefaultMonetaryRoundingsSingletonSpi.java
  67. +499 −0 src/main/java/javax/money/Monetary.java
  68. +542 −583 src/main/java/javax/money/MonetaryAmount.java
  69. +143 −118 src/main/java/javax/money/MonetaryAmountFactory.java
  70. +101 −0 src/main/java/javax/money/MonetaryAmountFactoryQuery.java
  71. +112 −0 src/main/java/javax/money/MonetaryAmountFactoryQueryBuilder.java
  72. +0 −125 src/main/java/javax/money/MonetaryAmounts.java
  73. +79 −351 src/main/java/javax/money/MonetaryContext.java
  74. +128 −0 src/main/java/javax/money/MonetaryContextBuilder.java
  75. +0 −149 src/main/java/javax/money/MonetaryCurrencies.java
  76. +15 −11 src/main/java/javax/money/MonetaryException.java
  77. +42 −38 src/main/java/javax/money/MonetaryOperator.java
  78. +22 −18 src/main/java/javax/money/MonetaryQuery.java
  79. +49 −0 src/main/java/javax/money/MonetaryRounding.java
  80. +0 −294 src/main/java/javax/money/MonetaryRoundings.java
  81. +35 −23 src/main/java/javax/money/NumberSupplier.java
  82. +80 −14 src/main/java/javax/money/NumberValue.java
  83. +84 −0 src/main/java/javax/money/RoundingContext.java
  84. +98 −0 src/main/java/javax/money/RoundingContextBuilder.java
  85. +103 −0 src/main/java/javax/money/RoundingQuery.java
  86. +116 −0 src/main/java/javax/money/RoundingQueryBuilder.java
  87. +18 −9 src/main/java/javax/money/UnknownCurrencyException.java
  88. +82 −288 src/main/java/javax/money/convert/ConversionContext.java
  89. +115 −0 src/main/java/javax/money/convert/ConversionContextBuilder.java
  90. +109 −0 src/main/java/javax/money/convert/ConversionQuery.java
  91. +132 −0 src/main/java/javax/money/convert/ConversionQueryBuilder.java
  92. +48 −53 src/main/java/javax/money/convert/CurrencyConversion.java
  93. +127 −121 src/main/java/javax/money/convert/CurrencyConversionException.java
  94. +46 −389 src/main/java/javax/money/convert/ExchangeRate.java
  95. +115 −122 src/main/java/javax/money/convert/ExchangeRateProvider.java
  96. +45 −0 src/main/java/javax/money/convert/ExchangeRateProviderSupplier.java
  97. +213 −189 src/main/java/javax/money/convert/MonetaryConversions.java
  98. +41 −290 src/main/java/javax/money/convert/ProviderContext.java
  99. +148 −0 src/main/java/javax/money/convert/ProviderContextBuilder.java
  100. +22 −12 src/main/java/javax/money/convert/RateType.java
  101. +14 −10 src/main/java/javax/money/convert/package-info.java
  102. +84 −0 src/main/java/javax/money/format/AmountFormatContext.java
  103. +164 −0 src/main/java/javax/money/format/AmountFormatContextBuilder.java
  104. +108 −0 src/main/java/javax/money/format/AmountFormatQuery.java
  105. +152 −0 src/main/java/javax/money/format/AmountFormatQueryBuilder.java
  106. +0 −524 src/main/java/javax/money/format/AmountFormatSymbols.java
  107. +0 −437 src/main/java/javax/money/format/AmountStyle.java
  108. +0 −58 src/main/java/javax/money/format/CurrencyStyle.java
  109. +96 −366 src/main/java/javax/money/format/MonetaryAmountFormat.java
  110. +274 −79 src/main/java/javax/money/format/MonetaryFormats.java
  111. +19 −9 src/main/java/javax/money/format/MonetaryParseException.java
  112. +16 −8 src/main/java/javax/money/format/package-info.java
  113. +17 −10 src/main/java/javax/money/package-info.java
  114. +0 −47 src/main/java/javax/money/spi/AmountFormatSymbolsProviderSpi.java
  115. +0 −48 src/main/java/javax/money/spi/AmountStyleProviderSpi.java
  116. +47 −66 src/main/java/javax/money/spi/Bootstrap.java
  117. +45 −33 src/main/java/javax/money/spi/CurrencyProviderSpi.java
  118. +65 −99 src/main/java/javax/money/spi/DefaultServiceProvider.java
  119. +86 −76 src/main/java/javax/money/spi/MonetaryAmountFactoryProviderSpi.java
  120. +47 −17 src/main/java/javax/money/spi/MonetaryAmountFormatProviderSpi.java
  121. +115 −0 src/main/java/javax/money/spi/MonetaryAmountsSingletonQuerySpi.java
  122. +92 −0 src/main/java/javax/money/spi/MonetaryAmountsSingletonSpi.java
  123. +0 −91 src/main/java/javax/money/spi/MonetaryAmountsSpi.java
  124. +213 −0 src/main/java/javax/money/spi/MonetaryConversionsSingletonSpi.java
  125. +0 −121 src/main/java/javax/money/spi/MonetaryConversionsSpi.java
  126. +179 −0 src/main/java/javax/money/spi/MonetaryCurrenciesSingletonSpi.java
  127. +133 −0 src/main/java/javax/money/spi/MonetaryFormatsSingletonSpi.java
  128. +175 −0 src/main/java/javax/money/spi/MonetaryRoundingsSingletonSpi.java
  129. +31 −89 src/main/java/javax/money/spi/RoundingProviderSpi.java
  130. +44 −58 src/main/java/javax/money/spi/ServiceProvider.java
  131. +14 −8 src/main/java/javax/money/spi/package-info.java
  132. +36 −0 src/main/java/module-info.java
  133. +7 −7 src/site/site.xml
  134. +13 −4 src/test/do-not-delete.txt
  135. +211 −0 src/test/java/javax/money/AbstractContextBuilderTest.java
  136. +82 −71 src/test/java/javax/money/AbstractContextTest.java
  137. +118 −0 src/test/java/javax/money/AbstractDynamicServiceProviderTest.java
  138. +66 −0 src/test/java/javax/money/AbstractQueryTest.java
  139. +34 −0 src/test/java/javax/money/CurrencyContextBuilderTest.java
  140. +68 −0 src/test/java/javax/money/CurrencyQueryBuilderTest.java
  141. +264 −240 src/test/java/javax/money/DummyAmount.java
  142. +157 −0 src/test/java/javax/money/DummyAmountBuilder.java
  143. +0 −125 src/test/java/javax/money/DummyAmountFactory.java
  144. +53 −39 src/test/java/javax/money/DummyAmountFactoryProvider.java
  145. +91 −0 src/test/java/javax/money/MonetaryAmountFactoryQueryTest.java
  146. +302 −0 src/test/java/javax/money/MonetaryAmountTest.java
  147. +114 −51 src/test/java/javax/money/MonetaryAmountsTest.java
  148. +59 −71 src/test/java/javax/money/MonetaryContextTest.java
  149. +0 −83 src/test/java/javax/money/MonetaryCurrenciesTest.java
  150. +207 −0 src/test/java/javax/money/MonetaryDynamicServiceProviderTest.java
  151. +16 −15 src/test/java/javax/money/MonetaryExceptionTest.java
  152. +78 −67 src/test/java/javax/money/MonetaryRoundingsTest.java
  153. +128 −0 src/test/java/javax/money/MonetaryTest.java
  154. +38 −0 src/test/java/javax/money/NumberValueTest.java
  155. +50 −0 src/test/java/javax/money/RoundingContextTest.java
  156. +38 −0 src/test/java/javax/money/RoundingQueryBuilderTest.java
  157. +258 −277 src/test/java/javax/money/TestCurrency.java
  158. +141 −97 src/test/java/javax/money/TestCurrencyProvider.java
  159. +52 −88 src/test/java/javax/money/TestRoundingProvider.java
  160. +23 −15 src/test/java/javax/money/UnknownCurrencyExceptionTest.java
  161. +30 −71 src/test/java/javax/money/convert/ConversionContextTest.java
  162. +57 −59 src/test/java/javax/money/convert/CurrencyConversionExceptionTest.java
  163. +460 −0 src/test/java/javax/money/convert/DefaultExchangeRate.java
  164. +73 −0 src/test/java/javax/money/convert/ExchangeRateProviderTest.java
  165. +118 −114 src/test/java/javax/money/convert/ExchangeRateTest.java
  166. +116 −122 src/test/java/javax/money/convert/ExchangeRate_BuilderTest.java
  167. +68 −0 src/test/java/javax/money/convert/MonetaryConversionsDynamicServiceProviderTest.java
  168. +83 −39 src/test/java/javax/money/convert/MonetaryConversionsTest.java
  169. +36 −83 src/test/java/javax/money/convert/ProviderContextTest.java
  170. +156 −0 src/test/java/javax/money/convert/TestMonetaryConversionsSingletonSpi.java
  171. +0 −182 src/test/java/javax/money/convert/TestMonetaryConversionsSpi.java
  172. +52 −39 src/test/java/javax/money/convert/{DefaultNumberValue.java → TestNumberValue.java}
  173. +59 −0 src/test/java/javax/money/format/AmountFormatContextTest.java
  174. +87 −0 src/test/java/javax/money/format/AmountFormatQueryTest.java
  175. +0 −113 src/test/java/javax/money/format/AmountFormatSymbolsTest.java
  176. +0 −179 src/test/java/javax/money/format/AmountStyleTest.java
  177. +68 −0 src/test/java/javax/money/format/MonetaryFormatsDynamicServiceProviderTest.java
  178. +86 −25 src/test/java/javax/money/format/MonetaryFormatsTest.java
  179. +23 −13 src/test/java/javax/money/format/MonetaryParseExceptionTest.java
  180. +85 −90 src/test/java/javax/money/format/TestAmountFormatProvider.java
  181. +0 −43 src/test/java/javax/money/format/TestAmountFormatSymbolsProvider.java
  182. +0 −41 src/test/java/javax/money/format/TestAmountStyleProvider.java
  183. +43 −0 src/test/java/javax/money/internal/DefaultMonetaryAmountsSingletonQuerySpi.java
  184. +24 −21 ...a/javax/money/internal/{DefaultMonetaryAmountsSpi.java → DefaultMonetaryAmountsSingletonSpi.java}
  185. +14 −9 src/test/java/javax/money/internal/package-info.java
  186. +44 −93 src/test/java/javax/money/spi/BootstrapTest.java
  187. +78 −0 src/test/java/javax/money/spi/ConcurrentInitializationTest.java
  188. +54 −0 src/test/java/javax/money/spi/CurrencyProviderSpiTest.java
  189. +86 −0 src/test/java/javax/money/spi/MonetaryAmountFactoryProviderSpiTest.java
  190. +58 −0 src/test/java/javax/money/spi/MonetaryAmountsSingletonQuerySpiTest.java
  191. +76 −0 src/test/java/javax/money/spi/MonetaryAmountsSingletonSpiTest.java
  192. +171 −0 src/test/java/javax/money/spi/MonetaryConversionsSingletonSpiTest.java
  193. +165 −0 src/test/java/javax/money/spi/MonetaryFormatsSingletonSpiTest.java
  194. +127 −0 src/test/java/javax/money/spi/MonetaryRoundingsSingletonSpiTest.java
  195. +125 −0 src/test/java/javax/money/spi/MonetarySingletonSpiTest.java
  196. +0 −11 src/test/resources/META-INF/services/javax.money.spi.AmountStyleProviderSpi
  197. +1 −0 src/test/resources/META-INF/services/javax.money.spi.MonetaryAmountsSingletonQuerySpi
  198. +1 −1 ...A-INF/services/{javax.money.spi.MonetaryAmountsSpi → javax.money.spi.MonetaryAmountsSingletonSpi}
  199. +1 −1 ...javax.money.spi.AmountFormatSymbolsProviderSpi → javax.money.spi.MonetaryConversionsSingletonSpi}
  200. +0 −11 src/test/resources/META-INF/services/javax.money.spi.MonetaryConversionsSpi
  201. +1 −1 ...ney.bootstrap.ServiceProvider → test/resources/META-INF/services/javax.money.spi.ServiceProvider}
58 changes: 58 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Use the latest 2.1 version of CircleCI pipeline process engine.
# See: https://circleci.com/docs/2.0/configuration-reference
version: 2.1

# Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
jobs:
# Below is the definition of your job to build and test your app, you can rename and customize it as you want.
build-and-test:
# These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/
# You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
# Be sure to update the Docker image tag below to openjdk version of your application.
# A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/openjdk
docker:
- image: cimg/openjdk:17.0
# Add steps to the job
# See: https://circleci.com/docs/2.0/configuration-reference/#steps
steps:
# Checkout the code as the first step.
- checkout
# Use mvn clean and package as the standard maven build phase
- run:
name: Build
command: mvn -B -DskipTests clean package
# Then run your tests!
- run:
name: Test
command: mvn test jacoco:report coveralls:report -DsourceEncoding=UTF-8 -P ci

deployment:
# These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/
# You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
# Be sure to update the Docker image tag below to openjdk version of your application.
# A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/openjdk
docker:
- image: cimg/openjdk:17.0
# Add steps to the job
# See: https://circleci.com/docs/2.0/configuration-reference/#steps
steps:
# Checkout the code as the first step.
- checkout
# Use mvn deploy as the standard maven build phase
- run:
name: Deploy
command: mvn deploy -Dmaven.test.skip -DcreateDocs=true -s settings.xml
# The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass
resource_class: large

# Invoke jobs via workflows
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
workflows:
build-test-deploy: # This is the name of the workflow, feel free to change it to better match your workflow.
# Inside the workflow, you define the jobs you want to run.
jobs:
- build-and-test
- deployment:
requires:
- build-and-test
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: [keilw]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/.settings
/.classpath
/.project
/.idea
/money-api.iml
/.resourceCache
/jdk-stub/bin
/target
/javamoney-api/core/bin
@@ -20,5 +23,6 @@
/money-platform/api/.settings/*.prefs
/money-platform/.settings
/money-platform/target
/target
/doc

tck-results
9 changes: 0 additions & 9 deletions .idea/copyright/Spec.xml

This file was deleted.

1 change: 0 additions & 1 deletion LICENSE.html

This file was deleted.

Loading