From 25dbdd40a1575584209b03d4d259b789b3415f2b Mon Sep 17 00:00:00 2001 From: Premek Date: Tue, 25 Jul 2023 10:22:09 +0200 Subject: [PATCH 01/82] BATM-5098 Bitbuy (#826) --- .../extra/bitcoin/BitcoinExtension.java | 12 +- .../bitcoin/exchanges/XChangeExchange.java | 54 +++------ .../exchanges/bitbuy/BitbuyDigest.java | 44 -------- .../exchanges/bitbuy/BitbuyExchange.java | 103 +++++++----------- .../exchanges/bitbuy/BitbuyMacData.java | 30 ----- .../bitcoin/exchanges/bitbuy/IBitbuyAPI.java | 77 +++++-------- .../bitcoin/exchanges/bitbuy/dto/Balance.java | 9 ++ .../exchanges/bitbuy/dto/BitbuyResponse.java | 8 ++ .../bitcoin/exchanges/bitbuy/dto/Coin.java | 11 -- .../bitbuy/dto/CreateOrderResponse.java | 6 + .../exchanges/bitbuy/dto/CurrencySide.java | 6 + .../exchanges/bitbuy/dto/DepositAddress.java | 5 - .../bitcoin/exchanges/bitbuy/dto/Market.java | 12 -- .../exchanges/bitbuy/dto/OrderBook.java | 9 ++ .../exchanges/bitbuy/dto/OrderBookLevel.java | 9 ++ .../exchanges/bitbuy/dto/OrderRequest.java | 33 ------ .../exchanges/bitbuy/dto/OrderResponse.java | 32 ------ .../exchanges/bitbuy/dto/OrderStatus.java | 8 ++ .../exchanges/bitbuy/dto/Paginated.java | 14 +++ .../exchanges/bitbuy/dto/QuoteRequest.java | 30 ++--- .../exchanges/bitbuy/dto/QuoteResponse.java | 21 ++-- .../bitcoin/exchanges/bitbuy/dto/Wallet.java | 20 ---- .../exchanges/bitbuy/dto/WithdrawResult.java | 10 -- .../util/OrderBookPriceCalculator.java | 73 +++++++++++++ .../src/main/resources/batm-extensions.xml | 6 - .../exchanges/bitbuy/BitbuyDigestTest.java | 56 ---------- .../util/OrderBookPriceCalculatorTest.java | 59 ++++++++++ 27 files changed, 309 insertions(+), 448 deletions(-) delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigest.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyMacData.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Balance.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/BitbuyResponse.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Coin.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CreateOrderResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CurrencySide.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Market.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBook.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBookLevel.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderRequest.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderStatus.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Paginated.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Wallet.java delete mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/WithdrawResult.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculator.java delete mode 100644 server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigestTest.java create mode 100644 server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculatorTest.java diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index 67ffc0982..27f0b6d86 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -220,11 +220,7 @@ public IExchange createExchange(String paramString) { } else if ("bitbuy".equalsIgnoreCase(prefix)) { String apiKey = paramTokenizer.nextToken(); String apiSecret = paramTokenizer.nextToken(); - String preferredFiatCurrency = FiatCurrency.CAD.getCode(); - if (paramTokenizer.hasMoreTokens()) { - preferredFiatCurrency = paramTokenizer.nextToken().toUpperCase(); - } - return new BitbuyExchange(apiKey, apiSecret, preferredFiatCurrency); + return new BitbuyExchange(apiKey, apiSecret); } } } catch (Exception e) { @@ -588,11 +584,7 @@ public IRateSource createRateSource(String sourceLogin) { } else if ("bitbuy".equalsIgnoreCase(rsType)) { String apiKey = st.nextToken(); String apiSecret = st.nextToken(); - String preferredFiatCurrency = FiatCurrency.CAD.getCode(); - if (st.hasMoreTokens()) { - preferredFiatCurrency = st.nextToken().toUpperCase(); - } - return new BitbuyExchange(apiKey, apiSecret, preferredFiatCurrency); + return new BitbuyExchange(apiKey, apiSecret); } } } catch (Exception e) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java index 2c01b86f8..40578a1ba 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java @@ -21,6 +21,7 @@ import com.generalbytes.batm.server.extensions.IExchangeAdvanced; import com.generalbytes.batm.server.extensions.IRateSourceAdvanced; import com.generalbytes.batm.server.extensions.ITask; +import com.generalbytes.batm.server.extensions.util.OrderBookPriceCalculator; import com.generalbytes.batm.server.extensions.util.net.RateLimiter; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -50,8 +51,6 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -61,8 +60,7 @@ import static java.util.Comparator.comparing; public abstract class XChangeExchange implements IExchangeAdvanced, IRateSourceAdvanced { - private static final Comparator asksComparator = comparing(LimitOrder::getLimitPrice); - private static final Comparator bidsComparator = comparing(LimitOrder::getLimitPrice).reversed(); + private static final OrderBookPriceCalculator orderBookPriceCalculator = new OrderBookPriceCalculator<>(LimitOrder::getLimitPrice, LimitOrder::getOriginalAmount); private String preferredFiatCurrency; private static final long cacheRefreshSeconds = 30; @@ -262,10 +260,9 @@ public String purchaseCoins(BigDecimal amount, String cryptoCurrency, String fia OrderBook orderBook = marketDataService.getOrderBook(currencyPair); List asks = orderBook.getAsks(); - - Collections.sort(asks, asksComparator); - - LimitOrder order = new LimitOrder(Order.OrderType.BID, getTradableAmount(amount, currencyPair), currencyPair, "", null, getTradablePrice(amount, asks)); + BigDecimal tradablePrice = orderBookPriceCalculator.getBuyPrice(amount, asks); + log.debug("tradablePrice: {}", tradablePrice); + LimitOrder order = new LimitOrder(Order.OrderType.BID, getTradableAmount(amount, currencyPair), currencyPair, "", null, tradablePrice); log.debug("order = {}", order); RateLimiter.waitForPossibleCall(getClass()); String orderId = tradeService.placeLimitOrder(order); @@ -326,26 +323,6 @@ public ITask createPurchaseCoinsTask(BigDecimal amount, String cryptoCurrency, S return new PurchaseCoinsTask(amount, cryptoCurrency, fiatCurrencyToUse, description); } - /** - * - * @param cryptoAmount - * @param bidsOrAsksSorted bids: highest first, asks: lowest first - * @return - * @throws IOException when tradable price not found, e.g orderbook not received or too small. - */ - private BigDecimal getTradablePrice(BigDecimal cryptoAmount, List bidsOrAsksSorted) throws IOException { - BigDecimal total = BigDecimal.ZERO; - - for (LimitOrder order : bidsOrAsksSorted) { - total = total.add(order.getOriginalAmount()); - if (cryptoAmount.compareTo(total) <= 0) { - log.debug("tradablePrice: {}", order.getLimitPrice()); - return order.getLimitPrice(); - } - } - throw new IOException("tradable price not available"); - } - @Override public String getDepositAddress(String cryptoCurrency) { if (cryptoCurrency == null) { @@ -404,10 +381,9 @@ public String sellCoins(BigDecimal cryptoAmount, String cryptoCurrency, String f List bids = orderBook.getBids(); log.debug("bids.size(): {}", bids.size()); - Collections.sort(bids, bidsComparator); - - LimitOrder order = new LimitOrder(Order.OrderType.ASK, getTradableAmount(cryptoAmount, currencyPair), currencyPair, - "", null, getTradablePrice(cryptoAmount, bids)); + BigDecimal tradablePrice = orderBookPriceCalculator.getSellPrice(cryptoAmount, bids); + log.debug("tradablePrice: {}", tradablePrice); + LimitOrder order = new LimitOrder(Order.OrderType.ASK, getTradableAmount(cryptoAmount, currencyPair), currencyPair, "", null, tradablePrice); log.debug("order: {}", order); RateLimiter.waitForPossibleCall(getClass()); @@ -628,10 +604,9 @@ public boolean onCreate() { OrderBook orderBook = marketDataService.getOrderBook(currencyPair); List asks = orderBook.getAsks(); - asks.sort(asksComparator); - - LimitOrder order = new LimitOrder(Order.OrderType.BID, getTradableAmount(amount, currencyPair), currencyPair, "", null, - getTradablePrice(amount, asks)); + BigDecimal tradablePrice = orderBookPriceCalculator.getBuyPrice(amount, asks); + log.debug("tradablePrice: {}", tradablePrice); + LimitOrder order = new LimitOrder(Order.OrderType.BID, getTradableAmount(amount, currencyPair), currencyPair, "", null, tradablePrice); log.debug("limitOrder = {}", order); @@ -759,10 +734,9 @@ public boolean onCreate() { List bids = orderBook.getBids(); log.debug("bids.size(): {}", bids.size()); - Collections.sort(bids, bidsComparator); - - LimitOrder order = new LimitOrder(Order.OrderType.ASK, getTradableAmount(cryptoAmount, currencyPair), currencyPair, - "", null, getTradablePrice(cryptoAmount, bids)); + BigDecimal tradablePrice = orderBookPriceCalculator.getSellPrice(cryptoAmount, bids); + log.debug("tradablePrice: {}", tradablePrice); + LimitOrder order = new LimitOrder(Order.OrderType.ASK, getTradableAmount(cryptoAmount, currencyPair), currencyPair, "", null, tradablePrice); log.debug("order = {}", order); RateLimiter.waitForPossibleCall(getClass()); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigest.java deleted file mode 100644 index 38a277680..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import si.mazi.rescu.ParamsDigest; -import si.mazi.rescu.RestInvocation; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.util.Base64; - -public class BitbuyDigest implements ParamsDigest { - - private static final String ALGORITHM = "HmacSHA256"; - private static final Charset CHARSET = StandardCharsets.UTF_8; - - private final Mac mac; - - public BitbuyDigest(String apiSecret) throws GeneralSecurityException { - this.mac = Mac.getInstance(ALGORITHM); - this.mac.init(new SecretKeySpec(apiSecret.getBytes(CHARSET), ALGORITHM)); - } - - public String digestParams(RestInvocation restInvocation) { - byte[] data = getMacData(restInvocation); - byte[] signature = mac.doFinal(data); - return Base64.getEncoder().encodeToString(signature); - } - - protected byte[] getMacData(RestInvocation restInvocation) { - try { - return new ObjectMapper().writer().writeValueAsBytes(BitbuyMacData.from(restInvocation)); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } -} - - - - diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java index e0d2370ce..3e24f5410 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java @@ -22,46 +22,40 @@ import com.generalbytes.batm.server.extensions.IExchangeAdvanced; import com.generalbytes.batm.server.extensions.IRateSourceAdvanced; import com.generalbytes.batm.server.extensions.ITask; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderRequest; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderResponse; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderBook; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderBookLevel; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderSide; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderType; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.QuoteRequest; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.QuoteResponse; +import com.generalbytes.batm.server.extensions.util.OrderBookPriceCalculator; import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import si.mazi.rescu.HttpStatusIOException; import java.math.BigDecimal; -import java.security.GeneralSecurityException; +import java.math.RoundingMode; import java.util.Set; import java.util.concurrent.Callable; public class BitbuyExchange implements IExchangeAdvanced, IRateSourceAdvanced { private static final Logger log = LoggerFactory.getLogger("batm.master.exchange.BitbuyExchange"); - - private static final Set fiatCurrencies = ImmutableSet.of( - FiatCurrency.CAD.getCode(), - CryptoCurrency.DAI.getCode()); // stable coin as fiat - + private static final OrderBookPriceCalculator orderBookPriceCalculator = new OrderBookPriceCalculator<>(o -> o.pricePerUnit, o -> o.quantity); + private static final int orderBookDepth = 200; + private static final String preferredFiatCurrency = FiatCurrency.CAD.getCode(); + private static final Set fiatCurrencies = ImmutableSet.of(FiatCurrency.CAD.getCode()); private static final Set cryptoCurrencies = ImmutableSet.of( CryptoCurrency.BCH.getCode(), CryptoCurrency.BTC.getCode(), - CryptoCurrency.DAI.getCode(), CryptoCurrency.ETH.getCode(), - CryptoCurrency.LTC.getCode(), - CryptoCurrency.XRP.getCode()); + CryptoCurrency.LTC.getCode()); - // Supported markets (2021-10-06; see IBitbuyAPI.getMarkets): - // [DAI-CAD, ETH-DAI, BTC-AAVE, ETH-AAVE, ETH-CAD, BTC-LINK, ETH-LINK, BCH-CAD, AAVE-CAD, BCH-BTC, BTC-DAI, LINK-CAD, BTC-CAD, XLM-CAD, LTC-CAD, XRP-CAD, EOS-BTC, XLM-BTC, XRP-BTC, ETH-BTC, LTC-BTC, EOS-CAD] + // Supported markets (2022-07-17) $ curl https://api-crypto.bitbuy.ca/public/markets | jq -r '.data|.[].symbol' | sort + // AAVE-CAD, ADA-CAD, APE-CAD, AXS-CAD, BAT-CAD, BCH-CAD, BTC-CAD, COMP-CAD, CRV-CAD, DOGE-CAD, DOT-CAD, EOS-CAD, ETH-CAD, FTM-CAD, LINK-CAD, LTC-CAD, MANA-CAD, MATIC-CAD, MKR-CAD, SOL-CAD, SUSHI-CAD, UNI-CAD, USDC-CAD, XLM-CAD - private final String preferredFiatCurrency; private final IBitbuyAPI api; - public BitbuyExchange(String apiKey, String apiSecret, String preferredFiatCurrency) throws GeneralSecurityException { - this.api = IBitbuyAPI.create(apiKey, apiSecret); - this.preferredFiatCurrency = preferredFiatCurrency; + public BitbuyExchange(String clientId, String secretKey) { + this.api = IBitbuyAPI.create(clientId, secretKey); } private String getMarketSymbol(String cryptoCurrency, String fiatCurrency) { @@ -101,13 +95,7 @@ public BigDecimal getFiatBalance(String fiatCurrency) { } private BigDecimal getBalance(String currency) { - return call(currency + " balance", () -> - api.getWallets().stream() - .filter(w -> currency.equals(w.symbol)) - .findAny() - .map(w -> w.availableBalance) - .orElseThrow(() -> new Exception(currency + " wallet not found")) - ); + return call(currency + " balance", () -> api.getBalance(currency).data.available); } @Override @@ -116,17 +104,13 @@ public String getDepositAddress(String cryptoCurrency) { return null; } - return call("deposit address", () -> api.getDepositAddress(cryptoCurrency).address); + return call("deposit address", () -> api.getDepositAddress(cryptoCurrency).data.address); } @Override public String sendCoins(String destinationAddress, BigDecimal amount, String cryptoCurrency, String description) { - if (!isCryptoCurrencySupported(cryptoCurrency)) { - return null; - } - - log.info("withdrawing {} {} to {}", amount, cryptoCurrency, destinationAddress); - return call("send coins", () -> api.withdraw(cryptoCurrency, destinationAddress, amount).transactionReference); + log.info("Sending coins from this exchange is not supported. Configure a different strategy in your crypto settings please"); + return null; } @Override @@ -158,7 +142,7 @@ public BigDecimal getExchangeRateForBuy(String cryptoCurrency, String fiatCurren BigDecimal rateSourceCryptoVolume = getRateSourceCryptoVolume(cryptoCurrency); BigDecimal result = calculateBuyPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); if (result != null) { - return result.divide(rateSourceCryptoVolume, 2, BigDecimal.ROUND_UP); + return result.divide(rateSourceCryptoVolume, 2, RoundingMode.UP); } return null; } @@ -168,7 +152,7 @@ public BigDecimal getExchangeRateForSell(String cryptoCurrency, String fiatCurre BigDecimal rateSourceCryptoVolume = getRateSourceCryptoVolume(cryptoCurrency); BigDecimal result = calculateSellPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); if (result != null) { - return result.divide(rateSourceCryptoVolume, 2, BigDecimal.ROUND_DOWN); + return result.divide(rateSourceCryptoVolume, 2, RoundingMode.DOWN); } return null; } @@ -187,7 +171,16 @@ private BigDecimal calculatePrice(String cryptoCurrency, String fiatCurrency, Bi if (!isCryptoCurrencySupported(cryptoCurrency) || !isFiatCurrencySupported(fiatCurrency)) { return null; } - return call("calculate " + orderSide + " price", () -> api.quoteOrder(new QuoteRequest(cryptoAmount, getMarketSymbol(cryptoCurrency, fiatCurrency), orderSide, OrderType.LIMIT)).fillPrice.multiply(cryptoAmount)); + String marketSymbol = getMarketSymbol(cryptoCurrency, fiatCurrency); + OrderBook orderBook = call(marketSymbol + " orderBook", () -> api.getOrderBook(marketSymbol, orderBookDepth).data); + if (orderBook == null) { + log.error("failed to get order book"); + return null; + } + if (orderSide == OrderSide.SELL) { + return orderBookPriceCalculator.getSellPrice(cryptoAmount, orderBook.bids); + } + return orderBookPriceCalculator.getBuyPrice(cryptoAmount, orderBook.asks); } class OrderTask implements ITask { @@ -196,7 +189,7 @@ class OrderTask implements ITask { private final long checkTillTime; private final BigDecimal cryptoAmount; private final String cryptoCurrency; - private final String fiatCurrencyToUse; + private final String fiatCurrency; private final OrderSide orderSide; private String orderId; @@ -206,24 +199,19 @@ class OrderTask implements ITask { OrderTask(BigDecimal cryptoAmount, String cryptoCurrency, String fiatCurrencyToUse, OrderSide orderSide) { this.cryptoAmount = cryptoAmount; this.cryptoCurrency = cryptoCurrency; - this.fiatCurrencyToUse = fiatCurrencyToUse; + fiatCurrency = fiatCurrencyToUse; this.orderSide = orderSide; this.checkTillTime = System.currentTimeMillis() + MAXIMUM_TIME_TO_WAIT_FOR_ORDER_TO_FINISH; } @Override public boolean onCreate() { - log.info("Calling exchange ({} {} {})", orderSide, cryptoAmount, cryptoCurrency); - orderId = call("task submitLimitOrder", () -> { - QuoteRequest quoteRequest = new QuoteRequest(cryptoAmount, getMarketSymbol(cryptoCurrency, fiatCurrencyToUse), orderSide, OrderType.LIMIT); - QuoteResponse quote = api.quoteOrder(quoteRequest); - - OrderRequest orderRequest = new OrderRequest(cryptoAmount, quote.fillPrice, getMarketSymbol(cryptoCurrency, fiatCurrencyToUse), orderSide, OrderType.LIMIT); - log.info("Submitting order: {}", orderRequest); - OrderResponse order = api.submitOrder(orderRequest); - return order.id; - }); - return (orderId != null); + log.info("Calling exchange ({} {} {}-{})", orderSide, cryptoAmount, cryptoCurrency, fiatCurrency); + + QuoteRequest request = new QuoteRequest(orderSide, cryptoCurrency, fiatCurrency, cryptoAmount); + orderId = call("task createOrder", () -> api.createOrder(request).data.rfqResponse.id); + call("task executeOrder", () -> api.executeOrder(orderId)); + return orderId != null; } @Override @@ -240,19 +228,12 @@ public boolean onDoStep() { return false; } - OrderResponse order = call("task getOrder", () -> api.getOrder(getMarketSymbol(cryptoCurrency, fiatCurrencyToUse), orderId)); - - if (order != null && order.status.equals(OrderResponse.STATUS_CANCELLED)) { - log.debug("trade cancelled"); - finished = true; - return false; - } - if (order != null && order.status.equals(OrderResponse.STATUS_FILLED)) { - result = orderId; - finished = true; - } + // we assume the order was executed already when we called api.executeOrder() + // we're not able to query the order status from the API - return result != null; + result = orderId; + finished = true; + return true; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyMacData.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyMacData.java deleted file mode 100644 index 0f1687f10..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyMacData.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import si.mazi.rescu.RestInvocation; - -// THE ORDER OF THE FIELDS IS IMPORTANT! -// The bitbuy documentation uses JSONObject which uses HashMap where elements are unordered -// but the MAC is computed over the resulting JSON string -@JsonPropertyOrder({"path", "content-length", "query"}) -class BitbuyMacData { - @JsonProperty("path") - public String path; - @JsonProperty("content-length") - public int contentLength; - @JsonProperty("query") - public String query; - - public static BitbuyMacData from(RestInvocation restInvocation) { - BitbuyMacData macData = new BitbuyMacData(); - macData.path = restInvocation.getPath(); - macData.contentLength = getBodyLength(restInvocation.getRequestBody()); - macData.query = restInvocation.getQueryString(); - return macData; - } - - private static int getBodyLength(String requestBody) { - return (requestBody == null || requestBody.isEmpty()) ? -1 : requestBody.length(); - } -} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/IBitbuyAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/IBitbuyAPI.java index 55af97b74..615121ef6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/IBitbuyAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/IBitbuyAPI.java @@ -17,24 +17,21 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.Coin; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.Balance; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.BitbuyResponse; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.CreateOrderResponse; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.DepositAddress; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.Market; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderResponse; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderRequest; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.OrderBook; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.QuoteRequest; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.QuoteResponse; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.Wallet; -import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto.WithdrawResult; +import com.generalbytes.batm.server.extensions.util.OrderBookPriceCalculator; import com.generalbytes.batm.server.extensions.util.net.RateLimitingInterceptor; -import org.knowm.xchange.utils.nonce.CurrentTimeIncrementalNonceFactory; import si.mazi.rescu.ClientConfig; +import si.mazi.rescu.ClientConfigUtil; import si.mazi.rescu.Interceptor; import si.mazi.rescu.RestProxyFactory; import javax.ws.rs.Consumes; import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -42,62 +39,48 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.IOException; -import java.math.BigDecimal; -import java.security.GeneralSecurityException; -import java.util.List; -import java.util.concurrent.TimeUnit; -@Path("/api/v1") +@Path("/") @Produces(MediaType.APPLICATION_JSON) public interface IBitbuyAPI { + String prodUrl = "https://api-crypto.bitbuy.ca"; + String testUrl = "https://bb-api-crypto-qa.blockchainmarkets.com"; - static IBitbuyAPI create(String apiKey, String apiSecret) throws GeneralSecurityException { + static IBitbuyAPI create(String clientId, String secretKey) { final ClientConfig config = new ClientConfig(); - config.addDefaultParam(QueryParam.class, "apikey", apiKey); - config.addDefaultParam(QueryParam.class, "stamp", new CurrentTimeIncrementalNonceFactory(TimeUnit.MILLISECONDS)); - config.addDefaultParam(HeaderParam.class, "signature", new BitbuyDigest(apiSecret)); + ClientConfigUtil.addBasicAuthCredentials(config, clientId, secretKey); Interceptor interceptor = new RateLimitingInterceptor(IBitbuyAPI.class, 25, 30_000); - return RestProxyFactory.createProxy(IBitbuyAPI.class, "https://partner.bcm.exchange", config, interceptor); + return RestProxyFactory.createProxy(IBitbuyAPI.class, prodUrl, config, interceptor); } - - @GET - @Path("/wallets") - List getWallets() throws IOException; - - @GET - @Path("/coins") - List getCoins() throws IOException; - + /** + * @param currency fiat or crypto currency + */ @GET - @Path("/markets") - List getMarkets() throws IOException; + @Path("/account/balance") + BitbuyResponse getBalance(@QueryParam("currency") String currency) throws IOException; /** * @return deposit address for the given coin (new address is NOT generated on each call) */ @GET - @Path("/wallets/{coin}/deposit-address") - DepositAddress getDepositAddress(@PathParam("coin") String coin) throws IOException; - - @POST - @Path("/wallets/{coin}/withdraw") - WithdrawResult withdraw(@PathParam("coin") String coin, @QueryParam("address") String address, @QueryParam("amount") BigDecimal amount) throws IOException; - + @Path("/account/deposit-address") + BitbuyResponse getDepositAddress(@QueryParam("coin") String coin) throws IOException; @POST @Consumes(MediaType.APPLICATION_JSON) - @Path("/submit/order") - OrderResponse submitOrder(OrderRequest orderRequest) throws IOException; - - @GET - @Path("/single-order") - OrderResponse getOrder(@QueryParam("marketSymbol") String marketSymbol, @QueryParam("orderId") String orderId) throws IOException; - + @Path("/rfq/create") + BitbuyResponse createOrder(QuoteRequest quoteRequest) throws IOException; @POST - @Consumes(MediaType.APPLICATION_JSON) - @Path("/quote/trade") - QuoteResponse quoteOrder(QuoteRequest quoteRequest) throws IOException; + @Path("/rfq/execute") + BitbuyResponse executeOrder(@QueryParam("id") String orderId) throws IOException; + /** + * @param depth number of bids and asks, e.g. for depth 10, 10 asks + 10 bids will be returned. + * Increase this if {@link OrderBookPriceCalculator} does not have enough orders to compute the price. + */ + @GET + @Path("/public/markets/{marketId}/{depth}") + BitbuyResponse getOrderBook(@PathParam("marketId") String market, @PathParam("depth") int depth) throws IOException; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Balance.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Balance.java new file mode 100644 index 000000000..aa91ab2e6 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Balance.java @@ -0,0 +1,9 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +import java.math.BigDecimal; + +public class Balance { + public String symbol; + public BigDecimal reserved; + public BigDecimal available; +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/BitbuyResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/BitbuyResponse.java new file mode 100644 index 000000000..b691ea63a --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/BitbuyResponse.java @@ -0,0 +1,8 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +public class BitbuyResponse { + public T data; + public String status; + public String message; + public Integer statusCode; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Coin.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Coin.java deleted file mode 100644 index 871ec6fce..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Coin.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -public class Coin { - public String symbol; - public String name; - - @Override - public String toString() { - return name + '(' + symbol + ')'; - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CreateOrderResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CreateOrderResponse.java new file mode 100644 index 000000000..5777067fb --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CreateOrderResponse.java @@ -0,0 +1,6 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +public class CreateOrderResponse { + public QuoteRequest rfqRequest; + public QuoteResponse rfqResponse; +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CurrencySide.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CurrencySide.java new file mode 100644 index 000000000..843b6b703 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/CurrencySide.java @@ -0,0 +1,6 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +public enum CurrencySide { + BASE, + QUOTE +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/DepositAddress.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/DepositAddress.java index 6ea6c1457..653decba8 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/DepositAddress.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/DepositAddress.java @@ -2,9 +2,4 @@ public class DepositAddress { public String address; - - @Override - public String toString() { - return address; - } } \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Market.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Market.java deleted file mode 100644 index a73d3bdbe..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Market.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -public class Market { - public String symbol; - public String baseCoin; - public String tradeCoin; - - @Override - public String toString() { - return symbol; - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBook.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBook.java new file mode 100644 index 000000000..adb24f67c --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBook.java @@ -0,0 +1,9 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +import java.util.List; + +public class OrderBook { + public String marketSymbol; + public List asks; + public List bids; +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBookLevel.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBookLevel.java new file mode 100644 index 000000000..f7a1159cb --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderBookLevel.java @@ -0,0 +1,9 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +import java.math.BigDecimal; + +public class OrderBookLevel { + public BigDecimal pricePerUnit; + public BigDecimal quantity; + public BigDecimal total; +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderRequest.java deleted file mode 100644 index dd00b68f7..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderRequest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -import java.math.BigDecimal; - -public class OrderRequest { - public BigDecimal quantity; - public BigDecimal pricePerUnit; - public String marketSymbol; - public OrderSide orderSide; - public OrderType orderType; - - public OrderRequest() { - } - - public OrderRequest(BigDecimal quantity, BigDecimal pricePerUnit, String marketSymbol, OrderSide orderSide, OrderType orderType) { - this.quantity = quantity; - this.pricePerUnit = pricePerUnit; - this.marketSymbol = marketSymbol; - this.orderSide = orderSide; - this.orderType = orderType; - } - - @Override - public String toString() { - return "OrderRequest{" + - "quantity=" + quantity + - ", pricePerUnit=" + pricePerUnit + - ", marketSymbol='" + marketSymbol + '\'' + - ", orderSide=" + orderSide + - ", orderType=" + orderType + - '}'; - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderResponse.java deleted file mode 100644 index f78022796..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderResponse.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -import java.math.BigDecimal; - -public class OrderResponse { - // not an enum because all possible values not documented - public static final String STATUS_CANCELLED = "CANCELLED"; - public static final String STATUS_PENDING_NEW = "PENDING_NEW"; - public static final String STATUS_FILLED = "FILLED"; - - public String id; - public String status; - public String statusInfo; - public BigDecimal fillPrice; - - @Override - public String toString() { - return "OrderResponse{" + - "id='" + id + '\'' + - ", status='" + status + '\'' + - ", statusInfo='" + statusInfo + '\'' + - ", fillPrice=" + fillPrice + - '}'; - } - - /* - Response examples: - - PENDING_NEW: {"id":"7782220156104123330","side":"BUY","date":"2021-10-04 14:54:34","pricePerUnit":"220.08000000","quantity":"0.01000000", "totalValue":"2.20080000", "market":{"tradeCoin":"LTC","baseCoin":"CAD","symbol":"LTC-CAD","state":null},"status":"PENDING_NEW","leavesQuantity":"0.00000000","fillCount":"0","tradedQuantity":"0.00000000","cancelledQuantity":"0.00000000","statusInfo":null, "totalValueTraded":null,"weightedAverageFillPrice":null,"cumulativeFee":null,"type":"MARKET"} - - FILLED: {"id":"7782220156104417848","side":"SELL","date":"2021-10-05 14:20:36","pricePerUnit":"1.35700000","quantity":"0.00009980", "totalValue":"0.00013542", "market":{"tradeCoin":"XRP","baseCoin":"CAD","symbol":"XRP-CAD","state":null},"status":"FILLED", "leavesQuantity":"0.00000000","fillCount":"1","tradedQuantity":"0.00009980","cancelledQuantity":"0.00000000","statusInfo":null, "totalValueTraded":"0.00013543","weightedAverageFillPrice":"1.35700000","cumulativeFee":"0.00000027","type":"LIMIT"} - - CANCELLED (insufficient funds): {"id":"0", "side":"BUY","date":"2021-10-04 14:59:21","pricePerUnit":"218.41050000","quantity":"1000.00000000","totalValue":"218410.50000000","market":{"tradeCoin":"LTC","baseCoin":"CAD","symbol":"LTC-CAD","state":null},"status":"CANCELLED", "leavesQuantity":"0.00000000","fillCount":"0","tradedQuantity":"0.00000000","cancelledQuantity":"0.00000000","statusInfo":"Insufficient Funds","totalValueTraded":null,"weightedAverageFillPrice":null,"cumulativeFee":null,"type":"MARKET"} - */ -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderStatus.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderStatus.java new file mode 100644 index 000000000..7b5abbd34 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/OrderStatus.java @@ -0,0 +1,8 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +public enum OrderStatus { + CANCELLED, + FULFILLED, + EXPIRED, + OPEN +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Paginated.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Paginated.java new file mode 100644 index 000000000..738f18487 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Paginated.java @@ -0,0 +1,14 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; + +import java.util.List; + +public class Paginated { + public List result; + + public Integer pageNumber; + public Integer totalPages; + public Integer currentCount; + public Integer totalCount; + public Integer limit; + public Boolean hasNextPage; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteRequest.java index 0a63d2b1d..266a26ac2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteRequest.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteRequest.java @@ -3,28 +3,20 @@ import java.math.BigDecimal; public class QuoteRequest { - public BigDecimal quantity; - public String marketSymbol; - public OrderSide orderSide; - public OrderType orderType; + public CurrencySide currencySide; + public String quantity; + public OrderSide side; + public String quote; // CAD + public String base; // crypto public QuoteRequest() { } - public QuoteRequest(BigDecimal quantity, String marketSymbol, OrderSide orderSide, OrderType orderType) { - this.quantity = quantity; - this.marketSymbol = marketSymbol; - this.orderSide = orderSide; - this.orderType = orderType; - } - - @Override - public String toString() { - return "OrderRequest{" + - "quantity=" + quantity + - ", marketSymbol='" + marketSymbol + '\'' + - ", orderSide=" + orderSide + - ", orderType=" + orderType + - '}'; + public QuoteRequest(OrderSide orderSide, String cryptoCurrency, String fiatCurrency, BigDecimal cryptoAmount) { + this.currencySide = CurrencySide.BASE; + this.quantity = cryptoAmount.toPlainString(); + this.side = orderSide; + this.quote = fiatCurrency; + this.base = cryptoCurrency; } } \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteResponse.java index 5db5f25ac..ce90a8197 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/QuoteResponse.java @@ -3,16 +3,13 @@ import java.math.BigDecimal; public class QuoteResponse { - public BigDecimal fillPrice; - - @Override - public String toString() { - return "QuoteResponse{" + - "fillPrice=" + fillPrice + - '}'; - } - /* - Response example: - {"originalQuantity":"1.00000000","originalQuantityCoinSymbol":"BTC","market":{"tradeCoin":"BTC","baseCoin":"CAD","symbol":"BTC-CAD","state":null},"baseCoinFillQuantity":"63002.71231682","tradeCoinFillQuantity":"1.00000000","fillPrice":"63097.00000000","averageFillprice":"63002.71231682","side":"BUY","status":null,"statusInfo":null} - */ + public String id; + public Long createdAt; + public Long expireAt; + public OrderSide side; + public String base; // crypto currency + public BigDecimal baseQuantity; + public String quote; // CAD + public BigDecimal quoteQuantity; + public BigDecimal unitPrice; } \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Wallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Wallet.java deleted file mode 100644 index 69abe62a7..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/Wallet.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -import java.math.BigDecimal; - -public class Wallet { - public String symbol; - public BigDecimal balance; - public BigDecimal reservedBalance; - public BigDecimal availableBalance; - - @Override - public String toString() { - return "Wallet{" + - "symbol='" + symbol + '\'' + - ", balance='" + balance + '\'' + - ", reservedBalance='" + reservedBalance + '\'' + - ", availableBalance='" + availableBalance + '\'' + - '}'; - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/WithdrawResult.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/WithdrawResult.java deleted file mode 100644 index e3e04a458..000000000 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/dto/WithdrawResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy.dto; - -public class WithdrawResult { - public String transactionReference; - - @Override - public String toString() { - return transactionReference; - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculator.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculator.java new file mode 100644 index 000000000..baed77459 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculator.java @@ -0,0 +1,73 @@ +package com.generalbytes.batm.server.extensions.util; + +import java.math.BigDecimal; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * Calculates buy or sell price from order book orders (bids or asks) downloaded from an exchange. + * The price depends on the amount you want to buy or sell, + * e.g. the price of one BTC when buying 10 BTC might be higher than when buying just 1 BTC. + * + * @param Type of the order book order objects used to calculate the price. + * It must be possible to obtain price and amount of each order. + */ +public class OrderBookPriceCalculator { + private final Comparator asksComparator; + private final Comparator bidsComparator; + private final Function orderLimitPriceGetter; + private final Function orderAmountGetter; + + /** + * @param orderLimitPriceGetter a function that retrieves limit price (price per unit) of the order in the order book + * @param orderAmountGetter a function that retrieves cryptocurrency amount (quantity) of the order in the order book + */ + public OrderBookPriceCalculator(Function orderLimitPriceGetter, Function orderAmountGetter) { + // bids: highest price first (used for sell) + // asks: lowest price first (used for buy) + this.asksComparator = Comparator.comparing(orderLimitPriceGetter); + this.bidsComparator = Comparator.comparing(orderLimitPriceGetter).reversed(); + this.orderLimitPriceGetter = orderLimitPriceGetter; + this.orderAmountGetter = orderAmountGetter; + } + + /** + * Calculates the price (per one unit of cryptocurrency) we would get if we wanted to SELL the given amount. + * + * @param bids bids from the order book. + * Bids are other people's BUY orders (we are selling, others are buying). + * Bids prices are lower than the last traded price (the midpoint price). + * We use the bids with the highest prices first until we reach the required amount. + */ + public BigDecimal getSellPrice(BigDecimal cryptoAmount, List bids) { + return getPrice(cryptoAmount, bids, bidsComparator); + } + + /** + * Calculates the price (per one unit of cryptocurrency) we would have to pay if we wanted to BUY the given amount. + * + * @param asks asks from the order book. + * Asks are other people's SELL orders (we are buying, others are selling). + * Asks prices are higher than the last traded price (the midpoint price). + * We use the asks with the lowest prices first until we reach the required amount. + */ + public BigDecimal getBuyPrice(BigDecimal cryptoAmount, List asks) { + return getPrice(cryptoAmount, asks, asksComparator); + } + + private BigDecimal getPrice(BigDecimal cryptoAmount, List orders, Comparator comparator) { + Objects.requireNonNull(orders, "orders list cannot be null"); + List sorted = orders.stream().sorted(comparator).collect(Collectors.toList()); + BigDecimal total = BigDecimal.ZERO; + for (T order : sorted) { + total = total.add(orderAmountGetter.apply(order)); + if (cryptoAmount.compareTo(total) <= 0) { + return orderLimitPriceGetter.apply(order); + } + } + throw new IllegalArgumentException("tradable price not available"); + } +} diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index a2a01022e..bc98c36f3 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -806,24 +806,18 @@ - BCH BTC - DAI ETH LTC - XRP - fiatcurrency is optional, default: CAD BCH BTC - DAI ETH LTC - XRP diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigestTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigestTest.java deleted file mode 100644 index 16988a464..000000000 --- a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyDigestTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitbuy; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Assert; -import org.junit.Test; -import si.mazi.rescu.RequestWriterResolver; -import si.mazi.rescu.RestInvocation; -import si.mazi.rescu.RestMethodMetadata; - -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import java.io.IOException; -import java.lang.reflect.Method; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; - -public class BitbuyDigestTest { - - private interface TestApi { - @GET - @Path("/test/path") - String testGet(@QueryParam("param1") String param1, @QueryParam("param2") String param2) throws IOException; - - @POST - @Path("/test/path") - @Consumes(MediaType.APPLICATION_JSON) - String testPost(@QueryParam("param1") String param1, @QueryParam("param2") String param2, String body) throws IOException; - } - - @Test - public void testGetMacDataGet() throws GeneralSecurityException, NoSuchMethodException { - Method method = TestApi.class.getMethod("testGet", String.class, String.class); - String expected = "{\"path\":\"interfacepath/test/path\",\"content-length\":-1,\"query\":\"param1=param1value¶m2=param2value\"}"; - Assert.assertEquals(expected, getMacData(method, "param1value", "param2value")); - } - - @Test - public void testGetMacDataPost() throws GeneralSecurityException, NoSuchMethodException { - Method method = TestApi.class.getMethod("testPost", String.class, String.class, String.class); - String expected = "{\"path\":\"interfacepath/test/path\",\"content-length\":6,\"query\":\"param1=param1value¶m2=param2value\"}"; - Assert.assertEquals(expected, getMacData(method, "param1value", "param2value", "body")); - } - - private String getMacData(Method method, Object... args) throws GeneralSecurityException { - RestMethodMetadata methodMetadata = RestMethodMetadata.create(method, "https://baseurl/", "interfacepath"); - RequestWriterResolver requestWriterResolver = RequestWriterResolver.createDefault(new ObjectMapper()); - RestInvocation restInvocation = RestInvocation.create(requestWriterResolver, methodMetadata, args, null); - - BitbuyDigest digest = new BitbuyDigest("secret"); - return new String(digest.getMacData(restInvocation), StandardCharsets.UTF_8); - } -} \ No newline at end of file diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculatorTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculatorTest.java new file mode 100644 index 000000000..afa2d33ec --- /dev/null +++ b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/util/OrderBookPriceCalculatorTest.java @@ -0,0 +1,59 @@ +package com.generalbytes.batm.server.extensions.util; + +import org.assertj.core.api.Assertions; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class OrderBookPriceCalculatorTest { + + private static class Order { + public final BigDecimal price; + public final BigDecimal amount; + + private Order(int price, int amount) { + this.price = new BigDecimal(price); + this.amount = new BigDecimal(amount); + } + } + private static final OrderBookPriceCalculator calc = new OrderBookPriceCalculator<>(order -> order.price, order -> order.amount); + + @Test + public void test() throws IOException { + + List asks = new ArrayList<>(); + List bids = new ArrayList<>(); + + Assert.assertThrows(IllegalArgumentException.class, () -> calc.getBuyPrice(BigDecimal.ONE, asks)); + Assert.assertThrows(IllegalArgumentException.class, () -> calc.getSellPrice(BigDecimal.ONE, bids)); + + bids.add(new Order(50, 2)); + bids.add(new Order(70, 2)); + bids.add(new Order(90, 2)); + + asks.add(new Order(110, 2)); + asks.add(new Order(130, 2)); + asks.add(new Order(150, 2)); + + Assertions.assertThat(calc.getBuyPrice(new BigDecimal("0.001"), asks)).isEqualByComparingTo("110"); + Assertions.assertThat(calc.getSellPrice(new BigDecimal("0.001"), bids)).isEqualByComparingTo("90"); + + Assertions.assertThat(calc.getBuyPrice(new BigDecimal("3"), asks)).isEqualByComparingTo("130"); + Assertions.assertThat(calc.getSellPrice(new BigDecimal("3"), bids)).isEqualByComparingTo("70"); + + Assertions.assertThat(calc.getBuyPrice(new BigDecimal("5"), asks)).isEqualByComparingTo("150"); + Assertions.assertThat(calc.getSellPrice(new BigDecimal("5"), bids)).isEqualByComparingTo("50"); + + Assertions.assertThat(calc.getBuyPrice(new BigDecimal("6"), asks)).isEqualByComparingTo("150"); + Assertions.assertThat(calc.getSellPrice(new BigDecimal("6"), bids)).isEqualByComparingTo("50"); + + Assert.assertThrows(IllegalArgumentException.class, () -> calc.getBuyPrice(new BigDecimal("6.1"), asks)); + Assert.assertThrows(IllegalArgumentException.class, () -> calc.getSellPrice(new BigDecimal("6.1"), bids)); + + } + +} \ No newline at end of file From 785e621e4bbba951d51b6cb4cf20ccb69e98c4fe Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 25 Jul 2023 11:00:40 +0200 Subject: [PATCH 02/82] BATM-5238 Log currency pair at XChangeExchange when asking for limits (#830) Co-authored-by: Filip Ocelka --- gradle.properties | 2 +- .../extensions/extra/bitcoin/exchanges/XChangeExchange.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2f8a46cdd..646a7a892 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.8 +projectVersion=1.1.9 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java index 40578a1ba..65f5b252f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/XChangeExchange.java @@ -554,7 +554,8 @@ public BigDecimal calculateSellPrice(String cryptoCurrency, String fiatCurrency, } if (tradableLimit == null) { - log.error("Not enough bids received from the exchange, bids count: {}, bids total: {}, crypto amount: {}", bids.size(), bidsTotal, cryptoAmount); + log.error("Not enough bids received from the exchange, bids count: {}, bids total: {}, crypto amount: {}, currency pair: {}", + bids.size(), bidsTotal, cryptoAmount, currencyPair); return null; } log.debug("Called {} exchange for SELL rate: {}:{} = {}", name, cryptoCurrency, fiatCurrency, tradableLimit); From 420a885cb4ad2bef6e9e79fe84c8a88384628f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:33:01 +0200 Subject: [PATCH 03/82] BATM-5263 - Coinbase Hot Wallet API change at response object (#834) --- gradle.properties | 2 +- .../coinbase/v2/dto/CBAccountResponse.java | 6 +- .../wallets/coinbase/v2/dto/CbAccountV2.java | 155 ++++++++++++++++++ 3 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CbAccountV2.java diff --git a/gradle.properties b/gradle.properties index 3a1282e69..5c657e021 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.3.1 +projectVersion=1.1.3.2 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccountResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccountResponse.java index e53e0bd92..f51b7cff8 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccountResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccountResponse.java @@ -22,14 +22,14 @@ */ public class CBAccountResponse extends CBResponse{ - private CBAccount data; + private CbAccountV2 data; - public CBAccount getData() { + public CbAccountV2 getData() { return data; } - public void setData(CBAccount data) { + public void setData(CbAccountV2 data) { this.data = data; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CbAccountV2.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CbAccountV2.java new file mode 100644 index 000000000..365d8d543 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CbAccountV2.java @@ -0,0 +1,155 @@ +/************************************************************************************* + * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.coinbase.v2.dto; + +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.coinbase.dto.CBCurrency; + +/** + * Created by b00lean on 23.7.17. + */ + +public class CbAccountV2 implements CBPaginatedItem { + private String id; + private String address; + private String name; + private boolean primary; + private boolean ready; + private String type; + private CBCurrency currency; + private CBBalance balance; + private CBBalance native_balance; + + private String created_at; + private String updated_at; + private String network; + private String resource; + private String resource_path; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCreated_at() { + return created_at; + } + + public void setCreated_at(String created_at) { + this.created_at = created_at; + } + + public String getUpdated_at() { + return updated_at; + } + + public void setUpdated_at(String updated_at) { + this.updated_at = updated_at; + } + + public String getNetwork() { + return network; + } + + public void setNetwork(String network) { + this.network = network; + } + + public String getResource() { + return resource; + } + + public void setResource(String resource) { + this.resource = resource; + } + + public String getResource_path() { + return resource_path; + } + + public void setResource_path(String resource_path) { + this.resource_path = resource_path; + } + + public boolean isPrimary() { + return primary; + } + + public void setPrimary(boolean primary) { + this.primary = primary; + } + + public boolean isReady() { + return ready; + } + + public void setReady(boolean ready) { + this.ready = ready; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public CBCurrency getCurrency() { + return currency; + } + + public void setCurrency(CBCurrency currency) { + this.currency = currency; + } + + public CBBalance getBalance() { + return balance; + } + + public void setBalance(CBBalance balance) { + this.balance = balance; + } + + public CBBalance getNative_balance() { + return native_balance; + } + + public void setNative_balance(CBBalance native_balance) { + this.native_balance = native_balance; + } +} From 6e23a904560f5c507545362a42804efea2fdc91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:35:07 +0200 Subject: [PATCH 04/82] BATM-5283 - Incorrect XRP conversion (#837) --- .../com/generalbytes/batm/server/extensions/Converters.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java index 0cb5e9267..d4d0fd174 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java @@ -29,7 +29,7 @@ public class Converters { public static final BigDecimal GQ = BigDecimal.TEN.pow(18); public static final BigDecimal USDT = BigDecimal.TEN.pow(6); public static final BigDecimal USDTTRON = BigDecimal.TEN.pow(6); - public static final BigDecimal XRP = BigDecimal.TEN.pow(8); + public static final BigDecimal XRP = BigDecimal.TEN.pow(6); public static final BigDecimal VERUM = BigDecimal.TEN.pow(8); public static final BigDecimal TBCH = BigDecimal.TEN.pow(8); From 12ab6f40de1dcc97f63d7dbde44daeabe0134fd6 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 14 Aug 2023 14:39:09 +0200 Subject: [PATCH 05/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d96a06517..6823689fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.10 +projectVersion=1.1.11 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From a82511798c4f31444b35ccd0b08fd9f6607b5caf Mon Sep 17 00:00:00 2001 From: Premek Date: Tue, 15 Aug 2023 08:04:33 +0200 Subject: [PATCH 06/82] LC-169 Add ability to modify transactionrecordcustomdata from extensions (#831) --- gradle.properties | 2 +- .../batm/server/extensions/IExtensionContext.java | 14 ++++++++++++++ .../server/extensions/ITransactionDetails.java | 9 +++++++++ .../server/extensions/TestExtensionContext.java | 5 +++++ .../extra/examples/TransactionExtension.java | 11 ++++++++++- 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6823689fc..87a04243c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.11 +projectVersion=1.1.12 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java index 0db56c2a4..9ba3a8294 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java @@ -131,6 +131,20 @@ public interface IExtensionContext { */ ITransactionDetails updateTransaction(String rid, Integer status, String detail, Set tags) throws UpdateException; + /** + * @param rid remote transaction ID of the transaction to be updated + * @param status new status to be set or null to keep it unmodified + * @param detail detail message to be appended if there already is a detail set. Null to keep it unmodified + * @param customData custom data to be set to the transaction. + * This will replace existing custom data stored for the transaction. + * If you need to keep existing data obtain them first using {@link ITransactionDetails#getCustomData()}. + * Providing an empty map will remove all existing custom data. + * Null keeps the existing custom data unchanged. + * @return modified transaction details + * @throws UpdateException if the update was not successful + */ + ITransactionDetails updateTransaction(String rid, Integer status, String detail, Map customData) throws UpdateException; + ITransactionDetails updateTransaction(String rid, Integer status, String detail) throws UpdateException; /** diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java index 53c92038b..5524e3a6f 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java @@ -20,6 +20,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; public interface ITransactionDetails { @@ -303,4 +304,12 @@ public interface ITransactionDetails { Set getTags(); List getBanknotes(); + + /** + * @return Custom data for the transaction. + * Saved when returned from {@link ITransactionListener#onTransactionCreated(ITransactionDetails)} + * or {@link ITransactionListener#onTransactionUpdated(ITransactionDetails)} + * or using {@link IExtensionContext#updateTransaction(String, Integer, String, Map)}. + */ + Map getCustomData(); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java index 0269544d1..aa6458f50 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java @@ -87,6 +87,11 @@ public ITransactionDetails updateTransaction(String rid, Integer status, String return null; } + @Override + public ITransactionDetails updateTransaction(String rid, Integer status, String detail, Map customData) throws UpdateException { + return null; + } + @Override public Set getTransactionTags(String organizationId) { return null; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java index 2ba8957a0..a8921d20f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java @@ -61,10 +61,19 @@ public Map onTransactionCreated(ITransactionDetails transactionD public Map onTransactionUpdated(ITransactionDetails transactionDetails) { log.info("Transaction updated; tags: {}", transactionDetails.getTags()); try { + String rid = transactionDetails.getRemoteTransactionId(); + + ITransactionDetails details = ctx.findTransactionByTransactionId(rid); + log.info("Transaction custom data: {}", details.getCustomData()); + Map customData = new HashMap<>(details.getCustomData()); + customData.remove("ticket.previous.counter"); + customData.put("ticket.footer", "Enjoy!"); + ctx.updateTransaction(rid, null, null, customData); + String organizationId = ctx.findIdentityByIdentityId(transactionDetails.getIdentityPublicId()).getOrganization().getId(); log.info("Defined transaction tags: {}", ctx.getTransactionTags(organizationId)); Set tags = Collections.singleton(transactionDetails.getCryptoCurrency()); - ITransactionDetails updated = ctx.updateTransaction(transactionDetails.getRemoteTransactionId(), null, null, tags); + ITransactionDetails updated = ctx.updateTransaction(rid, null, null, tags); log.info("Transaction updated; tags: {}", updated.getTags()); } catch (UpdateException e) { log.error("", e); From da4dbdc099dc99e57ffc6e8badd522e7865ea19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Tue, 15 Aug 2023 08:05:19 +0200 Subject: [PATCH 07/82] CF-484 - Notification - listener method for failed queued transactions (#832) --- .../extensions/INotificationListener.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java index 1b8d999f9..f522cc81d 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java @@ -51,6 +51,35 @@ default void transactionFailed(String terminalSerialNumber, BigDecimal cashAmoun */ default void transactionQueued(String terminalSerialNumber, BigDecimal cashAmount, String cashCurrency, String transactionRemoteId, String paymentType) {} + /** + * Invoked when one or more transactions in a queue have failed. + * + * @param queueName The name of the queue in which the transactions were queued. + * @param batchUid A unique identifier representing the batch of transactions. + * @param failedTransactions A list of transaction details for those transactions which failed. + * Each transaction detail includes information such as the serial number of the terminal. + * + *

+ * ITransactionDetails will have the following attributes populated: + *

    + *
  • Terminal Serial Number: Sourced from the transaction's terminal..
    • + *
  • Remote ID (Rid): The Rid associated with the transaction
    • + *
  • Local ID (Lid): The Lid associated with the transaction.
    • + *
  • Cash Amount: The fiat amount of transaction.
    • + *
  • Cash Currency: The type of fiat currency used in the transaction (e.g., USD, EUR).
    • + *
  • Crypto Amount: The fiat amount of transaction.
    • + *
  • Crypto Currency: The type of cryptocurrency used in the transaction (e.g., BTC, ETH).
    • + *
  • Crypto Address: The destination address for the cryptocurrency transaction.
    • + *
  • Identity Public ID: Public identity associated with the transaction, if any.
    • + *
+ *

+ *

+ * All other attributes are either set to default values or empty. + *

+ * + */ + default void queuedTransactionsFailed(String queueName, String batchUid, List failedTransactions) {} + default void cashbackCreated(String terminalSerialNumber, BigDecimal cashAmount, String cashCurrency) {} default void invalidPaymentReceived(String terminalSerialNumber, BigDecimal amount, String cryptoCurrency, String fromAddress, String toAddress, String transactionRemoteId) {} From 9e844ed5a66baa5af55b86019c9d8483658e2a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Tue, 15 Aug 2023 08:06:01 +0200 Subject: [PATCH 08/82] LC-221 - Identity Opt-out and Opt-in endpoint for setting opt-in/opt-out (#828) --- .../batm/server/extensions/IExtensionContext.java | 8 ++++++++ .../server/extensions/TestExtensionContext.java | 4 ++++ .../identity/IdentityExampleRestService.java | 14 ++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java index 9ba3a8294..d11e088bb 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java @@ -323,6 +323,14 @@ IIdentity updateIdentity(String identityId, String externalId, int state, int ty List limitCashPerMonth, List limitCashPer3Months, List limitCashPer12Months, List limitCashPerCalendarQuarter, List limitCashPerCalendarYear, List limitCashTotalIdentity, String configurationCashCurrency); + /** + * Updates the marketing opt-in agreement for the identity identified by {@code identityId}). + * + * @param identityId public ID of an existing identity to be updated + * @param agreeWithMarketingOptIn True if the customer agrees to marketing opt-in, false otherwise. + */ + void updateIdentityMarketingOptIn(String identityId, boolean agreeWithMarketingOptIn); + /** * @param customFieldDefinitionId use {@link CustomFieldDefinition#getId()} of a custom field to set */ diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java index aa6458f50..f598f4c5e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java @@ -187,6 +187,10 @@ public IIdentity updateIdentity(String identityId, String externalId, int state, return null; } + @Override + public void updateIdentityMarketingOptIn(String identityId, boolean agreeWithMarketingOptIn) { + } + @Override public void setIdentityCustomField(String identityPublicId, long customFieldDefinitionId, diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java index 168134e7d..51e36538b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java @@ -123,6 +123,20 @@ public String update(@FormParam("identityPublicId") String identityPublicId, @Fo return updatedIdentity.getPublicId(); } + // curl -k -XPOST https://localhost:7743/extensions/identity-example/update-opt-in -d "identityPublicId=IE3BVEBUIIXZ3SZV&agreeWithMarketingOptIn=true" + @POST + @Path("/update-opt-in") + @Produces(MediaType.APPLICATION_JSON) + public void updateOptInAgreement(@FormParam("identityPublicId") String identityPublicId, @FormParam("agreeWithMarketingOptIn") boolean agreeWithMarketingOptIn) { + IExtensionContext ctx = IdentityExampleExtension.getExtensionContext(); + IIdentity identity = ctx.findIdentityByIdentityId(identityPublicId); + if (identity == null) { + log.debug("Identity {} not found", identityPublicId); + return; + } + ctx.updateIdentityMarketingOptIn(identityPublicId, agreeWithMarketingOptIn); + } + // curl -k -XPOST https://localhost:7743/extensions/identity-example/getnotes -d "identityPublicId=IE3BVEBUIIXZ3SZV" @POST @Path("/getnotes") From ba942a1cd81a5f248b110dcff2c946d9fb39c320 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 15 Aug 2023 13:22:39 +0400 Subject: [PATCH 09/82] - Allow sell transactions for ETH & USDT on CryptX wallet - Remove GQ & BTBS support --- .../src/main/resources/batm-extensions.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index bc98c36f3..060894342 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -77,10 +77,8 @@ BCH BTC LTC - BTBS - GQ - ETH - USDT + ETH + USDT *host: https://api.cryptx.com/ (required) - port: (not required) - *token: generate Access tokens from CryptX Settings (required) - @@ -105,8 +103,8 @@ BCH BTC LTC - ETH - USDT + ETH + USDT *host: https://api.cryptx.com/ (required) - port: (not required) - *token: generate Access tokens from CryptX Settings (required) - From b1556b4b350a1c2e4bb16da79c494732c67ed243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Wed, 13 Sep 2023 12:45:04 +0200 Subject: [PATCH 10/82] LC-163 - Lowercase transaction tags example extension (#841) --- .../server/extensions/extra/examples/TransactionExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java index a8921d20f..c0c91e4c0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java @@ -72,7 +72,7 @@ public Map onTransactionUpdated(ITransactionDetails transactionD String organizationId = ctx.findIdentityByIdentityId(transactionDetails.getIdentityPublicId()).getOrganization().getId(); log.info("Defined transaction tags: {}", ctx.getTransactionTags(organizationId)); - Set tags = Collections.singleton(transactionDetails.getCryptoCurrency()); + Set tags = Collections.singleton(transactionDetails.getCryptoCurrency().toLowerCase()); ITransactionDetails updated = ctx.updateTransaction(rid, null, null, tags); log.info("Transaction updated; tags: {}", updated.getTags()); } catch (UpdateException e) { From 864f2d10f950bf4d33bbc860fcf48fd8fe9e1acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Wed, 13 Sep 2023 12:45:47 +0200 Subject: [PATCH 11/82] BATM-5339 - CryptX fixed parameters (#845) --- .../src/main/resources/batm-extensions.xml | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index 060894342..1d51ae0d7 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -68,25 +68,24 @@ - + - + - BCH BTC LTC ETH USDT - *host: https://api.cryptx.com/ (required) - - port: (not required) - *token: generate Access tokens from CryptX Settings (required) - - *walletid: find under [Wallet] > Settings > Wallet Info > Wallet ID (required) - - password: wallet password (not required) - - priority: Select "high" (2 blocks, default), "medium" (8 blocks), "low" (24 blocks), or "custom" - - max_custom_fee: fee rate (in s/vByte for bitcoin, gas price for ethereum) when "custom" priority is set (instead of estimating one using blocks) - - limit: gas limit - only for ETH, e.g., 50000 (not required) + *host: https://api.walletpro.cryptal.com/ (required) - + port: (not required) - + *api_key: the API Key obtained from CryptX (required) - + *walletid: the name of the wallet on CryptX (required) - + passphrase: the wallet passphrase (if used) (not required) - + priority: high: (default) = 2 blocks, medium = 8, low = 24, custom - also indicate the number of required blocks (e.g. custom:12) - + max_custom_fee: the maximum fee (in s/vByte) when "custom" priority is used @@ -94,25 +93,24 @@ - + - + - BCH BTC LTC ETH USDT - *host: https://api.cryptx.com/ (required) - - port: (not required) - *token: generate Access tokens from CryptX Settings (required) - - *walletid: find under [Wallet] > Settings > Wallet Info > Wallet ID (required) - - password: wallet password (not required) - - priority: Select high (2 blocks, default), medium (8 blocks), low (24 blocks), or custom - - max_custom_fee: fee rate in s/vByte when "custom" priority is set (instead of estimating one using blocks) - - limit: gas limit - only for ETH, e.g., 50000 (not required) + *host: https://api.walletpro.cryptal.com/ (required) - + port: (not required) - + *api_key: the API Key obtained from CryptX (required) - + *walletid: the name of the wallet on CryptX (required) - + passphrase: the wallet passphrase (if used) (not required) - + priority: high: (default) = 2 blocks, medium = 8, low = 24, custom - also indicate the number of required blocks (e.g. custom:12) - + max_custom_fee: the maximum fee (in s/vByte) when "custom" priority is used From a629254669371e9db2f9b77a8c190f166cb9a007 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Wed, 13 Sep 2023 12:47:24 +0200 Subject: [PATCH 12/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 87a04243c..b7adc6e61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.12 +projectVersion=1.1.13 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 577c7d3303735d1920553e4a4caa7cb7a5232b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:00:21 +0200 Subject: [PATCH 13/82] BATM-5359: Trident Wallet as buyOnly (#847) * BATM-5359: Trident Wallet as buyOnly --- gradle.properties | 2 +- server_extensions_extra/src/main/resources/batm-extensions.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b7adc6e61..040ce4d85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.13 +projectVersion=1.1.14 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index 1d51ae0d7..f50640f75 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -2295,7 +2295,7 @@ apikey is obtained from trongrid.io; privatekey is 64 characters long hex string; feeLimit optional, default 30 [TRX] - USDTTRON + USDTTRON From 8212fd134cde0d999eb8930c4863752ae3b50925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:01:27 +0200 Subject: [PATCH 14/82] BPUB-1837 - INotificationListener added Cash collection created (#839) --- .../extensions/INotificationListener.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java index f522cc81d..0f1036c17 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java @@ -243,6 +243,31 @@ default void countersShortCleared(String terminalSerialNumber, String cashCollec */ default void cashCollectionMissed(String terminalSerialNumber, LocalDate missedCashCollectionDate) {} + /** + * Invoked when a new cash collection record has been created. + * + * @param cashCollectionRecord Represents the details of the created cash collection record. + * + *

+ * ITerminalCashCollectionRecord will have the following attributes populated: + *

    + *
  • Terminal Serial Number: The serial number of the terminal where the cash collection event occurred.
    • + *
  • Terminal Time: Timestamp when event was created on terminal.
    • + *
  • Server Time: Timestamp when event was delivered and stored on server.
    • + *
  • Amounts: A collection of the total amounts in the cashbox, broken down by fiat currency. For example, if the ATM only sells BTC for USD, this will contain one member.
    • + *
  • Collecting Person: Details of the person who performed the cash collection, if available.
    • + *
  • Contains: A string containing a description of what was in the cashbox during the cash collection.
    • + *
  • Note: Any additional text description set by the user via admin.
    • + *
  • Counters Long: The value of the long counter at the time of cash collection.
    • + *
  • Counters Short: The value of the short counter at the time of cash collection before it was reset.
    • + *
  • Cashbox Name: The name of the cashbox.
    • + *
  • Public ID: The public ID of the cash collection.
    • + *
  • Location Public ID: The public ID of the related location.
    • + *
+ *

+ */ + default void cashCollectionCreated(ITerminalCashCollectionRecord cashCollectionRecord) {} + default void customerEnrolled(String terminalSerialNumber, String identityPublicId) {} default void identityCreated(String terminalSerialNumber, String identityPublicId) {} From bc3634c56f172d2b7dec55b884d1056b6a8cd3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:02:11 +0200 Subject: [PATCH 15/82] BATM-5350 - Add payment type into transaction detail (#844) --- .../batm/server/extensions/ITransactionDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java index 5524e3a6f..df5c2c51b 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java @@ -312,4 +312,9 @@ public interface ITransactionDetails { * or using {@link IExtensionContext#updateTransaction(String, Integer, String, Map)}. */ Map getCustomData(); + + /** + * @return Payment type: CASH/PAYMENT_CARD + */ + String getPaymentType(); } From 1a22124eaeb64eecdc151f126ad5daafc7264b73 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Wed, 4 Oct 2023 12:51:05 +0200 Subject: [PATCH 16/82] LC-241 Added application listener --- gradle.properties | 2 +- .../extensions/IApplicationListener.java | 8 +++++++ .../server/extensions/IExtensionContext.java | 4 ++++ .../extensions/event/ApplicationEvent.java | 22 +++++++++++++++++++ .../extensions/TestExtensionContext.java | 10 +++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApplicationListener.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/event/ApplicationEvent.java diff --git a/gradle.properties b/gradle.properties index 040ce4d85..bbecb7f86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.14 +projectVersion=1.1.15 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApplicationListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApplicationListener.java new file mode 100644 index 000000000..c7227192b --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApplicationListener.java @@ -0,0 +1,8 @@ +package com.generalbytes.batm.server.extensions; + +import com.generalbytes.batm.server.extensions.event.ApplicationEvent; + +public interface IApplicationListener { + + default void onStartup(ApplicationEvent event) {}; +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java index d11e088bb..3cfa69391 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java @@ -52,6 +52,10 @@ public interface IExtensionContext { int PERMISSION_WRITE = 2; int PERMISSION_EXECUTE = 4; + void addApplicationListener(IApplicationListener listener); + + boolean removeApplicationListener(IApplicationListener listener); + /** * Registers listener for listening to transaction events * @param listener diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/event/ApplicationEvent.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/event/ApplicationEvent.java new file mode 100644 index 000000000..e6772d193 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/event/ApplicationEvent.java @@ -0,0 +1,22 @@ +package com.generalbytes.batm.server.extensions.event; + +public class ApplicationEvent { + private boolean extensionsInitialized; + private boolean paymentMgrInitialized; + + public boolean isExtensionsInitialized() { + return extensionsInitialized; + } + + public void setExtensionsInitialized(boolean extensionsInitialized) { + this.extensionsInitialized = extensionsInitialized; + } + + public boolean isPaymentMgrInitialized() { + return paymentMgrInitialized; + } + + public void setPaymentMgrInitialized(boolean paymentMgrInitialized) { + this.paymentMgrInitialized = paymentMgrInitialized; + } +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java index f598f4c5e..0673499b7 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java @@ -24,6 +24,16 @@ import java.util.Set; public class TestExtensionContext implements IExtensionContext { + @Override + public void addApplicationListener(IApplicationListener listener) { + + } + + @Override + public boolean removeApplicationListener(IApplicationListener listener) { + return false; + } + @Override public void addTransactionListener(ITransactionListener listener) { From c73c1341436e612a84460ebe62f1e1459fd9e8cd Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 9 Oct 2023 09:15:26 +0200 Subject: [PATCH 17/82] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 58e1c59ce..03675addd 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,4 +23,4 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew clean build From 1d8bc8df97f448ff1f82f37cc8a82e3e1dbf7b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:40:26 +0200 Subject: [PATCH 18/82] LC-249 - Adding states and territories for Australian locations (#853) --- .../server/extensions/CountryAustralia.java | 46 +++++++++++++++++++ .../batm/server/extensions/CountryItaly.java | 4 +- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java new file mode 100644 index 000000000..cd410361a --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java @@ -0,0 +1,46 @@ +package com.generalbytes.batm.server.extensions; + +/** + * Australia province identifiers. + *

+ * Usage e.g.: + * CountryAustralia.AU-NSW.getProvinceName() + * CountryAustralia.valueOf("AU-NSW").getProvinceName() + */ +public enum CountryAustralia { + + AU_NSW("AU-NSW", "New South Wales"), + AU_QLD("AU-QLD", "Queensland"), + AU_SA("AU-SA", "South Australia"), + AU_TAS("AU-TAS", "Tasmania"), + AU_VIC("AU-VIC", "Victoria"), + AU_WA("AU-WA", "Western Australia"), + AU_ACT("AU-ACT", "Australian Capital Territory"), + AU_NT("AU-NT", "Northern Territory"); + + private final String iso; + + private final String provinceName; + + /** + * Private constructor. + */ + CountryAustralia(String iso, String provinceName) { + this.iso = iso; + this.provinceName = provinceName; + } + + /** + * ISO 3166-2 code of the province (2 digits). + */ + public String getIso() { + return iso; + } + + /** + * English province/territory name officially used by the ISO 3166 Maintenance Agency (ISO 3166/MA). + */ + public String getProvinceName() { + return provinceName; + } +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryItaly.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryItaly.java index 49e313ed9..7659b0b20 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryItaly.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryItaly.java @@ -20,8 +20,8 @@ /** * Italy province identifiers. * Usage e.g.: - * CountryItaly.QC.getProvinceName() - * CountryItaly.valueOf("QC").getProvinceName() + * CountryItaly.AG.getProvinceName() + * CountryItaly.valueOf("AG").getProvinceName() */ public enum CountryItaly { AG("AG", "Agrigento"), From 162789fe51717803cac914ddbe15c50355ac2317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:40:55 +0200 Subject: [PATCH 19/82] LC-250 - Fixed BitBuy exchange rate calculation (#854) --- .../bitcoin/exchanges/bitbuy/BitbuyExchange.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java index 3e24f5410..f074f1f19 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitbuy/BitbuyExchange.java @@ -140,21 +140,13 @@ private BigDecimal getRateSourceCryptoVolume(String cryptoCurrency) { @Override public BigDecimal getExchangeRateForBuy(String cryptoCurrency, String fiatCurrency) { BigDecimal rateSourceCryptoVolume = getRateSourceCryptoVolume(cryptoCurrency); - BigDecimal result = calculateBuyPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); - if (result != null) { - return result.divide(rateSourceCryptoVolume, 2, RoundingMode.UP); - } - return null; + return calculateBuyPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); } @Override public BigDecimal getExchangeRateForSell(String cryptoCurrency, String fiatCurrency) { BigDecimal rateSourceCryptoVolume = getRateSourceCryptoVolume(cryptoCurrency); - BigDecimal result = calculateSellPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); - if (result != null) { - return result.divide(rateSourceCryptoVolume, 2, RoundingMode.DOWN); - } - return null; + return calculateSellPrice(cryptoCurrency, fiatCurrency, rateSourceCryptoVolume); } @Override From a01f7b7a2696868e637837fd29edc9c6c421ab33 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Fri, 13 Oct 2023 16:41:57 +0200 Subject: [PATCH 20/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bbecb7f86..59c7948da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.15 +projectVersion=1.1.16 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 372719418f55caafdeb3e688ee5d55860d9d85b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 23 Oct 2023 08:37:34 +0200 Subject: [PATCH 21/82] LC-224 - Identity listener improvements (#848) --- .../server/extensions/IIdentityListener.java | 34 ++++++++++++++++++- .../identity/ExampleIdentityListener.java | 12 ++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IIdentityListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IIdentityListener.java index fef6ef3e8..5fc99940b 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IIdentityListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IIdentityListener.java @@ -21,6 +21,20 @@ import com.generalbytes.batm.server.extensions.aml.verification.IdentityApplicant; public interface IIdentityListener { + + /** + * @deprecated Use {@link #onIdentityVerificationResult(String, ApplicantCheckResult)} instead. + * + * @param rawPayload raw data received from the identity verification provider (e.g., in a webhook). + * Might be used to access additional data not recognized by the identity verification extension. + * @param result data parsed by the identity verification extension. + * Contains identity applicant ID that could be used to obtain the Identity, + * see {@link IExtensionContext#findIdentityVerificationApplicant(String)} + * and {@link IdentityApplicant#getIdentity()} + */ + @Deprecated + default void onVerificationResult(String rawPayload, ApplicantCheckResult result) { + } /** * Called by the server when an identity verification result is received from an identity verification provider. * @@ -31,6 +45,24 @@ public interface IIdentityListener { * see {@link IExtensionContext#findIdentityVerificationApplicant(String)} * and {@link IdentityApplicant#getIdentity()} */ - default void onVerificationResult(String rawPayload, ApplicantCheckResult result) { + default void onIdentityVerificationResult(String rawPayload, ApplicantCheckResult result) { + } + + /** + * Called when a new identity is created by the master or admin service. + * + * @param publicIdentityId Public ID of the newly created identity. + */ + default void onIdentityCreated(String publicIdentityId) { + } + + /** + * Called whenever the admin or master service changes the state of an identity. + * + * @param publicIdentityId Public ID of the identity whose state has changed. + * @param stateFrom The previous state of the identity before the change. + * @param stateTo The new state of the identity after the change. + */ + default void onIdentityStateChanged(String publicIdentityId, int stateFrom, int stateTo) { } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java index ffaaa42e9..e65f62b72 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java @@ -28,7 +28,7 @@ public class ExampleIdentityListener implements IIdentityListener { Logger log = LoggerFactory.getLogger(ExampleIdentityListener.class); @Override - public void onVerificationResult(String rawPayload, ApplicantCheckResult result) { + public void onIdentityVerificationResult(String rawPayload, ApplicantCheckResult result) { WebhookData data = parsePayload(rawPayload); IExtensionContext ctx = IdentityExampleExtension.getExtensionContext(); IdentityApplicant applicant = ctx.findIdentityVerificationApplicant(result.getIdentityApplicantId()); @@ -86,6 +86,16 @@ public void onVerificationResult(String rawPayload, ApplicantCheckResult result) new ChoiceCustomFieldValue(element.getId()))); } + @Override + public void onIdentityCreated(String publicIdentityId) { + log.info("Identity with public ID {} has been created", publicIdentityId); + } + + @Override + public void onIdentityStateChanged(String publicIdentityId, int stateFrom, int stateTo) { + log.info("Identity with public ID {} changed from state {} to state {}", publicIdentityId, stateFrom, stateTo); + } + private CustomFieldDefinition findCustomFieldDefinition(Collection customFieldDefinitions, String name, CustomFieldDefinitionType type) { From 4776364c82494c67cd1b94468b6661aa6c4761ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 23 Oct 2023 08:38:01 +0200 Subject: [PATCH 22/82] BATM-5013 - LND sendpayment should contain remote transaction id (#849) --- .../lightningbitcoin/wallets/lnd/LndWallet.java | 10 ++++++++++ .../wallets/lnd/dto/Payment.java | 17 ++++++++++++++++- .../wallets/lnd/LndWalletTest.java | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java index 69c7f962d..0471730ec 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java @@ -39,6 +39,7 @@ import java.net.ConnectException; import java.security.GeneralSecurityException; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -81,6 +82,7 @@ public String sendCoins(String destinationAddress, BigDecimal amount, String cry payment.amt = CoinUnit.bitcoinToSat(amount).toString(); payment.payment_request = destinationAddress; payment.fee_limit = getFeeLimit(feeLimit); + payment.dest_custom_records = getCustomRecords(description); log.info("Sending payment: {}", payment); SendPaymentResponse paymentResponse = callChecked(() -> api.sendPayment(payment)); @@ -111,6 +113,14 @@ private Payment.FeeLimit getFeeLimit(String fee) { return feeLimit; } + private static Map getCustomRecords(String description) { + Map customRecords = new HashMap<>(); + if (description != null && !description.trim().isEmpty()) { + customRecords.put(1L, description.getBytes()); + } + return customRecords; + } + @Override public String getInvoice(BigDecimal cryptoAmount, String cryptoCurrency, Long paymentValidityInSec, String description) { Invoice invoice = new Invoice(); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java index 74cb8c4b4..f14ef05fe 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java @@ -17,6 +17,9 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.lightningbitcoin.wallets.lnd.dto; +import java.nio.charset.StandardCharsets; +import java.util.Map; + public class Payment { /** * A bare-bones invoice for a payment within the Lightning Network. With the details of the invoice, the sender has all the data necessary to send a payment to the recipient @@ -34,6 +37,14 @@ public class Payment { */ public FeeLimit fee_limit; + /** + * An optional field that can be used to pass an arbitrary set of TLV records to a peer which understands the new records. + * This can be used to pass application specific data during the payment attempt. + * Record types are required to be in the custom range >= 65536. + * When using REST, the values must be encoded as base64. + */ + public Map dest_custom_records; + public static class FeeLimit { /** * The fee limit expressed as a fixed amount of satoshis @@ -52,6 +63,10 @@ public String toString() { @Override public String toString() { - return "Payment{" + amt + " sat, fee limit: " + fee_limit + " to " + payment_request + '}'; + String rid = ""; + if (dest_custom_records != null && !dest_custom_records.containsKey(1L)) { + rid = new String(dest_custom_records.get(1L), StandardCharsets.UTF_8); + } + return "Payment{" + amt + " sat, fee limit: " + fee_limit + " to " + payment_request + ", rid: " + rid + '}'; } } diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWalletTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWalletTest.java index a08ab3057..84a1c7ab7 100644 --- a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWalletTest.java +++ b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWalletTest.java @@ -21,7 +21,7 @@ public LndWalletTest() throws GeneralSecurityException { public void sendCoins() { IWalletInformation i = w.getWalletInformation(); String paymentHash = w.sendCoins("LNBC1U1PWJMJJNPP5YRDV8EPPK74UZ69QVHK940EHE9469H8GHXE626MZGCLZ202REZKQDPY2PKXZ7FQVYSXWCTDV5SX7E3QWD3HYCT5VD5QCQZPGQNL8L0227LDNLEJA3HQWUFHF788ADMD640YKFZ8A9FAGYG4RQE7XGC4CXFMTVU8SAWPE3WVU8WNUHW52R6LSD4797RZ0DPMPTHH3K0CQ378HK2", - new BigDecimal("0.000001"), CryptoCurrency.LBTC.getCode(), ""); + new BigDecimal("0.000001"), CryptoCurrency.LBTC.getCode(), "R23V4C"); System.out.println(paymentHash); } From 445d5336f9b1af96e3ec9d56b8d978d8b7e7f9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 23 Oct 2023 08:38:24 +0200 Subject: [PATCH 23/82] BPUB-1993 - Add overrideTransactionPreparation on ITransactionListener (#855) --- .../extensions/ITransactionListener.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index 67d9fccf4..535f7bb35 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -29,6 +29,24 @@ default boolean isTransactionPreparationApproved(ITransactionPreparation prepara return true; } + /** + * Allows the operator to override following values in {@link ITransactionPreparation}. + *

    + *
  • cryptoAddress
    • + *
  • cashTransactionLimitWithName
    • + *
  • cashTransactionMinimum
    • + *
  • supplyTransactionLimit
    • + *
  • allowedDiscountCode
    • + *
+ * This method is called for both BUY and SELL transactions. + * + * @param preparation The transaction preparation details, including calculated values. + * @return {@link ITransactionPreparation} that may contain modified transaction details. + */ + default ITransactionPreparation overrideTransactionPreparation(ITransactionPreparation preparation) { + return preparation; + } + /** * Callback method that is called by server before transaction is executed - however the cash is already inserted in machine in case of buy transaction. * If your method returns false than transaction will not take place and will fail with error ERROR_NOT_APPROVED. From fecae7d1e73127bde23c36ba1aacb277fe225cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 23 Oct 2023 08:38:57 +0200 Subject: [PATCH 24/82] CF-568 - Transaction Unlock Time in Output Queue Feature (#852) --- .../batm/server/extensions/IExtensionContext.java | 10 ++++++++++ .../server/extensions/OutputQueueInsertConfig.java | 12 ++++++++++++ .../batm/server/extensions/TestExtensionContext.java | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java index 3cfa69391..648d14360 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java @@ -831,4 +831,14 @@ public static class EmbeddedEmailImage { * @param remoteOrLocalTransactionId */ void markTransactionAsWithdrawn(String remoteOrLocalTransactionId); + + /** + * Allows to manage the unlock time of a specific transaction. + * This can be used to unlock the transaction sooner or prolong it. + * Transactions that are locked will remain in the output queue and won't be flushed until they are unlocked. + * + * @param rid Remote transaction ID + * @param serverTimeToUnlock The absolute datetime when the transaction should unlock. + */ + void unlockTransaction(String rid, Date serverTimeToUnlock); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/OutputQueueInsertConfig.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/OutputQueueInsertConfig.java index 7586f457d..7fefbb31b 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/OutputQueueInsertConfig.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/OutputQueueInsertConfig.java @@ -17,6 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions; +import java.util.Date; + /** * Information about how a transaction should be inserted into an Output Queue. * This is initially configured in admin per Output Queue and it can be overridden by extensions for each transaction. @@ -32,6 +34,7 @@ public class OutputQueueInsertConfig { private boolean secondaryManualApprovalRequired = false; private int secondaryDelaySeconds = 0; + private Date unlockTime; public boolean isSkipQueue() { return skipQueue; @@ -81,6 +84,14 @@ public void setSecondaryDelaySeconds(int secondaryDelaySeconds) { this.secondaryDelaySeconds = secondaryDelaySeconds; } + public Date getUnlockTime() { + return unlockTime; + } + + public void setUnlockTime(Date unlockTime) { + this.unlockTime = unlockTime; + } + @Override public String toString() { return "OutputQueueInsertConfig{" + @@ -90,6 +101,7 @@ public String toString() { ", insertIntoSecondaryQueue=" + insertIntoSecondaryQueue + ", secondaryManualApprovalRequired=" + secondaryManualApprovalRequired + ", secondaryDelaySeconds=" + secondaryDelaySeconds + + ", unlockTime=" + unlockTime + '}'; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java index 0673499b7..3b0c6cd60 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java @@ -481,4 +481,8 @@ public boolean isGlobalServer() { public void markTransactionAsWithdrawn(String remoteOrLocalTransactionId) { } + + @Override + public void unlockTransaction(String rid, Date serverTimeToUnlock) { + } } From 6709a8ae119bffc6be6b146402302921414bd2fd Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 23 Oct 2023 08:47:19 +0200 Subject: [PATCH 25/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 59c7948da..f55190239 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.16 +projectVersion=1.1.17 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 6a208b23eac1d5856a205c78d82209be595607bb Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 24 Oct 2023 11:18:17 +0200 Subject: [PATCH 26/82] BATM-5470 Upgrade gradle to version 8.3 (#851) --- annotations/build.gradle | 33 +- batm_ssh_tunnel/build.gradle | 25 +- build.gradle | 71 - buildSrc/build.gradle | 7 + .../gradle/plugin/GBGradlePlugin.groovy | 2 +- .../groovy/shared-build-conventions.gradle | 40 + .../groovy/shared-publish-conventions.gradle | 29 + ...shared-repositories-ext-conventions.gradle | 24 + currencies/build.gradle | 39 +- dependencySubstitutions.txt | 22 +- gradle/verification-metadata.xml | 1980 +++++++++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 37 +- gradlew.bat | 27 +- operators_sample_website/build.gradle | 61 +- server_extensions_api/build.gradle | 52 +- server_extensions_extra/build.gradle | 169 +- server_extensions_test/build.gradle | 30 +- verification_site/build.gradle | 31 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 21 files changed, 2259 insertions(+), 424 deletions(-) delete mode 100644 build.gradle create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/groovy/shared-build-conventions.gradle create mode 100644 buildSrc/src/main/groovy/shared-publish-conventions.gradle create mode 100644 buildSrc/src/main/groovy/shared-repositories-ext-conventions.gradle create mode 100644 gradle/verification-metadata.xml diff --git a/annotations/build.gradle b/annotations/build.gradle index ac636b1f0..e47c2d3bb 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -1,34 +1,7 @@ -apply plugin: "java" -apply plugin: "com.generalbytes.gradle.main" -apply plugin: 'maven-publish' +plugins { + id("shared-build-conventions") +} group = projectGroup version = projectVersion -publishing { - if (hasGbUploadArtifactory) { - repositories { - maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUploadUrl - } - } - } - - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} - -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) -} -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false -} \ No newline at end of file diff --git a/batm_ssh_tunnel/build.gradle b/batm_ssh_tunnel/build.gradle index 0089779d4..3fede2f26 100644 --- a/batm_ssh_tunnel/build.gradle +++ b/batm_ssh_tunnel/build.gradle @@ -1,10 +1,16 @@ -apply plugin: "java" -apply plugin: 'application' +plugins { + id("application") + id("shared-build-conventions") +} + +repositories { + mavenCentral() +} version = "1.0.0" application { - mainClassName = 'com.generalbytes.batm.sshtunnel.Main' + mainClass = "com.generalbytes.batm.sshtunnel.Main" } distributions { @@ -18,12 +24,13 @@ distributions { } } +configurations.configureEach { + exclude group: "org.eclipse.ee4j" +} dependencies { - compile(group: 'org.apache.sshd', name: 'sshd-core', version: '2.3.0') - compile(group: 'org.apache.sshd', name: 'sshd-common', version: '2.3.0') - compile(group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3') - - compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.63' - + implementation("org.apache.sshd:sshd-core:2.3.0") + implementation("org.apache.sshd:sshd-common:2.3.0") + implementation("ch.qos.logback:logback-classic:1.2.9") + implementation("org.bouncycastle:bcpkix-jdk15on:1.63") } \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 5ac8e3025..000000000 --- a/build.gradle +++ /dev/null @@ -1,71 +0,0 @@ -buildscript { - ext.with { - hasGbArtifactory = (project.hasProperty('gbArtifactoryUrl') - && project.hasProperty('gbArtifactoryUser') - && project.hasProperty('gbArtifactoryPassword')) - - hasGbUploadArtifactory = (project.hasProperty('gbArtifactoryUploadUrl') - && project.hasProperty('gbArtifactoryUser') - && project.hasProperty('gbArtifactoryPassword')) - - setRepositoriesFor = { RepositoryHandler repositoryHandler -> - if (hasGbArtifactory) { - repositoryHandler.maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUrl - } - } - repositoryHandler.mavenCentral() - repositoryHandler.maven { url 'https://jitpack.io' } - } - batmDependencySubstitutionConfig = file('dependencySubstitutions.txt') - batmDependencyChecksumsConfig = file('dependencyChecksums.txt') - } - setRepositoriesFor(repositories) -} - -allprojects { - setRepositoriesFor(buildscript.repositories) - setRepositoriesFor(repositories) - repositories { - //bitcoin-json-rpc-client-1.0.jar isn't part of any well known maven repo - //so we search the libs dir; gradle generates (guesses) metadata except dependencies. - //Artifacts from repos with real metadata take precedence. - flatDir { - dirs rootProject.file('libs') - } - } - tasks.withType(JavaCompile) { - project.sourceCompatibility = JavaVersion.VERSION_1_8 - options.encoding = 'UTF-8' - options.incremental = true - } - // Jars with the same contents should have the same checksums - tasks.withType(AbstractArchiveTask).configureEach { - preserveFileTimestamps = false - reproducibleFileOrder = true - } - afterEvaluate { - if (pluginManager.hasPlugin('com.generalbytes.gradle.dependency.verification')) { - dependencyChecksums { - global = true - } - dependencyVerifications { -// setConfigurations([]) // effectively turns off all checksum verifications -// failOnChecksumError = false // turns off failure on checksum problem (only warnings are printed) - } - } - if (pluginManager.hasPlugin('com.generalbytes.gradle.dependency.strict')) { - strictDependencies { -// conflictFail false // turns off failure on version conflict - } - } - } - - wrapper { - distributionType = Wrapper.DistributionType.ALL - } -} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 000000000..79ef21895 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,7 @@ +plugins { + id 'groovy-gradle-plugin' +} + +repositories { + gradlePluginPortal() +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/com/generalbytes/gradle/plugin/GBGradlePlugin.groovy b/buildSrc/src/main/groovy/com/generalbytes/gradle/plugin/GBGradlePlugin.groovy index acc2cc3d5..9c87fe8c4 100644 --- a/buildSrc/src/main/groovy/com/generalbytes/gradle/plugin/GBGradlePlugin.groovy +++ b/buildSrc/src/main/groovy/com/generalbytes/gradle/plugin/GBGradlePlugin.groovy @@ -63,7 +63,7 @@ class GBGradlePlugin implements Plugin { project.dependencyVerifications.configuration('releaseRuntimeClasspath') project.dependencyVerifications.configuration('debugRuntimeClasspath') } else if (pluginMgr.hasPlugin('org.gradle.java')) { - project.dependencyVerifications.configuration('runtime') + project.dependencyVerifications.configuration('runtimeClasspath') } final Configuration buildScriptClasspathConfiguration = diff --git a/buildSrc/src/main/groovy/shared-build-conventions.gradle b/buildSrc/src/main/groovy/shared-build-conventions.gradle new file mode 100644 index 000000000..1fb725fef --- /dev/null +++ b/buildSrc/src/main/groovy/shared-build-conventions.gradle @@ -0,0 +1,40 @@ +plugins { + id("java") + id("com.generalbytes.gradle.main") + id("shared-publish-conventions") +} + +repositories { + mavenCentral() +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" + options.incremental = true +} + +dependencySubstitutions { + substitute file("$project.rootDir/dependencySubstitutions.txt") +} + +tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true +} + +afterEvaluate { + if (pluginManager.hasPlugin('com.generalbytes.gradle.dependency.verification')) { + dependencyChecksums { + global = true + } + dependencyVerifications { + setConfigurations([]) // effectively turns off all checksum verifications - replaced by gradle's verification-metadata.xml + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/shared-publish-conventions.gradle b/buildSrc/src/main/groovy/shared-publish-conventions.gradle new file mode 100644 index 000000000..b04143398 --- /dev/null +++ b/buildSrc/src/main/groovy/shared-publish-conventions.gradle @@ -0,0 +1,29 @@ +plugins { + id("maven-publish") +} + +publishing { + if (hasGbUploadArtifactory()) { + repositories { + maven { + credentials { + username gbArtifactoryUser + password gbArtifactoryPassword + } + url gbArtifactoryUploadUrl + } + } + } + + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} + +private boolean hasGbUploadArtifactory() { + return project.hasProperty("gbArtifactoryUploadUrl") + && project.hasProperty("gbArtifactoryUser") + && project.hasProperty("gbArtifactoryPassword") +} diff --git a/buildSrc/src/main/groovy/shared-repositories-ext-conventions.gradle b/buildSrc/src/main/groovy/shared-repositories-ext-conventions.gradle new file mode 100644 index 000000000..67cae8a8b --- /dev/null +++ b/buildSrc/src/main/groovy/shared-repositories-ext-conventions.gradle @@ -0,0 +1,24 @@ +ext { + hasGbArtifactory = hasGbArtifactory() +} + +repositories { + maven { + url = uri("https://jitpack.io") + } + if (hasGbArtifactory) { + maven { + url = uri(project.findProperty("gbArtifactoryUrl").toString()) + credentials { + username = project.findProperty("gbArtifactoryUser").toString() + password = project.findProperty("gbArtifactoryPassword").toString() + } + } + } +} + +private boolean hasGbArtifactory() { + return project.hasProperty('gbArtifactoryUrl') + && project.hasProperty('gbArtifactoryUser') + && project.hasProperty('gbArtifactoryPassword') +} \ No newline at end of file diff --git a/currencies/build.gradle b/currencies/build.gradle index 64a7f6d69..d0ffed15d 100644 --- a/currencies/build.gradle +++ b/currencies/build.gradle @@ -1,40 +1,11 @@ -apply plugin: "java" -apply plugin: "com.generalbytes.gradle.main" -apply plugin: 'maven-publish' +plugins { + id("shared-build-conventions") +} group = projectGroup version = projectVersion - dependencies { - compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28') - testCompile (group: 'junit', name: 'junit', version: '4.13.1') -} - -publishing { - if (hasGbUploadArtifactory) { - repositories { - maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUploadUrl - } - } - } - - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} - -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) -} -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false + implementation("org.slf4j:slf4j-api:1.7.28") + testImplementation("junit:junit:4.13.1") } \ No newline at end of file diff --git a/dependencySubstitutions.txt b/dependencySubstitutions.txt index 43b827b55..57fbad937 100644 --- a/dependencySubstitutions.txt +++ b/dependencySubstitutions.txt @@ -1,18 +1,17 @@ // generated at 2021-05-26T11:51:06 // shared substitutions (project ':currencies') -substitute module: 'com.fasterxml.jackson.core:jackson-annotations', versions: ['2.9.1', '2.9.9', '2.11.2'], toVersion: '2.12.0' -substitute module: 'com.fasterxml.jackson.core:jackson-core', versions: ['2.7.4', '2.9.9', '2.11.2'], toVersion: '2.12.0' -substitute module: 'com.fasterxml.jackson.core:jackson-databind', versions: ['2.7.4', '2.8.5', '2.9.6', '2.9.9', '2.10.0', '2.11.2'], toVersion: '2.12.0' +substitute module: 'com.fasterxml.jackson.core:jackson-databind', versions: ['2.7.4', '2.9.6', '2.9.9', '2.10.0', '2.11.2'], toVersion: '2.12.0' +substitute module: 'com.fasterxml.jackson.core:jackson-core', versions: ['2.7.4', '2.11.2'], toVersion: '2.12.0' +substitute module: 'com.fasterxml.jackson.core:jackson-databind', versions: ['2.7.4', '2.9.6', '2.9.9', '2.10.0', '2.11.2'], toVersion: '2.12.0' substitute module: 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider', versions: ['2.8.5'], toVersion: '2.12.0' -substitute module: 'com.github.jnr:jnr-ffi', versions: ['2.1.1'], toVersion: '2.1.2' +substitute module: 'com.fasterxml.jackson.core:jackson-annotations', versions: ['2.9.1', '2.11.2'], toVersion: '2.12.0' substitute module: 'com.github.mmazi:rescu', versions: ['2.0.2'], toVersion: '2.1.0' substitute module: 'com.google.code.findbugs:jsr305', versions: ['2.0.1'], toVersion: '3.0.2' -substitute module: 'com.google.errorprone:error_prone_annotations', versions: ['2.2.0', '2.3.3', '2.3.4', '2.5.1'], toVersion: '2.7.1' -substitute module: 'com.google.guava:guava', versions: ['21.0', '27.0.1-android', '28.1-android', '28.2-android', '29.0-android', '29.0-jre', '30.0-android', '30.1.1-jre', '31.0.1-android'], toVersion: '31.0.1-jre' -substitute module: 'com.google.j2objc:j2objc-annotations', versions: ['1.1'], toVersion: '1.3' +substitute module: 'com.google.errorprone:error_prone_annotations', versions: ['2.3.3', '2.3.4'], toVersion: '2.7.1' +substitute module: 'com.google.guava:guava', versions: ['21.0', '27.0.1-android', '28.1-android', '29.0-android', '29.0-jre', '30.0-android', '30.1.1-jre', '31.0.1-android'], toVersion: '31.0.1-jre' substitute module: 'com.google.protobuf:protobuf-java', versions: ['2.6.1', '3.6.1', '3.11.0', '3.12.0'], toVersion: '3.13.0' substitute module: 'com.madgag.spongycastle:core', versions: ['1.51.0.0', '1.52.0.0'], toVersion: '1.58.0.0' -substitute module: 'com.squareup.okhttp3:okhttp', versions: ['3.8.1', '3.12.1', '3.12.8', '3.12.12', '3.14.9', '4.2.2'], toVersion: '4.9.0' +substitute module: 'com.squareup.okhttp3:okhttp', versions: ['3.12.1', '3.12.12', '3.14.9', '4.2.2'], toVersion: '4.9.0' substitute module: 'com.squareup.okhttp:okhttp', versions: ['2.7.2'], toVersion: '2.7.4' substitute module: 'com.squareup.okio:okio', versions: ['1.6.0', '1.13.0', '1.16.0'], toVersion: '2.8.0' substitute module: 'commons-codec:commons-codec', versions: ['1.3', '1.9', '1.11'], toVersion: '1.13' @@ -29,15 +28,14 @@ substitute module: 'io.netty:netty-transport', versions: ['4.1.8.Final'], toVers substitute module: 'javax.ws.rs:javax.ws.rs-api', versions: ['2.0.1'], toVersion: '2.1' substitute module: 'javax.annotation:javax.annotation-api', versions: ['1.2'], toVersion: '1.3.2' substitute module: 'org.apache.commons:commons-lang3', versions: ['3.5'], toVersion: '3.12.0' -substitute module: 'org.bouncycastle:bcprov-jdk15on', versions: ['1.54', '1.60', '1.66', '1.68'], toVersion: '1.63' -substitute module: 'org.codehaus.mojo:animal-sniffer-annotations', versions: ['1.17'], toVersion: '1.18' +substitute module: 'org.bouncycastle:bcprov-jdk15on', versions: ['1.60', '1.66', '1.68'], toVersion: '1.63' substitute module: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8', versions: ['1.3.31'], toVersion: '1.4.10' substitute module: 'org.jetbrains.kotlin:kotlin-stdlib', versions: ['1.4.0'], toVersion: '1.4.10' substitute module: 'org.jetbrains.kotlin:kotlin-stdlib-common', versions: ['1.4.0'], toVersion: '1.4.10' substitute module: 'org.json:json', versions: ['20140107'], toVersion: '20180130' -substitute module: 'org.slf4j:slf4j-api', versions: ['1.7.20', '1.7.21', '1.7.25', '1.7.30', '1.7.32', '1.7.33', '1.8.0-beta4'], toVersion: '1.7.28' +substitute module: 'org.slf4j:slf4j-api', versions: ['1.7.20', '1.7.21', '1.7.25', '1.7.26', '1.7.30', '1.7.32', '1.7.33', '1.8.0-beta4'], toVersion: '1.7.28' substitute module: 'org.knowm.xchange:xchange-core', versions: ['5.0.12', '5.0.13'], toVersion: '5.0.10' -substitute module: 'org.bouncycastle:bcprov-jdk15to18', versions: ['1.66','1.68'], toVersion: '1.69' +substitute module: 'org.bouncycastle:bcprov-jdk15to18', versions: ['1.66'], toVersion: '1.69' substitute module: 'com.fasterxml.jackson.datatype:jackson-datatype-guava', versions: ['2.11.2'], toVersion: '2.12.0' substitute module: 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8', versions: ['2.11.2'], toVersion: '2.12.0' substitute module: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310', versions: ['2.11.2'], toVersion: '2.12.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml new file mode 100644 index 000000000..068423da7 --- /dev/null +++ b/gradle/verification-metadata.xml @@ -0,0 +1,1980 @@ + + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 23334 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 WDWbsF$p{Gi@ZUasP|4|kdH)CXgbPdn delta 19998 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 186b71557..27313fbc8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5..4f906e0c8 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -125,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -154,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9991c5032..107acd32c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/operators_sample_website/build.gradle b/operators_sample_website/build.gradle index 98980b044..a6c78c78a 100644 --- a/operators_sample_website/build.gradle +++ b/operators_sample_website/build.gradle @@ -1,27 +1,16 @@ -apply plugin: "java" -apply plugin: "com.generalbytes.gradle.main" -apply plugin: 'maven-publish' +plugins { + id("shared-build-conventions") +} group = projectGroup version = projectVersion jar { - baseName "${archiveBaseName.get()}" archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}" } configurations { artifactOnly - - // handle Github (e.g. community) vs GENERAL BYTES dichotomy - generalBytesCompile - githubCompile - if (hasGbArtifactory) { - compile { extendsFrom generalBytesCompile } - } else { - compile { extendsFrom githubCompile } - - } } artifacts { @@ -29,44 +18,10 @@ artifacts { } dependencies { - compile project(':server_extensions_api') - compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28') - compile(group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1') - compile(group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0') - implementation 'com.google.code.gson:gson:2.8.8' -} + implementation project(":server_extensions_api") -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) + implementation("org.slf4j:slf4j-api:1.7.28") + implementation("javax.ws.rs:javax.ws.rs-api:2.1") + implementation("javax.servlet:javax.servlet-api:3.1.0") + implementation("com.google.code.gson:gson:2.8.9") } - -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false - - // additional configurations - if (hasGbArtifactory) { - configuration project.configurations.generalBytesCompile - } - configuration project.configurations.githubCompile -} - -publishing { - if (hasGbUploadArtifactory) { - repositories { - maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUploadUrl - } - } - } - - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} \ No newline at end of file diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle index bd5d524d0..f804a2172 100644 --- a/server_extensions_api/build.gradle +++ b/server_extensions_api/build.gradle @@ -1,59 +1,31 @@ -apply plugin: "java" -apply plugin: "distribution" -apply plugin: "com.generalbytes.gradle.main" -apply plugin: 'maven-publish' +plugins { + id("shared-build-conventions") + id("distribution") +} group = projectGroup version = projectVersion jar { - baseName 'batm_server_extensions_api' - archiveName "${baseName}.${extension}" + archiveFileName = "batm_server_extensions_api.${archiveExtension.get()}" } distributions { main { contents { from jar - from configurations.runtime + from configurations.runtimeClasspath } } } dependencies { - compile project(':currencies') - compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28') - compile(group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2') - compile(group: 'com.vdurmont', name: 'emoji-java', version: '3.1.3') //for chat emojis - - testCompile(group: 'junit', name: 'junit', version: '4.13.1') - testImplementation(group: 'org.assertj', name: 'assertj-core', version: '3.19.0') -} - -publishing { - if (hasGbUploadArtifactory) { - repositories { - maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUploadUrl - } - } - } - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} + implementation project(":currencies") -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) -} + implementation("org.slf4j:slf4j-api:1.7.28") + implementation("com.sun.mail:javax.mail:1.6.2") + implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false + testImplementation("junit:junit:4.13.1") + testImplementation("org.assertj:assertj-core:3.19.0") } diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle index f05e8d4f9..582ee8fcd 100644 --- a/server_extensions_extra/build.gradle +++ b/server_extensions_extra/build.gradle @@ -1,29 +1,25 @@ -apply plugin: "java" -apply plugin: "com.generalbytes.gradle.main" -apply plugin: 'maven-publish' +plugins { + id("shared-build-conventions") + id("shared-repositories-ext-conventions") +} group = projectGroup version = projectVersion jar { - baseName 'batm_server_extensions_extra' - archiveName "${baseName}.${extension}" + archiveFileName = "batm_server_extensions_extra.${archiveExtension.get()}" } configurations { artifactOnly - runtimeNoArtifact { - extendsFrom compile - } // handle Github (e.g. community) vs GENERAL BYTES dichotomy generalBytesCompile githubCompile if (hasGbArtifactory) { - compile { extendsFrom generalBytesCompile } + implementation { extendsFrom generalBytesCompile } } else { - compile { extendsFrom githubCompile } - + implementation { extendsFrom githubCompile } } } @@ -36,112 +32,77 @@ ext { } dependencies { - compile project(':server_extensions_api') - compile project(':currencies') - compile(group: 'com.github.Polve', name: 'JavaBitcoindRpcClient', version: javaBitcoindRpcVersion) - compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28') - compile(group: 'com.github.mmazi', name: 'rescu', version: '2.0.2') - compile(group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1') - compile(group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0') - compile(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.9') - compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9') - compile(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.9') - compile(group: 'com.google.guava', name: 'guava', version: '27.0.1-android') - compile(group: 'com.google.zxing', name: 'core', version: '3.5.1') - compile(group: 'org.knowm.xchange', name: 'xchange-core', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-bitfinex', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-binance', version: "5.0.12") - compile(group: 'org.knowm.xchange', name: 'xchange-bittrex', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-bitstamp', version: "5.0.13") - compile(group: 'org.knowm.xchange', name: 'xchange-hitbtc', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-dvchain', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-coinbasepro', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-coingi', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-enigma', version: xchangeVersion) - compile(group: 'org.knowm.xchange', name: 'xchange-poloniex', version: xchangeVersion) - compile(group: 'org.web3j', name: 'core', version: '4.9.0') - compile(group: 'org.web3j', name: 'crypto', version: '4.9.0') - compile(group: 'org.web3j', name: 'utils', version: '4.9.0') - compile(group: 'org.web3j', name: 'abi', version: '4.9.0') - compile(group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.2') - compile(group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2') // for ERC20Interface generated by web3j - compile(group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.2') // for ERC20Interface generated by web3j - compile(group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.0') - compile(group: 'com.squareup.okio', name: 'okio', version: '2.8.0') - compile(group: 'com.vdurmont', name: 'emoji-java', version: '3.1.3') //for chat emojis - compile(group: 'com.nexmo', name: 'client', version: '5.5.0') // sms provider - implementation group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.16.1' + implementation project(":server_extensions_api") + implementation project(":currencies") + + implementation("com.github.Polve:JavaBitcoindRpcClient:$javaBitcoindRpcVersion") + implementation("org.slf4j:slf4j-api:1.7.28") + implementation("com.github.mmazi:rescu:2.1.0") + implementation("javax.ws.rs:javax.ws.rs-api:2.1") + implementation("javax.servlet:javax.servlet-api:3.1.0") + implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.0") + implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0") + implementation("com.fasterxml.jackson.core:jackson-core:2.12.0") + implementation("com.google.guava:guava:30.1.1-jre") + implementation("com.google.zxing:core:3.5.1") + implementation("org.knowm.xchange:xchange-core:$xchangeVersion") + implementation("org.knowm.xchange:xchange-bitfinex:$xchangeVersion") + implementation("org.knowm.xchange:xchange-binance:5.0.12") + implementation("org.knowm.xchange:xchange-bittrex:$xchangeVersion") + implementation("org.knowm.xchange:xchange-bitstamp:5.0.13") + implementation("org.knowm.xchange:xchange-hitbtc:$xchangeVersion") + implementation("org.knowm.xchange:xchange-dvchain:$xchangeVersion") + implementation("org.knowm.xchange:xchange-coinbasepro:$xchangeVersion") + implementation("org.knowm.xchange:xchange-coingi:$xchangeVersion") + implementation("org.knowm.xchange:xchange-enigma:$xchangeVersion") + implementation("org.knowm.xchange:xchange-poloniex:$xchangeVersion") + implementation("org.web3j:core:4.9.0") + implementation("org.web3j:crypto:4.9.0") + implementation("org.web3j:utils:4.9.0") + implementation("org.web3j:abi:4.9.0") + implementation("org.java-websocket:Java-WebSocket:1.5.2") + implementation("io.reactivex.rxjava2:rxjava:2.2.2") // for ERC20Interface generated by web3j + implementation("org.reactivestreams:reactive-streams:1.0.2") // for ERC20Interface generated by web3j + implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okio:okio:2.8.0") + implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis + implementation("com.nexmo:client:5.5.0") // sms provider + implementation("org.bitcoinj:bitcoinj-core:0.16.1") // Note when updating bitcoinj: block.io depends on libdohj for doge and ltc // which depends on bitcoinj and extends some classes, it must be compatible version // and it will break at runtime if the version is substituted for an incompatible one - implementation group: 'com.github.dogecoin', name: 'libdohj', version: 'a2a37e454e5cd02f664ca119ab8b59dfddc75590' - compile (group: 'org.xrpl', name: 'xrpl4j-model', version:'2.1.0') - compile (group: 'org.xrpl', name: 'xrpl4j-keypairs', version:'2.1.0') + implementation("com.github.dogecoin:libdohj:a2a37e454e5cd02f664ca119ab8b59dfddc75590") + implementation("org.xrpl:xrpl4j-model:2.1.0") + implementation("org.xrpl:xrpl4j-keypairs:2.1.0") + implementation("org.bouncycastle:bcprov-jdk15on:1.63") - compile(group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.63') + runtimeOnly("com.google.protobuf:protobuf-java:3.13.0") - runtime(group: 'com.google.protobuf', name: 'protobuf-java', version: '2.6.1') - - generalBytesCompile(group: 'com.generalbytes.bitrafael.public', name: 'bitrafael-client', version: bitrafaelVersion) { + generalBytesCompile("com.generalbytes.bitrafael.public:bitrafael-client:$bitrafaelVersion") { exclude group: 'org.slf4j', module: 'slf4j-simple' } - githubCompile(group: 'com.github.GENERALBYTESCOM.bitrafael_public', name: 'bitrafael-client', version: bitrafaelVersion) { + githubCompile("com.github.GENERALBYTESCOM.bitrafael_public:bitrafael-client:$bitrafaelVersion") { exclude group: 'org.slf4j', module: 'slf4j-simple' } - generalBytesCompile(group: 'com.generalbytes.bitrafael.public', name: 'bitrafael-client-api', version: bitrafaelVersion) - githubCompile(group: 'com.github.GENERALBYTESCOM.bitrafael_public', name: 'bitrafael-client-api', version: bitrafaelVersion) - generalBytesCompile(group: 'com.generalbytes.bitrafael.public', name: 'bitrafael-server-api', version: bitrafaelVersion) - githubCompile(group: 'com.github.GENERALBYTESCOM.bitrafael_public', name: 'bitrafael-server-api', version: bitrafaelVersion) - - compile(group: 'com.github.generalbytescom.trident', name:'abi', version:'fff6ed0') // fff6ed0 should be close to 0.1.1 - compile(group: 'com.github.generalbytescom.trident', name:'core', version:'fff6ed0') - compile(group: 'com.github.generalbytescom.trident', name:'utils', version:'fff6ed0') - compile(group: 'com.google.protobuf', name:'protobuf-java', version: '3.11.0') - compile(group: 'com.onfido', name: 'onfido-api-java', version: '2.3.1') - - testCompile(group: 'junit', name: 'junit', version: '4.13.1') - testImplementation(group: 'org.assertj', name: 'assertj-core', version: '3.19.0') - testCompile(group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3') - testCompile(group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3') + generalBytesCompile("com.generalbytes.bitrafael.public:bitrafael-client-api:$bitrafaelVersion") + githubCompile("com.github.GENERALBYTESCOM.bitrafael_public:bitrafael-client-api:$bitrafaelVersion") + generalBytesCompile("com.generalbytes.bitrafael.public:bitrafael-server-api:$bitrafaelVersion") + githubCompile("com.github.GENERALBYTESCOM.bitrafael_public:bitrafael-server-api:$bitrafaelVersion") + + implementation("com.github.generalbytescom.trident:abi:fff6ed0") // fff6ed0 should be close to 0.1.1 + implementation("com.github.generalbytescom.trident:core:fff6ed0") + implementation("com.github.generalbytescom.trident:utils:fff6ed0") + implementation("com.google.protobuf:protobuf-java:3.13.0") + implementation("com.onfido:onfido-api-java:2.3.1") + + testImplementation("junit:junit:4.13.1") + testImplementation("org.assertj:assertj-core:3.19.0") + testImplementation("ch.qos.logback:logback-classic:1.2.9") + testImplementation("ch.qos.logback:logback-core:1.2.9") testImplementation("org.assertj:assertj-core:3.19.0") testImplementation('org.glassfish.jersey.core:jersey-common:2.25.1') } -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) -} - -publishing { - if (hasGbUploadArtifactory) { - repositories { - maven { - credentials { - username gbArtifactoryUser - password gbArtifactoryPassword - } - url gbArtifactoryUploadUrl - } - } - } - - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} - -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false - - // additional configurations - if (hasGbArtifactory) { - configuration project.configurations.generalBytesCompile - } - configuration project.configurations.githubCompile -} - test { testLogging { events "failed" diff --git a/server_extensions_test/build.gradle b/server_extensions_test/build.gradle index 2ae235adb..fd5e7cc19 100644 --- a/server_extensions_test/build.gradle +++ b/server_extensions_test/build.gradle @@ -1,25 +1,21 @@ -apply plugin: "java" -apply plugin: "application" -apply plugin: "com.generalbytes.gradle.main" +plugins { + id("application") + id("shared-build-conventions") + id("shared-repositories-ext-conventions") +} -mainClassName = 'com.generalbytes.batm.server.extensions.test.Tester' +application { + mainClass = "com.generalbytes.batm.server.extensions.test.Tester" +} jar { - baseName 'batm_server_extensions_test' + archiveFileName = "batm_server_extensions_test.jar" } dependencies { - compile project(':server_extensions_api'); - compile project(':server_extensions_extra'); - compile(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '4.9') - runtime(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25') -} - -dependencySubstitutions { - substitute file(batmDependencySubstitutionConfig) -} + implementation project(":server_extensions_api") + implementation project(":server_extensions_extra") -dependencyVerifications { - checksums batmDependencyChecksumsConfig - printUnusedAssertions false + implementation("net.sf.jopt-simple:jopt-simple:4.9") + runtimeOnly("org.slf4j:slf4j-simple:1.7.28") } diff --git a/verification_site/build.gradle b/verification_site/build.gradle index 93a909af5..c0df1b2cc 100644 --- a/verification_site/build.gradle +++ b/verification_site/build.gradle @@ -1,12 +1,17 @@ plugins { - id 'org.springframework.boot' version '2.4.3' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'java' + id "org.springframework.boot" version "2.7.15" + id "io.spring.dependency-management" version "1.0.15.RELEASE" + id "java" } -group = 'com.generalbytes.batm' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +group = "com.generalbytes.batm" +version = "0.0.1-SNAPSHOT" + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} configurations { compileOnly { @@ -19,12 +24,14 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.apache.httpcomponents:httpclient:4.5.13' - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - implementation 'com.google.guava:guava:30.1.1-jre' + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.apache.httpcomponents:httpclient:4.5.13" + implementation "com.google.guava:guava:30.1.1-jre" + + compileOnly "org.projectlombok:lombok" + + annotationProcessor "org.projectlombok:lombok" + testImplementation "org.springframework.boot:spring-boot-starter-test" } test { diff --git a/verification_site/gradle/wrapper/gradle-wrapper.properties b/verification_site/gradle/wrapper/gradle-wrapper.properties index 2a563242c..db9a6b825 100644 --- a/verification_site/gradle/wrapper/gradle-wrapper.properties +++ b/verification_site/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 620f92acf3a549219fe7f15087b26283f9788798 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 24 Oct 2023 11:21:30 +0200 Subject: [PATCH 27/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f55190239..2479bf09e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.17 +projectVersion=1.2.0 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 5fc9ff70ed54b0c88bfa883f4b5dbe0051189d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Wed, 1 Nov 2023 16:09:26 +0100 Subject: [PATCH 28/82] CF-569: Allowed to create voice call provider as extension --- gradle.properties | 2 +- gradle/verification-metadata.xml | 50 ++++++++++--------- .../server/extensions/AbstractExtension.java | 4 ++ .../batm/server/extensions/IExtension.java | 9 +++- .../voicecall/IVoiceCallErrorResponse.java | 33 ++++++++++++ .../voicecall/IVoiceCallProvider.java | 43 ++++++++++++++++ .../voicecall/IVoiceCallResponse.java | 43 ++++++++++++++++ .../communication/voicecall/MessageType.java | 24 +++++++++ 8 files changed, 182 insertions(+), 26 deletions(-) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallErrorResponse.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallProvider.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallResponse.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/MessageType.java diff --git a/gradle.properties b/gradle.properties index 2479bf09e..591f6bfd6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.0 +projectVersion=1.2.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 068423da7..b437247e2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -36,9 +36,9 @@ - - - + + + @@ -74,11 +74,6 @@ - - - - - @@ -103,6 +98,11 @@ + + + + + @@ -111,11 +111,6 @@ - - - - - @@ -124,15 +119,10 @@ - - - - - - - - - + + + + @@ -142,6 +132,16 @@ + + + + + + + + + + @@ -1132,7 +1132,9 @@ - + + + @@ -1655,7 +1657,7 @@ - + diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/AbstractExtension.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/AbstractExtension.java index 9152eba81..7464ecff1 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/AbstractExtension.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/AbstractExtension.java @@ -23,6 +23,7 @@ import com.generalbytes.batm.server.extensions.aml.verification.IIdentityVerificationProvider; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; import com.generalbytes.batm.server.extensions.communication.IPhoneLookupProvider; +import com.generalbytes.batm.server.extensions.communication.voicecall.IVoiceCallProvider; import com.generalbytes.batm.server.extensions.watchlist.IWatchList; import java.util.Set; @@ -127,6 +128,9 @@ public Set getCommunicationProviders() { return null; } + @Override + public Set getVoiceCallProviders() { return null; } + @Override public Set getSsnValidators() { return null; diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtension.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtension.java index b0c9d7e41..dee337b18 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtension.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtension.java @@ -24,6 +24,7 @@ import com.generalbytes.batm.server.extensions.aml.verification.IIdentityVerificationProvider; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; import com.generalbytes.batm.server.extensions.communication.IPhoneLookupProvider; +import com.generalbytes.batm.server.extensions.communication.voicecall.IVoiceCallProvider; import com.generalbytes.batm.server.extensions.watchlist.IWatchList; import java.util.Set; @@ -174,11 +175,17 @@ public interface IExtension { ITransactionScoringProvider createTransactionScoringProvider(String transactionScoringProviderParamValues); /** - * Optionally returns external communication providers that can be used by server to sending SMS or making voice calls. + * Optionally returns external communication providers that can be used by server to sending SMS. * @return */ Set getCommunicationProviders(); + /** + * Optionally returns external communication providers that can be used by server to making voice call. + * @return + */ + Set getVoiceCallProviders(); + /** * @return Validators that can be used to validate SSNs */ diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallErrorResponse.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallErrorResponse.java new file mode 100644 index 000000000..d34274f87 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallErrorResponse.java @@ -0,0 +1,33 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.communication.voicecall; + +public interface IVoiceCallErrorResponse { + + /** + * Error message. + */ + String getErrorMessage(); + + /** + * Making of voice call failed due the number is on black list. + */ + boolean isBlacklisted(); + +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallProvider.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallProvider.java new file mode 100644 index 000000000..601b48413 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallProvider.java @@ -0,0 +1,43 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.communication.voicecall; + +/** + * Provider for making voice call. + */ +public interface IVoiceCallProvider { + + /** + * Name of the voice call provider. + */ + String getName(); + + /** + * Make the voice call. + * + * @param credentials Credentials. + * @param phoneNumber Phone number. + * @param message Message. + * @param messageType Type of message. + * @param language Language in ISO 639-1 standard used at terminal. + * @return {@link IVoiceCallResponse} + */ + IVoiceCallResponse makeVoiceCall(String credentials, String phoneNumber, String message, MessageType messageType, String language); + +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallResponse.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallResponse.java new file mode 100644 index 000000000..cccc19c5f --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/IVoiceCallResponse.java @@ -0,0 +1,43 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.communication.voicecall; + +public interface IVoiceCallResponse { + + enum ResponseStatus { + OK, + ERROR + } + + /** + * ID of voice call. + */ + String getSid(); + + /** + * Response status [OK, ERROR]. + */ + ResponseStatus getStatus(); + + /** + * Error information. + */ + IVoiceCallErrorResponse getErrorResponse(); + +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/MessageType.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/MessageType.java new file mode 100644 index 000000000..296cafbe8 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/communication/voicecall/MessageType.java @@ -0,0 +1,24 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.communication.voicecall; + +public enum MessageType { + MESSAGE, + OTP +} From 9b525c73c92c481bc767f05ca063b9b9ab1363b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 7 Nov 2023 13:03:06 +0100 Subject: [PATCH 29/82] BATM-4385: six decimal places for USDT on Binance exchange --- gradle.properties | 2 +- gradle/verification-metadata.xml | 50 ++++++++++--------- .../exchanges/binance/BinanceExchange.java | 11 +++- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2479bf09e..591f6bfd6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.0 +projectVersion=1.2.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 068423da7..b437247e2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -36,9 +36,9 @@ - - - + + + @@ -74,11 +74,6 @@ - - - - - @@ -103,6 +98,11 @@ + + + + + @@ -111,11 +111,6 @@ - - - - - @@ -124,15 +119,10 @@ - - - - - - - - - + + + + @@ -142,6 +132,16 @@ + + + + + + + + + + @@ -1132,7 +1132,9 @@ - + + + @@ -1655,7 +1657,7 @@ - + diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/binance/BinanceExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/binance/BinanceExchange.java index ff2b8c0f0..0f5cf602e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/binance/BinanceExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/binance/BinanceExchange.java @@ -17,6 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.binance; +import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.XChangeExchange; import org.knowm.xchange.ExchangeSpecification; import org.knowm.xchange.currency.CurrencyPair; @@ -24,6 +25,7 @@ import org.knowm.xchange.dto.account.Wallet; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Set; import java.util.stream.Collectors; @@ -91,6 +93,11 @@ protected BigDecimal getAmountRoundedToMinStep(BigDecimal cryptoAmount, BigDecim public String sendCoins(String destinationAddress, BigDecimal amount, String cryptoCurrency, String description) { BigDecimal withdrawalFee = getWithdrawalFee(cryptoCurrency); amount = amount.add(withdrawalFee); + + if (CryptoCurrency.USDT.getCode().equals(cryptoCurrency)) { + amount = amount.setScale(6, RoundingMode.FLOOR); + } + return super.sendCoins(destinationAddress, amount, cryptoCurrency, description); } @@ -110,8 +117,8 @@ protected BigDecimal getWithdrawalMinStep(String cryptoCurrency) { } protected static class SupportedCryptoCurrency { - private String cryptoCurrency; - private BigDecimal withdrawalMinStep; + private final String cryptoCurrency; + private final BigDecimal withdrawalMinStep; public SupportedCryptoCurrency(String cryptoCurrency) { this(cryptoCurrency, new BigDecimal("0.00000001")); From 33fe141e817617e87d13538675bf68a857a1e018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 14 Nov 2023 14:37:26 +0100 Subject: [PATCH 30/82] BATM-5625: fix Coinbase Wallet response --- gradle.properties | 2 +- .../wallets/coinbase/v2/CoinbaseWalletV2.java | 17 ++-- .../wallets/coinbase/v2/dto/CBAccount.java | 6 +- .../wallets/coinbase/v2/dto/CBCurrency.java | 78 +++++++++++++++++++ 4 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java diff --git a/gradle.properties b/gradle.properties index 59c7948da..8a29fa766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.16 +projectVersion=1.1.16.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java index cb8d0d37d..a41f4c6c4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java @@ -118,8 +118,8 @@ private String getAccountId(String accountName, String cryptoCurrency) { if (accountName != null) { for (CBAccount cbAccount : accounts) { if (accountName.equalsIgnoreCase(cbAccount.getName())) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } @@ -127,22 +127,22 @@ private String getAccountId(String accountName, String cryptoCurrency) { } else { for (CBAccount cbAccount : accounts) { if (cbAccount.isPrimary()) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } } } for (CBAccount cbAccount : accounts) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } CBAccount cbAccount = accounts.get(0); - preferredCryptoCurrency = cbAccount.getCurrency(); + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } @@ -165,8 +165,7 @@ public String getCryptoAddress(String cryptoCurrency) { String network = getNetworkName(cryptoCurrency); CBAddress address = null; if (network != null) { - for (int i = 0; i < addresses.size(); i++) { - CBAddress a = addresses.get(i); + for (CBAddress a : addresses) { if (a.getNetwork().equalsIgnoreCase(network)) { address = a; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java index 098a3a014..b165d663f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java @@ -28,7 +28,7 @@ public class CBAccount implements CBPaginatedItem { private boolean primary; private boolean ready; private String type; - private String currency; + private CBCurrency currency; private CBBalance balance; private CBBalance native_balance; @@ -127,11 +127,11 @@ public void setType(String type) { this.type = type; } - public String getCurrency() { + public CBCurrency getCurrency() { return currency; } - public void setCurrency(String currency) { + public void setCurrency(CBCurrency currency) { this.currency = currency; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java new file mode 100644 index 000000000..802be2842 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java @@ -0,0 +1,78 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.coinbase.v2.dto; + +public class CBCurrency { + private String code; + private String name; + private String color; + private Integer exponent; + private String type; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public Integer getExponent() { + return exponent; + } + + public void setExponent(Integer exponent) { + this.exponent = exponent; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public String toString() { + return "CBCurrency{" + + "code=" + getCode() + + ", name='" + getName() + "'" + + ", color='" + getColor() + "'" + + ", exponent='" + getExponent() + "'" + + ", type='" + getType() + "'" + + '}'; + } +} From cdb69bffa51859b67758e6b87331cedf611b07dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:23:38 +0100 Subject: [PATCH 31/82] BATM-5625: fix Coinbase Wallet response (#861) --- gradle.properties | 2 +- .../wallets/coinbase/v2/CoinbaseWalletV2.java | 17 ++-- .../wallets/coinbase/v2/dto/CBAccount.java | 6 +- .../wallets/coinbase/v2/dto/CBCurrency.java | 78 +++++++++++++++++++ 4 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java diff --git a/gradle.properties b/gradle.properties index 59c7948da..8a29fa766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.16 +projectVersion=1.1.16.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java index cb8d0d37d..a41f4c6c4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/CoinbaseWalletV2.java @@ -118,8 +118,8 @@ private String getAccountId(String accountName, String cryptoCurrency) { if (accountName != null) { for (CBAccount cbAccount : accounts) { if (accountName.equalsIgnoreCase(cbAccount.getName())) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } @@ -127,22 +127,22 @@ private String getAccountId(String accountName, String cryptoCurrency) { } else { for (CBAccount cbAccount : accounts) { if (cbAccount.isPrimary()) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } } } for (CBAccount cbAccount : accounts) { - if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency())) { - preferredCryptoCurrency = cbAccount.getCurrency(); + if (cryptoCurrency.equalsIgnoreCase(cbAccount.getCurrency().getCode())) { + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } } CBAccount cbAccount = accounts.get(0); - preferredCryptoCurrency = cbAccount.getCurrency(); + preferredCryptoCurrency = cbAccount.getCurrency().getCode(); return cbAccount.getId(); } @@ -165,8 +165,7 @@ public String getCryptoAddress(String cryptoCurrency) { String network = getNetworkName(cryptoCurrency); CBAddress address = null; if (network != null) { - for (int i = 0; i < addresses.size(); i++) { - CBAddress a = addresses.get(i); + for (CBAddress a : addresses) { if (a.getNetwork().equalsIgnoreCase(network)) { address = a; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java index 098a3a014..b165d663f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBAccount.java @@ -28,7 +28,7 @@ public class CBAccount implements CBPaginatedItem { private boolean primary; private boolean ready; private String type; - private String currency; + private CBCurrency currency; private CBBalance balance; private CBBalance native_balance; @@ -127,11 +127,11 @@ public void setType(String type) { this.type = type; } - public String getCurrency() { + public CBCurrency getCurrency() { return currency; } - public void setCurrency(String currency) { + public void setCurrency(CBCurrency currency) { this.currency = currency; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java new file mode 100644 index 000000000..802be2842 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/coinbase/v2/dto/CBCurrency.java @@ -0,0 +1,78 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.coinbase.v2.dto; + +public class CBCurrency { + private String code; + private String name; + private String color; + private Integer exponent; + private String type; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public Integer getExponent() { + return exponent; + } + + public void setExponent(Integer exponent) { + this.exponent = exponent; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public String toString() { + return "CBCurrency{" + + "code=" + getCode() + + ", name='" + getName() + "'" + + ", color='" + getColor() + "'" + + ", exponent='" + getExponent() + "'" + + ", type='" + getType() + "'" + + '}'; + } +} From 49c114a7e1229dfaa6a4db1b9d8d2f4f81f36d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Wed, 15 Nov 2023 15:44:11 +0100 Subject: [PATCH 32/82] BATM-5625: increase version to 1.2.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8a29fa766..b8e4eb429 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.16.1 +projectVersion=1.2.3 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From bc4d1787a62fba934690db5efca309d49cea37dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Thu, 16 Nov 2023 10:32:17 +0100 Subject: [PATCH 33/82] CF-569: increase version to 1.3.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 591f6bfd6..ea5778e37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.1 +projectVersion=1.3.0 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From f4536422223cb12446304a2c9805d1461055f9fb Mon Sep 17 00:00:00 2001 From: kkyovsky Date: Mon, 20 Nov 2023 23:53:34 +0100 Subject: [PATCH 34/82] BATM-5644 - Create template module for customers to develop their extensions --- .../extensions/ITransactionListener.java | 2 +- server_extensions_template/build.gradle | 33 +++++++++++++++++++ .../myfirstextension/MyFirstExtension.java | 18 ++++++++++ .../MyTransactionListener.java | 27 +++++++++++++++ .../src/main/resources/batm-extensions.xml | 4 +++ settings.gradle | 1 + 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 server_extensions_template/build.gradle create mode 100644 server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java create mode 100644 server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java create mode 100644 server_extensions_template/src/main/resources/batm-extensions.xml diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index 535f7bb35..385a3bc06 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -49,7 +49,7 @@ default ITransactionPreparation overrideTransactionPreparation(ITransactionPrepa /** * Callback method that is called by server before transaction is executed - however the cash is already inserted in machine in case of buy transaction. - * If your method returns false than transaction will not take place and will fail with error ERROR_NOT_APPROVED. + * If your method returns false than transaction will< not take place and will fail with error ERROR_NOT_APPROVED. * Try to return from this method in less then 10 seconds. */ default boolean isTransactionApproved(ITransactionRequest transactionRequest) { diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle new file mode 100644 index 000000000..76f878e57 --- /dev/null +++ b/server_extensions_template/build.gradle @@ -0,0 +1,33 @@ +plugins { + id("shared-build-conventions") + id("shared-repositories-ext-conventions") +} + +group = projectGroup +version = projectVersion + +jar { + archiveFileName = "myfirstextension.${archiveExtension.get()}" +} + +configurations { + artifactOnly + + // handle Github (e.g. community) vs GENERAL BYTES dichotomy + generalBytesCompile + githubCompile + if (hasGbArtifactory) { + implementation { extendsFrom generalBytesCompile } + } else { + implementation { extendsFrom githubCompile } + } +} + +artifacts { + artifactOnly jar +} + +dependencies { + implementation project(":server_extensions_api") + implementation project(":currencies") +} \ No newline at end of file diff --git a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java new file mode 100644 index 000000000..1baefc5f7 --- /dev/null +++ b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java @@ -0,0 +1,18 @@ +package com.mygreatcompany.batm.server.extensions.myfirstextension; + +import com.generalbytes.batm.server.extensions.AbstractExtension; +import com.generalbytes.batm.server.extensions.IExtensionContext; + +public class MyFirstExtension extends AbstractExtension { + + @Override + public String getName() { + return "My first extension"; + } + + @Override + public void init(IExtensionContext ctx) { + super.init(ctx); + ctx.addTransactionListener(new MyTransactionListener(ctx)); + } +} diff --git a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java new file mode 100644 index 000000000..a9f053b89 --- /dev/null +++ b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java @@ -0,0 +1,27 @@ +package com.mygreatcompany.batm.server.extensions.myfirstextension; + +import com.generalbytes.batm.server.extensions.IExtensionContext; +import com.generalbytes.batm.server.extensions.ITransactionDetails; +import com.generalbytes.batm.server.extensions.ITransactionListener; + +import java.util.Map; + +public class MyTransactionListener implements ITransactionListener { + private IExtensionContext ctx; + + public MyTransactionListener(IExtensionContext ctx) { + this.ctx = ctx; + } + + @Override + public Map onTransactionCreated(ITransactionDetails transactionDetails) { + System.out.println("Bravo! Transaction has been created! Here are the details: = " + transactionDetails); + return null; + } + + @Override + public Map onTransactionUpdated(ITransactionDetails transactionDetails) { + System.out.println("Hey! Transaction has been updated! Here are the details: " + transactionDetails); + return null; + } +} diff --git a/server_extensions_template/src/main/resources/batm-extensions.xml b/server_extensions_template/src/main/resources/batm-extensions.xml new file mode 100644 index 000000000..07c2d7222 --- /dev/null +++ b/server_extensions_template/src/main/resources/batm-extensions.xml @@ -0,0 +1,4 @@ + + + + diff --git a/settings.gradle b/settings.gradle index 3bb28c1ac..f4227ae8b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ include ':server_extensions_api' include ':server_extensions_extra' include ':server_extensions_test' +include ':server_extensions_template' include ':currencies' include ':batm_ssh_tunnel' include ':operators_sample_website' From 13dde99600beb8a95c95ec08291678dbdd1d36c8 Mon Sep 17 00:00:00 2001 From: kkyovsky Date: Tue, 21 Nov 2023 00:01:55 +0100 Subject: [PATCH 35/82] BATM-5644 - Create template module for customers to develop their extensions --- .../batm/server/extensions/ITransactionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index 385a3bc06..535f7bb35 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -49,7 +49,7 @@ default ITransactionPreparation overrideTransactionPreparation(ITransactionPrepa /** * Callback method that is called by server before transaction is executed - however the cash is already inserted in machine in case of buy transaction. - * If your method returns false than transaction will< not take place and will fail with error ERROR_NOT_APPROVED. + * If your method returns false than transaction will not take place and will fail with error ERROR_NOT_APPROVED. * Try to return from this method in less then 10 seconds. */ default boolean isTransactionApproved(ITransactionRequest transactionRequest) { From b5f0aac8fa02fdcf074347469092ce4d6ec0bf29 Mon Sep 17 00:00:00 2001 From: GENERAL BYTES Date: Tue, 21 Nov 2023 00:18:52 +0100 Subject: [PATCH 36/82] Update README.md --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5471a88f8..85795b7af 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Requirements: * Java **1.8** (we recommend using https://sdkman.io/ for managing multiple JDK versions on your computer) * Gradle -When you implement support for a new crypto-coin, please add it to **server_extensions_extra** - so that it may get into the default CAS installation pack for customers. +When you implement support for a new crypto-coin, please add it to **server_extensions_extra** - so that it may get into the default CAS distribution ready to be used by other operators. Please use the appropriate Fork and Pull Request in the GitHub workflow when adding new functions, and bear in mind that your code will be reviewed prior to any merge with the master. When adding new cryptocurrency support, please remember to provide its logo! This logo will later be downloaded by the BATM from CAS and displayed on the BATM screen. Both SVG and PNG logos are supported; however, only the SVG logo is used on newer BATM versions. A PNG logo is offered only for backward compatibility, and in the few cases where the SVG logo has an unusually large size. @@ -88,6 +88,16 @@ Note that on startup, CAS scans the: /batm/app/master/extensions/ f If you happen to add new cryptocurrency in CryptoCurrency class in currencies module then don't forget to make sure that you copy your version of currencies-1.0.XX-SNAPSHOT.jar to /batm/app/master/lib +Creating your own extension +================= +When you want to develop your own operator specific extension please create a new module and implement your extension there. +Use server_extensions_template module as a termplate for your first extension. Just copy this module and rename it. +You will need to modify also settings.gradle file to contain your new extension module's name. See how is the server_extensions_template module mentioned and add line for your new extension module. +After building the whole project your built extension shoud be in following file: yournewextension/build/libs/yournewextension.jar +Copy it to CAS server at following location: /batm/app/master/extensions/ +You may also want to modify build.gradle in your new module to change at least package names and final output filename. + + How to run Tester ========== ```bash From 389343130d60f65238e2429b7add17660e1debb8 Mon Sep 17 00:00:00 2001 From: kkyovsky Date: Sun, 26 Nov 2023 15:30:01 +0100 Subject: [PATCH 37/82] BATM-5644 - added logging into extension template --- server_extensions_template/build.gradle | 1 + .../extensions/myfirstextension/MyFirstExtension.java | 7 +++++++ .../myfirstextension/MyTransactionListener.java | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index 76f878e57..b13228751 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -28,6 +28,7 @@ artifacts { } dependencies { + implementation("org.slf4j:slf4j-api:1.7.28") implementation project(":server_extensions_api") implementation project(":currencies") } \ No newline at end of file diff --git a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java index 1baefc5f7..446451dee 100644 --- a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java +++ b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyFirstExtension.java @@ -2,17 +2,24 @@ import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MyFirstExtension extends AbstractExtension { + protected final Logger log = LoggerFactory.getLogger("batm.master.myextension"); + + @Override public String getName() { return "My first extension"; } + @Override public void init(IExtensionContext ctx) { super.init(ctx); + log.debug("MyFirst extension initialized. Adding listener"); ctx.addTransactionListener(new MyTransactionListener(ctx)); } } diff --git a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java index a9f053b89..274645f0c 100644 --- a/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java +++ b/server_extensions_template/src/main/java/com/mygreatcompany/batm/server/extensions/myfirstextension/MyTransactionListener.java @@ -3,11 +3,15 @@ import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.ITransactionDetails; import com.generalbytes.batm.server.extensions.ITransactionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; public class MyTransactionListener implements ITransactionListener { private IExtensionContext ctx; + protected final Logger log = LoggerFactory.getLogger("batm.master.myextension"); + public MyTransactionListener(IExtensionContext ctx) { this.ctx = ctx; @@ -15,13 +19,13 @@ public MyTransactionListener(IExtensionContext ctx) { @Override public Map onTransactionCreated(ITransactionDetails transactionDetails) { - System.out.println("Bravo! Transaction has been created! Here are the details: = " + transactionDetails); + log.info("Bravo! Transaction has been created! Here are the details: = " + transactionDetails); return null; } @Override public Map onTransactionUpdated(ITransactionDetails transactionDetails) { - System.out.println("Hey! Transaction has been updated! Here are the details: " + transactionDetails); + log.info("Hey! Transaction has been updated! Here are the details: " + transactionDetails); return null; } } From 4279acb1e1655342e8d659bf9e4487b2d0efd1a8 Mon Sep 17 00:00:00 2001 From: Nikita Tolstunov Date: Mon, 27 Nov 2023 11:57:26 +0200 Subject: [PATCH 38/82] Stillman Digital LLC integration --- .../extra/bitcoin/BitcoinExtension.java | 11 ++ .../stillmandigital/CurrentTimeFactory.java | 34 ++++ .../stillmandigital/IStillmanDigitalAPI.java | 78 ++++++++ .../StillmanDigitalDigest.java | 60 ++++++ .../StillmanDigitalExchange.java | 183 ++++++++++++++++++ .../stillmandigital/StillmanOrderTask.java | 121 ++++++++++++ .../stillmandigital/dto/BalanceResponse.java | 28 +++ .../stillmandigital/dto/NewOrderResponse.java | 24 +++ .../stillmandigital/dto/OrdType.java | 24 +++ .../stillmandigital/dto/OrderRequest.java | 31 +++ .../stillmandigital/dto/OrderStatus.java | 31 +++ .../exchanges/stillmandigital/dto/Rate.java | 38 ++++ .../stillmandigital/dto/RateRequest.java | 38 ++++ .../dto/RowBalanceByAssetResponse.java | 32 +++ .../stillmandigital/dto/RowOrderResponse.java | 36 ++++ .../exchanges/stillmandigital/dto/Side.java | 23 +++ .../src/main/resources/batm-extensions.xml | 13 ++ .../StillmanDigitalExchangeTest.java | 58 ++++++ 18 files changed, 863 insertions(+) create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/CurrentTimeFactory.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/IStillmanDigitalAPI.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalDigest.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchange.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanOrderTask.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/BalanceResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/NewOrderResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrdType.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderRequest.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderStatus.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Rate.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RateRequest.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowBalanceByAssetResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowOrderResponse.java create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Side.java create mode 100644 server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchangeTest.java diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index 27f0b6d86..1e0096efc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -37,6 +37,7 @@ import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.hitbtc.HitbtcExchange; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.enigma.EnigmaExchange; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.poloniex.PoloniexExchange; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.StillmanDigitalExchange; import com.generalbytes.batm.server.extensions.extra.bitcoin.paymentprocessors.bitcoinpay.BitcoinPayPP; import com.generalbytes.batm.server.extensions.extra.bitcoin.paymentprocessors.coinofsale.CoinOfSalePP; import com.generalbytes.batm.server.extensions.extra.bitcoin.sources.bitkub.BitKubRateSource; @@ -221,6 +222,11 @@ public IExchange createExchange(String paramString) { String apiKey = paramTokenizer.nextToken(); String apiSecret = paramTokenizer.nextToken(); return new BitbuyExchange(apiKey, apiSecret); + } else if ("stillmandigital".equalsIgnoreCase(prefix)) { + String apiKey = paramTokenizer.nextToken(); + String apiSecret = paramTokenizer.nextToken(); + boolean useSandbox = paramTokenizer.hasMoreTokens() && paramTokenizer.nextToken().equals("sandbox"); + return new StillmanDigitalExchange(apiKey, apiSecret, useSandbox); } } } catch (Exception e) { @@ -585,6 +591,11 @@ public IRateSource createRateSource(String sourceLogin) { String apiKey = st.nextToken(); String apiSecret = st.nextToken(); return new BitbuyExchange(apiKey, apiSecret); + } else if ("stillmandigital".equalsIgnoreCase(rsType)) { + String apiKey = st.nextToken(); + String apiSecret = st.nextToken(); + boolean useSandbox = st.hasMoreTokens() && st.nextToken().equals("sandbox"); + return new StillmanDigitalExchange(apiKey, apiSecret, useSandbox); } } } catch (Exception e) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/CurrentTimeFactory.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/CurrentTimeFactory.java new file mode 100644 index 000000000..9332d68cf --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/CurrentTimeFactory.java @@ -0,0 +1,34 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import si.mazi.rescu.SynchronizedValueFactory; + +import java.time.Clock; +import java.util.concurrent.TimeUnit; + +public class CurrentTimeFactory implements SynchronizedValueFactory { + + private static final Clock UTC_CLOCK = Clock.systemUTC(); + + + @Override + public Long createValue() { + return TimeUnit.MILLISECONDS.toSeconds(UTC_CLOCK.millis()); + } +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/IStillmanDigitalAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/IStillmanDigitalAPI.java new file mode 100644 index 000000000..ec0cf83f2 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/IStillmanDigitalAPI.java @@ -0,0 +1,78 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.*; +import com.generalbytes.batm.server.extensions.util.net.RateLimitingInterceptor; +import si.mazi.rescu.ClientConfig; +import si.mazi.rescu.Interceptor; +import si.mazi.rescu.RestProxyFactory; + +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.List; + +@Path("") +@Produces(MediaType.APPLICATION_JSON) +public interface IStillmanDigitalAPI { + + String API_EXPIRES_HEADER = "api-timestamp"; + + static IStillmanDigitalAPI create(String apiKey, String apiSecret, + boolean useSandbox) throws GeneralSecurityException { + return create(apiKey, apiSecret, + useSandbox ? "https://sandbox-api.stillmandigital.com" : "https://api.stillmandigital.com"); + } + + static IStillmanDigitalAPI create(String apiKey, String apiSecret, String baseUrl) throws GeneralSecurityException { + final ClientConfig config = new ClientConfig(); + config.addDefaultParam(HeaderParam.class, "api-key", apiKey); + config.addDefaultParam(HeaderParam.class, API_EXPIRES_HEADER, new CurrentTimeFactory()); + config.addDefaultParam(HeaderParam.class, "api-signature", new StillmanDigitalDigest(apiSecret)); + Interceptor interceptor = new RateLimitingInterceptor(IStillmanDigitalAPI.class, 25, 30_000); + return RestProxyFactory.createProxy(IStillmanDigitalAPI.class, baseUrl, config, interceptor); + } + + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Path("/v1/trading/rate") + Rate requestRate(RateRequest request) throws IOException; + + @GET + @Path("/v1/balances") + List getBalance() throws IOException; + + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Path("/v1/trading/new") + NewOrderResponse sendOrder(OrderRequest orderRequest) throws IOException; + + @GET + @Path("/v1/orders/{id}") + RowOrderResponse getOrder(@PathParam("id") long orderId) throws IOException; + +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalDigest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalDigest.java new file mode 100644 index 000000000..260d6c5fd --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalDigest.java @@ -0,0 +1,60 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import com.generalbytes.batm.server.coinutil.Hex; +import si.mazi.rescu.ParamsDigest; +import si.mazi.rescu.RestInvocation; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.GeneralSecurityException; + +public class StillmanDigitalDigest implements ParamsDigest { + + private static final String HMAC_SHA256_ALGORITHM = "HmacSHA256"; + private static final Charset CHARSET = StandardCharsets.UTF_8; + + private final Mac mac; + + public StillmanDigitalDigest(String apiSecret) throws GeneralSecurityException { + mac = Mac.getInstance(HMAC_SHA256_ALGORITHM); + mac.init(new SecretKeySpec(apiSecret.getBytes(CHARSET), HMAC_SHA256_ALGORITHM)); + } + + public String digestParams(RestInvocation restInvocation) { + // String dataForSign = method + BALANCE_URL_PART + validUntilSeconds + body; + String dataForSign = restInvocation.getHttpMethod() + + restInvocation.getMethodPath() + + restInvocation.getHttpHeadersFromParams().get(IStillmanDigitalAPI.API_EXPIRES_HEADER) + + restInvocation.getRequestBody(); + return signHmacSha256(dataForSign); + } + + private String signHmacSha256(String data) { + byte[] signData = mac.doFinal(data.getBytes(StandardCharsets.UTF_8)); + + return Hex.bytesToHexString(signData); + } +} + + + + diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchange.java new file mode 100644 index 000000000..504f0182e --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchange.java @@ -0,0 +1,183 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import com.generalbytes.batm.common.currencies.CryptoCurrency; +import com.generalbytes.batm.common.currencies.FiatCurrency; +import com.generalbytes.batm.server.extensions.IExchangeAdvanced; +import com.generalbytes.batm.server.extensions.IRateSourceAdvanced; +import com.generalbytes.batm.server.extensions.ITask; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.RateRequest; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.RowBalanceByAssetResponse; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.Side; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.Rate; +import com.google.common.collect.ImmutableSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.math.BigDecimal; +import java.security.GeneralSecurityException; +import java.util.Objects; +import java.util.Set; + +public class StillmanDigitalExchange implements IExchangeAdvanced, IRateSourceAdvanced { + private static final Logger log = LoggerFactory.getLogger("batm.master.exchange.StillmanDigitalExchange"); + public static final String SEPARATOR = "/"; + + private final String preferredFiatCurrency = FiatCurrency.USD.getCode(); + private final IStillmanDigitalAPI api; + + public StillmanDigitalExchange(String apiKey, + String apiSecret, + boolean useSandbox) throws GeneralSecurityException { + this.api = IStillmanDigitalAPI.create(apiKey, apiSecret, useSandbox); + } + + // for tests only + StillmanDigitalExchange(String apiKey, + String apiSecret, + String baseUrl) throws GeneralSecurityException { + this.api = IStillmanDigitalAPI.create(apiKey, apiSecret, baseUrl); + } + + private static final Set fiatCurrencies = ImmutableSet.of( + FiatCurrency.USD.getCode()); + + private static final Set cryptoCurrencies = ImmutableSet.of( + CryptoCurrency.BTC.getCode(), + CryptoCurrency.ETH.getCode()); + + @Override + public Set getCryptoCurrencies() { + return cryptoCurrencies; + } + + @Override + public Set getFiatCurrencies() { + return fiatCurrencies; + } + + @Override + public String getPreferredFiatCurrency() { + return preferredFiatCurrency; + } + + @Override + public BigDecimal getCryptoBalance(String cryptoCurrency) { + try { + for (RowBalanceByAssetResponse assetData : api.getBalance()) { + if (Objects.equals(cryptoCurrency, assetData.asset)) { + // crypto is interesting in terms on how much client can withdraw + return assetData.total; + } + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } + + @Override + public BigDecimal getFiatBalance(String fiatCurrency) { + try { + for (RowBalanceByAssetResponse assetData : api.getBalance()) { + if (Objects.equals(fiatCurrency, assetData.asset)) { + // fiat is interesting in terms on how much client can spent to buy crypto, due this just FREE + return assetData.free; + } + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } + + @Override + public String sendCoins(String destinationAddress, + BigDecimal amount, String cryptoCurrency, String description) { + return "Plz contact your manager for withdraw"; + } + + @Override + public String getDepositAddress(String cryptoCurrency) { + return null; + } + + @Override + public ITask createPurchaseCoinsTask(BigDecimal amount, String cryptoCurrency, String fiatCurrencyToUse, String description) { + return new StillmanOrderTask(api, Side.BUY, cryptoCurrency + SEPARATOR + fiatCurrencyToUse, amount, log); + } + + @Override + public ITask createSellCoinsTask(BigDecimal amount, String cryptoCurrency, String fiatCurrencyToUse, String description) { + return new StillmanOrderTask(api, Side.SELL, cryptoCurrency + SEPARATOR + fiatCurrencyToUse, amount, log); + } + + @Override + public BigDecimal getExchangeRateForBuy(String cryptoCurrency, String fiatCurrency) { + try { + Rate rate = api.requestRate(new RateRequest(cryptoCurrency + SEPARATOR + fiatCurrency)); + if (rate != null) { + return rate.buyRate; + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } + + @Override + public BigDecimal getExchangeRateForSell(String cryptoCurrency, String fiatCurrency) { + try { + Rate rate = api.requestRate(new RateRequest(cryptoCurrency + SEPARATOR + fiatCurrency)); + if (rate != null) { + return rate.sellRate; + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } + + @Override + public BigDecimal calculateBuyPrice(String cryptoCurrency, String fiatCurrency, BigDecimal cryptoAmount) { + try { + Rate rate = api.requestRate(new RateRequest(cryptoCurrency + SEPARATOR + fiatCurrency, cryptoAmount)); + if (rate != null && rate.buyRate != null) { + return rate.buyRate; + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } + + @Override + public BigDecimal calculateSellPrice(String cryptoCurrency, String fiatCurrency, BigDecimal cryptoAmount) { + try { + Rate rate = api.requestRate(new RateRequest(cryptoCurrency + SEPARATOR + fiatCurrency, cryptoAmount)); + if (rate != null && rate.sellRate != null) { + return rate.sellRate; + } + } catch (IOException e) { + log.error("Error", e); + } + return null; + } +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanOrderTask.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanOrderTask.java new file mode 100644 index 000000000..ff8bf35f3 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanOrderTask.java @@ -0,0 +1,121 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import com.generalbytes.batm.server.extensions.ITask; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.OrderRequest; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.OrderStatus; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.RowOrderResponse; +import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto.Side; +import org.slf4j.Logger; + +import java.io.IOException; +import java.math.BigDecimal; +import java.util.concurrent.ThreadLocalRandom; + +public class StillmanOrderTask implements ITask { + + private final IStillmanDigitalAPI api; + private final OrderRequest request; + private final Logger log; + + private boolean failed; + private OrderStatus result; + private long orderId; + + public StillmanOrderTask(IStillmanDigitalAPI api, Side side, String symbol, BigDecimal qty, Logger log) { + this.log = log; + this.api = api; + request = new OrderRequest(); + request.side = side; + request.pairName = symbol; + request.requestAmount = qty; + request.clOrdId = "GB_" + ThreadLocalRandom.current().nextInt(0, 1_000_000); + } + + @Override + public boolean onCreate() { + try { + orderId = api.sendOrder(request).orderId; + } catch (IOException e) { + log.error("Create order task failed", e); + failed = true; + result = OrderStatus.UNKNOWN; + return false; + } + return true; + } + + @Override + public boolean onDoStep() { + RowOrderResponse orderResponse; + try { + orderResponse = api.getOrder(orderId); + } catch (IOException e) { + log.error("Get order failed, try next time", e); + return false; + } + switch (orderResponse.status) { + case ACTIVE: + case PARTIALLY_FILLED: { + log.debug("Order is still active {}", orderResponse); + return false; + } + + case REJECTED: { + result = orderResponse.status; + failed = true; + return true; + } + case CANCELED: + case CANCEL: + case FILLED: + case PARTIALLY_FILLED_CANCELED: { + result = orderResponse.status; + return true; + } + } + + return false; + } + + @Override + public void onFinish() { + + } + + @Override + public boolean isFinished() { + return result != null; + } + + @Override + public Object getResult() { + return result.toString(); + } + + @Override + public boolean isFailed() { + return failed; + } + + @Override + public long getShortestTimeForNexStepInvocation() { + return 5 * 1000; + } +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/BalanceResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/BalanceResponse.java new file mode 100644 index 000000000..f5c8ce115 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/BalanceResponse.java @@ -0,0 +1,28 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +import java.util.List; + +public class BalanceResponse { + + public String account; + + public List data; + +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/NewOrderResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/NewOrderResponse.java new file mode 100644 index 000000000..b2dbfa600 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/NewOrderResponse.java @@ -0,0 +1,24 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + + +public class NewOrderResponse { + + public long orderId; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrdType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrdType.java new file mode 100644 index 000000000..b980eb3e0 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrdType.java @@ -0,0 +1,24 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +public enum OrdType { + + MARKET + +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderRequest.java new file mode 100644 index 000000000..aed503040 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderRequest.java @@ -0,0 +1,31 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +import java.math.BigDecimal; + +public class OrderRequest { + + public Side side; + + public String pairName; + + public String clOrdId; + + public BigDecimal requestAmount; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderStatus.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderStatus.java new file mode 100644 index 000000000..513e1738c --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/OrderStatus.java @@ -0,0 +1,31 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +public enum OrderStatus { + ACTIVE, + CANCEL, + CANCELED, + EXPIRED, + FILLED, + PARTIALLY_FILLED, + PARTIALLY_FILLED_CANCELED, + REPLACED, + REJECTED, + UNKNOWN; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Rate.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Rate.java new file mode 100644 index 000000000..a841204fa --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Rate.java @@ -0,0 +1,38 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +import java.math.BigDecimal; + +public class Rate { + + public String pairName; + + public BigDecimal buyQuantity; + + public BigDecimal buyRate; + + public BigDecimal buyTotal; + + public BigDecimal sellQuantity; + + public BigDecimal sellRate; + + public BigDecimal sellTotal; + +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RateRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RateRequest.java new file mode 100644 index 000000000..939dcb68c --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RateRequest.java @@ -0,0 +1,38 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +import java.math.BigDecimal; + +public class RateRequest { + + public RateRequest(String pairName) { + this(pairName, BigDecimal.ZERO); + } + + public RateRequest(String pairName, BigDecimal requestAmount) { + this.pairName = pairName; + this.requestAmount = requestAmount; + } + + public String pairName; + + public Boolean requestInBaseAsset = true; + + public BigDecimal requestAmount; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowBalanceByAssetResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowBalanceByAssetResponse.java new file mode 100644 index 000000000..5329ddebb --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowBalanceByAssetResponse.java @@ -0,0 +1,32 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +import java.math.BigDecimal; + +public class RowBalanceByAssetResponse { + + public String asset; + + public BigDecimal total; + + public BigDecimal free; + + public BigDecimal credit; + +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowOrderResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowOrderResponse.java new file mode 100644 index 000000000..c2e818884 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/RowOrderResponse.java @@ -0,0 +1,36 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + + +import java.math.BigDecimal; + +public class RowOrderResponse { + + public long orderId; + public String pairName; + public Side side; + public BigDecimal price; + public OrdType ordType; + public BigDecimal quantity; + public BigDecimal filledQty; + public BigDecimal avgPrice; + public BigDecimal volume; + + public OrderStatus status; +} diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Side.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Side.java new file mode 100644 index 000000000..972f2f8b1 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/dto/Side.java @@ -0,0 +1,23 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital.dto; + +public enum Side { + BUY, + SELL +} diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index f50640f75..bf704461a 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -815,6 +815,19 @@ ETH LTC + + + + BTC + ETH + https://www.stillmandigital.com + + + + + BTC + ETH + diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchangeTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchangeTest.java new file mode 100644 index 000000000..17fe7511a --- /dev/null +++ b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/stillmandigital/StillmanDigitalExchangeTest.java @@ -0,0 +1,58 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.stillmandigital; + +import com.generalbytes.batm.server.extensions.ITask; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +import java.math.BigDecimal; +import java.security.GeneralSecurityException; + +import static org.junit.Assert.assertNotNull; + +@Ignore // requires online resources - for manual run only +public class StillmanDigitalExchangeTest { + private static final String PUBLIC_KEY = "9QU20A1IO3QN2L6ND90JBG80"; + private static final String PRIVATE_KEY = "A2CBOQMJKJ69O59ZC9SKVY58M9NCNQQXEOF9W1Y0DSF56GBI"; + private static final String BASE_URL = "https://sandbox-api.stillmandigital.com"; + + private static StillmanDigitalExchange exchange; + + @BeforeClass + public static void createExchange() throws GeneralSecurityException { + exchange = new StillmanDigitalExchange(PUBLIC_KEY, PRIVATE_KEY, BASE_URL); + } + + @Test + public void getFiatBalanceTest() { + System.out.println("USD balance: " + exchange.getFiatBalance("USD")); + } + + @Test + public void getCryptoBalanceTest() { + System.out.println("Crypto balance: " + exchange.getFiatBalance("BTC")); + } + + @Test + public void getRatesTest() { + System.out.println("Buy rate: " + exchange.getExchangeRateForBuy("BTC", "USD")); + System.out.println("Sell rate: " + exchange.getExchangeRateForSell("BTC", "USD")); + System.out.println("Buy rate for 1 BTC: " + exchange.calculateBuyPrice("BTC", "USD", BigDecimal.ONE)); + System.out.println("Sell rate for 1 BTC: " + exchange.calculateSellPrice("BTC", "USD", BigDecimal.ONE)); + } + + + @Test + public void createOrderTest() throws InterruptedException { + ITask task = exchange.createPurchaseCoinsTask(BigDecimal.valueOf(0.01), "BTC", "USD", null); + task.onCreate(); + for (int i = 0; i < 10 && !task.isFinished(); i++) { + Thread.sleep(1000L); + task.onDoStep(); + } + assertNotNull(task.getResult()); + System.out.println("Task result: " + task.getResult()); + } + + +} From f70f7a89ac6bfdaf5bb09bbf0f8c4945da0c0867 Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 16:37:04 +0100 Subject: [PATCH 39/82] BATM-5013 - LND sendpayment should contain remote transaction id - Fix --- .../extra/lightningbitcoin/wallets/lnd/dto/Payment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java index f14ef05fe..d8f788596 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java @@ -64,8 +64,8 @@ public String toString() { @Override public String toString() { String rid = ""; - if (dest_custom_records != null && !dest_custom_records.containsKey(1L)) { - rid = new String(dest_custom_records.get(1L), StandardCharsets.UTF_8); + if (dest_custom_records != null && !dest_custom_records.containsKey(70000L)) { + rid = new String(dest_custom_records.get(70000L), StandardCharsets.UTF_8); } return "Payment{" + amt + " sat, fee limit: " + fee_limit + " to " + payment_request + ", rid: " + rid + '}'; } From fd00b56b85c801e007c7fb9a5b61755242a92e68 Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 22:44:34 +0100 Subject: [PATCH 40/82] BATM-5013 - LND sendpayment should contain remote transaction id - Fix getCustomRecords --- .../extra/lightningbitcoin/wallets/lnd/LndWallet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java index 0471730ec..e99966b48 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java @@ -116,7 +116,7 @@ private Payment.FeeLimit getFeeLimit(String fee) { private static Map getCustomRecords(String description) { Map customRecords = new HashMap<>(); if (description != null && !description.trim().isEmpty()) { - customRecords.put(1L, description.getBytes()); + customRecords.put(70000L, description.getBytes()); } return customRecords; } From 6cb2ffaef27b6b15dc102d5f0b356c4ea6c179ff Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 16:37:04 +0100 Subject: [PATCH 41/82] BATM-5013 - LND sendpayment should contain remote transaction id - Fix --- .../extra/lightningbitcoin/wallets/lnd/dto/Payment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java index f14ef05fe..d8f788596 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java @@ -64,8 +64,8 @@ public String toString() { @Override public String toString() { String rid = ""; - if (dest_custom_records != null && !dest_custom_records.containsKey(1L)) { - rid = new String(dest_custom_records.get(1L), StandardCharsets.UTF_8); + if (dest_custom_records != null && !dest_custom_records.containsKey(70000L)) { + rid = new String(dest_custom_records.get(70000L), StandardCharsets.UTF_8); } return "Payment{" + amt + " sat, fee limit: " + fee_limit + " to " + payment_request + ", rid: " + rid + '}'; } From 93bd0c9eef811efd2c951b96124e28537c0528b3 Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 22:44:34 +0100 Subject: [PATCH 42/82] BATM-5013 - LND sendpayment should contain remote transaction id - Fix getCustomRecords --- .../extra/lightningbitcoin/wallets/lnd/LndWallet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java index 0471730ec..e99966b48 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java @@ -116,7 +116,7 @@ private Payment.FeeLimit getFeeLimit(String fee) { private static Map getCustomRecords(String description) { Map customRecords = new HashMap<>(); if (description != null && !description.trim().isEmpty()) { - customRecords.put(1L, description.getBytes()); + customRecords.put(70000L, description.getBytes()); } return customRecords; } From d952ba6ea16375f70ea1af27b2f5172f82711c1d Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Wed, 29 Nov 2023 13:21:23 +0100 Subject: [PATCH 43/82] BATM-5013 - BATM-5013 - LND sendpayment should contain remote transaction id --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b8e4eb429..b9cd86a25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.3 +projectVersion=1.2.4 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 1b6032602dce7050bc8e817d5b5c05e33dc5880f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Mon, 18 Dec 2023 11:24:53 +0100 Subject: [PATCH 44/82] increase project version to 1.4.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ea5778e37..600d41760 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.0 +projectVersion=1.4.0 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From a8d1b1fe5d00c06514f2a592766b613be7dadc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 19 Dec 2023 10:47:33 +0100 Subject: [PATCH 45/82] BATM-5515: added DATE Custom Field BATM-5699: added quiz results --- gradle.properties | 2 +- gradle/verification-metadata.xml | 50 +++++++++-------- .../extensions/ITransactionRequest.java | 12 +++- .../CustomFieldDefinitionType.java | 8 ++- .../value/LocalDateCustomFieldValue.java | 20 +++++++ .../extensions/quiz/QuestionAnswer.java | 53 ++++++++++++++++++ .../server/extensions/quiz/QuizResult.java | 55 +++++++++++++++++++ .../CustomFieldDefinitionTypeTest.java | 1 + 8 files changed, 172 insertions(+), 29 deletions(-) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/value/LocalDateCustomFieldValue.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java diff --git a/gradle.properties b/gradle.properties index b9cd86a25..8ce96390f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.4 +projectVersion=1.3.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 068423da7..b437247e2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -36,9 +36,9 @@ - - - + + + @@ -74,11 +74,6 @@ - - - - - @@ -103,6 +98,11 @@ + + + + + @@ -111,11 +111,6 @@ - - - - - @@ -124,15 +119,10 @@ - - - - - - - - - + + + + @@ -142,6 +132,16 @@ + + + + + + + + + + @@ -1132,7 +1132,9 @@ - + + + @@ -1655,7 +1657,7 @@ - + diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java index ac4fb8d2c..050e9cfdf 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java @@ -17,8 +17,11 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions; +import com.generalbytes.batm.server.extensions.quiz.QuizResult; + import java.math.BigDecimal; import java.util.Date; +import java.util.List; public interface ITransactionRequest { @@ -156,8 +159,11 @@ public interface ITransactionRequest { */ BigDecimal getDiscountQuotient(); - - - + /** + * Returns quiz results if any quiz has been activated. + * + * @return List of {@link QuizResult}. Can be null. + */ + List getQuizResults(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionType.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionType.java index 43aea7dcc..30f42355a 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionType.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionType.java @@ -4,6 +4,7 @@ import com.generalbytes.batm.server.extensions.customfields.value.ChoiceCustomFieldValue; import com.generalbytes.batm.server.extensions.customfields.value.CustomFieldValue; import com.generalbytes.batm.server.extensions.customfields.value.FileCustomFieldValue; +import com.generalbytes.batm.server.extensions.customfields.value.LocalDateCustomFieldValue; import com.generalbytes.batm.server.extensions.customfields.value.StringCustomFieldValue; /** @@ -39,7 +40,12 @@ public enum CustomFieldDefinitionType { /** * Document scan or other file */ - DOCUMENT(FileCustomFieldValue.class); + DOCUMENT(FileCustomFieldValue.class), + /** + * A date value. + * Presented as date picker. + */ + DATE(LocalDateCustomFieldValue.class); private final Class allowedValueType; diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/value/LocalDateCustomFieldValue.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/value/LocalDateCustomFieldValue.java new file mode 100644 index 000000000..f3db23c11 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/customfields/value/LocalDateCustomFieldValue.java @@ -0,0 +1,20 @@ +package com.generalbytes.batm.server.extensions.customfields.value; + +import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinitionType; + +import java.time.LocalDate; + +/** + * used with {@link CustomFieldDefinitionType#DATE} + */ +public class LocalDateCustomFieldValue implements CustomFieldValue { + private final LocalDate localDateValue; + + public LocalDateCustomFieldValue(LocalDate localDateValue) { + this.localDateValue = localDateValue; + } + + public LocalDate getLocalDateValue() { + return localDateValue; + } +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java new file mode 100644 index 000000000..02c8bbcdf --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java @@ -0,0 +1,53 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.quiz; + +/** + * An object representing the question and answer data in the {@link QuizResult}. + */ +public class QuestionAnswer { + + private String question; + + private String answer; + + public QuestionAnswer() { + + } + + public QuestionAnswer(String question, String answer) { + this.question = question; + this.answer = answer; + } + + public String getQuestion() { + return question; + } + + public void setQuestion(String question) { + this.question = question; + } + + public String getAnswer() { + return answer; + } + + public void setAnswer(String answer) { + this.answer = answer; + } +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java new file mode 100644 index 000000000..623e6c913 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java @@ -0,0 +1,55 @@ +/************************************************************************************* + * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions.quiz; + +import java.util.List; + +/** + * An object representing data about quiz result. + */ +public class QuizResult { + + private String quizName; + + private List answers; + + public QuizResult() { + + } + + public QuizResult(String quizName, List answers) { + this.quizName = quizName; + this.answers = answers; + } + + public String getQuizName() { + return quizName; + } + + public void setQuizName(String quizName) { + this.quizName = quizName; + } + + public List getAnswers() { + return answers; + } + + public void setAnswers(List answers) { + this.answers = answers; + } +} diff --git a/server_extensions_api/src/test/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionTypeTest.java b/server_extensions_api/src/test/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionTypeTest.java index c92ada66a..2da70f720 100644 --- a/server_extensions_api/src/test/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionTypeTest.java +++ b/server_extensions_api/src/test/java/com/generalbytes/batm/server/extensions/customfields/CustomFieldDefinitionTypeTest.java @@ -18,5 +18,6 @@ public void isValueTypeAllowed() { assertFalse(CustomFieldDefinitionType.CHECKBOX.isValueTypeAllowed(str.getClass())); assertFalse(CustomFieldDefinitionType.IMAGE.isValueTypeAllowed(str.getClass())); assertFalse(CustomFieldDefinitionType.DOCUMENT.isValueTypeAllowed(str.getClass())); + assertFalse(CustomFieldDefinitionType.DATE.isValueTypeAllowed(str.getClass())); } } \ No newline at end of file From 12345a5f75c8d965d362a23978a652e123285b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:16:03 +0100 Subject: [PATCH 46/82] BATM-5730: sending Custom Field ID to extension (#879) --- gradle.properties | 2 +- .../extensions/quiz/QuestionAnswer.java | 35 ++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8ce96390f..3a639c976 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.1 +projectVersion=1.3.2 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java index 02c8bbcdf..d80f8236b 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java @@ -17,24 +17,49 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.quiz; +import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinition; +import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinitionType; + /** * An object representing the question and answer data in the {@link QuizResult}. */ public class QuestionAnswer { + /** + * ID of {@link CustomFieldDefinition} representing a question. + * May be null if the Custom Field has been deleted on the server. + */ + private Long customFieldDefinitionId; + private String question; + /** + * ID of {@link CustomFieldDefinition.Element} representing an answer for a type {@link CustomFieldDefinitionType#DROPDOWN} and {@link CustomFieldDefinitionType#RADIO_BTN}. + * May be null if it is not one of the above types or if the Custom Field Element has been deleted on the server. + */ + private Long customFieldElementId; + private String answer; public QuestionAnswer() { } - public QuestionAnswer(String question, String answer) { + public QuestionAnswer(Long customFieldDefinitionId, String question, Long customFieldElementId, String answer) { + this.customFieldDefinitionId = customFieldDefinitionId; this.question = question; + this.customFieldElementId = customFieldElementId; this.answer = answer; } + public Long getCustomFieldDefinitionId() { + return customFieldDefinitionId; + } + + public void setCustomFieldDefinitionId(Long customFieldDefinitionId) { + this.customFieldDefinitionId = customFieldDefinitionId; + } + public String getQuestion() { return question; } @@ -43,6 +68,14 @@ public void setQuestion(String question) { this.question = question; } + public Long getCustomFieldElementId() { + return customFieldElementId; + } + + public void setCustomFieldElementId(Long customFieldElementId) { + this.customFieldElementId = customFieldElementId; + } + public String getAnswer() { return answer; } From 802ef4488179f1255840b004a7dfa83e82cd3608 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Fri, 22 Dec 2023 09:09:35 +0100 Subject: [PATCH 47/82] BATM-5742 added overrideTransactionRequest method to the API (#881) --- gradle.properties | 2 +- .../server/extensions/ITransactionListener.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3a639c976..b78ef29cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.2 +projectVersion=1.3.3 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index 535f7bb35..e17d7cca3 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -47,6 +47,20 @@ default ITransactionPreparation overrideTransactionPreparation(ITransactionPrepa return preparation; } + /** + * Allows the operator to override following values in {@link ITransactionRequest}. + *
    + *
  • cryptoAmount
    • + *
+ * This method is called for both BUY and SELL transactions. + * + * @param request The transaction request initialized by server + * @return {@link ITransactionRequest} that may contain modified transaction request. + */ + default ITransactionRequest overrideTransactionRequest(ITransactionRequest request) { + return request; + } + /** * Callback method that is called by server before transaction is executed - however the cash is already inserted in machine in case of buy transaction. * If your method returns false than transaction will not take place and will fail with error ERROR_NOT_APPROVED. From 716fb0ddc6ee1f0743347c68fb5c8f80955ebb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Mon, 8 Jan 2024 14:58:32 +0100 Subject: [PATCH 48/82] BATM-5722: added Quiz Results to ITransactionPreparation (#884) --- gradle.properties | 2 +- .../server/extensions/ITransactionPreparation.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b78ef29cc..c93eee36a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.3 +projectVersion=1.3.4 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java index 2cd452180..92424eaa2 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -18,8 +18,11 @@ package com.generalbytes.batm.server.extensions; +import com.generalbytes.batm.server.extensions.quiz.QuizResult; + import java.math.BigDecimal; import java.util.Date; +import java.util.List; import java.util.Map; public interface ITransactionPreparation { @@ -201,5 +204,11 @@ public interface ITransactionPreparation { */ void setWithdrawalReason(int reason); + /** + * Returns quiz results if any quiz has been activated. + * + * @return List of {@link QuizResult}. Can be null. + */ + List getQuizResults(); } From 29d365e94720827d9fdbb0c113b6f354848a257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Tue, 9 Jan 2024 15:53:17 +0100 Subject: [PATCH 49/82] LC-301 - remove AU- prepend to australian states (#886) --- .../server/extensions/CountryAustralia.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java index cd410361a..a26cbba03 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryAustralia.java @@ -4,19 +4,19 @@ * Australia province identifiers. *

* Usage e.g.: - * CountryAustralia.AU-NSW.getProvinceName() - * CountryAustralia.valueOf("AU-NSW").getProvinceName() + * CountryAustralia.NSW.getProvinceName() + * CountryAustralia.valueOf("NSW").getProvinceName() */ public enum CountryAustralia { - AU_NSW("AU-NSW", "New South Wales"), - AU_QLD("AU-QLD", "Queensland"), - AU_SA("AU-SA", "South Australia"), - AU_TAS("AU-TAS", "Tasmania"), - AU_VIC("AU-VIC", "Victoria"), - AU_WA("AU-WA", "Western Australia"), - AU_ACT("AU-ACT", "Australian Capital Territory"), - AU_NT("AU-NT", "Northern Territory"); + NSW("NSW", "New South Wales"), + QLD("QLD", "Queensland"), + SA("SA", "South Australia"), + TAS("TAS", "Tasmania"), + VIC("VIC", "Victoria"), + WA("WA", "Western Australia"), + ACT("ACT", "Australian Capital Territory"), + NT("NT", "Northern Territory"); private final String iso; From f9a3511c4403a79392b36ebf8e565d288de8ddb4 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 9 Jan 2024 15:54:00 +0100 Subject: [PATCH 50/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8a29fa766..ff3d8a377 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.1.16.1 +projectVersion=1.1.16.2 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From aa966d5a2e77c18dfb5a3d350f226309b0b67f97 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 9 Jan 2024 16:41:32 +0100 Subject: [PATCH 51/82] Increased gradle version from 6.5 to 6.8.2 (#887) --- gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 37 +++++++++++------------ gradlew.bat | 6 +++- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644 GIT binary patch delta 23020 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 delta 19839 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 Date: Wed, 10 Jan 2024 16:11:55 +0100 Subject: [PATCH 52/82] LC-256 - ITransactionSellInfo and ITransactionBuyInfo should include servertime and terminaltime (#857) Co-authored-by: Maros Silady --- .../server/extensions/ITransactionBuyInfo.java | 15 +++++++++++++++ .../server/extensions/ITransactionSellInfo.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionBuyInfo.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionBuyInfo.java index 421df426b..2aace3fa4 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionBuyInfo.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionBuyInfo.java @@ -18,6 +18,7 @@ package com.generalbytes.batm.server.extensions; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; public interface ITransactionBuyInfo { @@ -67,4 +68,18 @@ public interface ITransactionBuyInfo { * @return Custom texts that should be written on the ticket. Custom data are usually generated by ITransactionListener */ Map getCustomData(); + + /** + * Server time of the transaction + * + * @return {@link Date} + */ + Date getServerTime(); + + /** + * Terminal time of the transaction - calculated from the terminal location timezone (you may have terminals across multiple time zones) + * + * @return {@link Date} + */ + Date getTerminalTime(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionSellInfo.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionSellInfo.java index f0f07186c..7be95a45e 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionSellInfo.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionSellInfo.java @@ -18,6 +18,7 @@ package com.generalbytes.batm.server.extensions; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; public interface ITransactionSellInfo { @@ -93,4 +94,18 @@ public interface ITransactionSellInfo { * @return */ Map getCustomData(); + + /** + * Server time of the transaction + * + * @return {@link Date} + */ + Date getServerTime(); + + /** + * Terminal time of the transaction - calculated from the terminal location timezone (you may have terminals across multiple time zones) + * + * @return {@link Date} + */ + Date getTerminalTime(); } From 0d4dd4aab12ef90da140aacf6ac9bf0f40886d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:12:16 +0100 Subject: [PATCH 53/82] LC-257 - IExtensionContext#startVerificationByIdentityId should also return applicantId (#858) Co-authored-by: Maros Silady --- .../generalbytes/batm/server/extensions/IVerificationInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IVerificationInfo.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IVerificationInfo.java index 686430522..dd158e4a6 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IVerificationInfo.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IVerificationInfo.java @@ -4,5 +4,6 @@ public interface IVerificationInfo { boolean isSuccess(); String getErrorMessage(); - + String getApplicantId(); + String getVerificationWebUrl(); } From 91c2f4437f705b221519c4fdb4c7f2262e88b4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:13:23 +0100 Subject: [PATCH 54/82] LC-255 - Discount from fixed fee (#859) Co-authored-by: Maros Silady --- .../batm/server/extensions/DiscountSpec.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/DiscountSpec.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/DiscountSpec.java index a1b58e9cc..2d6865681 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/DiscountSpec.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/DiscountSpec.java @@ -6,6 +6,8 @@ public class DiscountSpec { private BigDecimal buyDiscount; private BigDecimal sellDiscount; + private BigDecimal buyFixedFeeDiscount; + private BigDecimal sellFixedFeeDiscount; private Date validityFrom; private Date validityTill; private Long maximumUsages; @@ -19,6 +21,60 @@ public class DiscountSpec { private String notes; /** + * Creates Discount Specification. + * + * @param buyDiscount + * @param sellDiscount + * @param buyFixedFeeDiscount The percentage discount applied to the fixed fee on purchase transactions + * A value of 10 would represent a 10% discount on the fixed fee for buying. + * @param sellFixedFeeDiscount The percentage discount applied to the fixed fee on sale transactions + * A value of 10 would represent a 10% discount on the fixed fee for selling. + * @param validityFrom + * @param validityTill + * @param maximumUsages + * @param maximumUsagesPerIdentity + * @param minimumTransactionAmount + * @param totalLimit + * @param fiatCurrency in which currency are limit amounts + * @param firstTransactionOnly + * @param code (Optional) Defined code to be used (upper-cased) or null for code to be generated. + * @param linkedIdentityPublicId (Optional) Public ID of an existing identity to be linked to the Discount. + * @param notes (Optional) Notes worth noting. + */ + public DiscountSpec(BigDecimal buyDiscount, + BigDecimal sellDiscount, + BigDecimal buyFixedFeeDiscount, + BigDecimal sellFixedFeeDiscount, + Date validityFrom, + Date validityTill, + Long maximumUsages, + Long maximumUsagesPerIdentity, + BigDecimal minimumTransactionAmount, + BigDecimal totalLimit, + String fiatCurrency, + boolean firstTransactionOnly, + String code, + String linkedIdentityPublicId, + String notes) { + this.buyDiscount = buyDiscount; + this.sellDiscount = sellDiscount; + this.buyFixedFeeDiscount = buyFixedFeeDiscount; + this.sellFixedFeeDiscount = sellFixedFeeDiscount; + this.validityFrom = validityFrom; + this.validityTill = validityTill; + this.maximumUsages = maximumUsages; + this.maximumUsagesPerIdentity = maximumUsagesPerIdentity; + this.minimumTransactionAmount = minimumTransactionAmount; + this.totalLimit = totalLimit; + this.fiatCurrency = fiatCurrency; + this.firstTransactionOnly = firstTransactionOnly; + this.code = code; + this.linkedIdentityPublicId = linkedIdentityPublicId; + this.notes = notes; + } + + /** + * @deprecated Use first constructor instead. * Creates Discount Specification. * * @param buyDiscount @@ -34,7 +90,9 @@ public class DiscountSpec { * @param code (Optional) Defined code to be used (upper-cased) or null for code to be generated. * @param linkedIdentityPublicId (Optional) Public ID of an existing identity to be linked to the Discount. * @param notes (Optional) Notes worth noting. + * */ + @Deprecated public DiscountSpec(BigDecimal buyDiscount, BigDecimal sellDiscount, Date validityFrom, Date validityTill, Long maximumUsages, Long maximumUsagesPerIdentity, BigDecimal minimumTransactionAmount, BigDecimal totalLimit, String fiatCurrency, boolean firstTransactionOnly, String code, String linkedIdentityPublicId, String notes) { this.buyDiscount = buyDiscount; this.sellDiscount = sellDiscount; @@ -67,6 +125,22 @@ public void setSellDiscount(BigDecimal sellDiscount) { this.sellDiscount = sellDiscount; } + public BigDecimal getBuyFixedFeeDiscount() { + return buyFixedFeeDiscount; + } + + public void setBuyFixedFeeDiscount(BigDecimal buyFixedFeeDiscount) { + this.buyFixedFeeDiscount = buyFixedFeeDiscount; + } + + public BigDecimal getSellFixedFeeDiscount() { + return sellFixedFeeDiscount; + } + + public void setSellFixedFeeDiscount(BigDecimal sellFixedFeeDiscount) { + this.sellFixedFeeDiscount = sellFixedFeeDiscount; + } + public Date getValidityFrom() { return validityFrom; } From aaf8c8c02f75b560296adf75bc51be57da21f232 Mon Sep 17 00:00:00 2001 From: b00lean Date: Wed, 10 Jan 2024 16:17:13 +0100 Subject: [PATCH 55/82] BATM-5682 - Extensions examples should be in separate module (#873) Co-authored-by: kkyovsky --- README.md | 8 +++-- server_extensions_examples/build.gradle | 34 +++++++++++++++++++ .../examples/ProfitOverrideExtension.java | 2 +- .../examples/TransactionExtension.java | 3 +- .../ActiveTerminalsExtension.java | 2 +- .../RestServiceActiveTerminals.java | 2 +- .../chat/ChatBotExtensionExample.java | 2 +- .../extensions}/examples/chat/ChatUtils.java | 2 +- .../examples/chat/InfoCommand.java | 2 +- .../examples/chat/LightningCommand.java | 2 +- .../examples/chat/VersionCommand.java | 2 +- ...ExternalCommunicationExampleExtension.java | 2 +- .../communication/NexmoSmsProvider.java | 2 +- .../communication/SmsErrorResponseImpl.java | 2 +- .../communication/SmsResponseImpl.java | 2 +- .../identity/ExampleIdentityListener.java | 2 +- .../ExternalIdentityExampleExtension.java | 2 +- .../identity/IdentityExampleExtension.java | 2 +- .../identity/IdentityExampleIRestService.java | 2 +- .../identity/IdentityExampleRestService.java | 2 +- .../identity/IdentityPieceExample.java | 2 +- .../examples/identity/LimitExample.java | 2 +- .../location/CashCollectionDayExample.java | 2 +- .../location/LocationDetailExample.java | 2 +- .../location/LocationExampleExtension.java | 2 +- .../location/LocationExampleIRestService.java | 2 +- .../location/LocationExampleRestService.java | 2 +- .../examples/location/NoteExample.java | 2 +- .../location/OpeningHoursExample.java | 2 +- .../location/OrganizationExample.java | 2 +- .../examples/location/PersonExample.java | 2 +- .../ExampleNotificationListener.java | 2 +- .../NotificationExampleExtension.java | 4 +-- .../rest/MyExtensionExampleResponse.java | 2 +- .../examples/rest/RESTExampleExtension.java | 2 +- .../examples/rest/RESTServiceExample.java | 2 +- .../rest/SecuredRESTServiceClient.java | 2 +- .../rest/SecuredRESTServiceExample.java | 2 +- .../examples/rest/ServletFilterExample.java | 2 +- .../watchlists/WatchlistExtension.java | 2 +- .../src/main/resources/batm-extensions.xml | 18 ++++++++++ server_extensions_extra/build.gradle | 2 -- .../src/main/resources/batm-extensions.xml | 13 ------- server_extensions_template/build.gradle | 9 ----- settings.gradle | 1 + 45 files changed, 97 insertions(+), 67 deletions(-) create mode 100644 server_extensions_examples/build.gradle rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/ProfitOverrideExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/TransactionExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals}/ActiveTerminalsExtension.java (94%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals}/RestServiceActiveTerminals.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/ChatBotExtensionExample.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/ChatUtils.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/InfoCommand.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/LightningCommand.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/VersionCommand.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/ExternalCommunicationExampleExtension.java (91%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/NexmoSmsProvider.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/SmsErrorResponseImpl.java (90%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/SmsResponseImpl.java (92%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/ExampleIdentityListener.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/ExternalIdentityExampleExtension.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleExtension.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleIRestService.java (93%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleRestService.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityPieceExample.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/LimitExample.java (94%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/CashCollectionDayExample.java (80%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationDetailExample.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleExtension.java (92%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleIRestService.java (82%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleRestService.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/NoteExample.java (93%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/OpeningHoursExample.java (89%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/OrganizationExample.java (81%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/PersonExample.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/notification/ExampleNotificationListener.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/notification/NotificationExampleExtension.java (87%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/MyExtensionExampleResponse.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/RESTExampleExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/RESTServiceExample.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/SecuredRESTServiceClient.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/SecuredRESTServiceExample.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/ServletFilterExample.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples}/watchlists/WatchlistExtension.java (97%) create mode 100644 server_extensions_examples/src/main/resources/batm-extensions.xml diff --git a/README.md b/README.md index 85795b7af..00707147d 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ CAS then parses any "batm-extensions.xml" found in the JAR file to enumerate the Extension is a high level component - something like a plugin - that encapsulates and instantiates the rest of the features. -Extension can be asked to provide wallet X for currency Y etc. The best way to learn more about extensions is to read the sample code and examine how other people have implemented support for their wallet or cryptocurrency in the server_extensions_extra module. Additional examples can be found here. +Extension can be asked to provide wallet X for currency Y etc. The best way to learn more about extensions is to read the sample code and examine how other people have implemented support for their wallet or cryptocurrency in the server_extensions_extra module. Additional examples can be found here. Here is the list of some functionality that can be extended using Extensions API: * **Implement support for different cryptocurrency wallets** - for more information, see the IWallet interface. @@ -43,14 +43,16 @@ Here is the list of some functionality that can be extended using Extensions API * **Send emails or SMSes from extension** - To notify your customer via SMS or email with custom messages, call the methods exposed by the IExtensionContext interface. * **ExtensionContext** is your main entrypoint for interacting with CAS. ExtensionContext may be called from any extension. A reference to ExtensionContext is passed to an Extension when the **init** method is called by CAS on any Extension. Please make sure you read all of the methods that are available on the IExtensionContext interface. There are, for example: cash related operations, sell functionality, and more! -* **Implement RESTful services** - facilitates integration of the Server with a 3rd party system. Extensions enable you to quickly and easily create a RESTful service that sends/receives data via JSON and HTTPS. Do you want your website to contact CAS to find the current exchange rate on your BATM (or even more complicated functions)? Use IRestService for that. A simple example that returns your current CAS version can be found here. -* **Implement ChatBot commands** - Do you need to execute some tasks on server by sending message to server via Telegram Messenger? Simply implement Telegram your command and you are ready to go. A simple example that returns your current CAS version can be found here. +* **Implement RESTful services** - facilitates integration of the Server with a 3rd party system. Extensions enable you to quickly and easily create a RESTful service that sends/receives data via JSON and HTTPS. Do you want your website to contact CAS to find the current exchange rate on your BATM (or even more complicated functions)? Use IRestService for that. A simple example that returns your current CAS version can be found here. +* **Implement ChatBot commands** - Do you need to execute some tasks on server by sending message to server via Telegram Messenger? Simply implement Telegram your command and you are ready to go. A simple example that returns your current CAS version can be found here. Content ======= * **server_extensions_api** - contains the extension API that all extensions use to extend CAS' functionality. * **server_extensions_extra** - reference extension implementation that demonstrates BTC, LTC, CLOAK, DGB, DASH, HATCH, POT, VIA, BTX, SYS, FLASH, DOGE, NLG, ICG, NBT, GRS, MAX, BSD, MEC, BTDX, NANO, SUM, BURST, ECA, LINDA, $PAC, DAI, MKR, BTBS, GQ, VERUM, MUE, BAT and REP coin support functionality. +* **server_extensions_examples** - contains example implementations of various extensions. +* **server_extensions_template** - contains template for developer's own extension. * **server_extensions_test** - contains tester for testing the extensions (CAS not required). * **operators_sample_website** - The OSW is a sample web application that demonstrates how operators can enable their customers initiate sell transactions online via operator's website and later visit two-way BATMThree or BATMFour ATM when cash is ready for withdrawal. For more detailed information see description.

` diff --git a/server_extensions_examples/build.gradle b/server_extensions_examples/build.gradle new file mode 100644 index 000000000..275a5bf6b --- /dev/null +++ b/server_extensions_examples/build.gradle @@ -0,0 +1,34 @@ +plugins { + id("shared-build-conventions") + id("shared-repositories-ext-conventions") +} + +group = projectGroup +version = projectVersion + +jar { + archiveFileName = "batm_server_extensions_examples.${archiveExtension.get()}" +} + +configurations { + artifactOnly +} + +artifacts { + artifactOnly jar +} + +dependencies { + implementation("org.slf4j:slf4j-api:1.7.28") //for logging + implementation("javax.ws.rs:javax.ws.rs-api:2.1") //for REST services + implementation("javax.servlet:javax.servlet-api:3.1.0") //for REST services + implementation("com.github.mmazi:rescu:2.1.0") //for REST client + implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis + implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.0") //JSON serialization + implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0") //JSON serialization + implementation("com.fasterxml.jackson.core:jackson-core:2.12.0") //JSON serialization + implementation("com.nexmo:client:5.5.0") // sms provider + + implementation project(":server_extensions_api") + implementation project(":currencies") +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java index 6bb423feb..47a3b22c0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples; +package com.generalbytes.batm.server.extensions.examples; import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.AbstractExtension; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java index c0c91e4c0..f3a073c30 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java @@ -15,14 +15,13 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples; +package com.generalbytes.batm.server.extensions.examples; import com.generalbytes.batm.server.extensions.*; import com.generalbytes.batm.server.extensions.exceptions.UpdateException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigDecimal; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java similarity index 94% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java index 4a4dd5a47..fb8e3a7f2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.activeTerminals; +package com.generalbytes.batm.server.extensions.examples.activeterminals; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java index 0ff8dd65d..66158ed2b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.activeTerminals; +package com.generalbytes.batm.server.extensions.examples.activeterminals; import com.generalbytes.batm.server.extensions.ApiAccessType; import com.generalbytes.batm.server.extensions.IApiAccess; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java index 5277fb023..5741400de 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.AbstractExtension; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java index 76850544f..81680d253 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java index aaa4d186e..fc22f8e84 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IBanknoteCounts; import com.generalbytes.batm.server.extensions.ICryptoConfiguration; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java index dd3a1f76d..4d86adaf2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java index 9de4c839d..17e990ba7 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.chat.AbstractChatCommnad; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java similarity index 91% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java index c449eda5c..99398ff38 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java index 09e7e95b7..6d18863c6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; import com.generalbytes.batm.server.extensions.communication.ISmsResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java similarity index 90% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java index 340a30dc9..bd518b54f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ISmsErrorResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java similarity index 92% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java index 4035642ef..7e64053b3 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ISmsErrorResponse; import com.generalbytes.batm.server.extensions.communication.ISmsResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java index e65f62b72..30c93f213 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java index b8f33fc1c..b9b72ca29 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.aml.IExternalIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java index 7343bc70c..61dfa9e5e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java similarity index 93% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java index f5b8f8f5b..9d64795a4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IRestService; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java index 51e36538b..41339bac4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java index 1e0c398c8..75befc75f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IIdentityPiece; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java similarity index 94% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java index 2809406cb..251a22c41 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.ILimit; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java similarity index 80% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java index 50039c2a4..834ae7ecc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.ICashCollectionDay; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java index 82423c0fd..49f3d3eef 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.ICashCollectionDay; import com.generalbytes.batm.server.extensions.ILocationDetail; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java similarity index 92% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java index 9f21211ee..c5ffeaf40 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java similarity index 82% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java index 7a627cde5..df1b3ddca 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IRestService; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java index f16081abf..8d5ab6daf 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java similarity index 93% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java index 89c41ce8d..9d3384f21 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.INote; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java similarity index 89% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java index 712c4ed91..77330508b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IOpeningHours; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java similarity index 81% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java index 94c8ab8d2..5a9d99316 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IOrganization; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java index e60688011..62ce902af 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java index fb0d14d9e..9528d0846 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.notification; +package com.generalbytes.batm.server.extensions.examples.notification; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java similarity index 87% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java index ba4ee9add..a9991a975 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java @@ -15,14 +15,14 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.notification; +package com.generalbytes.batm.server.extensions.examples.notification; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; /* Enable this extension by adding the following line to /batm/config/extensions -com.generalbytes.batm.server.extensions.extra.examples.notification.NotificationExampleExtension.autoload=true +com.generalbytes.batm.server.extensions.examples.notification.NotificationExampleExtension.autoload=true */ public class NotificationExampleExtension extends AbstractExtension { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java index 7514ee0fb..c8a0195a0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; /** * Simple data transfer class diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java index 477db7a91..ca05e6f5e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java index 967db2c24..8e129b7f1 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.ITransactionCashbackInfo; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java index ba4b85455..e5f98ab66 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java index ac6a0c3d9..f9005f19b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java index a6dc666d8..1694ab8cd 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java index 93bf6c981..c6b1f537e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.watchlists; +package com.generalbytes.batm.server.extensions.examples.watchlists; import com.generalbytes.batm.server.extensions.*; import com.generalbytes.batm.server.extensions.watchlist.WatchListMatch; diff --git a/server_extensions_examples/src/main/resources/batm-extensions.xml b/server_extensions_examples/src/main/resources/batm-extensions.xml new file mode 100644 index 000000000..7a7cf5dc0 --- /dev/null +++ b/server_extensions_examples/src/main/resources/batm-extensions.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle index 582ee8fcd..f29377a07 100644 --- a/server_extensions_extra/build.gradle +++ b/server_extensions_extra/build.gradle @@ -65,8 +65,6 @@ dependencies { implementation("org.reactivestreams:reactive-streams:1.0.2") // for ERC20Interface generated by web3j implementation("com.squareup.okhttp3:okhttp:4.9.0") implementation("com.squareup.okio:okio:2.8.0") - implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis - implementation("com.nexmo:client:5.5.0") // sms provider implementation("org.bitcoinj:bitcoinj-core:0.16.1") // Note when updating bitcoinj: block.io depends on libdohj for doge and ltc // which depends on bitcoinj and extends some classes, it must be compatible version diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index bf704461a..1ab29a93a 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -2179,7 +2179,6 @@ - @@ -2366,16 +2365,4 @@ - - - - - - - - - - - - diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index b13228751..32493ee0b 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -12,15 +12,6 @@ jar { configurations { artifactOnly - - // handle Github (e.g. community) vs GENERAL BYTES dichotomy - generalBytesCompile - githubCompile - if (hasGbArtifactory) { - implementation { extendsFrom generalBytesCompile } - } else { - implementation { extendsFrom githubCompile } - } } artifacts { diff --git a/settings.gradle b/settings.gradle index f4227ae8b..1f15e385b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ include ':server_extensions_api' include ':server_extensions_extra' include ':server_extensions_test' +include ':server_extensions_examples' include ':server_extensions_template' include ':currencies' include ':batm_ssh_tunnel' From 268863ebc402af2c8d36cfda997cc2e18ef28eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pl=C3=A1nsk=C3=BD?= <67519977+d0by1@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:32:07 +0100 Subject: [PATCH 56/82] CF-576 Add tags to ITerminal (#867) --- .../batm/server/extensions/ITerminal.java | 88 +++++++++++++------ 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITerminal.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITerminal.java index 320c7f2bf..f6d332df6 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITerminal.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITerminal.java @@ -19,6 +19,7 @@ import java.util.Date; import java.util.List; +import java.util.Set; public interface ITerminal { @@ -59,111 +60,140 @@ public interface ITerminal { long ERROR_ACCEPTOR_IS_NOT_DETECTED = 1 << 18; //"ACCEPTOR IS NOT DETECTED" /** - * Type of terminal @see TYPE_PHYSICAL and @see TYPE_VIRTUAL(Deprecated) - * @return + * Get the type of this terminal. See TYPE_PHYSICAL and TYPE_VIRTUAL. + * + * @return The type. */ Integer getType(); /** - * Serial number of terminal - * @return + * Get the serial number of this terminal. + * + * @return The serial number. */ String getSerialNumber(); /** - * Name of the terminal - * @return + * Get the name of this terminal. + * + * @return The name. */ String getName(); /** * Terminal is active = Server will not refuse terminal communication requests - * @return + * + * @return True if this terminal is active */ boolean isActive(); /** * Terminal is locked - * @return + * + * @return True if this terminal is locked */ boolean isLocked(); /** - * Deleted terminals are not displayed in administration but are still stored in database and marked as deleted - * @return + * Deleted terminals are not displayed in administration but are still stored + * in a database and marked as deleted. + * + * @return True if this terminal is deleted */ boolean isDeleted(); /** - * Location of terminal - * @return + * Get the location of this terminal. + * + * @return The location */ ILocation getLocation(); /** - * Server time of moment when terminal connected to server last time - * @return + * Get the server time of the moment this terminal last connected to the server. + * + * @return The date and time */ Date getConnectedAt(); /** - * Server time of moment when server received last ping request from terminal - * @return + * Get the server time of the moment the server last received a ping request from this terminal. + * + * @return The date and time */ Date getLastPingAt(); /** * Duration in number of milliseconds of last ping operation measured by terminal (request + response time) - * @return + * + * @return The duration */ long getLastPingDuration(); /** - * Server date and time when terminal asked for exchange rate at last time - * @return + * Server date and time when the terminal asked for exchange rate the last time + * + * @return The date and time */ Date getExchangeRateUpdatedAt(); /** * String representation of BUY exchange rate displayed on terminal on last successful ping - * @return + * + * @return The exchange rate */ String getExchangeRatesBuy(); /** * String representation of SELL exchange rate displayed on terminal on last successful ping - * @return + * + * @return The exchange rate */ String getExchangeRatesSell(); /** * Terminal error signalized by bit value see error constants in this interface ie ERROR_NO_ERROR - * @return + * + * @return The error code */ long getErrors(); /** * Signalizes current mode in which is terminal operating see different modes in this interface i.e.: MODE_ - * @return + * + * @return The mode in which is terminal operating */ int getOperationalMode(); /** - * When server refuses to talk to terminal it signalizes the this by a REASON see list of possible reasons in this interface: MODE_REJECTED_REASON_... - * @return + * When a server refuses to talk to the terminal, it signalizes this by a REASON. + * See the list of possible reasons in this interface: + * MODE_REJECTED_REASON_... + * + * @return The reason why the server refused to talk to the terminal */ int getRejectedReason(); /** - * Returns list of enabled fiat currencies on Terminal - * @return + * Returns list of enabled fiat currencies on this terminal. + * + * @return The list of fiat currencies */ List getAllowedCashCurrencies(); /** - * Returns list of enabled cryptocurrencies on Terminal - * @return + * Returns list of enabled cryptocurrencies on this terminal. + * + * @return The list of cryptocurrencies */ List getAllowedCryptoCurrencies(); + + /** + * Returns a set of tags that are attached to this terminal. + * + * @return The tags. + */ + Set getTags(); + } From 87a13b90f80b78b791511e53650e5edaa53eb406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pl=C3=A1nsk=C3=BD?= <67519977+d0by1@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:35:47 +0100 Subject: [PATCH 57/82] BPUB-2001 Updating personal info identity pieces (#880) --- .../batm/server/extensions/IExtensionContext.java | 11 +++++++++++ .../batm/server/extensions/TestExtensionContext.java | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java index 648d14360..461da7fff 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IExtensionContext.java @@ -308,6 +308,17 @@ public interface IExtensionContext { */ boolean addIdentityPiece(String identityPublicId, IIdentityPiece iidentityPiece); + /** + * Update an existing personal info identity piece. + * + *

This method can only be used to update Personal Info identity pieces. + * + * @param identityPublicId public ID of an existing identity to be updated + * @param identityPiece identity piece to be updated + * @return true in case of success, false otherwise + */ + boolean updateIdentityPiecePersonalInfo(String identityPublicId, IIdentityPiece identityPiece); + /** * @param identityId public ID of an existing identity to be updated * @param state new state to be set diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java index 3b0c6cd60..4fa5b1892 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/TestExtensionContext.java @@ -192,6 +192,11 @@ public boolean addIdentityPiece(String identityPublicId, IIdentityPiece iidentit return false; } + @Override + public boolean updateIdentityPiecePersonalInfo(String identityPublicId, IIdentityPiece identityPiece) { + return false; + } + @Override public IIdentity updateIdentity(String identityId, String externalId, int state, int type, Date created, Date registered, BigDecimal vipBuyDiscount, BigDecimal vipSellDiscount, String note, List limitCashPerTransaction, List limitCashPerHour, List limitCashPerDay, List limitCashPerWeek, List limitCashPerMonth, List limitCashPer3Months, List limitCashPer12Months, List limitCashPerCalendarQuarter, List limitCashPerCalendarYear, List limitCashTotalIdentity, String configurationCashCurrency) { return null; From 4be57b58de4156a20d52d218091219ed053e1ff4 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Wed, 10 Jan 2024 16:40:21 +0100 Subject: [PATCH 58/82] Increased project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7fc2ce6e7..f79d25ad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.4.1 +projectVersion=1.4.2 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 9692dcb21f100471a784bea473df925a056ca40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:46:35 +0100 Subject: [PATCH 59/82] BATM-5777: possibility to set error message on ITransactionRequest (#891) --- gradle.properties | 2 +- .../batm/server/extensions/ITransactionRequest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 131911510..afdbbdcb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.5 +projectVersion=1.3.6 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java index 050e9cfdf..9382eaf7e 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java @@ -166,4 +166,17 @@ public interface ITransactionRequest { */ List getQuizResults(); + /** + * Error message displayed to the customer. + * + * @return Error message. + */ + String getErrorMessage(); + + + /** + * Error message displayed to the customer. + */ + void setErrorMessage(String errorMessage); + } From d5f48463e45c53d5c26d347f708c1fcad90e6b86 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Fri, 19 Jan 2024 13:36:26 +0100 Subject: [PATCH 60/82] BATM-3507 Added IP whitelist check to OSW (#893) --- gradle.properties | 2 +- .../website/RestServiceWebsite.java | 45 ++++++++++++------- .../batm/server/extensions/IApiAccess.java | 1 + 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 69a38df96..8568b7b6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.4.3 +projectVersion=1.4.4 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/operators_sample_website/src/main/java/com/generalbytes/batm/server/extensions/website/RestServiceWebsite.java b/operators_sample_website/src/main/java/com/generalbytes/batm/server/extensions/website/RestServiceWebsite.java index d4a80999d..05857e45b 100644 --- a/operators_sample_website/src/main/java/com/generalbytes/batm/server/extensions/website/RestServiceWebsite.java +++ b/operators_sample_website/src/main/java/com/generalbytes/batm/server/extensions/website/RestServiceWebsite.java @@ -7,8 +7,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.*; +import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.math.BigDecimal; @@ -29,10 +31,10 @@ public class RestServiceWebsite { @Path("/terminals-with-available-cash") @Produces(MediaType.APPLICATION_JSON) public Object terminalsWithAvailableCash(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("amount") BigDecimal amount, - @QueryParam("fiat_currency") String fiatCurrency) { + @QueryParam("fiat_currency") String fiatCurrency, @Context HttpServletRequest request) { try { - checkSecurity(apiKey); + checkSecurity(apiKey, request); List params = new ArrayList<>(); if (amount == null) { params.add("amount"); @@ -53,7 +55,7 @@ public Object terminalsWithAvailableCash(@HeaderParam("X-Api-Key") String apiKey } return filteredTerminals; } catch (AuthenticationException e) { - return responseInvalidApiKey(); + return responseInvalidApiKey(e); } catch (Throwable e) { log.error("Error - terminals with available cash", e); } @@ -73,10 +75,11 @@ public Object terminalsWithAvailableCash(@HeaderParam("X-Api-Key") String apiKey public Object sellCrypto(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("serial_number") String serialNumber, @QueryParam("fiat_amount") BigDecimal fiatAmount, @QueryParam("fiat_currency") String fiatCurrency, @QueryParam("crypto_amount") BigDecimal cryptoAmount, @QueryParam("crypto_currency") String cryptoCurrency, - @QueryParam("identity_public_id") String identityPublicId, @QueryParam("discount_code") String discountCode) { + @QueryParam("identity_public_id") String identityPublicId, @QueryParam("discount_code") String discountCode, + @Context HttpServletRequest request) { try { - checkSecurity(apiKey); + checkSecurity(apiKey, request); List params = new ArrayList<>(); if (serialNumber == null || serialNumber.trim().isEmpty()) { params.add("serial_number"); @@ -96,7 +99,7 @@ public Object sellCrypto(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("s return SellExtension.getExtensionContext().sellCrypto(serialNumber, fiatAmount, fiatCurrency, cryptoAmount, cryptoCurrency, identityPublicId, discountCode); } catch (AuthenticationException e) { - return responseInvalidApiKey(); + return responseInvalidApiKey(e); } catch (Throwable e) { log.error("Error - sell crypto", e); @@ -112,16 +115,18 @@ public Object sellCrypto(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("s @GET @Path("/status") @Produces(MediaType.APPLICATION_JSON) - public Object status(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("transaction_id") String transactionId) { + public Object status(@HeaderParam("X-Api-Key") String apiKey, + @QueryParam("transaction_id") String transactionId, + @Context HttpServletRequest request) { try { - checkSecurity(apiKey); + checkSecurity(apiKey, request); if (transactionId == null) { return Response.status(HttpServletResponse.SC_BAD_REQUEST).entity("{ \"error\": \"Missing parameter transaction_id\" }").build(); } return SellExtension.getExtensionContext().findTransactionByTransactionId(transactionId).getStatus(); } catch (AuthenticationException e) { - return responseInvalidApiKey(); + return responseInvalidApiKey(e); } catch (Throwable e) { log.error("Error - status", e); } @@ -137,13 +142,13 @@ public Object status(@HeaderParam("X-Api-Key") String apiKey, @QueryParam("trans @GET @Path("/terminals") @Produces(MediaType.APPLICATION_JSON) - public Object terminals(@HeaderParam("X-Api-Key") String apiKey) { + public Object terminals(@HeaderParam("X-Api-Key") String apiKey, @Context HttpServletRequest request) { try { - IApiAccess iApiAccess = checkSecurity(apiKey); + IApiAccess iApiAccess = checkSecurity(apiKey, request); return getTerminalsByApiKey(iApiAccess); } catch (AuthenticationException e) { - return responseInvalidApiKey(); + return responseInvalidApiKey(e); } catch (Throwable e) { log.error("Error - terminals", e); } @@ -184,23 +189,31 @@ private boolean isOnline(ITerminal terminal) { * @param apiKey - key generated in CAS / Third Party / Operators sample website (OSW) * @return IApiAccess - Authenticated API key */ - private IApiAccess checkSecurity(String apiKey) throws AuthenticationException { + private IApiAccess checkSecurity(String apiKey, HttpServletRequest request) throws AuthenticationException { IApiAccess iApiAccess = SellExtension.getExtensionContext().getAPIAccessByKey(apiKey, ApiAccessType.OSW); if (iApiAccess == null) { - throw new AuthenticationException("Authentication failed"); + throw new AuthenticationException("Invalid X-Api-Key"); + } + log.info("IP whitelist check, from apiAccess={}, from request={}", iApiAccess.getIpWhitelist(), request.getRemoteAddr()); + if (isIpWhitelistSet(iApiAccess) && !iApiAccess.getIpWhitelist().equals(request.getRemoteAddr())) { + throw new AuthenticationException("Access from not allowed IP address"); } return iApiAccess; } + private boolean isIpWhitelistSet(IApiAccess iApiAccess) { + return iApiAccess.getIpWhitelist() != null && !iApiAccess.getIpWhitelist().isEmpty(); + } + private Response responseInvalidParameter(List params) { Map> map = new HashMap<>(); map.put("missingParameter", params); return Response.status(HttpServletResponse.SC_BAD_REQUEST).entity(createJsonString(map)).build(); } - private Response responseInvalidApiKey() { + private Response responseInvalidApiKey(AuthenticationException e) { Map map = new HashMap<>(); - map.put("error", "Invalid X-Api-Key"); + map.put("error", e.getMessage()); return Response.status(HttpServletResponse.SC_UNAUTHORIZED).entity(createJsonString(map)).build(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApiAccess.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApiAccess.java index 8fb744d44..60f19157c 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApiAccess.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IApiAccess.java @@ -5,4 +5,5 @@ public interface IApiAccess { Collection getTerminalSerialNumbers(); + String getIpWhitelist(); } From 175b4e3c786e53860915f74f9d363000cab273d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 23 Jan 2024 13:12:12 +0100 Subject: [PATCH 61/82] BATM-5752: added optional parameters to BitGo --- gradle.properties | 2 +- .../extra/bitcoin/BitcoinExtension.java | 28 ++++++++++--------- .../bitcoin/wallets/bitgo/v2/BitgoWallet.java | 20 +++++++++---- .../v2/BitgoWalletWithUniqueAddresses.java | 6 +++- .../bitgo/v2/dto/BitGoCoinRequest.java | 27 +++++++++++++++++- 5 files changed, 61 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index afdbbdcb9..b23b3932f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.6 +projectVersion=1.3.7 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index 27f0b6d86..c8c986cf6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -285,9 +285,11 @@ public IWallet createWallet(String walletLogin, String tunnelPassword) { String proxyUrl = st.nextToken("\n").replaceFirst(":", ""); return new BitcoreWallet(apiKey, proxyUrl); } else if ("bitgo".equalsIgnoreCase(walletType) || "bitgonoforward".equalsIgnoreCase(walletType)) { - // bitgo:host:port:token:wallet_address:wallet_passphrase:num_blocks + // bitgo:host:port:token:wallet_address:wallet_passphrase:num_blocks:max_rate:max_fee_rate // but host is optionally including the "http://" and port is optional, - // num_blocks is an optional integer greater than 2 and it's used to calculate mining fee. + // num_blocks is an optional integer greater than 2 and it's used to calculate mining fee, + // fee_rate is an optional integer defined fee rate, + // max_fee_rate is an optional integer defined maximum fee rate. // bitgo:http://localhost:80:token:wallet_address:wallet_passphrase // bitgo:http://localhost:token:wallet_address:wallet_passphrase // bitgo:localhost:token:wallet_address:wallet_passphrase @@ -322,22 +324,22 @@ public IWallet createWallet(String walletLogin, String tunnelPassword) { host = tunnelAddress.getHostString(); port = tunnelAddress.getPort(); - String blocks; - int num; - Integer numBlocks = 2; - if(st.hasMoreTokens()){ - blocks = st.nextToken(); - num = Integer.parseInt(blocks); - if(num > 2) { - numBlocks = num; - } + int numBlocks = 2; + if (st.hasMoreTokens()) { + int number = Integer.parseInt(st.nextToken()); + if (number > 2) { + numBlocks = number; + } } + Integer feeRate = st.hasMoreTokens() ? Integer.parseInt(st.nextToken()) : null; + Integer maxFeeRate = st.hasMoreTokens() ? Integer.parseInt(st.nextToken()) : null; + if ("bitgonoforward".equalsIgnoreCase(walletType)) { - return new BitgoWalletWithUniqueAddresses(scheme, host, port, token, walletId, walletPassphrase, numBlocks); + return new BitgoWalletWithUniqueAddresses(scheme, host, port, token, walletId, walletPassphrase, numBlocks, feeRate, maxFeeRate); } - return new BitgoWallet(scheme, host, port, token, walletId, walletPassphrase, numBlocks); + return new BitgoWallet(scheme, host, port, token, walletId, walletPassphrase, numBlocks, feeRate, maxFeeRate); } else if ("coinbasewallet2".equalsIgnoreCase(walletType) || "coinbasewallet2noforward".equalsIgnoreCase(walletType)) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java index e7a6c585b..d33a42ded 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -57,6 +57,8 @@ public class BitgoWallet implements IWallet, ICanSendMany { protected String url; protected static final Integer readTimeout = 90 * 1000; //90 seconds protected Integer numBlocks; + protected Integer feeRate; + protected Integer maxFeeRate; protected static final Map cryptoCurrencies = new HashMap() { { @@ -93,10 +95,16 @@ private int pow10Exp(BigDecimal val) { }; public BitgoWallet(String scheme, String host, int port, String token, String walletId, String walletPassphrase, Integer numBlocks) { + this(scheme, host, port, token, walletId, walletPassphrase, numBlocks, null, null); + } + + public BitgoWallet(String scheme, String host, int port, String token, String walletId, String walletPassphrase, Integer numBlocks, Integer feeRate, Integer maxFeeRate) { this.walletId = walletId; this.walletPassphrase = walletPassphrase; this.url = new HttpUrl.Builder().scheme(scheme).host(host).port(port).build().toString(); this.numBlocks = numBlocks; + this.feeRate = feeRate; + this.maxFeeRate = maxFeeRate; ClientConfig config = new ClientConfig(); config.setHttpReadTimeout(readTimeout); @@ -146,7 +154,7 @@ public String sendMany(Collection transfers, String cryptoCurrency, St @Override public String sendCoins(String destinationAddress, BigDecimal amount, String cryptoCurrency, String description) { try { - final BitGoCoinRequest request = new BitGoCoinRequest(destinationAddress, toSatoshis(amount, cryptoCurrency), walletPassphrase, description, this.numBlocks); + final BitGoCoinRequest request = new BitGoCoinRequest(destinationAddress, toSatoshis(amount, cryptoCurrency), walletPassphrase, description, this.numBlocks, this.feeRate, this.maxFeeRate); String bitgoCryptoCurrency = cryptoCurrencies.get(cryptoCurrency); return getResultTxId(api.sendCoins(bitgoCryptoCurrency, this.walletId, request)); } catch (HttpStatusIOException hse) { @@ -172,7 +180,7 @@ private Integer getDecimals(String cryptoCurrency) { @Override public String getCryptoAddress(String cryptoCurrency) { - if(cryptoCurrency == null) { + if (cryptoCurrency == null) { cryptoCurrency = getPreferredCryptoCurrency(); } String bitgoCryptoCurrency = cryptoCurrencies.get(cryptoCurrency); @@ -181,18 +189,18 @@ public String getCryptoAddress(String cryptoCurrency) { } try { final Map response = api.getWalletById(bitgoCryptoCurrency, walletId); - if(response == null || response.isEmpty()) { + if (response == null || response.isEmpty()) { return null; } Object receiveAddressObj = response.get("receiveAddress"); - if(receiveAddressObj == null || !(receiveAddressObj instanceof Map)) { + if (!(receiveAddressObj instanceof Map)) { return null; } Map receiveAddressMap = (Map)receiveAddressObj; Object addressObj = receiveAddressMap.get("address"); - if(addressObj == null || !(addressObj instanceof String)) { + if (!(addressObj instanceof String)) { return null; } return (String)addressObj; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWalletWithUniqueAddresses.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWalletWithUniqueAddresses.java index f2328b1d3..213f7dffa 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWalletWithUniqueAddresses.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWalletWithUniqueAddresses.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -46,6 +46,10 @@ public BitgoWalletWithUniqueAddresses(String scheme, String host, int port, Stri super(scheme, host, port, token, walletId, walletPassphrase, numBlocks); } + public BitgoWalletWithUniqueAddresses(String scheme, String host, int port, String token, String walletId, String walletPassphrase, Integer numBlocks, Integer feeRate, Integer maxFeeRate) { + super(scheme, host, port, token, walletId, walletPassphrase, numBlocks, feeRate, maxFeeRate); + } + @Override public String generateNewDepositCryptoAddress(String cryptoCurrency, String label) { if (cryptoCurrency == null) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java index aa3e9a60c..3f9ad4b85 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -23,6 +23,8 @@ public class BitGoCoinRequest { private String walletPassphrase; private Integer numBlocks; private String comment; + private Integer feeRate; + private Integer maxFeeRate; public BitGoCoinRequest(String address, String amount, String walletPassphrase, String comment, Integer numBlocks) { @@ -33,6 +35,13 @@ public BitGoCoinRequest(String address, String amount, String walletPassphrase, this.comment = comment; } + public BitGoCoinRequest(String address, String amount, String walletPassphrase, String comment, Integer numBlocks, Integer feeRate, Integer maxFeeRate) { + this(address, amount, walletPassphrase, comment, numBlocks); + + this.feeRate = feeRate; + this.maxFeeRate = maxFeeRate; + } + public String getAddress() { return address; } @@ -72,4 +81,20 @@ public String getComment() { public void setComment(String comment){ this.comment = comment; } + + public Integer getFeeRate() { + return feeRate; + } + + public void setFeeRate(Integer feeRate) { + this.feeRate = feeRate; + } + + public Integer getMaxFeeRate() { + return maxFeeRate; + } + + public void setMaxFeeRate(Integer maxFeeRate) { + this.maxFeeRate = maxFeeRate; + } } From 8a3c4bc8c9c9be37124f08cf83038ea0a07cf1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 23 Jan 2024 13:14:32 +0100 Subject: [PATCH 62/82] BATM-5752: fixed comment --- .../batm/server/extensions/extra/bitcoin/BitcoinExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index c8c986cf6..e31abf323 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -285,7 +285,7 @@ public IWallet createWallet(String walletLogin, String tunnelPassword) { String proxyUrl = st.nextToken("\n").replaceFirst(":", ""); return new BitcoreWallet(apiKey, proxyUrl); } else if ("bitgo".equalsIgnoreCase(walletType) || "bitgonoforward".equalsIgnoreCase(walletType)) { - // bitgo:host:port:token:wallet_address:wallet_passphrase:num_blocks:max_rate:max_fee_rate + // bitgo:host:port:token:wallet_address:wallet_passphrase:num_blocks:fee_rate:max_fee_rate // but host is optionally including the "http://" and port is optional, // num_blocks is an optional integer greater than 2 and it's used to calculate mining fee, // fee_rate is an optional integer defined fee rate, From 3e3da6186b329b787ccedf77af8af7c96c69e641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 23 Jan 2024 13:32:53 +0100 Subject: [PATCH 63/82] BATM-5752: fixed params on BitGo --- .../src/main/resources/batm-extensions.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index f50640f75..a0baec433 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -37,6 +37,8 @@ + + BCH BTC LTC @@ -54,6 +56,8 @@ + + BCH BTC LTC From e50ff334a41770477db6baa7ed6e73ca8a38a721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= Date: Tue, 23 Jan 2024 13:49:45 +0100 Subject: [PATCH 64/82] BATM-5752: minor fix --- .../batm/server/extensions/extra/bitcoin/BitcoinExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index e31abf323..e1c041913 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software From d369cb158baa9aaf5fe2b89f4b2ed020d38e5195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ro=C4=8Dek?= <122279630+drocek@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:51:06 +0100 Subject: [PATCH 65/82] BATM-5812: renamed quizzes to questionnaires (#897) --- gradle.properties | 2 +- .../extensions/ITransactionPreparation.java | 8 +++---- .../extensions/ITransactionRequest.java | 10 ++++---- .../QuestionAnswer.java | 4 ++-- .../QuestionnaireResult.java} | 24 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) rename server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/{quiz => questionnaire}/QuestionAnswer.java (96%) rename server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/{quiz/QuizResult.java => questionnaire/QuestionnaireResult.java} (62%) diff --git a/gradle.properties b/gradle.properties index b23b3932f..b733dc035 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.7 +projectVersion=1.3.8 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java index 92424eaa2..9e50c7f05 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionPreparation.java @@ -18,7 +18,7 @@ package com.generalbytes.batm.server.extensions; -import com.generalbytes.batm.server.extensions.quiz.QuizResult; +import com.generalbytes.batm.server.extensions.questionnaire.QuestionnaireResult; import java.math.BigDecimal; import java.util.Date; @@ -205,10 +205,10 @@ public interface ITransactionPreparation { void setWithdrawalReason(int reason); /** - * Returns quiz results if any quiz has been activated. + * Returns questionnaire results if any questionnaire has been activated. * - * @return List of {@link QuizResult}. Can be null. + * @return List of {@link QuestionnaireResult}. Can be null. */ - List getQuizResults(); + List getQuestionnaireResults(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java index 9382eaf7e..09ef2c38e 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions; -import com.generalbytes.batm.server.extensions.quiz.QuizResult; +import com.generalbytes.batm.server.extensions.questionnaire.QuestionnaireResult; import java.math.BigDecimal; import java.util.Date; @@ -160,11 +160,11 @@ public interface ITransactionRequest { BigDecimal getDiscountQuotient(); /** - * Returns quiz results if any quiz has been activated. + * Returns questionnaire results if any questionnaire has been activated. * - * @return List of {@link QuizResult}. Can be null. + * @return List of {@link QuestionnaireResult}. Can be null. */ - List getQuizResults(); + List getQuestionnaireResults(); /** * Error message displayed to the customer. diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java similarity index 96% rename from server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java rename to server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java index d80f8236b..3a93e78cc 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuestionAnswer.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionAnswer.java @@ -15,13 +15,13 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.quiz; +package com.generalbytes.batm.server.extensions.questionnaire; import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinition; import com.generalbytes.batm.server.extensions.customfields.CustomFieldDefinitionType; /** - * An object representing the question and answer data in the {@link QuizResult}. + * An object representing the question and answer data in the {@link QuestionnaireResult}. */ public class QuestionAnswer { diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java similarity index 62% rename from server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java rename to server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java index 623e6c913..07f52f7ee 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/quiz/QuizResult.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/questionnaire/QuestionnaireResult.java @@ -1,5 +1,5 @@ /************************************************************************************* - * Copyright (C) 2014-2023 GENERAL BYTES s.r.o. All rights reserved. + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. * * This software may be distributed and modified under the terms of the GNU * General Public License version 2 (GPL2) as published by the Free Software @@ -15,34 +15,34 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.quiz; +package com.generalbytes.batm.server.extensions.questionnaire; import java.util.List; /** - * An object representing data about quiz result. + * An object representing data about questionnaire result. */ -public class QuizResult { +public class QuestionnaireResult { - private String quizName; + private String questionnaireName; private List answers; - public QuizResult() { + public QuestionnaireResult() { } - public QuizResult(String quizName, List answers) { - this.quizName = quizName; + public QuestionnaireResult(String questionnaireName, List answers) { + this.questionnaireName = questionnaireName; this.answers = answers; } - public String getQuizName() { - return quizName; + public String getQuestionnaireName() { + return questionnaireName; } - public void setQuizName(String quizName) { - this.quizName = quizName; + public void setQuestionnaireName(String questionnaireName) { + this.questionnaireName = questionnaireName; } public List getAnswers() { From 6342b949fff6a99c78edf4ba6a90671bad2f1cc8 Mon Sep 17 00:00:00 2001 From: sandgub <138492453+sandgub@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:03:54 +0400 Subject: [PATCH 66/82] Update CryptX wallet to process USDT in TRON network (#883) * Add support for USDT on TR20 network for CryptX wallet * Add TRX support to CryptX wallet * Make CryptX wallet implement IQueryableWallet --- .../batm/server/extensions/Converters.java | 1 + .../wallets/cryptx/v2/CryptXWallet.java | 15 +++++++-- .../cryptx/v2/CryptXWithUniqueAddresses.java | 31 ++++++++++++++++++- .../bitcoin/wallets/cryptx/v2/ICryptXAPI.java | 13 +++++--- .../cryptx/v2/dto/CryptXReceivedAmount.java | 12 +++++++ .../src/main/resources/batm-extensions.xml | 4 +++ 6 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/dto/CryptXReceivedAmount.java diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java index d4d0fd174..7e70fa49b 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Converters.java @@ -31,6 +31,7 @@ public class Converters { public static final BigDecimal USDTTRON = BigDecimal.TEN.pow(6); public static final BigDecimal XRP = BigDecimal.TEN.pow(6); public static final BigDecimal VERUM = BigDecimal.TEN.pow(8); + public static final BigDecimal TRX = BigDecimal.TEN.pow(6); public static final BigDecimal TBCH = BigDecimal.TEN.pow(8); public static final BigDecimal TBTC = BigDecimal.TEN.pow(8); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWallet.java index 0a92c46c9..1d70a34b9 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWallet.java @@ -109,9 +109,9 @@ public Set getCryptoCurrencies() { coins.add(CryptoCurrency.LTC.getCode()); coins.add(CryptoCurrency.BCH.getCode()); coins.add(CryptoCurrency.ETH.getCode()); + coins.add(CryptoCurrency.TRX.getCode()); coins.add(CryptoCurrency.USDT.getCode()); - coins.add(CryptoCurrency.BTBS.getCode()); - coins.add(CryptoCurrency.GQ.getCode()); + coins.add(CryptoCurrency.USDTTRON.getCode()); coins.add(CryptoCurrency.TBTC.getCode()); coins.add(CryptoCurrency.TLTC.getCode()); coins.add(CryptoCurrency.TBCH.getCode()); @@ -159,6 +159,9 @@ public String getAPICryptocurrency(String cryptoCurrency) { if (cryptoCurrency.equalsIgnoreCase(CryptoCurrency.USDT.getCode())) { return CryptoCurrency.ETH.getCode(); } + if (cryptoCurrency.equalsIgnoreCase(CryptoCurrency.USDTTRON.getCode())) { + return CryptoCurrency.TRX.getCode(); + } return cryptoCurrency; } @@ -177,12 +180,16 @@ private BigInteger toMinorUnit(String cryptoCurrency, BigDecimal amount) { case TETH: case ETH: return amount.multiply(Converters.ETH).toBigInteger(); + case TRX: + return amount.multiply(Converters.TRX).toBigInteger(); case BTBS: return amount.multiply(Converters.BTBS).toBigInteger(); case GQ: return amount.multiply(Converters.GQ).toBigInteger(); case USDT: return amount.multiply(Converters.USDT).toBigInteger(); + case USDTTRON: + return amount.multiply(Converters.USDTTRON).toBigInteger(); default: return amount.toBigInteger(); } @@ -205,7 +212,7 @@ private String sendCryptXTransaction(String cryptoCurrency, CryptXSendTransactio return null; } - private BigDecimal toMajorUnit(String cryptoCurrency, String amount) { + protected BigDecimal toMajorUnit(String cryptoCurrency, String amount) { BigInteger bigIntegerAmount = new BigInteger(amount); switch (CryptoCurrency.valueOfCode(cryptoCurrency)) { case TBTC: @@ -221,6 +228,8 @@ private BigDecimal toMajorUnit(String cryptoCurrency, String amount) { case GQ: return new BigDecimal(bigIntegerAmount).movePointLeft(18); case USDT: + case USDTTRON: + case TRX: return new BigDecimal(bigIntegerAmount).movePointLeft(6); default: throw new IllegalArgumentException("Unsupported crypto currency"); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWithUniqueAddresses.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWithUniqueAddresses.java index e44c04837..9fa46c9d0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWithUniqueAddresses.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/CryptXWithUniqueAddresses.java @@ -2,15 +2,19 @@ import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.IGeneratesNewDepositCryptoAddress; +import com.generalbytes.batm.server.extensions.IQueryableWallet; import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXCreateAddressRequest; import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXException; +import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXReceivedAmount; +import com.generalbytes.batm.server.extensions.payment.ReceivedAmount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import si.mazi.rescu.HttpStatusIOException; +import java.math.BigInteger; import java.util.Map; -public class CryptXWithUniqueAddresses extends CryptXWallet implements IGeneratesNewDepositCryptoAddress { +public class CryptXWithUniqueAddresses extends CryptXWallet implements IGeneratesNewDepositCryptoAddress, IQueryableWallet { private static final Logger log = LoggerFactory.getLogger(CryptXWithUniqueAddresses.class); @@ -49,4 +53,29 @@ public String generateNewDepositCryptoAddress(String cryptoCurrency, String labe return null; } + @Override + public ReceivedAmount getReceivedAmount(String address, String cryptoCurrency) { + if (!getCryptoCurrencies().contains(cryptoCurrency)) { + log.warn("{} not supported", cryptoCurrency); + return ReceivedAmount.ZERO; + } + cryptoCurrency = cryptoCurrency.toLowerCase(); + + try { + CryptXReceivedAmount cryptXReceivedAmount = api.getReceivedAmount(cryptoCurrency, this.walletId, address); + if (cryptXReceivedAmount.getAmount().compareTo(BigInteger.ZERO) > 0) { + return new ReceivedAmount(toMajorUnit(cryptoCurrency, cryptXReceivedAmount.getAmount().toString()), 999); + } + return new ReceivedAmount(toMajorUnit(cryptoCurrency, cryptXReceivedAmount.getAmount().toString()), 0); + } catch (HttpStatusIOException hse) { + log.debug("get received amount error: {}", hse.getHttpBody()); + } catch (CryptXException e) { + log.debug("get received amount error: {}", e.getErrorMessage()); + } catch (Exception e) { + log.error("get received amount error", e); + } + + return ReceivedAmount.ZERO; + } + } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/ICryptXAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/ICryptXAPI.java index e0d8324a6..29efc84b2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/ICryptXAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/ICryptXAPI.java @@ -1,9 +1,6 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2; -import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.Balance; -import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXCreateAddressRequest; -import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXException; -import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.CryptXSendTransactionRequest; +import com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto.*; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @@ -53,4 +50,12 @@ Balance getWalletBalance( @QueryParam("allTokens") Boolean allTokens ) throws IOException; + @GET + @Path("{coin}/wallet/{walletId}/{address}/amount") + CryptXReceivedAmount getReceivedAmount( + @PathParam("coin") String coin, + @PathParam("walletId") String walletId, + @PathParam("address") String address + ) throws IOException; + } \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/dto/CryptXReceivedAmount.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/dto/CryptXReceivedAmount.java new file mode 100644 index 000000000..665359f30 --- /dev/null +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/cryptx/v2/dto/CryptXReceivedAmount.java @@ -0,0 +1,12 @@ +package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.cryptx.v2.dto; + +import java.math.BigInteger; + +public class CryptXReceivedAmount { + + private BigInteger amount; + + public BigInteger getAmount() { + return amount; + } +} diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index e97882634..b8d78e6aa 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -81,7 +81,9 @@ BTC LTC ETH + TRX USDT + USDTTRON *host: https://api.walletpro.cryptal.com/ (required) - port: (not required) - @@ -106,7 +108,9 @@ BTC LTC ETH + TRX USDT + USDTTRON *host: https://api.walletpro.cryptal.com/ (required) - port: (not required) - From fbd7e885c3f0c5748336762f6f20c98db2d5ef6d Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Fri, 23 Feb 2024 16:04:15 +0100 Subject: [PATCH 67/82] BATM-5894 and BATM-5900 bug fixes (#900) BATM-5894 Added support for EUR, GBP and JPY at BitfinexExchange BATM-5900 Fixed false positives when scanning CA sanction list and matching using aliases --- gradle.properties | 2 +- .../exchanges/bitfinex/BitfinexExchange.java | 3 +++ .../extra/watchlists/ca/ParsedSanctions.java | 18 ++++++++++++++++-- .../watchlists/ca/ParsedSanctionsTest.java | 9 +++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b733dc035..5052d5b00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.3.8 +projectVersion=1.3.9 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java index d3575b658..1e2eac54b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java @@ -77,6 +77,9 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced static { FIAT_CURRENCIES.add(FiatCurrency.USD.getCode()); + FIAT_CURRENCIES.add(FiatCurrency.EUR.getCode()); + FIAT_CURRENCIES.add(FiatCurrency.GBP.getCode()); + FIAT_CURRENCIES.add(FiatCurrency.JPY.getCode()); FIAT_CURRENCIES.add(CryptoCurrency.USDT.getCode()); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java index 45990d53d..5de73fc84 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctions.java @@ -36,7 +36,7 @@ public Set search(String firstName, String lastName) { matchedParties.add(new Match(getPartyId(item), 100)); continue; } - if (containsSubstring(lastName, item.getAliases())) { + if (aliasContainsLastName(lastName, item.getAliases())) { matchedParties.add(new Match(getPartyId(item), 50)); } } @@ -56,7 +56,7 @@ public Set search(String firstName, String lastName) { } continue; } - if (containsSubstring(lastName, item.getAliases())) { + if (aliasContainsLastName(lastName, item.getAliases())) { candidateRecords.add(item); } } @@ -111,4 +111,18 @@ private String fixCountryName(String countryRaw) { private boolean containsSubstring(String substring, String input) { return input != null && input.toLowerCase().contains(substring.toLowerCase()); } + + private boolean aliasContainsLastName(String lastName, String alias) { + if (alias == null) { + return false; + } + String aliasNoSeparators = alias.replaceAll(";", ""); + String[] aliasWords = aliasNoSeparators.split(" "); + for (String aliasWord : aliasWords) { + if (aliasWord.equalsIgnoreCase(lastName)) { + return true; + } + } + return false; + } } diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java index f61dcad5a..27648e3a7 100644 --- a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java +++ b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/watchlists/ca/ParsedSanctionsTest.java @@ -58,6 +58,15 @@ public void testSearchNotFound() { assertTrue(result.isEmpty()); } + @Test + public void testSearchAliasNoMatch() { + final Record record = createRecord("Vladimir Rudolfovich", "SOLOVYOV"); + record.setAliases("Владимир Рудольфович Соловьёв; Vladimir Solovev; Soloviev"); + final ParsedSanctions parsedSanctions = initializeParsedSanctions(record); + Set result = parsedSanctions.search("Unknown", "Vlad"); + assertTrue(result.isEmpty()); + } + private void assertMatch(Set result, int i) { assertEquals(1, result.size()); final Match foundMatch = result.iterator().next(); From 2c5fcaea5e29ff8926a98ca71310e1706ffc0e7d Mon Sep 17 00:00:00 2001 From: "M.Hassan Amin" Date: Mon, 4 Mar 2024 19:25:06 +0500 Subject: [PATCH 68/82] Update README.md Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00707147d..0de9b9778 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ If you happen to add new cryptocurrency in CryptoCurrency class in currencies mo Creating your own extension ================= When you want to develop your own operator specific extension please create a new module and implement your extension there. -Use server_extensions_template module as a termplate for your first extension. Just copy this module and rename it. +Use server_extensions_template module as a template for your first extension. Just copy this module and rename it. You will need to modify also settings.gradle file to contain your new extension module's name. See how is the server_extensions_template module mentioned and add line for your new extension module. After building the whole project your built extension shoud be in following file: yournewextension/build/libs/yournewextension.jar Copy it to CAS server at following location: /batm/app/master/extensions/ From 981443c89e0429dc80561f57034e78a7536c22c3 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Wed, 20 Mar 2024 09:10:19 +0100 Subject: [PATCH 69/82] Increase project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e3b1315d7..98e932d28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.4.6 +projectVersion=1.5.0 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 1f7bc9c5b8837c93c0929d5c1e9f720a3c1498e0 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Wed, 20 Mar 2024 10:15:03 +0100 Subject: [PATCH 70/82] Remove duplicate repo settings from build.gradle files (#903) --- batm_ssh_tunnel/build.gradle | 4 ---- server_extensions_examples/build.gradle | 1 - server_extensions_template/build.gradle | 1 - settings.gradle | 4 ++++ 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/batm_ssh_tunnel/build.gradle b/batm_ssh_tunnel/build.gradle index 3fede2f26..646b2f252 100644 --- a/batm_ssh_tunnel/build.gradle +++ b/batm_ssh_tunnel/build.gradle @@ -3,10 +3,6 @@ plugins { id("shared-build-conventions") } -repositories { - mavenCentral() -} - version = "1.0.0" application { diff --git a/server_extensions_examples/build.gradle b/server_extensions_examples/build.gradle index 275a5bf6b..1fade2898 100644 --- a/server_extensions_examples/build.gradle +++ b/server_extensions_examples/build.gradle @@ -1,6 +1,5 @@ plugins { id("shared-build-conventions") - id("shared-repositories-ext-conventions") } group = projectGroup diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index 32493ee0b..78226917c 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -1,6 +1,5 @@ plugins { id("shared-build-conventions") - id("shared-repositories-ext-conventions") } group = projectGroup diff --git a/settings.gradle b/settings.gradle index 1f15e385b..1d3365536 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +dependencyResolutionManagement { + repositoriesMode = RepositoriesMode.PREFER_PROJECT +} + include ':server_extensions_api' include ':server_extensions_extra' include ':server_extensions_test' From a23f40f4f4ec83a1ce706845530d53e9367a62e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pl=C3=A1nsk=C3=BD?= <67519977+d0by1@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:03:19 +0200 Subject: [PATCH 71/82] BATM-6066 BitGo optional parameters error fix (#906) * BATM-6066 max_fee_rate cannot be lower than fee_rate * BATM-6066 Add test for parsing BitGo wallet * BATM-6066 Exclude null parameters from BitGoCoinRequest: null != undefined * BATM-6066 Increase version --- gradle.properties | 2 +- .../extra/bitcoin/BitcoinExtension.java | 5 +++ .../bitcoin/wallets/bitgo/v2/BitgoWallet.java | 8 +++++ .../bitgo/v2/dto/BitGoCoinRequest.java | 3 ++ .../extra/bitcoin/BitcoinExtensionTest.java | 34 +++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e3b1315d7..a0264bb36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.4.6 +projectVersion=1.4.7 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index e31130f10..ce2410314 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -291,6 +291,8 @@ public IWallet createWallet(String walletLogin, String tunnelPassword) { String proxyUrl = st.nextToken("\n").replaceFirst(":", ""); return new BitcoreWallet(apiKey, proxyUrl); } else if ("bitgo".equalsIgnoreCase(walletType) || "bitgonoforward".equalsIgnoreCase(walletType)) { + // BitGo API Specification: https://developers.bitgo.com/api/express.wallet.sendcoins + // // bitgo:host:port:token:wallet_address:wallet_passphrase:num_blocks:fee_rate:max_fee_rate // but host is optionally including the "http://" and port is optional, // num_blocks is an optional integer greater than 2 and it's used to calculate mining fee, @@ -340,6 +342,9 @@ public IWallet createWallet(String walletLogin, String tunnelPassword) { Integer feeRate = st.hasMoreTokens() ? Integer.parseInt(st.nextToken()) : null; Integer maxFeeRate = st.hasMoreTokens() ? Integer.parseInt(st.nextToken()) : null; + if (feeRate != null && (maxFeeRate == null || feeRate > maxFeeRate)) { + maxFeeRate = feeRate; + } if ("bitgonoforward".equalsIgnoreCase(walletType)) { return new BitgoWalletWithUniqueAddresses(scheme, host, port, token, walletId, walletPassphrase, numBlocks, feeRate, maxFeeRate); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java index d33a42ded..4d4d8a98e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/BitgoWallet.java @@ -282,4 +282,12 @@ public String getUrl() { public String getWalletId() { return walletId; } + + public Integer getFeeRate() { + return feeRate; + } + + public Integer getMaxFeeRate() { + return maxFeeRate; + } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java index 3f9ad4b85..d08b64693 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitgo/v2/dto/BitGoCoinRequest.java @@ -17,6 +17,9 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.bitgo.v2.dto; +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) public class BitGoCoinRequest { private String address; private String amount; diff --git a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtensionTest.java b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtensionTest.java index 98e11c180..1a6fb7dd4 100644 --- a/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtensionTest.java +++ b/server_extensions_extra/src/test/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtensionTest.java @@ -32,6 +32,40 @@ private void testUrl(String expected, String walletLogin) { Assert.assertEquals(expected, ((BitgoWallet)bitgowallet).getUrl()); } + @Test + public void testCreateWalletBitGoFees() { + // Both fee rate and max fee rate are set -> parse fee rate and max fee rate individually + doTestCreateWalletBitGoFees(createBitGoWalletUrl(1000, 2000), 1000, 2000); + // Max fee rate is lower than fee rate -> use fee rate as max fee rate + doTestCreateWalletBitGoFees(createBitGoWalletUrl(1000, 500), 1000, 1000); + // Max fee rate is not set -> use fee rate as max fee rate + doTestCreateWalletBitGoFees(createBitGoWalletUrl(1000, null), 1000, 1000); + // Neither fee rate nor max fee rate is set -> expect nulls + doTestCreateWalletBitGoFees(createBitGoWalletUrl(null, null), null, null); + } + + private String createBitGoWalletUrl(Integer feeRate, Integer maxFeeRate) { + StringBuilder builder = new StringBuilder("bitgo:http://localhost:3080:tokentoken:wallet_address:wallet_passphrase:2"); + if (feeRate != null) { + builder.append(":").append(feeRate); + if (maxFeeRate != null) { + builder.append(":").append(maxFeeRate); + } + } + return builder.toString(); + } + + private void doTestCreateWalletBitGoFees(String url, Integer expectedFeeRate, Integer expectedMaxFeeRate) { + final BitcoinExtension bitcoinExtension = new BitcoinExtension(); + bitcoinExtension.init(new TestExtensionContext()); + final IWallet wallet = bitcoinExtension.createWallet(url, null); + Assert.assertTrue(wallet instanceof BitgoWallet); + final BitgoWallet bitgoWallet = (BitgoWallet) wallet; + Assert.assertNotNull(bitgoWallet); + Assert.assertEquals(expectedFeeRate, bitgoWallet.getFeeRate()); + Assert.assertEquals(expectedMaxFeeRate, bitgoWallet.getMaxFeeRate()); + } + @Test public void bitgoFullTokenTest() { String wallet = "bitgo:http://localhost:3080:v2x8d5e9e46379dc328b2039a400a12b04ea986689b38107fd84cd339bc89e3fb21:5b20e3a9266bbe80095757489d84a6bb:Vranec8586"; From a2fc1eac0161e8edbad9658f0ab97a63a37b70aa Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Fri, 5 Apr 2024 13:12:12 +0200 Subject: [PATCH 72/82] Remove duplicate repo settings from build.gradle files (#907) --- batm_ssh_tunnel/build.gradle | 4 ---- server_extensions_examples/build.gradle | 1 - server_extensions_template/build.gradle | 1 - settings.gradle | 4 ++++ 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/batm_ssh_tunnel/build.gradle b/batm_ssh_tunnel/build.gradle index 3fede2f26..646b2f252 100644 --- a/batm_ssh_tunnel/build.gradle +++ b/batm_ssh_tunnel/build.gradle @@ -3,10 +3,6 @@ plugins { id("shared-build-conventions") } -repositories { - mavenCentral() -} - version = "1.0.0" application { diff --git a/server_extensions_examples/build.gradle b/server_extensions_examples/build.gradle index 275a5bf6b..1fade2898 100644 --- a/server_extensions_examples/build.gradle +++ b/server_extensions_examples/build.gradle @@ -1,6 +1,5 @@ plugins { id("shared-build-conventions") - id("shared-repositories-ext-conventions") } group = projectGroup diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index 32493ee0b..78226917c 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -1,6 +1,5 @@ plugins { id("shared-build-conventions") - id("shared-repositories-ext-conventions") } group = projectGroup diff --git a/settings.gradle b/settings.gradle index 1f15e385b..1d3365536 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +dependencyResolutionManagement { + repositoriesMode = RepositoriesMode.PREFER_PROJECT +} + include ':server_extensions_api' include ':server_extensions_extra' include ':server_extensions_test' From e22f245457d356e82781da0962c8ff2116a117ec Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 27 May 2024 16:49:10 +0200 Subject: [PATCH 73/82] BATM-6033 Add ITransactionListener#onDepositCreated method (#912) --- .../server/extensions/IDepositDetails.java | 70 +++++++++++++++++++ .../extensions/ITransactionDetails.java | 12 ++++ .../extensions/ITransactionListener.java | 4 ++ 3 files changed, 86 insertions(+) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java new file mode 100644 index 000000000..a2f1957a9 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java @@ -0,0 +1,70 @@ +package com.generalbytes.batm.server.extensions; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * Provides details about created deposit transaction. + */ +public interface IDepositDetails { + + /** + * Serial number of the GB Safe where the deposit was made. + */ + String getSafeSerialNumber(); + + /** + * Status of the deposit transaction. + *

    + *
  • 0 - completed
    • + *
  • 1 - error
    • + *
+ */ + int getStatus(); + + /** + * Server time of the deposit transaction. + */ + Date getServerTime(); + + /** + * GB Safe time of the deposit transaction. + */ + Date getSafeTime(); + + /** + * Deposit code of the related order transaction. + */ + String getDepositCode(); + + /** + * Identity of the customer who made the deposit. + */ + IIdentity getIdentity(); + + /** + * Amount of cash deposited. + */ + BigDecimal getCashAmount(); + + /** + * Fiat currency of the cash deposited. + */ + String getCashCurrency(); + + /** + * Remote transaction ID of the deposit. + */ + String getRemoteTransactionId(); + + /** + * Local transaction ID of the deposit. + */ + String getLocalTransactionId(); + + /** + * List of banknotes deposited in the transaction. + */ + List getBanknotes(); +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java index df5c2c51b..5de9b6037 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionDetails.java @@ -30,6 +30,8 @@ public interface ITransactionDetails { int TYPE_SELL_CRYPTO = 1; int TYPE_WITHDRAW_CASH = 2; int TYPE_CASHBACK = 3; + int TYPE_ORDER_CRYPTO = 4; + int TYPE_DEPOSIT_CASH = 5; //Buy states int STATUS_BUY_IN_PROGRESS = 0; @@ -54,6 +56,16 @@ public interface ITransactionDetails { int STATUS_CASHBACK_COMPLETED = 0; int STATUS_CASHBACK_ERROR = 1; + // ORDER STATES + int STATUS_ORDER_IN_PROGRESS = 0; + int STATUS_ORDER_CASH_DEPOSITED = 1; + int STATUS_ORDER_COMPLETED = 2; + int STATUS_ORDER_ERROR = 3; + + // DEPOSIT STATES + int STATUS_DEPOSIT_COMPLETED = 0; + int STATUS_DEPOSIT_ERROR = 1; + //error codes int BUY_ERROR_NO_ERROR = 0; int BUY_ERROR_INVALID_PARAMETERS = 1; diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index e17d7cca3..cca8019a8 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -106,4 +106,8 @@ default Map onTransactionUpdated(ITransactionDetails transactionD */ default void receiptSent(IReceiptDetails receiptDetails) { } + + default Map onDepositCreated(IDepositDetails depositDetails) { + return null; + } } From f3ef934756d78333ef71c5d22022538ff4a0783c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maro=C5=A1=20Silady?= <38668012+SMaros@users.noreply.github.com> Date: Mon, 27 May 2024 16:55:38 +0200 Subject: [PATCH 74/82] LC-376 - New Zealand regions (#909) --- .../server/extensions/CountryNewZealand.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryNewZealand.java diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryNewZealand.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryNewZealand.java new file mode 100644 index 000000000..ca906d3a9 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/CountryNewZealand.java @@ -0,0 +1,54 @@ +package com.generalbytes.batm.server.extensions; + +/** + * New Zealand regions identifiers. + *

+ * Usage e.g.: + * CountryNewZealand.NTL.getProvinceName() + * CountryNewZealand.valueOf("NTL").getProvinceName() + */ +public enum CountryNewZealand { + + NTL("NTL", "Northland"), + AUK("AUK", "Auckland"), + WKO("WKO", "Waikato"), + BOP("BOP", "Bay of Plenty"), + GIS("GIS", "Gisborne"), + HKB("HKB", "Hawke's Bay"), + TKI("TKI", "Taranaki"), + MWT("MWT", "Manawatū-Whanganui"), + WGN("WGN", "Wellington"), + TAS("TAS", "Tasman"), + NSN("NSN", "Nelson"), + MBH("MBH", "Marlborough"), + WTC("WTC", "West Coast"), + CAN("CAN", "Canterbury"), + OTA("OTA", "Otago"), + STL("STL", "Southland"); + + private final String iso; + + private final String provinceName; + + /** + * Private constructor. + */ + CountryNewZealand(String iso, String provinceName) { + this.iso = iso; + this.provinceName = provinceName; + } + + /** + * ISO 3166-2 code of the province (2 digits). + */ + public String getIso() { + return iso; + } + + /** + * English province/region name officially used by the ISO 3166 Maintenance Agency (ISO 3166/MA). + */ + public String getProvinceName() { + return provinceName; + } +} From 02861e4ca4f80a87f7036094e9eb50526ffadac7 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 27 May 2024 16:59:03 +0200 Subject: [PATCH 75/82] Increase project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7be125463..d7024827b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.5.1 +projectVersion=1.6.0 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From f25a19f370c2ba4905c33d9fcd17d6443e43a24f Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Thu, 30 May 2024 14:37:49 +0200 Subject: [PATCH 76/82] BATM-6033 Add API allowing to approve/override a deposit transaction (#913) --- gradle.properties | 2 +- .../extensions/IDepositPreparation.java | 63 +++++++++++++++++ .../server/extensions/IDepositRequest.java | 67 +++++++++++++++++++ .../extensions/ITransactionListener.java | 60 +++++++++++++++++ .../extensions/ITransactionRequest.java | 2 + 5 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java create mode 100644 server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java diff --git a/gradle.properties b/gradle.properties index d7024827b..288d91de9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.6.0 +projectVersion=1.6.1 # buildscript - common dependency versions bitrafaelVersion=1.0.44 diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java new file mode 100644 index 000000000..b333ee6ab --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java @@ -0,0 +1,63 @@ +/************************************************************************************* + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ + +package com.generalbytes.batm.server.extensions; + +import java.math.BigDecimal; + +/** + * Represents a deposit preparation made by a customer before the deposit is submitted by the customer. + */ +public interface IDepositPreparation { + + /** + * Serial number of the GB Safe where the deposit was made. + */ + String getSafeSerialNumber(); + + /** + * Deposit code used to identify the deposit. Equals to the RID of the order transaction. + */ + String getDepositCode(); + + /** + * Local transaction ID of the expected deposit transaction. Generated by GB Safe when preparing deposit. + */ + String getLocalTransactionId(); + + /** + * Amount of cash deposited. Can be overridden by an extension. + */ + BigDecimal getCashAmount(); + + /** + * Fiat currency of the cash deposited. + */ + String getCashCurrency(); + + /** + * Identity of the customer who made the deposit. + */ + IIdentity getIdentity(); + + /** + * Error message in case of error. + */ + String getErrorMessage(); + +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java new file mode 100644 index 000000000..b6da2a508 --- /dev/null +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java @@ -0,0 +1,67 @@ +/************************************************************************************* + * Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved. + * + * This software may be distributed and modified under the terms of the GNU + * General Public License version 2 (GPL2) as published by the Free Software + * Foundation and appearing in the file GPL2.TXT included in the packaging of + * this file. Please note that GPL2 Section 2[b] requires that all works based + * on this software must also be made publicly available under the terms of + * the GPL2 ("Copyleft"). + * + * Contact information + * ------------------- + * + * GENERAL BYTES s.r.o. + * Web : http://www.generalbytes.com + * + ************************************************************************************/ +package com.generalbytes.batm.server.extensions; + +import java.math.BigDecimal; + +/** + * Represents a deposit request submitted by a customer. + */ +public interface IDepositRequest { + + /** + * Serial number of the GB Safe where the deposit was made. + */ + String getSafeSerialNumber(); + + /** + * Deposit code used to identify the deposit. Equals to the RID of the order transaction. + */ + String getDepositCode(); + + /** + * Local transaction ID of the deposit transaction. Generated by GB Safe when preparing deposit. + */ + String getLocalTransactionId(); + + /** + * Remote transaction ID of the deposit transaction. + */ + String getRemoteTransactionId(); + + /** + * Amount of cash deposited. Can be overridden by an extension. + */ + BigDecimal getCashAmount(); + + /** + * Fiat currency of the cash deposited. + */ + String getCashCurrency(); + + /** + * Identity of the customer who made the deposit. + */ + IIdentity getIdentity(); + + /** + * Error message in case of error. + */ + String getErrorMessage(); + +} diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index cca8019a8..f6c776d99 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -107,7 +107,67 @@ default Map onTransactionUpdated(ITransactionDetails transactionD default void receiptSent(IReceiptDetails receiptDetails) { } + /** + * Callback method that is called by server when a deposit transaction is created on server + * Returned value is a map of keys and values that will be stored in the database and available for later use in ticket template + * + * @param depositDetails {@link IDepositDetails} + * @return map containing custom data related to the deposit + */ default Map onDepositCreated(IDepositDetails depositDetails) { return null; } + + /** + * Allows to approve or deny deposit preparation. Called after person inserts deposit code but before inserting money into GB Safe. + * When returned {@code false}, provided error message via {@link IDepositPreparation#getErrorMessage()} is displayed to user. + * + * @return result of the approval + */ + default boolean isDepositPreparationApproved(IDepositPreparation preparation) { + return true; + } + + /** + * Allows the operator to override following values in {@link IDepositPreparation}. + *

    + *
  • cashAmount
    • - cannot be higher than the provided amount, if yes will be reduced back to the provided amount + *
  • errorMessage
    • + *
+ * The method is called right before {@link ITransactionListener#isDepositPreparationApproved(IDepositPreparation)}, + * this allows to override values in preparation before the approval check. + * + * @param preparation The deposit preparation data + * @return {@link IDepositPreparation} that may contain modified data from an extension + */ + default IDepositPreparation overrideDepositPreparation(IDepositPreparation preparation) { + return preparation; + } + + /** + * Allows to approve or deny a deposit request. Called by server before a deposit transaction is created. + * When returned {@code false}, provided error message via {@link IDepositRequest#getErrorMessage()} is displayed to user + * and the transaction will be created in an ERROR status. + * + * @return result of the approval + */ + default boolean isTransactionApproved(IDepositRequest depositRequest) { + return true; + } + + /** + * Allows the operator to override following values in {@link IDepositRequest}. + *
    + *
  • cashAmount
    • - cannot be higher than the provided amount, if yes will be reduced back to the provided amount + *
  • errorMessage
    • + *
+ * This method is called for both BUY and SELL transactions. + * + * @param request The transaction request initialized by server + * @return {@link ITransactionRequest} that may contain modified transaction request. + */ + default IDepositRequest overrideTransactionRequest(IDepositRequest request) { + return request; + } + } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java index 09ef2c38e..4b59a9e71 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionRequest.java @@ -29,6 +29,8 @@ public interface ITransactionRequest { int TYPE_BUY_CRYPTO = 0; int TYPE_SELL_CRYPTO = 1; int TYPE_WITHDRAW_CASH = 2; + int TYPE_CASHBACK = 3; + int TYPE_ORDER_CRYPTO = 4; /** * Server time of the transaction From 8ca09a272fc2d2ab304246df2e42f5bc497c398e Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 3 Jun 2024 08:51:33 +0200 Subject: [PATCH 77/82] BATM-6033 Improve IDepositX API to return similar data as ITransactionX interfaces (#914) --- .../batm/server/extensions/IDepositDetails.java | 8 ++------ .../batm/server/extensions/IDepositPreparation.java | 4 ++-- .../batm/server/extensions/IDepositRequest.java | 4 ++-- .../batm/server/extensions/ITransactionListener.java | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java index a2f1957a9..f135e700e 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositDetails.java @@ -39,9 +39,9 @@ public interface IDepositDetails { String getDepositCode(); /** - * Identity of the customer who made the deposit. + * Identity public ID of the customer who made the deposit. */ - IIdentity getIdentity(); + String getIdentityPublicId(); /** * Amount of cash deposited. @@ -63,8 +63,4 @@ public interface IDepositDetails { */ String getLocalTransactionId(); - /** - * List of banknotes deposited in the transaction. - */ - List getBanknotes(); } diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java index b333ee6ab..f5b593f69 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositPreparation.java @@ -51,9 +51,9 @@ public interface IDepositPreparation { String getCashCurrency(); /** - * Identity of the customer who made the deposit. + * Identity public ID of the customer who made the deposit. */ - IIdentity getIdentity(); + String getIdentityPublicId(); /** * Error message in case of error. diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java index b6da2a508..96bd705c7 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/IDepositRequest.java @@ -55,9 +55,9 @@ public interface IDepositRequest { String getCashCurrency(); /** - * Identity of the customer who made the deposit. + * Identity public ID of the customer who made the deposit. */ - IIdentity getIdentity(); + String getIdentityPublicId(); /** * Error message in case of error. diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java index f6c776d99..093589934 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ITransactionListener.java @@ -151,7 +151,7 @@ default IDepositPreparation overrideDepositPreparation(IDepositPreparation prepa * * @return result of the approval */ - default boolean isTransactionApproved(IDepositRequest depositRequest) { + default boolean isDepositApproved(IDepositRequest request) { return true; } @@ -166,7 +166,7 @@ default boolean isTransactionApproved(IDepositRequest depositRequest) { * @param request The transaction request initialized by server * @return {@link ITransactionRequest} that may contain modified transaction request. */ - default IDepositRequest overrideTransactionRequest(IDepositRequest request) { + default IDepositRequest overrideDepositRequest(IDepositRequest request) { return request; } From c734cdd823c7694d6142e820131965bb24baea0a Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 3 Jun 2024 08:52:03 +0200 Subject: [PATCH 78/82] Increase project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 288d91de9..90be89b04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.6.1 +projectVersion=1.6.2 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From 53ccbcbd2c9743aa5b374e9bf77601e6e614c549 Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Tue, 11 Jun 2024 16:20:13 +0200 Subject: [PATCH 79/82] Update README.md Add how to enable extension hot reload feature --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 0de9b9778..b22d33b01 100644 --- a/README.md +++ b/README.md @@ -152,3 +152,15 @@ By default, verification-site runs on port 8443. You should change it and most i ```bash java -jar verification_site-.jar --server.port=443 --security.require-ssl=true --server.ssl.key-store=/etc/letsencrypt/live/example.com/keystore.p12 --server.ssl.key-store-password= --server.ssl.keyStoreType=PKCS12 --server.ssl.keyAlias=tomcat ``` +How to enable extension hot reload feature +================= +You can turn on/off extension hot reaload feature to be able to replace extension classes without restarting CAS. + +:warning: Use this feature with caution as it may allow anyone with access to the server to change extension code on the fly. + +To enable hot reload feature you need to modify `/batm/config/extensions` configuration file and set: + +``` +hot-reload=true +``` + From b26b4f4c417a16908eec0283e8972ab2a8186770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pl=C3=A1nsk=C3=BD?= <67519977+d0by1@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:07:18 +0200 Subject: [PATCH 80/82] BATM-6376 Fix US sanctions list failing to download (#916) --- .../extra/watchlists/ofac/tags/Comment.java | 25 +- .../ofac/tags/DateBoundarySchemaType.java | 61 +- .../watchlists/ofac/tags/DatePeriod.java | 93 +- .../ofac/tags/DatePointSchemaType.java | 49 +- .../watchlists/ofac/tags/DateSchemaType.java | 55 +- .../extra/watchlists/ofac/tags/Day.java | 25 +- .../ofac/tags/DeltaActionSchemaType.java | 11 +- .../extra/watchlists/ofac/tags/DirectURL.java | 25 +- .../ofac/tags/DistinctPartySchemaType.java | 279 +-- .../ofac/tags/DocumentedNameSchemaType.java | 173 +- .../ofac/tags/DurationSchemaType.java | 103 +- .../ofac/tags/EntryDeltaFlagSchemaType.java | 11 +- .../ofac/tags/FeatureSchemaType.java | 187 +- .../ofac/tags/FeatureVersionReference.java | 25 +- .../ofac/tags/IDRegDocumentReference.java | 25 +- .../ofac/tags/IDRegDocumentSchemaType.java | 227 ++- .../ofac/tags/IdentitySchemaType.java | 211 +- .../ofac/tags/LocationSchemaType.java | 211 +- .../extra/watchlists/ofac/tags/Month.java | 25 +- .../watchlists/ofac/tags/ObjectFactory.java | 311 +-- .../tags/ProfileRelationshipReference.java | 25 +- .../tags/ProfileRelationshipSchemaType.java | 89 +- .../ofac/tags/ReferenceSchemaType.java | 11 +- .../tags/ReferenceValueSetsSchemaType.java | 1775 +++++++++-------- .../extra/watchlists/ofac/tags/Sanctions.java | 163 +- .../tags/SanctionsEntryLinkSchemaType.java | 63 +- .../ofac/tags/SanctionsEntrySchemaType.java | 279 +-- .../extra/watchlists/ofac/tags/Year.java | 25 +- .../watchlists/ofac/tags/sdn_advanced.xsd | 6 +- .../src/test/resources/ofac_sdn_advanced.xml | 5 +- 30 files changed, 2385 insertions(+), 2188 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Comment.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Comment.java index 480104681..8716dfa11 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Comment.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Comment.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -19,7 +26,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -31,15 +38,15 @@ @XmlType(name = "", propOrder = { "value" }) -@XmlRootElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class Comment { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -50,7 +57,7 @@ public class Comment { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -63,7 +70,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -76,7 +83,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -89,7 +96,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateBoundarySchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateBoundarySchemaType.java index d0539bba3..a3bc32ce5 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateBoundarySchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateBoundarySchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,16 +31,16 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}From"/> - * <element ref="{http://www.un.org/sanctions/1.0}To" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}From"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}To" minOccurs="0"/> * </sequence> - * <element ref="{http://www.un.org/sanctions/1.0}To"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}To"/> * </choice> * <attribute name="Approximate" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="YearFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="MonthFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="DayFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -42,32 +49,32 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DateBoundarySchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DateBoundarySchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "content" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DateBoundarySchemaType { @XmlElementRefs({ - @XmlElementRef(name = "From", namespace = "http://www.un.org/sanctions/1.0", type = JAXBElement.class, required = false), - @XmlElementRef(name = "To", namespace = "http://www.un.org/sanctions/1.0", type = JAXBElement.class, required = false) + @XmlElementRef(name = "To", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", type = JAXBElement.class, required = false), + @XmlElementRef(name = "From", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", type = JAXBElement.class, required = false) }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List> content; @XmlAttribute(name = "Approximate", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean approximate; @XmlAttribute(name = "YearFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean yearFixed; @XmlAttribute(name = "MonthFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean monthFixed; @XmlAttribute(name = "DayFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean dayFixed; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -76,8 +83,8 @@ public class DateBoundarySchemaType { *

* You are getting this "catch-all" property because of the following reason: * The field name "To" is used by two different parts of a schema. See: - * line 1228 of file:/home/b00lean/projects/batm/batm_main/server/src/com/generalbytes/batm/server/services/amlkyc/watchlist/ofac/tags/sdn_advanced.xsd - * line 1226 of file:/home/b00lean/projects/batm/batm_main/server/src/com/generalbytes/batm/server/services/amlkyc/watchlist/ofac/tags/sdn_advanced.xsd + * line 1228 of file:/home/tplansky/IdeaProjects/batm_public/server_extensions_extra/src/main/java/sdn_advanced.xsd + * line 1226 of file:/home/tplansky/IdeaProjects/batm_public/server_extensions_extra/src/main/java/sdn_advanced.xsd *

* To get rid of this property, apply a property customization to one * of both of the following declarations to change their names: @@ -103,7 +110,7 @@ public class DateBoundarySchemaType { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List> getContent() { if (content == null) { content = new ArrayList>(); @@ -115,7 +122,7 @@ public List> getContent() { * Gets the value of the approximate property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isApproximate() { return approximate; } @@ -124,7 +131,7 @@ public boolean isApproximate() { * Sets the value of the approximate property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setApproximate(boolean value) { this.approximate = value; } @@ -133,7 +140,7 @@ public void setApproximate(boolean value) { * Gets the value of the yearFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isYearFixed() { return yearFixed; } @@ -142,7 +149,7 @@ public boolean isYearFixed() { * Sets the value of the yearFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setYearFixed(boolean value) { this.yearFixed = value; } @@ -151,7 +158,7 @@ public void setYearFixed(boolean value) { * Gets the value of the monthFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isMonthFixed() { return monthFixed; } @@ -160,7 +167,7 @@ public boolean isMonthFixed() { * Sets the value of the monthFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setMonthFixed(boolean value) { this.monthFixed = value; } @@ -169,7 +176,7 @@ public void setMonthFixed(boolean value) { * Gets the value of the dayFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isDayFixed() { return dayFixed; } @@ -178,7 +185,7 @@ public boolean isDayFixed() { * Sets the value of the dayFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDayFixed(boolean value) { this.dayFixed = value; } @@ -191,7 +198,7 @@ public void setDayFixed(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -204,7 +211,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePeriod.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePeriod.java index 7432dd8a0..d50e2326d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePeriod.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePeriod.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -22,17 +29,17 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element name="Start" type="{http://www.un.org/sanctions/1.0}DateBoundarySchemaType" minOccurs="0"/> - * <element name="End" type="{http://www.un.org/sanctions/1.0}DateBoundarySchemaType" minOccurs="0"/> - * <element name="DurationMinimum" type="{http://www.un.org/sanctions/1.0}DurationSchemaType" minOccurs="0"/> - * <element name="DurationMaximum" type="{http://www.un.org/sanctions/1.0}DurationSchemaType" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element name="Start" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateBoundarySchemaType" minOccurs="0"/> + * <element name="End" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateBoundarySchemaType" minOccurs="0"/> + * <element name="DurationMinimum" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DurationSchemaType" minOccurs="0"/> + * <element name="DurationMaximum" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DurationSchemaType" minOccurs="0"/> * </sequence> * <attribute name="CalendarTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="YearFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="MonthFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="DayFixed" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -48,40 +55,40 @@ "durationMinimum", "durationMaximum" }) -@XmlRootElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DatePeriod { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "Start", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Start", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DateBoundarySchemaType start; - @XmlElement(name = "End", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "End", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DateBoundarySchemaType end; - @XmlElement(name = "DurationMinimum", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DurationMinimum", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DurationSchemaType durationMinimum; - @XmlElement(name = "DurationMaximum", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DurationMaximum", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DurationSchemaType durationMaximum; @XmlAttribute(name = "CalendarTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger calendarTypeID; @XmlAttribute(name = "YearFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean yearFixed; @XmlAttribute(name = "MonthFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean monthFixed; @XmlAttribute(name = "DayFixed", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean dayFixed; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -92,7 +99,7 @@ public class DatePeriod { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -105,7 +112,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -118,7 +125,7 @@ public void setComment(Comment value) { * {@link DateBoundarySchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DateBoundarySchemaType getStart() { return start; } @@ -131,7 +138,7 @@ public DateBoundarySchemaType getStart() { * {@link DateBoundarySchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setStart(DateBoundarySchemaType value) { this.start = value; } @@ -144,7 +151,7 @@ public void setStart(DateBoundarySchemaType value) { * {@link DateBoundarySchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DateBoundarySchemaType getEnd() { return end; } @@ -157,7 +164,7 @@ public DateBoundarySchemaType getEnd() { * {@link DateBoundarySchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEnd(DateBoundarySchemaType value) { this.end = value; } @@ -170,7 +177,7 @@ public void setEnd(DateBoundarySchemaType value) { * {@link DurationSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DurationSchemaType getDurationMinimum() { return durationMinimum; } @@ -183,7 +190,7 @@ public DurationSchemaType getDurationMinimum() { * {@link DurationSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDurationMinimum(DurationSchemaType value) { this.durationMinimum = value; } @@ -196,7 +203,7 @@ public void setDurationMinimum(DurationSchemaType value) { * {@link DurationSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DurationSchemaType getDurationMaximum() { return durationMaximum; } @@ -209,7 +216,7 @@ public DurationSchemaType getDurationMaximum() { * {@link DurationSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDurationMaximum(DurationSchemaType value) { this.durationMaximum = value; } @@ -222,7 +229,7 @@ public void setDurationMaximum(DurationSchemaType value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCalendarTypeID() { return calendarTypeID; } @@ -235,7 +242,7 @@ public BigInteger getCalendarTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCalendarTypeID(BigInteger value) { this.calendarTypeID = value; } @@ -244,7 +251,7 @@ public void setCalendarTypeID(BigInteger value) { * Gets the value of the yearFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isYearFixed() { return yearFixed; } @@ -253,7 +260,7 @@ public boolean isYearFixed() { * Sets the value of the yearFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setYearFixed(boolean value) { this.yearFixed = value; } @@ -262,7 +269,7 @@ public void setYearFixed(boolean value) { * Gets the value of the monthFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isMonthFixed() { return monthFixed; } @@ -271,7 +278,7 @@ public boolean isMonthFixed() { * Sets the value of the monthFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setMonthFixed(boolean value) { this.monthFixed = value; } @@ -280,7 +287,7 @@ public void setMonthFixed(boolean value) { * Gets the value of the dayFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isDayFixed() { return dayFixed; } @@ -289,7 +296,7 @@ public boolean isDayFixed() { * Sets the value of the dayFixed property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDayFixed(boolean value) { this.dayFixed = value; } @@ -302,7 +309,7 @@ public void setDayFixed(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -315,7 +322,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePointSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePointSchemaType.java index f2ee14538..15e338c11 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePointSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DatePointSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -19,11 +26,11 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Year"/> - * <element ref="{http://www.un.org/sanctions/1.0}Month"/> - * <element ref="{http://www.un.org/sanctions/1.0}Day"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Year"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Month"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Day"/> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -32,25 +39,25 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DatePointSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DatePointSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "year", "month", "day" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DatePointSchemaType { - @XmlElement(name = "Year", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Year", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Year year; - @XmlElement(name = "Month", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Month", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Month month; - @XmlElement(name = "Day", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Day", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Day day; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -61,7 +68,7 @@ public class DatePointSchemaType { * {@link Year } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Year getYear() { return year; } @@ -74,7 +81,7 @@ public Year getYear() { * {@link Year } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setYear(Year value) { this.year = value; } @@ -87,7 +94,7 @@ public void setYear(Year value) { * {@link Month } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Month getMonth() { return month; } @@ -100,7 +107,7 @@ public Month getMonth() { * {@link Month } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setMonth(Month value) { this.month = value; } @@ -113,7 +120,7 @@ public void setMonth(Month value) { * {@link Day } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Day getDay() { return day; } @@ -126,7 +133,7 @@ public Day getDay() { * {@link Day } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDay(Day value) { this.day = value; } @@ -139,7 +146,7 @@ public void setDay(Day value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -152,7 +159,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateSchemaType.java index b7db80fdc..5e6fa88ba 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DateSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,12 +28,12 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Year"/> - * <element ref="{http://www.un.org/sanctions/1.0}Month"/> - * <element ref="{http://www.un.org/sanctions/1.0}Day"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Year"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Month"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Day"/> * </sequence> * <attribute name="CalendarTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -35,29 +42,29 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DateSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DateSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "year", "month", "day" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DateSchemaType { - @XmlElement(name = "Year", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Year", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Year year; - @XmlElement(name = "Month", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Month", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Month month; - @XmlElement(name = "Day", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Day", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Day day; @XmlAttribute(name = "CalendarTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger calendarTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -68,7 +75,7 @@ public class DateSchemaType { * {@link Year } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Year getYear() { return year; } @@ -81,7 +88,7 @@ public Year getYear() { * {@link Year } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setYear(Year value) { this.year = value; } @@ -94,7 +101,7 @@ public void setYear(Year value) { * {@link Month } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Month getMonth() { return month; } @@ -107,7 +114,7 @@ public Month getMonth() { * {@link Month } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setMonth(Month value) { this.month = value; } @@ -120,7 +127,7 @@ public void setMonth(Month value) { * {@link Day } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Day getDay() { return day; } @@ -133,7 +140,7 @@ public Day getDay() { * {@link Day } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDay(Day value) { this.day = value; } @@ -146,7 +153,7 @@ public void setDay(Day value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCalendarTypeID() { return calendarTypeID; } @@ -159,7 +166,7 @@ public BigInteger getCalendarTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCalendarTypeID(BigInteger value) { this.calendarTypeID = value; } @@ -172,7 +179,7 @@ public void setCalendarTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -185,7 +192,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Day.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Day.java index c270243eb..4db0bd363 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Day.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Day.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -33,16 +40,16 @@ @XmlType(name = "", propOrder = { "value" }) -@XmlRootElement(name = "Day", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "Day", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class Day { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -53,7 +60,7 @@ public class Day { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -66,7 +73,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -79,7 +86,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -92,7 +99,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DeltaActionSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DeltaActionSchemaType.java index 70bb894ad..dd0b52882 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DeltaActionSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DeltaActionSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,9 +31,9 @@ * * */ -@XmlType(name = "DeltaActionSchemaType", namespace = "http://www.un.org/sanctions/1.0") +@XmlType(name = "DeltaActionSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") @XmlEnum -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public enum DeltaActionSchemaType { @XmlEnumValue("add") diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DirectURL.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DirectURL.java index 63d779589..091f53690 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DirectURL.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DirectURL.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -19,7 +26,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -31,15 +38,15 @@ @XmlType(name = "", propOrder = { "value" }) -@XmlRootElement(name = "DirectURL", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "DirectURL", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DirectURL { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -50,7 +57,7 @@ public class DirectURL { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -63,7 +70,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -76,7 +83,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -89,7 +96,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DistinctPartySchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DistinctPartySchemaType.java index 53d63995b..a43b117e7 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DistinctPartySchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DistinctPartySchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,21 +31,21 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" maxOccurs="unbounded" minOccurs="0"/> * <element name="Profile" maxOccurs="unbounded"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" maxOccurs="unbounded" minOccurs="0"/> - * <element name="Identity" type="{http://www.un.org/sanctions/1.0}IdentitySchemaType" maxOccurs="unbounded"/> - * <element name="Feature" type="{http://www.un.org/sanctions/1.0}FeatureSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Identity" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IdentitySchemaType" maxOccurs="unbounded"/> + * <element name="Feature" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}FeatureSchemaType" maxOccurs="unbounded" minOccurs="0"/> * <element name="SanctionsEntryReference" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -48,17 +55,17 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="ExRefValue" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL" minOccurs="0"/> * <element name="SubLink" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> @@ -68,22 +75,22 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL"/> * </sequence> * <attribute name="TargetTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="ExRefTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -91,14 +98,14 @@ * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="PartySubTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="FixedRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -107,24 +114,24 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DistinctPartySchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DistinctPartySchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "profile" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DistinctPartySchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List comment; - @XmlElement(name = "Profile", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Profile", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List profile; @XmlAttribute(name = "FixedRef", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String fixedRef; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -149,7 +156,7 @@ public class DistinctPartySchemaType { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getComment() { if (comment == null) { comment = new ArrayList(); @@ -179,7 +186,7 @@ public List getComment() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getProfile() { if (profile == null) { profile = new ArrayList(); @@ -195,7 +202,7 @@ public List getProfile() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getFixedRef() { return fixedRef; } @@ -208,7 +215,7 @@ public String getFixedRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFixedRef(String value) { this.fixedRef = value; } @@ -221,7 +228,7 @@ public void setFixedRef(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -234,7 +241,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -250,15 +257,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" maxOccurs="unbounded" minOccurs="0"/> - * <element name="Identity" type="{http://www.un.org/sanctions/1.0}IdentitySchemaType" maxOccurs="unbounded"/> - * <element name="Feature" type="{http://www.un.org/sanctions/1.0}FeatureSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Identity" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IdentitySchemaType" maxOccurs="unbounded"/> + * <element name="Feature" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}FeatureSchemaType" maxOccurs="unbounded" minOccurs="0"/> * <element name="SanctionsEntryReference" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -268,17 +275,17 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="ExRefValue" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL" minOccurs="0"/> * <element name="SubLink" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> @@ -288,22 +295,22 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL"/> * </sequence> * <attribute name="TargetTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="ExRefTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -311,7 +318,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="PartySubTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -327,34 +334,34 @@ public void setDeltaAction(DeltaActionSchemaType value) { "sanctionsEntryReference", "externalReference" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Profile { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List comment; - @XmlElement(name = "Identity", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Identity", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List identity; - @XmlElement(name = "Feature", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Feature", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List feature; - @XmlElement(name = "SanctionsEntryReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsEntryReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List sanctionsEntryReference; - @XmlElement(name = "ExternalReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ExternalReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List externalReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "PartySubTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger partySubTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -379,7 +386,7 @@ public static class Profile { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getComment() { if (comment == null) { comment = new ArrayList(); @@ -409,7 +416,7 @@ public List getComment() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIdentity() { if (identity == null) { identity = new ArrayList(); @@ -439,7 +446,7 @@ public List getIdentity() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getFeature() { if (feature == null) { feature = new ArrayList(); @@ -469,7 +476,7 @@ public List getFeature() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSanctionsEntryReference() { if (sanctionsEntryReference == null) { sanctionsEntryReference = new ArrayList(); @@ -499,7 +506,7 @@ public List getSanction * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getExternalReference() { if (externalReference == null) { externalReference = new ArrayList(); @@ -515,7 +522,7 @@ public List getExternalRefere * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -528,7 +535,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -541,7 +548,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getPartySubTypeID() { return partySubTypeID; } @@ -554,7 +561,7 @@ public BigInteger getPartySubTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPartySubTypeID(BigInteger value) { this.partySubTypeID = value; } @@ -567,7 +574,7 @@ public void setPartySubTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -580,7 +587,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -596,17 +603,17 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="ExRefValue" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL" minOccurs="0"/> * <element name="SubLink" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> @@ -616,22 +623,22 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL"/> * </sequence> * <attribute name="TargetTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="ExRefTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -646,27 +653,27 @@ public void setDeltaAction(DeltaActionSchemaType value) { "directURL", "subLink" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ExternalReference { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "ExRefValue", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ExRefValue", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DistinctPartySchemaType.Profile.ExternalReference.ExRefValue exRefValue; - @XmlElement(name = "DirectURL", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DirectURL", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DirectURL directURL; - @XmlElement(name = "SubLink", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SubLink", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List subLink; @XmlAttribute(name = "ExRefTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger exRefTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -677,7 +684,7 @@ public static class ExternalReference { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -690,7 +697,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -703,7 +710,7 @@ public void setComment(Comment value) { * {@link DistinctPartySchemaType.Profile.ExternalReference.ExRefValue } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DistinctPartySchemaType.Profile.ExternalReference.ExRefValue getExRefValue() { return exRefValue; } @@ -716,7 +723,7 @@ public DistinctPartySchemaType.Profile.ExternalReference.ExRefValue getExRefValu * {@link DistinctPartySchemaType.Profile.ExternalReference.ExRefValue } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setExRefValue(DistinctPartySchemaType.Profile.ExternalReference.ExRefValue value) { this.exRefValue = value; } @@ -729,7 +736,7 @@ public void setExRefValue(DistinctPartySchemaType.Profile.ExternalReference.ExRe * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DirectURL getDirectURL() { return directURL; } @@ -742,7 +749,7 @@ public DirectURL getDirectURL() { * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDirectURL(DirectURL value) { this.directURL = value; } @@ -769,7 +776,7 @@ public void setDirectURL(DirectURL value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSubLink() { if (subLink == null) { subLink = new ArrayList(); @@ -785,7 +792,7 @@ public List getSubLin * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getExRefTypeID() { return exRefTypeID; } @@ -798,7 +805,7 @@ public BigInteger getExRefTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setExRefTypeID(BigInteger value) { this.exRefTypeID = value; } @@ -811,7 +818,7 @@ public void setExRefTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -824,7 +831,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -839,7 +846,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -851,14 +858,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ExRefValue { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -869,7 +876,7 @@ public static class ExRefValue { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -882,7 +889,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -895,7 +902,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -908,7 +915,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -930,15 +937,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL"/> * </sequence> * <attribute name="TargetTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -951,21 +958,21 @@ public void setDeltaAction(DeltaActionSchemaType value) { "description", "directURL" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SubLink { - @XmlElement(name = "Description", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Description", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description description; - @XmlElement(name = "DirectURL", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DirectURL", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DirectURL directURL; @XmlAttribute(name = "TargetTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger targetTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -976,7 +983,7 @@ public static class SubLink { * {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description getDescription() { return description; } @@ -989,7 +996,7 @@ public DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description get * {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDescription(DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description value) { this.description = value; } @@ -1002,7 +1009,7 @@ public void setDescription(DistinctPartySchemaType.Profile.ExternalReference.Sub * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DirectURL getDirectURL() { return directURL; } @@ -1015,7 +1022,7 @@ public DirectURL getDirectURL() { * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDirectURL(DirectURL value) { this.directURL = value; } @@ -1028,7 +1035,7 @@ public void setDirectURL(DirectURL value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getTargetTypeID() { return targetTypeID; } @@ -1041,7 +1048,7 @@ public BigInteger getTargetTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setTargetTypeID(BigInteger value) { this.targetTypeID = value; } @@ -1054,7 +1061,7 @@ public void setTargetTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1067,7 +1074,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -1082,7 +1089,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -1094,14 +1101,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Description { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -1112,7 +1119,7 @@ public static class Description { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -1125,7 +1132,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -1138,7 +1145,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1151,7 +1158,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -1173,7 +1180,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -1183,15 +1190,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsEntryReference { @XmlAttribute(name = "SanctionsEntryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger sanctionsEntryID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -1202,7 +1209,7 @@ public static class SanctionsEntryReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getSanctionsEntryID() { return sanctionsEntryID; } @@ -1215,7 +1222,7 @@ public BigInteger getSanctionsEntryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsEntryID(BigInteger value) { this.sanctionsEntryID = value; } @@ -1228,7 +1235,7 @@ public void setSanctionsEntryID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1241,7 +1248,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DocumentedNameSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DocumentedNameSchemaType.java index 4c151dd00..95a830bb5 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DocumentedNameSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DocumentedNameSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,7 +31,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="DocumentedNamePart" maxOccurs="unbounded"> * <complexType> * <complexContent> @@ -38,7 +45,7 @@ * <attribute name="ScriptID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Acronym" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -46,7 +53,7 @@ * </sequence> * <attribute name="LeadingChars" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="TrailingChars" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -56,20 +63,20 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * </sequence> * <attribute name="CountryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FixedRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="DocNameStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -78,40 +85,40 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DocumentedNameSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DocumentedNameSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "documentedNamePart", "documentedNameCountry", "idRegDocumentReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DocumentedNameSchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "DocumentedNamePart", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocumentedNamePart", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List documentedNamePart; - @XmlElement(name = "DocumentedNameCountry", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocumentedNameCountry", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List documentedNameCountry; - @XmlElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "FixedRef", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String fixedRef; @XmlAttribute(name = "DocNameStatusID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger docNameStatusID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -122,7 +129,7 @@ public class DocumentedNameSchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -135,7 +142,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -162,7 +169,7 @@ public void setComment(Comment value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDocumentedNamePart() { if (documentedNamePart == null) { documentedNamePart = new ArrayList(); @@ -192,7 +199,7 @@ public List getDocumentedNamePart() * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDocumentedNameCountry() { if (documentedNameCountry == null) { documentedNameCountry = new ArrayList(); @@ -222,7 +229,7 @@ public List getDocumentedNameCou * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentReference() { if (idRegDocumentReference == null) { idRegDocumentReference = new ArrayList(); @@ -238,7 +245,7 @@ public List getIDRegDocumentReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -251,7 +258,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -264,7 +271,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getFixedRef() { return fixedRef; } @@ -277,7 +284,7 @@ public String getFixedRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFixedRef(String value) { this.fixedRef = value; } @@ -290,7 +297,7 @@ public void setFixedRef(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getDocNameStatusID() { return docNameStatusID; } @@ -303,7 +310,7 @@ public BigInteger getDocNameStatusID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDocNameStatusID(BigInteger value) { this.docNameStatusID = value; } @@ -316,7 +323,7 @@ public void setDocNameStatusID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -329,7 +336,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -345,10 +352,10 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * </sequence> * <attribute name="CountryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -360,18 +367,18 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "comment" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DocumentedNameCountry { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; @XmlAttribute(name = "CountryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger countryID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -382,7 +389,7 @@ public static class DocumentedNameCountry { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -395,7 +402,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -408,7 +415,7 @@ public void setComment(Comment value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCountryID() { return countryID; } @@ -421,7 +428,7 @@ public BigInteger getCountryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryID(BigInteger value) { this.countryID = value; } @@ -434,7 +441,7 @@ public void setCountryID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -447,7 +454,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -473,7 +480,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <attribute name="ScriptID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Acronym" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -481,7 +488,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * </sequence> * <attribute name="LeadingChars" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="TrailingChars" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -493,20 +500,20 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "namePartValue" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DocumentedNamePart { - @XmlElement(name = "NamePartValue", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "NamePartValue", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DocumentedNameSchemaType.DocumentedNamePart.NamePartValue namePartValue; @XmlAttribute(name = "LeadingChars") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String leadingChars; @XmlAttribute(name = "TrailingChars") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String trailingChars; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -517,7 +524,7 @@ public static class DocumentedNamePart { * {@link DocumentedNameSchemaType.DocumentedNamePart.NamePartValue } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DocumentedNameSchemaType.DocumentedNamePart.NamePartValue getNamePartValue() { return namePartValue; } @@ -530,7 +537,7 @@ public DocumentedNameSchemaType.DocumentedNamePart.NamePartValue getNamePartValu * {@link DocumentedNameSchemaType.DocumentedNamePart.NamePartValue } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setNamePartValue(DocumentedNameSchemaType.DocumentedNamePart.NamePartValue value) { this.namePartValue = value; } @@ -543,7 +550,7 @@ public void setNamePartValue(DocumentedNameSchemaType.DocumentedNamePart.NamePar * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getLeadingChars() { return leadingChars; } @@ -556,7 +563,7 @@ public String getLeadingChars() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLeadingChars(String value) { this.leadingChars = value; } @@ -569,7 +576,7 @@ public void setLeadingChars(String value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getTrailingChars() { return trailingChars; } @@ -582,7 +589,7 @@ public String getTrailingChars() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setTrailingChars(String value) { this.trailingChars = value; } @@ -595,7 +602,7 @@ public void setTrailingChars(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -608,7 +615,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -627,7 +634,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <attribute name="ScriptID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Acronym" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -639,29 +646,29 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class NamePartValue { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "NamePartGroupID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger namePartGroupID; @XmlAttribute(name = "ScriptID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger scriptID; @XmlAttribute(name = "ScriptStatusID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger scriptStatusID; @XmlAttribute(name = "Acronym", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean acronym; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -672,7 +679,7 @@ public static class NamePartValue { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -685,7 +692,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -698,7 +705,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getNamePartGroupID() { return namePartGroupID; } @@ -711,7 +718,7 @@ public BigInteger getNamePartGroupID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setNamePartGroupID(BigInteger value) { this.namePartGroupID = value; } @@ -724,7 +731,7 @@ public void setNamePartGroupID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getScriptID() { return scriptID; } @@ -737,7 +744,7 @@ public BigInteger getScriptID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setScriptID(BigInteger value) { this.scriptID = value; } @@ -750,7 +757,7 @@ public void setScriptID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getScriptStatusID() { return scriptStatusID; } @@ -763,7 +770,7 @@ public BigInteger getScriptStatusID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setScriptStatusID(BigInteger value) { this.scriptStatusID = value; } @@ -772,7 +779,7 @@ public void setScriptStatusID(BigInteger value) { * Gets the value of the acronym property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isAcronym() { return acronym; } @@ -781,7 +788,7 @@ public boolean isAcronym() { * Sets the value of the acronym property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAcronym(boolean value) { this.acronym = value; } @@ -794,7 +801,7 @@ public void setAcronym(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -807,7 +814,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DurationSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DurationSchemaType.java index 8ab2ca6d4..fdc0b34c2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DurationSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/DurationSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -26,7 +33,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -35,7 +42,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -44,14 +51,14 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> * </sequence> * <attribute name="Approximate" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -60,28 +67,28 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DurationSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "DurationSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "years", "months", "days" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class DurationSchemaType { - @XmlElement(name = "Years", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Years", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DurationSchemaType.Years years; - @XmlElement(name = "Months", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Months", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DurationSchemaType.Months months; - @XmlElement(name = "Days", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Days", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DurationSchemaType.Days days; @XmlAttribute(name = "Approximate", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean approximate; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -92,7 +99,7 @@ public class DurationSchemaType { * {@link DurationSchemaType.Years } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DurationSchemaType.Years getYears() { return years; } @@ -105,7 +112,7 @@ public DurationSchemaType.Years getYears() { * {@link DurationSchemaType.Years } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setYears(DurationSchemaType.Years value) { this.years = value; } @@ -118,7 +125,7 @@ public void setYears(DurationSchemaType.Years value) { * {@link DurationSchemaType.Months } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DurationSchemaType.Months getMonths() { return months; } @@ -131,7 +138,7 @@ public DurationSchemaType.Months getMonths() { * {@link DurationSchemaType.Months } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setMonths(DurationSchemaType.Months value) { this.months = value; } @@ -144,7 +151,7 @@ public void setMonths(DurationSchemaType.Months value) { * {@link DurationSchemaType.Days } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DurationSchemaType.Days getDays() { return days; } @@ -157,7 +164,7 @@ public DurationSchemaType.Days getDays() { * {@link DurationSchemaType.Days } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDays(DurationSchemaType.Days value) { this.days = value; } @@ -166,7 +173,7 @@ public void setDays(DurationSchemaType.Days value) { * Gets the value of the approximate property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isApproximate() { return approximate; } @@ -175,7 +182,7 @@ public boolean isApproximate() { * Sets the value of the approximate property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setApproximate(boolean value) { this.approximate = value; } @@ -188,7 +195,7 @@ public void setApproximate(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -201,7 +208,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -216,7 +223,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -228,15 +235,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Days { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -247,7 +254,7 @@ public static class Days { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -260,7 +267,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -273,7 +280,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -286,7 +293,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -303,7 +310,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -315,15 +322,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Months { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -334,7 +341,7 @@ public static class Months { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -347,7 +354,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -360,7 +367,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -373,7 +380,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -390,7 +397,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -402,15 +409,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Years { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -421,7 +428,7 @@ public static class Years { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -434,7 +441,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -447,7 +454,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -460,7 +467,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/EntryDeltaFlagSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/EntryDeltaFlagSchemaType.java index 01d04720e..cd6e477c6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/EntryDeltaFlagSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/EntryDeltaFlagSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -23,9 +30,9 @@ * * */ -@XmlType(name = "EntryDeltaFlagSchemaType", namespace = "http://www.un.org/sanctions/1.0") +@XmlType(name = "EntryDeltaFlagSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") @XmlEnum -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public enum EntryDeltaFlagSchemaType { @XmlEnumValue("NewEntry") diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureSchemaType.java index 49955e9c2..53f775155 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -29,15 +36,15 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod" maxOccurs="unbounded" minOccurs="0"/> * <element name="VersionDetail" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="DetailTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailReferenceID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -47,16 +54,16 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="LocationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ReliabilityID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -67,7 +74,7 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="IdentityID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="IdentityFeatureLinkTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -75,7 +82,7 @@ * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FeatureTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -84,29 +91,29 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "FeatureSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "FeatureSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "featureVersion", "identityReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class FeatureSchemaType { - @XmlElement(name = "FeatureVersion", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureVersion", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List featureVersion; - @XmlElement(name = "IdentityReference", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IdentityReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List identityReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "FeatureTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger featureTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -131,7 +138,7 @@ public class FeatureSchemaType { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getFeatureVersion() { if (featureVersion == null) { featureVersion = new ArrayList(); @@ -161,7 +168,7 @@ public List getFeatureVersion() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIdentityReference() { if (identityReference == null) { identityReference = new ArrayList(); @@ -177,7 +184,7 @@ public List getIdentityReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -190,7 +197,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -203,7 +210,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getFeatureTypeID() { return featureTypeID; } @@ -216,7 +223,7 @@ public BigInteger getFeatureTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFeatureTypeID(BigInteger value) { this.featureTypeID = value; } @@ -229,7 +236,7 @@ public void setFeatureTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -242,7 +249,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -258,15 +265,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod" maxOccurs="unbounded" minOccurs="0"/> * <element name="VersionDetail" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="DetailTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailReferenceID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -276,16 +283,16 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="LocationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ReliabilityID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -301,34 +308,34 @@ public void setDeltaAction(DeltaActionSchemaType value) { "versionLocation", "idRegDocumentReference" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class FeatureVersion { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List datePeriod; - @XmlElement(name = "VersionDetail", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "VersionDetail", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List versionDetail; - @XmlElement(name = "VersionLocation", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "VersionLocation", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List versionLocation; - @XmlElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "ReliabilityID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger reliabilityID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -339,7 +346,7 @@ public static class FeatureVersion { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -352,7 +359,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -379,7 +386,7 @@ public void setComment(Comment value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDatePeriod() { if (datePeriod == null) { datePeriod = new ArrayList(); @@ -409,7 +416,7 @@ public List getDatePeriod() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getVersionDetail() { if (versionDetail == null) { versionDetail = new ArrayList(); @@ -439,7 +446,7 @@ public List getVersionDetail() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getVersionLocation() { if (versionLocation == null) { versionLocation = new ArrayList(); @@ -469,7 +476,7 @@ public List getVersionLocation * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentReference() { if (idRegDocumentReference == null) { idRegDocumentReference = new ArrayList(); @@ -485,7 +492,7 @@ public List getIDRegDocumentReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -498,7 +505,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -511,7 +518,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getReliabilityID() { return reliabilityID; } @@ -524,7 +531,7 @@ public BigInteger getReliabilityID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setReliabilityID(BigInteger value) { this.reliabilityID = value; } @@ -537,7 +544,7 @@ public void setReliabilityID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -550,7 +557,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -567,7 +574,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="DetailTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailReferenceID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -579,22 +586,22 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class VersionDetail { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DetailTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger detailTypeID; @XmlAttribute(name = "DetailReferenceID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger detailReferenceID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -605,7 +612,7 @@ public static class VersionDetail { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -618,7 +625,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -631,7 +638,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getDetailTypeID() { return detailTypeID; } @@ -644,7 +651,7 @@ public BigInteger getDetailTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDetailTypeID(BigInteger value) { this.detailTypeID = value; } @@ -657,7 +664,7 @@ public void setDetailTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getDetailReferenceID() { return detailReferenceID; } @@ -670,7 +677,7 @@ public BigInteger getDetailReferenceID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDetailReferenceID(BigInteger value) { this.detailReferenceID = value; } @@ -683,7 +690,7 @@ public void setDetailReferenceID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -696,7 +703,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -714,7 +721,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="LocationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -724,15 +731,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class VersionLocation { @XmlAttribute(name = "LocationID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger locationID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -743,7 +750,7 @@ public static class VersionLocation { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLocationID() { return locationID; } @@ -756,7 +763,7 @@ public BigInteger getLocationID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocationID(BigInteger value) { this.locationID = value; } @@ -769,7 +776,7 @@ public void setLocationID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -782,7 +789,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -803,7 +810,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="IdentityID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="IdentityFeatureLinkTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -813,19 +820,19 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IdentityReference { @XmlAttribute(name = "IdentityID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger identityID; @XmlAttribute(name = "IdentityFeatureLinkTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger identityFeatureLinkTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -836,7 +843,7 @@ public static class IdentityReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIdentityID() { return identityID; } @@ -849,7 +856,7 @@ public BigInteger getIdentityID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIdentityID(BigInteger value) { this.identityID = value; } @@ -862,7 +869,7 @@ public void setIdentityID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIdentityFeatureLinkTypeID() { return identityFeatureLinkTypeID; } @@ -875,7 +882,7 @@ public BigInteger getIdentityFeatureLinkTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIdentityFeatureLinkTypeID(BigInteger value) { this.identityFeatureLinkTypeID = value; } @@ -888,7 +895,7 @@ public void setIdentityFeatureLinkTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -901,7 +908,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureVersionReference.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureVersionReference.java index 061e0ccbd..24cc07563 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureVersionReference.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/FeatureVersionReference.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="FeatureVersionID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -31,16 +38,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -@XmlRootElement(name = "FeatureVersionReference", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "FeatureVersionReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class FeatureVersionReference { @XmlAttribute(name = "FeatureVersionID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger featureVersionID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -51,7 +58,7 @@ public class FeatureVersionReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getFeatureVersionID() { return featureVersionID; } @@ -64,7 +71,7 @@ public BigInteger getFeatureVersionID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFeatureVersionID(BigInteger value) { this.featureVersionID = value; } @@ -77,7 +84,7 @@ public void setFeatureVersionID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -90,7 +97,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentReference.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentReference.java index d210878c1..fa65f3684 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentReference.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentReference.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="IDRegDocumentID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -31,16 +38,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -@XmlRootElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class IDRegDocumentReference { @XmlAttribute(name = "IDRegDocumentID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger idRegDocumentID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -51,7 +58,7 @@ public class IDRegDocumentReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIDRegDocumentID() { return idRegDocumentID; } @@ -64,7 +71,7 @@ public BigInteger getIDRegDocumentID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocumentID(BigInteger value) { this.idRegDocumentID = value; } @@ -77,7 +84,7 @@ public void setIDRegDocumentID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -90,7 +97,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentSchemaType.java index 32b24a8a6..8184cf270 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IDRegDocumentSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,12 +31,12 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="IDRegistrationNo" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -38,7 +45,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -48,10 +55,10 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod"/> * </sequence> * <attribute name="IDRegDocDateTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -61,24 +68,24 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="IDRegDocumentID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="ReferenceType" use="required" type="{http://www.un.org/sanctions/1.0}ReferenceSchemaType" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="ReferenceType" use="required" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ReferenceSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}FeatureVersionReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}FeatureVersionReference" maxOccurs="unbounded" minOccurs="0"/> * <element name="DocumentedNameReference" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="DocumentedNameID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}ProfileRelationshipReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ProfileRelationshipReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="IDRegDocTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> @@ -86,7 +93,7 @@ * <attribute name="IssuedBy-CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="IssuedIn-LocationID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ValidityID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -95,7 +102,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "IDRegDocumentSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "IDRegDocumentSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "idRegistrationNo", "issuingAuthority", @@ -105,59 +112,59 @@ "documentedNameReference", "profileRelationshipReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class IDRegDocumentSchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "IDRegistrationNo", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegistrationNo", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected IDRegDocumentSchemaType.IDRegistrationNo idRegistrationNo; - @XmlElement(name = "IssuingAuthority", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IssuingAuthority", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected IDRegDocumentSchemaType.IssuingAuthority issuingAuthority; - @XmlElement(name = "DocumentDate", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocumentDate", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List documentDate; - @XmlElement(name = "IDRegDocumentMention", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentMention", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentMention; - @XmlElement(name = "FeatureVersionReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureVersionReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List featureVersionReference; - @XmlElement(name = "DocumentedNameReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocumentedNameReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List documentedNameReference; - @XmlElement(name = "ProfileRelationshipReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ProfileRelationshipReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List profileRelationshipReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "IDRegDocTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger idRegDocTypeID; @XmlAttribute(name = "IdentityID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger identityID; @XmlAttribute(name = "IssuedBy-CountryID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger issuedByCountryID; @XmlAttribute(name = "IssuedIn-LocationID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger issuedInLocationID; @XmlAttribute(name = "ValidityID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger validityID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -168,7 +175,7 @@ public class IDRegDocumentSchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -181,7 +188,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -194,7 +201,7 @@ public void setComment(Comment value) { * {@link IDRegDocumentSchemaType.IDRegistrationNo } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public IDRegDocumentSchemaType.IDRegistrationNo getIDRegistrationNo() { return idRegistrationNo; } @@ -207,7 +214,7 @@ public IDRegDocumentSchemaType.IDRegistrationNo getIDRegistrationNo() { * {@link IDRegDocumentSchemaType.IDRegistrationNo } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegistrationNo(IDRegDocumentSchemaType.IDRegistrationNo value) { this.idRegistrationNo = value; } @@ -220,7 +227,7 @@ public void setIDRegistrationNo(IDRegDocumentSchemaType.IDRegistrationNo value) * {@link IDRegDocumentSchemaType.IssuingAuthority } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public IDRegDocumentSchemaType.IssuingAuthority getIssuingAuthority() { return issuingAuthority; } @@ -233,7 +240,7 @@ public IDRegDocumentSchemaType.IssuingAuthority getIssuingAuthority() { * {@link IDRegDocumentSchemaType.IssuingAuthority } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIssuingAuthority(IDRegDocumentSchemaType.IssuingAuthority value) { this.issuingAuthority = value; } @@ -260,7 +267,7 @@ public void setIssuingAuthority(IDRegDocumentSchemaType.IssuingAuthority value) * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDocumentDate() { if (documentDate == null) { documentDate = new ArrayList(); @@ -290,7 +297,7 @@ public List getDocumentDate() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentMention() { if (idRegDocumentMention == null) { idRegDocumentMention = new ArrayList(); @@ -320,7 +327,7 @@ public List getIDRegDocumentMentio * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getFeatureVersionReference() { if (featureVersionReference == null) { featureVersionReference = new ArrayList(); @@ -350,7 +357,7 @@ public List getFeatureVersionReference() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDocumentedNameReference() { if (documentedNameReference == null) { documentedNameReference = new ArrayList(); @@ -380,7 +387,7 @@ public List getDocumentedNameRe * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getProfileRelationshipReference() { if (profileRelationshipReference == null) { profileRelationshipReference = new ArrayList(); @@ -396,7 +403,7 @@ public List getProfileRelationshipReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -409,7 +416,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -422,7 +429,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIDRegDocTypeID() { return idRegDocTypeID; } @@ -435,7 +442,7 @@ public BigInteger getIDRegDocTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocTypeID(BigInteger value) { this.idRegDocTypeID = value; } @@ -448,7 +455,7 @@ public void setIDRegDocTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIdentityID() { return identityID; } @@ -461,7 +468,7 @@ public BigInteger getIdentityID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIdentityID(BigInteger value) { this.identityID = value; } @@ -474,7 +481,7 @@ public void setIdentityID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIssuedByCountryID() { return issuedByCountryID; } @@ -487,7 +494,7 @@ public BigInteger getIssuedByCountryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIssuedByCountryID(BigInteger value) { this.issuedByCountryID = value; } @@ -500,7 +507,7 @@ public void setIssuedByCountryID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIssuedInLocationID() { return issuedInLocationID; } @@ -513,7 +520,7 @@ public BigInteger getIssuedInLocationID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIssuedInLocationID(BigInteger value) { this.issuedInLocationID = value; } @@ -526,7 +533,7 @@ public void setIssuedInLocationID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValidityID() { return validityID; } @@ -539,7 +546,7 @@ public BigInteger getValidityID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValidityID(BigInteger value) { this.validityID = value; } @@ -552,7 +559,7 @@ public void setValidityID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -565,7 +572,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -581,10 +588,10 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod"/> * </sequence> * <attribute name="IDRegDocDateTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -596,18 +603,18 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "datePeriod" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DocumentDate { - @XmlElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DatePeriod datePeriod; @XmlAttribute(name = "IDRegDocDateTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger idRegDocDateTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -618,7 +625,7 @@ public static class DocumentDate { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DatePeriod getDatePeriod() { return datePeriod; } @@ -631,7 +638,7 @@ public DatePeriod getDatePeriod() { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDatePeriod(DatePeriod value) { this.datePeriod = value; } @@ -644,7 +651,7 @@ public void setDatePeriod(DatePeriod value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIDRegDocDateTypeID() { return idRegDocDateTypeID; } @@ -657,7 +664,7 @@ public BigInteger getIDRegDocDateTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocDateTypeID(BigInteger value) { this.idRegDocDateTypeID = value; } @@ -670,7 +677,7 @@ public void setIDRegDocDateTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -683,7 +690,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -701,7 +708,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="DocumentedNameID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -711,15 +718,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DocumentedNameReference { @XmlAttribute(name = "DocumentedNameID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger documentedNameID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -730,7 +737,7 @@ public static class DocumentedNameReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getDocumentedNameID() { return documentedNameID; } @@ -743,7 +750,7 @@ public BigInteger getDocumentedNameID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDocumentedNameID(BigInteger value) { this.documentedNameID = value; } @@ -756,7 +763,7 @@ public void setDocumentedNameID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -769,7 +776,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -787,8 +794,8 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="IDRegDocumentID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="ReferenceType" use="required" type="{http://www.un.org/sanctions/1.0}ReferenceSchemaType" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="ReferenceType" use="required" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ReferenceSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -798,18 +805,18 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IDRegDocumentMention { @XmlAttribute(name = "IDRegDocumentID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger idRegDocumentID; @XmlAttribute(name = "ReferenceType", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceSchemaType referenceType; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -820,7 +827,7 @@ public static class IDRegDocumentMention { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getIDRegDocumentID() { return idRegDocumentID; } @@ -833,7 +840,7 @@ public BigInteger getIDRegDocumentID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocumentID(BigInteger value) { this.idRegDocumentID = value; } @@ -846,7 +853,7 @@ public void setIDRegDocumentID(BigInteger value) { * {@link ReferenceSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceSchemaType getReferenceType() { return referenceType; } @@ -859,7 +866,7 @@ public ReferenceSchemaType getReferenceType() { * {@link ReferenceSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setReferenceType(ReferenceSchemaType value) { this.referenceType = value; } @@ -872,7 +879,7 @@ public void setReferenceType(ReferenceSchemaType value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -885,7 +892,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -902,7 +909,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -914,14 +921,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IDRegistrationNo { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -932,7 +939,7 @@ public static class IDRegistrationNo { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -945,7 +952,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -958,7 +965,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -971,7 +978,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -988,7 +995,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -1000,14 +1007,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IssuingAuthority { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -1018,7 +1025,7 @@ public static class IssuingAuthority { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -1031,7 +1038,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -1044,7 +1051,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1057,7 +1064,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IdentitySchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IdentitySchemaType.java index e658e88d5..29722fd4b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IdentitySchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/IdentitySchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -23,21 +30,21 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="Alias" maxOccurs="unbounded"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod" minOccurs="0"/> - * <element name="DocumentedName" type="{http://www.un.org/sanctions/1.0}DocumentedNameSchemaType" maxOccurs="unbounded"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod" minOccurs="0"/> + * <element name="DocumentedName" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DocumentedNameSchemaType" maxOccurs="unbounded"/> * </sequence> * <attribute name="FixedRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="AliasTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="LowQuality" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -58,30 +65,30 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="NamePartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FixedRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="False" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -90,42 +97,42 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "IdentitySchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "IdentitySchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "alias", "namePartGroups", "idRegDocumentReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class IdentitySchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "Alias", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Alias", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List alias; - @XmlElement(name = "NamePartGroups", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "NamePartGroups", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected IdentitySchemaType.NamePartGroups namePartGroups; - @XmlElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "FixedRef", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String fixedRef; @XmlAttribute(name = "Primary", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean primary; @XmlAttribute(name = "False", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean _false; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -136,7 +143,7 @@ public class IdentitySchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -149,7 +156,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -176,7 +183,7 @@ public void setComment(Comment value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getAlias() { if (alias == null) { alias = new ArrayList(); @@ -192,7 +199,7 @@ public List getAlias() { * {@link IdentitySchemaType.NamePartGroups } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public IdentitySchemaType.NamePartGroups getNamePartGroups() { return namePartGroups; } @@ -205,7 +212,7 @@ public IdentitySchemaType.NamePartGroups getNamePartGroups() { * {@link IdentitySchemaType.NamePartGroups } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setNamePartGroups(IdentitySchemaType.NamePartGroups value) { this.namePartGroups = value; } @@ -232,7 +239,7 @@ public void setNamePartGroups(IdentitySchemaType.NamePartGroups value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentReference() { if (idRegDocumentReference == null) { idRegDocumentReference = new ArrayList(); @@ -248,7 +255,7 @@ public List getIDRegDocumentReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -261,7 +268,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -274,7 +281,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getFixedRef() { return fixedRef; } @@ -287,7 +294,7 @@ public String getFixedRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFixedRef(String value) { this.fixedRef = value; } @@ -296,7 +303,7 @@ public void setFixedRef(String value) { * Gets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isPrimary() { return primary; } @@ -305,7 +312,7 @@ public boolean isPrimary() { * Sets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPrimary(boolean value) { this.primary = value; } @@ -314,7 +321,7 @@ public void setPrimary(boolean value) { * Gets the value of the false property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isFalse() { return _false; } @@ -323,7 +330,7 @@ public boolean isFalse() { * Sets the value of the false property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFalse(boolean value) { this._false = value; } @@ -336,7 +343,7 @@ public void setFalse(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -349,7 +356,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -365,15 +372,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod" minOccurs="0"/> - * <element name="DocumentedName" type="{http://www.un.org/sanctions/1.0}DocumentedNameSchemaType" maxOccurs="unbounded"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod" minOccurs="0"/> + * <element name="DocumentedName" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DocumentedNameSchemaType" maxOccurs="unbounded"/> * </sequence> * <attribute name="FixedRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="AliasTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="LowQuality" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -387,33 +394,33 @@ public void setDeltaAction(DeltaActionSchemaType value) { "datePeriod", "documentedName" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Alias { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DatePeriod datePeriod; - @XmlElement(name = "DocumentedName", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocumentedName", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List documentedName; @XmlAttribute(name = "FixedRef", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String fixedRef; @XmlAttribute(name = "AliasTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger aliasTypeID; @XmlAttribute(name = "Primary", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean primary; @XmlAttribute(name = "LowQuality", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean lowQuality; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -424,7 +431,7 @@ public static class Alias { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -437,7 +444,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -450,7 +457,7 @@ public void setComment(Comment value) { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DatePeriod getDatePeriod() { return datePeriod; } @@ -463,7 +470,7 @@ public DatePeriod getDatePeriod() { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDatePeriod(DatePeriod value) { this.datePeriod = value; } @@ -490,7 +497,7 @@ public void setDatePeriod(DatePeriod value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDocumentedName() { if (documentedName == null) { documentedName = new ArrayList(); @@ -506,7 +513,7 @@ public List getDocumentedName() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getFixedRef() { return fixedRef; } @@ -519,7 +526,7 @@ public String getFixedRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFixedRef(String value) { this.fixedRef = value; } @@ -532,7 +539,7 @@ public void setFixedRef(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getAliasTypeID() { return aliasTypeID; } @@ -545,7 +552,7 @@ public BigInteger getAliasTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAliasTypeID(BigInteger value) { this.aliasTypeID = value; } @@ -554,7 +561,7 @@ public void setAliasTypeID(BigInteger value) { * Gets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isPrimary() { return primary; } @@ -563,7 +570,7 @@ public boolean isPrimary() { * Sets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPrimary(boolean value) { this.primary = value; } @@ -572,7 +579,7 @@ public void setPrimary(boolean value) { * Gets the value of the lowQuality property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isLowQuality() { return lowQuality; } @@ -581,7 +588,7 @@ public boolean isLowQuality() { * Sets the value of the lowQuality property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLowQuality(boolean value) { this.lowQuality = value; } @@ -594,7 +601,7 @@ public void setLowQuality(boolean value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -607,7 +614,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -636,19 +643,19 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="NamePartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -660,14 +667,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "masterNamePartGroup" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class NamePartGroups { - @XmlElement(name = "MasterNamePartGroup", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "MasterNamePartGroup", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List masterNamePartGroup; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -692,7 +699,7 @@ public static class NamePartGroups { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getMasterNamePartGroup() { if (masterNamePartGroup == null) { masterNamePartGroup = new ArrayList(); @@ -708,7 +715,7 @@ public List getMasterName * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -721,7 +728,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -743,13 +750,13 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="NamePartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -761,14 +768,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "namePartGroup" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class MasterNamePartGroup { - @XmlElement(name = "NamePartGroup", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "NamePartGroup", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List namePartGroup; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -793,7 +800,7 @@ public static class MasterNamePartGroup { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getNamePartGroup() { if (namePartGroup == null) { namePartGroup = new ArrayList(); @@ -809,7 +816,7 @@ public List * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -822,7 +829,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -839,7 +846,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="NamePartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -849,19 +856,19 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class NamePartGroup { @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "NamePartTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger namePartTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -872,7 +879,7 @@ public static class NamePartGroup { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -885,7 +892,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -898,7 +905,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getNamePartTypeID() { return namePartTypeID; } @@ -911,7 +918,7 @@ public BigInteger getNamePartTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setNamePartTypeID(BigInteger value) { this.namePartTypeID = value; } @@ -924,7 +931,7 @@ public void setNamePartTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -937,7 +944,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/LocationSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/LocationSchemaType.java index ffaea23b3..7c71603d6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/LocationSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/LocationSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,13 +31,13 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="LocationAreaCode" maxOccurs="unbounded" minOccurs="0"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="AreaCodeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -41,7 +48,7 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="CountryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="CountryRelevanceID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -56,12 +63,12 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="Value"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -70,23 +77,23 @@ * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="LocPartValueTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="LocPartValueStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="LocPartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}FeatureVersionReference" maxOccurs="unbounded" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}FeatureVersionReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -95,7 +102,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "LocationSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "LocationSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "locationAreaCode", "locationCountry", @@ -103,33 +110,33 @@ "featureVersionReference", "idRegDocumentReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class LocationSchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "LocationAreaCode", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocationAreaCode", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List locationAreaCode; - @XmlElement(name = "LocationCountry", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocationCountry", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List locationCountry; - @XmlElement(name = "LocationPart", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocationPart", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List locationPart; - @XmlElement(name = "FeatureVersionReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureVersionReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List featureVersionReference; - @XmlElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -140,7 +147,7 @@ public class LocationSchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -153,7 +160,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -180,7 +187,7 @@ public void setComment(Comment value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getLocationAreaCode() { if (locationAreaCode == null) { locationAreaCode = new ArrayList(); @@ -210,7 +217,7 @@ public List getLocationAreaCode() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getLocationCountry() { if (locationCountry == null) { locationCountry = new ArrayList(); @@ -240,7 +247,7 @@ public List getLocationCountry() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getLocationPart() { if (locationPart == null) { locationPart = new ArrayList(); @@ -270,7 +277,7 @@ public List getLocationPart() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getFeatureVersionReference() { if (featureVersionReference == null) { featureVersionReference = new ArrayList(); @@ -300,7 +307,7 @@ public List getFeatureVersionReference() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentReference() { if (idRegDocumentReference == null) { idRegDocumentReference = new ArrayList(); @@ -316,7 +323,7 @@ public List getIDRegDocumentReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -329,7 +336,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -342,7 +349,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -355,7 +362,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -371,7 +378,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="AreaCodeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -381,15 +388,15 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocationAreaCode { @XmlAttribute(name = "AreaCodeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger areaCodeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -400,7 +407,7 @@ public static class LocationAreaCode { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getAreaCodeID() { return areaCodeID; } @@ -413,7 +420,7 @@ public BigInteger getAreaCodeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAreaCodeID(BigInteger value) { this.areaCodeID = value; } @@ -426,7 +433,7 @@ public void setAreaCodeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -439,7 +446,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -458,7 +465,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="CountryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="CountryRelevanceID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -468,19 +475,19 @@ public void setDeltaAction(DeltaActionSchemaType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocationCountry { @XmlAttribute(name = "CountryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger countryID; @XmlAttribute(name = "CountryRelevanceID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger countryRelevanceID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -491,7 +498,7 @@ public static class LocationCountry { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCountryID() { return countryID; } @@ -504,7 +511,7 @@ public BigInteger getCountryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryID(BigInteger value) { this.countryID = value; } @@ -517,7 +524,7 @@ public void setCountryID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCountryRelevanceID() { return countryRelevanceID; } @@ -530,7 +537,7 @@ public BigInteger getCountryRelevanceID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryRelevanceID(BigInteger value) { this.countryRelevanceID = value; } @@ -543,7 +550,7 @@ public void setCountryRelevanceID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -556,7 +563,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -579,12 +586,12 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="Value"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -593,14 +600,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="LocPartValueTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="LocPartValueStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> * <attribute name="LocPartTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -612,18 +619,18 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "locationPartValue" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocationPart { - @XmlElement(name = "LocationPartValue", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocationPartValue", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List locationPartValue; @XmlAttribute(name = "LocPartTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger locPartTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -648,7 +655,7 @@ public static class LocationPart { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getLocationPartValue() { if (locationPartValue == null) { locationPartValue = new ArrayList(); @@ -664,7 +671,7 @@ public List getLocationPartVa * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLocPartTypeID() { return locPartTypeID; } @@ -677,7 +684,7 @@ public BigInteger getLocPartTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartTypeID(BigInteger value) { this.locPartTypeID = value; } @@ -690,7 +697,7 @@ public void setLocPartTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -703,7 +710,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -719,12 +726,12 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="Value"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -733,7 +740,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <attribute name="Primary" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="LocPartValueTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="LocPartValueStatusID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -746,28 +753,28 @@ public void setDeltaAction(DeltaActionSchemaType value) { "comment", "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocationPartValue { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "Value", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Value", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected LocationSchemaType.LocationPart.LocationPartValue.Value value; @XmlAttribute(name = "Primary", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean primary; @XmlAttribute(name = "LocPartValueTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger locPartValueTypeID; @XmlAttribute(name = "LocPartValueStatusID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger locPartValueStatusID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -778,7 +785,7 @@ public static class LocationPartValue { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -791,7 +798,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -804,7 +811,7 @@ public void setComment(Comment value) { * {@link LocationSchemaType.LocationPart.LocationPartValue.Value } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public LocationSchemaType.LocationPart.LocationPartValue.Value getValue() { return value; } @@ -817,7 +824,7 @@ public LocationSchemaType.LocationPart.LocationPartValue.Value getValue() { * {@link LocationSchemaType.LocationPart.LocationPartValue.Value } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(LocationSchemaType.LocationPart.LocationPartValue.Value value) { this.value = value; } @@ -826,7 +833,7 @@ public void setValue(LocationSchemaType.LocationPart.LocationPartValue.Value val * Gets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isPrimary() { return primary; } @@ -835,7 +842,7 @@ public boolean isPrimary() { * Sets the value of the primary property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPrimary(boolean value) { this.primary = value; } @@ -848,7 +855,7 @@ public void setPrimary(boolean value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLocPartValueTypeID() { return locPartValueTypeID; } @@ -861,7 +868,7 @@ public BigInteger getLocPartValueTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartValueTypeID(BigInteger value) { this.locPartValueTypeID = value; } @@ -874,7 +881,7 @@ public void setLocPartValueTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLocPartValueStatusID() { return locPartValueStatusID; } @@ -887,7 +894,7 @@ public BigInteger getLocPartValueStatusID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartValueStatusID(BigInteger value) { this.locPartValueStatusID = value; } @@ -900,7 +907,7 @@ public void setLocPartValueStatusID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -913,7 +920,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -928,7 +935,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -940,14 +947,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Value { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -958,7 +965,7 @@ public static class Value { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -971,7 +978,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -984,7 +991,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -997,7 +1004,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Month.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Month.java index 37ebad785..ac70de4b6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Month.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Month.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -33,16 +40,16 @@ @XmlType(name = "", propOrder = { "value" }) -@XmlRootElement(name = "Month", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "Month", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class Month { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -53,7 +60,7 @@ public class Month { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -66,7 +73,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -79,7 +86,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -92,7 +99,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ObjectFactory.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ObjectFactory.java index 0eb019e10..05742e4e4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ObjectFactory.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ObjectFactory.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -10,7 +17,7 @@ /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.generalbytes.batm.server.services.amlkyc.watchlist.ofac.tags package. + * generated in the com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -24,11 +31,11 @@ @XmlRegistry public class ObjectFactory { - private final static QName _From_QNAME = new QName("http://www.un.org/sanctions/1.0", "From"); - private final static QName _To_QNAME = new QName("http://www.un.org/sanctions/1.0", "To"); + private final static QName _From_QNAME = new QName("https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", "From"); + private final static QName _To_QNAME = new QName("https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", "To"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.generalbytes.batm.server.services.amlkyc.watchlist.ofac.tags + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags * */ public ObjectFactory() { @@ -59,123 +66,123 @@ public FeatureSchemaType.FeatureVersion createFeatureSchemaTypeFeatureVersion() } /** - * Create an instance of {@link SanctionsEntrySchemaType } + * Create an instance of {@link IDRegDocumentSchemaType } * */ - public SanctionsEntrySchemaType createSanctionsEntrySchemaType() { - return new SanctionsEntrySchemaType(); + public IDRegDocumentSchemaType createIDRegDocumentSchemaType() { + return new IDRegDocumentSchemaType(); } /** - * Create an instance of {@link SanctionsEntrySchemaType.SupportingInfo } + * Create an instance of {@link LocationSchemaType } * */ - public SanctionsEntrySchemaType.SupportingInfo createSanctionsEntrySchemaTypeSupportingInfo() { - return new SanctionsEntrySchemaType.SupportingInfo(); + public LocationSchemaType createLocationSchemaType() { + return new LocationSchemaType(); } /** - * Create an instance of {@link DistinctPartySchemaType } + * Create an instance of {@link LocationSchemaType.LocationPart } * */ - public DistinctPartySchemaType createDistinctPartySchemaType() { - return new DistinctPartySchemaType(); + public LocationSchemaType.LocationPart createLocationSchemaTypeLocationPart() { + return new LocationSchemaType.LocationPart(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile } + * Create an instance of {@link LocationSchemaType.LocationPart.LocationPartValue } * */ - public DistinctPartySchemaType.Profile createDistinctPartySchemaTypeProfile() { - return new DistinctPartySchemaType.Profile(); + public LocationSchemaType.LocationPart.LocationPartValue createLocationSchemaTypeLocationPartLocationPartValue() { + return new LocationSchemaType.LocationPart.LocationPartValue(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference } + * Create an instance of {@link SanctionsEntrySchemaType } * */ - public DistinctPartySchemaType.Profile.ExternalReference createDistinctPartySchemaTypeProfileExternalReference() { - return new DistinctPartySchemaType.Profile.ExternalReference(); + public SanctionsEntrySchemaType createSanctionsEntrySchemaType() { + return new SanctionsEntrySchemaType(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink } + * Create an instance of {@link SanctionsEntrySchemaType.SupportingInfo } * */ - public DistinctPartySchemaType.Profile.ExternalReference.SubLink createDistinctPartySchemaTypeProfileExternalReferenceSubLink() { - return new DistinctPartySchemaType.Profile.ExternalReference.SubLink(); + public SanctionsEntrySchemaType.SupportingInfo createSanctionsEntrySchemaTypeSupportingInfo() { + return new SanctionsEntrySchemaType.SupportingInfo(); } /** - * Create an instance of {@link LocationSchemaType } + * Create an instance of {@link IdentitySchemaType } * */ - public LocationSchemaType createLocationSchemaType() { - return new LocationSchemaType(); + public IdentitySchemaType createIdentitySchemaType() { + return new IdentitySchemaType(); } /** - * Create an instance of {@link LocationSchemaType.LocationPart } + * Create an instance of {@link IdentitySchemaType.NamePartGroups } * */ - public LocationSchemaType.LocationPart createLocationSchemaTypeLocationPart() { - return new LocationSchemaType.LocationPart(); + public IdentitySchemaType.NamePartGroups createIdentitySchemaTypeNamePartGroups() { + return new IdentitySchemaType.NamePartGroups(); } /** - * Create an instance of {@link LocationSchemaType.LocationPart.LocationPartValue } + * Create an instance of {@link IdentitySchemaType.NamePartGroups.MasterNamePartGroup } * */ - public LocationSchemaType.LocationPart.LocationPartValue createLocationSchemaTypeLocationPartLocationPartValue() { - return new LocationSchemaType.LocationPart.LocationPartValue(); + public IdentitySchemaType.NamePartGroups.MasterNamePartGroup createIdentitySchemaTypeNamePartGroupsMasterNamePartGroup() { + return new IdentitySchemaType.NamePartGroups.MasterNamePartGroup(); } /** - * Create an instance of {@link DocumentedNameSchemaType } + * Create an instance of {@link DistinctPartySchemaType } * */ - public DocumentedNameSchemaType createDocumentedNameSchemaType() { - return new DocumentedNameSchemaType(); + public DistinctPartySchemaType createDistinctPartySchemaType() { + return new DistinctPartySchemaType(); } /** - * Create an instance of {@link DocumentedNameSchemaType.DocumentedNamePart } + * Create an instance of {@link DistinctPartySchemaType.Profile } * */ - public DocumentedNameSchemaType.DocumentedNamePart createDocumentedNameSchemaTypeDocumentedNamePart() { - return new DocumentedNameSchemaType.DocumentedNamePart(); + public DistinctPartySchemaType.Profile createDistinctPartySchemaTypeProfile() { + return new DistinctPartySchemaType.Profile(); } /** - * Create an instance of {@link IDRegDocumentSchemaType } + * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference } * */ - public IDRegDocumentSchemaType createIDRegDocumentSchemaType() { - return new IDRegDocumentSchemaType(); + public DistinctPartySchemaType.Profile.ExternalReference createDistinctPartySchemaTypeProfileExternalReference() { + return new DistinctPartySchemaType.Profile.ExternalReference(); } /** - * Create an instance of {@link IdentitySchemaType } + * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink } * */ - public IdentitySchemaType createIdentitySchemaType() { - return new IdentitySchemaType(); + public DistinctPartySchemaType.Profile.ExternalReference.SubLink createDistinctPartySchemaTypeProfileExternalReferenceSubLink() { + return new DistinctPartySchemaType.Profile.ExternalReference.SubLink(); } /** - * Create an instance of {@link IdentitySchemaType.NamePartGroups } + * Create an instance of {@link DocumentedNameSchemaType } * */ - public IdentitySchemaType.NamePartGroups createIdentitySchemaTypeNamePartGroups() { - return new IdentitySchemaType.NamePartGroups(); + public DocumentedNameSchemaType createDocumentedNameSchemaType() { + return new DocumentedNameSchemaType(); } /** - * Create an instance of {@link IdentitySchemaType.NamePartGroups.MasterNamePartGroup } + * Create an instance of {@link DocumentedNameSchemaType.DocumentedNamePart } * */ - public IdentitySchemaType.NamePartGroups.MasterNamePartGroup createIdentitySchemaTypeNamePartGroupsMasterNamePartGroup() { - return new IdentitySchemaType.NamePartGroups.MasterNamePartGroup(); + public DocumentedNameSchemaType.DocumentedNamePart createDocumentedNameSchemaTypeDocumentedNamePart() { + return new DocumentedNameSchemaType.DocumentedNamePart(); } /** @@ -507,11 +514,27 @@ public DurationSchemaType createDurationSchemaType() { } /** - * Create an instance of {@link Year } + * Create an instance of {@link Comment } * */ - public Year createYear() { - return new Year(); + public Comment createComment() { + return new Comment(); + } + + /** + * Create an instance of {@link Month } + * + */ + public Month createMonth() { + return new Month(); + } + + /** + * Create an instance of {@link ProfileRelationshipReference } + * + */ + public ProfileRelationshipReference createProfileRelationshipReference() { + return new ProfileRelationshipReference(); } /** @@ -531,27 +554,27 @@ public IDRegDocumentReference createIDRegDocumentReference() { } /** - * Create an instance of {@link DatePointSchemaType } + * Create an instance of {@link Year } * */ - public DatePointSchemaType createDatePointSchemaType() { - return new DatePointSchemaType(); + public Year createYear() { + return new Year(); } /** - * Create an instance of {@link DatePeriod } + * Create an instance of {@link DirectURL } * */ - public DatePeriod createDatePeriod() { - return new DatePeriod(); + public DirectURL createDirectURL() { + return new DirectURL(); } /** - * Create an instance of {@link Comment } + * Create an instance of {@link DatePeriod } * */ - public Comment createComment() { - return new Comment(); + public DatePeriod createDatePeriod() { + return new DatePeriod(); } /** @@ -562,6 +585,22 @@ public DateBoundarySchemaType createDateBoundarySchemaType() { return new DateBoundarySchemaType(); } + /** + * Create an instance of {@link DatePointSchemaType } + * + */ + public DatePointSchemaType createDatePointSchemaType() { + return new DatePointSchemaType(); + } + + /** + * Create an instance of {@link Day } + * + */ + public Day createDay() { + return new Day(); + } + /** * Create an instance of {@link DateSchemaType } * @@ -618,38 +657,6 @@ public Sanctions.SanctionsEntryLinks createSanctionsSanctionsEntryLinks() { return new Sanctions.SanctionsEntryLinks(); } - /** - * Create an instance of {@link DirectURL } - * - */ - public DirectURL createDirectURL() { - return new DirectURL(); - } - - /** - * Create an instance of {@link Day } - * - */ - public Day createDay() { - return new Day(); - } - - /** - * Create an instance of {@link Month } - * - */ - public Month createMonth() { - return new Month(); - } - - /** - * Create an instance of {@link ProfileRelationshipReference } - * - */ - public ProfileRelationshipReference createProfileRelationshipReference() { - return new ProfileRelationshipReference(); - } - /** * Create an instance of {@link ProfileRelationshipSchemaType } * @@ -691,155 +698,155 @@ public FeatureSchemaType.FeatureVersion.VersionLocation createFeatureSchemaTypeF } /** - * Create an instance of {@link SanctionsEntrySchemaType.LimitationsToListing } + * Create an instance of {@link IDRegDocumentSchemaType.IDRegistrationNo } * */ - public SanctionsEntrySchemaType.LimitationsToListing createSanctionsEntrySchemaTypeLimitationsToListing() { - return new SanctionsEntrySchemaType.LimitationsToListing(); + public IDRegDocumentSchemaType.IDRegistrationNo createIDRegDocumentSchemaTypeIDRegistrationNo() { + return new IDRegDocumentSchemaType.IDRegistrationNo(); } /** - * Create an instance of {@link SanctionsEntrySchemaType.EntryEvent } + * Create an instance of {@link IDRegDocumentSchemaType.IssuingAuthority } * */ - public SanctionsEntrySchemaType.EntryEvent createSanctionsEntrySchemaTypeEntryEvent() { - return new SanctionsEntrySchemaType.EntryEvent(); + public IDRegDocumentSchemaType.IssuingAuthority createIDRegDocumentSchemaTypeIssuingAuthority() { + return new IDRegDocumentSchemaType.IssuingAuthority(); } /** - * Create an instance of {@link SanctionsEntrySchemaType.SanctionsMeasure } + * Create an instance of {@link IDRegDocumentSchemaType.DocumentDate } * */ - public SanctionsEntrySchemaType.SanctionsMeasure createSanctionsEntrySchemaTypeSanctionsMeasure() { - return new SanctionsEntrySchemaType.SanctionsMeasure(); + public IDRegDocumentSchemaType.DocumentDate createIDRegDocumentSchemaTypeDocumentDate() { + return new IDRegDocumentSchemaType.DocumentDate(); } /** - * Create an instance of {@link SanctionsEntrySchemaType.SupportingInfo.Text } + * Create an instance of {@link IDRegDocumentSchemaType.IDRegDocumentMention } * */ - public SanctionsEntrySchemaType.SupportingInfo.Text createSanctionsEntrySchemaTypeSupportingInfoText() { - return new SanctionsEntrySchemaType.SupportingInfo.Text(); + public IDRegDocumentSchemaType.IDRegDocumentMention createIDRegDocumentSchemaTypeIDRegDocumentMention() { + return new IDRegDocumentSchemaType.IDRegDocumentMention(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile.SanctionsEntryReference } + * Create an instance of {@link IDRegDocumentSchemaType.DocumentedNameReference } * */ - public DistinctPartySchemaType.Profile.SanctionsEntryReference createDistinctPartySchemaTypeProfileSanctionsEntryReference() { - return new DistinctPartySchemaType.Profile.SanctionsEntryReference(); + public IDRegDocumentSchemaType.DocumentedNameReference createIDRegDocumentSchemaTypeDocumentedNameReference() { + return new IDRegDocumentSchemaType.DocumentedNameReference(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.ExRefValue } + * Create an instance of {@link LocationSchemaType.LocationAreaCode } * */ - public DistinctPartySchemaType.Profile.ExternalReference.ExRefValue createDistinctPartySchemaTypeProfileExternalReferenceExRefValue() { - return new DistinctPartySchemaType.Profile.ExternalReference.ExRefValue(); + public LocationSchemaType.LocationAreaCode createLocationSchemaTypeLocationAreaCode() { + return new LocationSchemaType.LocationAreaCode(); } /** - * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description } + * Create an instance of {@link LocationSchemaType.LocationCountry } * */ - public DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description createDistinctPartySchemaTypeProfileExternalReferenceSubLinkDescription() { - return new DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description(); + public LocationSchemaType.LocationCountry createLocationSchemaTypeLocationCountry() { + return new LocationSchemaType.LocationCountry(); } /** - * Create an instance of {@link LocationSchemaType.LocationAreaCode } + * Create an instance of {@link LocationSchemaType.LocationPart.LocationPartValue.Value } * */ - public LocationSchemaType.LocationAreaCode createLocationSchemaTypeLocationAreaCode() { - return new LocationSchemaType.LocationAreaCode(); + public LocationSchemaType.LocationPart.LocationPartValue.Value createLocationSchemaTypeLocationPartLocationPartValueValue() { + return new LocationSchemaType.LocationPart.LocationPartValue.Value(); } /** - * Create an instance of {@link LocationSchemaType.LocationCountry } + * Create an instance of {@link SanctionsEntrySchemaType.LimitationsToListing } * */ - public LocationSchemaType.LocationCountry createLocationSchemaTypeLocationCountry() { - return new LocationSchemaType.LocationCountry(); + public SanctionsEntrySchemaType.LimitationsToListing createSanctionsEntrySchemaTypeLimitationsToListing() { + return new SanctionsEntrySchemaType.LimitationsToListing(); } /** - * Create an instance of {@link LocationSchemaType.LocationPart.LocationPartValue.Value } + * Create an instance of {@link SanctionsEntrySchemaType.EntryEvent } * */ - public LocationSchemaType.LocationPart.LocationPartValue.Value createLocationSchemaTypeLocationPartLocationPartValueValue() { - return new LocationSchemaType.LocationPart.LocationPartValue.Value(); + public SanctionsEntrySchemaType.EntryEvent createSanctionsEntrySchemaTypeEntryEvent() { + return new SanctionsEntrySchemaType.EntryEvent(); } /** - * Create an instance of {@link DocumentedNameSchemaType.DocumentedNameCountry } + * Create an instance of {@link SanctionsEntrySchemaType.SanctionsMeasure } * */ - public DocumentedNameSchemaType.DocumentedNameCountry createDocumentedNameSchemaTypeDocumentedNameCountry() { - return new DocumentedNameSchemaType.DocumentedNameCountry(); + public SanctionsEntrySchemaType.SanctionsMeasure createSanctionsEntrySchemaTypeSanctionsMeasure() { + return new SanctionsEntrySchemaType.SanctionsMeasure(); } /** - * Create an instance of {@link DocumentedNameSchemaType.DocumentedNamePart.NamePartValue } + * Create an instance of {@link SanctionsEntrySchemaType.SupportingInfo.Text } * */ - public DocumentedNameSchemaType.DocumentedNamePart.NamePartValue createDocumentedNameSchemaTypeDocumentedNamePartNamePartValue() { - return new DocumentedNameSchemaType.DocumentedNamePart.NamePartValue(); + public SanctionsEntrySchemaType.SupportingInfo.Text createSanctionsEntrySchemaTypeSupportingInfoText() { + return new SanctionsEntrySchemaType.SupportingInfo.Text(); } /** - * Create an instance of {@link IDRegDocumentSchemaType.IDRegistrationNo } + * Create an instance of {@link IdentitySchemaType.Alias } * */ - public IDRegDocumentSchemaType.IDRegistrationNo createIDRegDocumentSchemaTypeIDRegistrationNo() { - return new IDRegDocumentSchemaType.IDRegistrationNo(); + public IdentitySchemaType.Alias createIdentitySchemaTypeAlias() { + return new IdentitySchemaType.Alias(); } /** - * Create an instance of {@link IDRegDocumentSchemaType.IssuingAuthority } + * Create an instance of {@link IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup } * */ - public IDRegDocumentSchemaType.IssuingAuthority createIDRegDocumentSchemaTypeIssuingAuthority() { - return new IDRegDocumentSchemaType.IssuingAuthority(); + public IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup createIdentitySchemaTypeNamePartGroupsMasterNamePartGroupNamePartGroup() { + return new IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup(); } /** - * Create an instance of {@link IDRegDocumentSchemaType.DocumentDate } + * Create an instance of {@link DistinctPartySchemaType.Profile.SanctionsEntryReference } * */ - public IDRegDocumentSchemaType.DocumentDate createIDRegDocumentSchemaTypeDocumentDate() { - return new IDRegDocumentSchemaType.DocumentDate(); + public DistinctPartySchemaType.Profile.SanctionsEntryReference createDistinctPartySchemaTypeProfileSanctionsEntryReference() { + return new DistinctPartySchemaType.Profile.SanctionsEntryReference(); } /** - * Create an instance of {@link IDRegDocumentSchemaType.IDRegDocumentMention } + * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.ExRefValue } * */ - public IDRegDocumentSchemaType.IDRegDocumentMention createIDRegDocumentSchemaTypeIDRegDocumentMention() { - return new IDRegDocumentSchemaType.IDRegDocumentMention(); + public DistinctPartySchemaType.Profile.ExternalReference.ExRefValue createDistinctPartySchemaTypeProfileExternalReferenceExRefValue() { + return new DistinctPartySchemaType.Profile.ExternalReference.ExRefValue(); } /** - * Create an instance of {@link IDRegDocumentSchemaType.DocumentedNameReference } + * Create an instance of {@link DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description } * */ - public IDRegDocumentSchemaType.DocumentedNameReference createIDRegDocumentSchemaTypeDocumentedNameReference() { - return new IDRegDocumentSchemaType.DocumentedNameReference(); + public DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description createDistinctPartySchemaTypeProfileExternalReferenceSubLinkDescription() { + return new DistinctPartySchemaType.Profile.ExternalReference.SubLink.Description(); } /** - * Create an instance of {@link IdentitySchemaType.Alias } + * Create an instance of {@link DocumentedNameSchemaType.DocumentedNameCountry } * */ - public IdentitySchemaType.Alias createIdentitySchemaTypeAlias() { - return new IdentitySchemaType.Alias(); + public DocumentedNameSchemaType.DocumentedNameCountry createDocumentedNameSchemaTypeDocumentedNameCountry() { + return new DocumentedNameSchemaType.DocumentedNameCountry(); } /** - * Create an instance of {@link IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup } + * Create an instance of {@link DocumentedNameSchemaType.DocumentedNamePart.NamePartValue } * */ - public IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup createIdentitySchemaTypeNamePartGroupsMasterNamePartGroupNamePartGroup() { - return new IdentitySchemaType.NamePartGroups.MasterNamePartGroup.NamePartGroup(); + public DocumentedNameSchemaType.DocumentedNamePart.NamePartValue createDocumentedNameSchemaTypeDocumentedNamePartNamePartValue() { + return new DocumentedNameSchemaType.DocumentedNamePart.NamePartValue(); } /** @@ -1182,7 +1189,7 @@ public DurationSchemaType.Days createDurationSchemaTypeDays() { * Create an instance of {@link JAXBElement }{@code <}{@link DatePointSchemaType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.un.org/sanctions/1.0", name = "From") + @XmlElementDecl(namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", name = "From") public JAXBElement createFrom(DatePointSchemaType value) { return new JAXBElement(_From_QNAME, DatePointSchemaType.class, null, value); } @@ -1191,7 +1198,7 @@ public JAXBElement createFrom(DatePointSchemaType value) { * Create an instance of {@link JAXBElement }{@code <}{@link DatePointSchemaType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.un.org/sanctions/1.0", name = "To") + @XmlElementDecl(namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", name = "To") public JAXBElement createTo(DatePointSchemaType value) { return new JAXBElement(_To_QNAME, DatePointSchemaType.class, null, value); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipReference.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipReference.java index 6b163ce82..0d96a20cb 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipReference.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipReference.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <attribute name="ProfileRelationshipID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -31,16 +38,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -@XmlRootElement(name = "ProfileRelationshipReference", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "ProfileRelationshipReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class ProfileRelationshipReference { @XmlAttribute(name = "ProfileRelationshipID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger profileRelationshipID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -51,7 +58,7 @@ public class ProfileRelationshipReference { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getProfileRelationshipID() { return profileRelationshipID; } @@ -64,7 +71,7 @@ public BigInteger getProfileRelationshipID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setProfileRelationshipID(BigInteger value) { this.profileRelationshipID = value; } @@ -77,7 +84,7 @@ public void setProfileRelationshipID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -90,7 +97,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipSchemaType.java index dd28ff442..41b46766a 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ProfileRelationshipSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -23,9 +30,9 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="From-ProfileID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> @@ -34,7 +41,7 @@ * <attribute name="RelationQualityID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Former" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -43,52 +50,52 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ProfileRelationshipSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "ProfileRelationshipSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "datePeriod", "idRegDocumentReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class ProfileRelationshipSchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DatePeriod datePeriod; - @XmlElement(name = "IDRegDocumentReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocumentReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocumentReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "From-ProfileID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger fromProfileID; @XmlAttribute(name = "To-ProfileID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger toProfileID; @XmlAttribute(name = "RelationTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger relationTypeID; @XmlAttribute(name = "RelationQualityID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger relationQualityID; @XmlAttribute(name = "Former", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected boolean former; @XmlAttribute(name = "SanctionsEntryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger sanctionsEntryID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -99,7 +106,7 @@ public class ProfileRelationshipSchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -112,7 +119,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -125,7 +132,7 @@ public void setComment(Comment value) { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DatePeriod getDatePeriod() { return datePeriod; } @@ -138,7 +145,7 @@ public DatePeriod getDatePeriod() { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDatePeriod(DatePeriod value) { this.datePeriod = value; } @@ -165,7 +172,7 @@ public void setDatePeriod(DatePeriod value) { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocumentReference() { if (idRegDocumentReference == null) { idRegDocumentReference = new ArrayList(); @@ -181,7 +188,7 @@ public List getIDRegDocumentReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -194,7 +201,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -207,7 +214,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getFromProfileID() { return fromProfileID; } @@ -220,7 +227,7 @@ public BigInteger getFromProfileID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFromProfileID(BigInteger value) { this.fromProfileID = value; } @@ -233,7 +240,7 @@ public void setFromProfileID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getToProfileID() { return toProfileID; } @@ -246,7 +253,7 @@ public BigInteger getToProfileID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setToProfileID(BigInteger value) { this.toProfileID = value; } @@ -259,7 +266,7 @@ public void setToProfileID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getRelationTypeID() { return relationTypeID; } @@ -272,7 +279,7 @@ public BigInteger getRelationTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setRelationTypeID(BigInteger value) { this.relationTypeID = value; } @@ -285,7 +292,7 @@ public void setRelationTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getRelationQualityID() { return relationQualityID; } @@ -298,7 +305,7 @@ public BigInteger getRelationQualityID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setRelationQualityID(BigInteger value) { this.relationQualityID = value; } @@ -307,7 +314,7 @@ public void setRelationQualityID(BigInteger value) { * Gets the value of the former property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public boolean isFormer() { return former; } @@ -316,7 +323,7 @@ public boolean isFormer() { * Sets the value of the former property. * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFormer(boolean value) { this.former = value; } @@ -329,7 +336,7 @@ public void setFormer(boolean value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getSanctionsEntryID() { return sanctionsEntryID; } @@ -342,7 +349,7 @@ public BigInteger getSanctionsEntryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsEntryID(BigInteger value) { this.sanctionsEntryID = value; } @@ -355,7 +362,7 @@ public void setSanctionsEntryID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -368,7 +375,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceSchemaType.java index 2af8b1a0b..58217412d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -22,9 +29,9 @@ * * */ -@XmlType(name = "ReferenceSchemaType", namespace = "http://www.un.org/sanctions/1.0") +@XmlType(name = "ReferenceSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") @XmlEnum -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public enum ReferenceSchemaType { @XmlEnumValue("RefersTo") diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceValueSetsSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceValueSetsSchemaType.java index 6558c7dab..a1683a968 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceValueSetsSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/ReferenceValueSetsSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -33,7 +40,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -56,7 +63,7 @@ * <attribute name="CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Description" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="AreaCodeTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -76,7 +83,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -96,7 +103,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -120,7 +127,7 @@ * <attribute name="IS03166-3Code" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="ISO3" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="ISO2" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -140,7 +147,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -161,7 +168,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="OrganisationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -182,7 +189,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -202,7 +209,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -222,7 +229,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -242,7 +249,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -262,7 +269,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -282,7 +289,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -303,7 +310,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FeatureTypeGroupID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -323,7 +330,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -343,7 +350,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -363,7 +370,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -383,7 +390,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -406,7 +413,7 @@ * <attribute name="LegalBasisShortRef" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="LegalBasisTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SanctionsProgramID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -426,7 +433,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -447,7 +454,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Comment" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -467,7 +474,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -487,7 +494,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -507,7 +514,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -527,7 +534,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -548,7 +555,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -569,7 +576,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="PartyTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -589,7 +596,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -609,7 +616,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -630,7 +637,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Symmetrical" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -650,7 +657,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -671,7 +678,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SubsidiaryBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -691,7 +698,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -712,7 +719,7 @@ * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -732,7 +739,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -754,7 +761,7 @@ * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Notional" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="DecisionMakingBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -774,7 +781,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -794,7 +801,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -814,7 +821,7 @@ * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -833,7 +840,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenceValueSetsSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "ReferenceValueSetsSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "aliasTypeValues", "areaCodeValues", "areaCodeTypeValues", @@ -874,125 +881,125 @@ "targetTypeValues", "validityValues" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class ReferenceValueSetsSchemaType { - @XmlElement(name = "AliasTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AliasTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.AliasTypeValues aliasTypeValues; - @XmlElement(name = "AreaCodeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AreaCodeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.AreaCodeValues areaCodeValues; - @XmlElement(name = "AreaCodeTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AreaCodeTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.AreaCodeTypeValues areaCodeTypeValues; - @XmlElement(name = "CalendarTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "CalendarTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.CalendarTypeValues calendarTypeValues; - @XmlElement(name = "CountryValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "CountryValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.CountryValues countryValues; - @XmlElement(name = "CountryRelevanceValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "CountryRelevanceValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.CountryRelevanceValues countryRelevanceValues; - @XmlElement(name = "DecisionMakingBodyValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DecisionMakingBodyValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.DecisionMakingBodyValues decisionMakingBodyValues; - @XmlElement(name = "DetailReferenceValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DetailReferenceValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.DetailReferenceValues detailReferenceValues; - @XmlElement(name = "DetailTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DetailTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.DetailTypeValues detailTypeValues; - @XmlElement(name = "DocNameStatusValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocNameStatusValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.DocNameStatusValues docNameStatusValues; - @XmlElement(name = "EntryEventTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "EntryEventTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.EntryEventTypeValues entryEventTypeValues; - @XmlElement(name = "EntryLinkTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "EntryLinkTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.EntryLinkTypeValues entryLinkTypeValues; - @XmlElement(name = "ExRefTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ExRefTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ExRefTypeValues exRefTypeValues; - @XmlElement(name = "FeatureTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.FeatureTypeValues featureTypeValues; - @XmlElement(name = "FeatureTypeGroupValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureTypeGroupValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.FeatureTypeGroupValues featureTypeGroupValues; - @XmlElement(name = "IDRegDocDateTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocDateTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.IDRegDocDateTypeValues idRegDocDateTypeValues; - @XmlElement(name = "IDRegDocTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.IDRegDocTypeValues idRegDocTypeValues; - @XmlElement(name = "IdentityFeatureLinkTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IdentityFeatureLinkTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues identityFeatureLinkTypeValues; - @XmlElement(name = "LegalBasisValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LegalBasisValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.LegalBasisValues legalBasisValues; - @XmlElement(name = "LegalBasisTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LegalBasisTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.LegalBasisTypeValues legalBasisTypeValues; - @XmlElement(name = "ListValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ListValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ListValues listValues; - @XmlElement(name = "LocPartTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.LocPartTypeValues locPartTypeValues; - @XmlElement(name = "LocPartValueStatusValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartValueStatusValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.LocPartValueStatusValues locPartValueStatusValues; - @XmlElement(name = "LocPartValueTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartValueTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.LocPartValueTypeValues locPartValueTypeValues; - @XmlElement(name = "NamePartTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "NamePartTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.NamePartTypeValues namePartTypeValues; - @XmlElement(name = "OrganisationValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "OrganisationValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.OrganisationValues organisationValues; - @XmlElement(name = "PartySubTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "PartySubTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.PartySubTypeValues partySubTypeValues; - @XmlElement(name = "PartyTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "PartyTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.PartyTypeValues partyTypeValues; - @XmlElement(name = "RelationQualityValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "RelationQualityValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.RelationQualityValues relationQualityValues; - @XmlElement(name = "RelationTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "RelationTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.RelationTypeValues relationTypeValues; - @XmlElement(name = "ReliabilityValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ReliabilityValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ReliabilityValues reliabilityValues; - @XmlElement(name = "SanctionsProgramValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsProgramValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.SanctionsProgramValues sanctionsProgramValues; - @XmlElement(name = "SanctionsTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.SanctionsTypeValues sanctionsTypeValues; - @XmlElement(name = "ScriptValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ScriptValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ScriptValues scriptValues; - @XmlElement(name = "ScriptStatusValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ScriptStatusValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ScriptStatusValues scriptStatusValues; - @XmlElement(name = "SubsidiaryBodyValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SubsidiaryBodyValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.SubsidiaryBodyValues subsidiaryBodyValues; - @XmlElement(name = "SupInfoTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SupInfoTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.SupInfoTypeValues supInfoTypeValues; - @XmlElement(name = "TargetTypeValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "TargetTypeValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.TargetTypeValues targetTypeValues; - @XmlElement(name = "ValidityValues", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ValidityValues", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType.ValidityValues validityValues; /** @@ -1003,7 +1010,7 @@ public class ReferenceValueSetsSchemaType { * {@link ReferenceValueSetsSchemaType.AliasTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.AliasTypeValues getAliasTypeValues() { return aliasTypeValues; } @@ -1016,7 +1023,7 @@ public ReferenceValueSetsSchemaType.AliasTypeValues getAliasTypeValues() { * {@link ReferenceValueSetsSchemaType.AliasTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAliasTypeValues(ReferenceValueSetsSchemaType.AliasTypeValues value) { this.aliasTypeValues = value; } @@ -1029,7 +1036,7 @@ public void setAliasTypeValues(ReferenceValueSetsSchemaType.AliasTypeValues valu * {@link ReferenceValueSetsSchemaType.AreaCodeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.AreaCodeValues getAreaCodeValues() { return areaCodeValues; } @@ -1042,7 +1049,7 @@ public ReferenceValueSetsSchemaType.AreaCodeValues getAreaCodeValues() { * {@link ReferenceValueSetsSchemaType.AreaCodeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAreaCodeValues(ReferenceValueSetsSchemaType.AreaCodeValues value) { this.areaCodeValues = value; } @@ -1055,7 +1062,7 @@ public void setAreaCodeValues(ReferenceValueSetsSchemaType.AreaCodeValues value) * {@link ReferenceValueSetsSchemaType.AreaCodeTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.AreaCodeTypeValues getAreaCodeTypeValues() { return areaCodeTypeValues; } @@ -1068,7 +1075,7 @@ public ReferenceValueSetsSchemaType.AreaCodeTypeValues getAreaCodeTypeValues() { * {@link ReferenceValueSetsSchemaType.AreaCodeTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAreaCodeTypeValues(ReferenceValueSetsSchemaType.AreaCodeTypeValues value) { this.areaCodeTypeValues = value; } @@ -1081,7 +1088,7 @@ public void setAreaCodeTypeValues(ReferenceValueSetsSchemaType.AreaCodeTypeValue * {@link ReferenceValueSetsSchemaType.CalendarTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.CalendarTypeValues getCalendarTypeValues() { return calendarTypeValues; } @@ -1094,7 +1101,7 @@ public ReferenceValueSetsSchemaType.CalendarTypeValues getCalendarTypeValues() { * {@link ReferenceValueSetsSchemaType.CalendarTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCalendarTypeValues(ReferenceValueSetsSchemaType.CalendarTypeValues value) { this.calendarTypeValues = value; } @@ -1107,7 +1114,7 @@ public void setCalendarTypeValues(ReferenceValueSetsSchemaType.CalendarTypeValue * {@link ReferenceValueSetsSchemaType.CountryValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.CountryValues getCountryValues() { return countryValues; } @@ -1120,7 +1127,7 @@ public ReferenceValueSetsSchemaType.CountryValues getCountryValues() { * {@link ReferenceValueSetsSchemaType.CountryValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryValues(ReferenceValueSetsSchemaType.CountryValues value) { this.countryValues = value; } @@ -1133,7 +1140,7 @@ public void setCountryValues(ReferenceValueSetsSchemaType.CountryValues value) { * {@link ReferenceValueSetsSchemaType.CountryRelevanceValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.CountryRelevanceValues getCountryRelevanceValues() { return countryRelevanceValues; } @@ -1146,7 +1153,7 @@ public ReferenceValueSetsSchemaType.CountryRelevanceValues getCountryRelevanceVa * {@link ReferenceValueSetsSchemaType.CountryRelevanceValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryRelevanceValues(ReferenceValueSetsSchemaType.CountryRelevanceValues value) { this.countryRelevanceValues = value; } @@ -1159,7 +1166,7 @@ public void setCountryRelevanceValues(ReferenceValueSetsSchemaType.CountryReleva * {@link ReferenceValueSetsSchemaType.DecisionMakingBodyValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.DecisionMakingBodyValues getDecisionMakingBodyValues() { return decisionMakingBodyValues; } @@ -1172,7 +1179,7 @@ public ReferenceValueSetsSchemaType.DecisionMakingBodyValues getDecisionMakingBo * {@link ReferenceValueSetsSchemaType.DecisionMakingBodyValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDecisionMakingBodyValues(ReferenceValueSetsSchemaType.DecisionMakingBodyValues value) { this.decisionMakingBodyValues = value; } @@ -1185,7 +1192,7 @@ public void setDecisionMakingBodyValues(ReferenceValueSetsSchemaType.DecisionMak * {@link ReferenceValueSetsSchemaType.DetailReferenceValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.DetailReferenceValues getDetailReferenceValues() { return detailReferenceValues; } @@ -1198,7 +1205,7 @@ public ReferenceValueSetsSchemaType.DetailReferenceValues getDetailReferenceValu * {@link ReferenceValueSetsSchemaType.DetailReferenceValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDetailReferenceValues(ReferenceValueSetsSchemaType.DetailReferenceValues value) { this.detailReferenceValues = value; } @@ -1211,7 +1218,7 @@ public void setDetailReferenceValues(ReferenceValueSetsSchemaType.DetailReferenc * {@link ReferenceValueSetsSchemaType.DetailTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.DetailTypeValues getDetailTypeValues() { return detailTypeValues; } @@ -1224,7 +1231,7 @@ public ReferenceValueSetsSchemaType.DetailTypeValues getDetailTypeValues() { * {@link ReferenceValueSetsSchemaType.DetailTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDetailTypeValues(ReferenceValueSetsSchemaType.DetailTypeValues value) { this.detailTypeValues = value; } @@ -1237,7 +1244,7 @@ public void setDetailTypeValues(ReferenceValueSetsSchemaType.DetailTypeValues va * {@link ReferenceValueSetsSchemaType.DocNameStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.DocNameStatusValues getDocNameStatusValues() { return docNameStatusValues; } @@ -1250,7 +1257,7 @@ public ReferenceValueSetsSchemaType.DocNameStatusValues getDocNameStatusValues() * {@link ReferenceValueSetsSchemaType.DocNameStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDocNameStatusValues(ReferenceValueSetsSchemaType.DocNameStatusValues value) { this.docNameStatusValues = value; } @@ -1263,7 +1270,7 @@ public void setDocNameStatusValues(ReferenceValueSetsSchemaType.DocNameStatusVal * {@link ReferenceValueSetsSchemaType.EntryEventTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.EntryEventTypeValues getEntryEventTypeValues() { return entryEventTypeValues; } @@ -1276,7 +1283,7 @@ public ReferenceValueSetsSchemaType.EntryEventTypeValues getEntryEventTypeValues * {@link ReferenceValueSetsSchemaType.EntryEventTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryEventTypeValues(ReferenceValueSetsSchemaType.EntryEventTypeValues value) { this.entryEventTypeValues = value; } @@ -1289,7 +1296,7 @@ public void setEntryEventTypeValues(ReferenceValueSetsSchemaType.EntryEventTypeV * {@link ReferenceValueSetsSchemaType.EntryLinkTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.EntryLinkTypeValues getEntryLinkTypeValues() { return entryLinkTypeValues; } @@ -1302,7 +1309,7 @@ public ReferenceValueSetsSchemaType.EntryLinkTypeValues getEntryLinkTypeValues() * {@link ReferenceValueSetsSchemaType.EntryLinkTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryLinkTypeValues(ReferenceValueSetsSchemaType.EntryLinkTypeValues value) { this.entryLinkTypeValues = value; } @@ -1315,7 +1322,7 @@ public void setEntryLinkTypeValues(ReferenceValueSetsSchemaType.EntryLinkTypeVal * {@link ReferenceValueSetsSchemaType.ExRefTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ExRefTypeValues getExRefTypeValues() { return exRefTypeValues; } @@ -1328,7 +1335,7 @@ public ReferenceValueSetsSchemaType.ExRefTypeValues getExRefTypeValues() { * {@link ReferenceValueSetsSchemaType.ExRefTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setExRefTypeValues(ReferenceValueSetsSchemaType.ExRefTypeValues value) { this.exRefTypeValues = value; } @@ -1341,7 +1348,7 @@ public void setExRefTypeValues(ReferenceValueSetsSchemaType.ExRefTypeValues valu * {@link ReferenceValueSetsSchemaType.FeatureTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.FeatureTypeValues getFeatureTypeValues() { return featureTypeValues; } @@ -1354,7 +1361,7 @@ public ReferenceValueSetsSchemaType.FeatureTypeValues getFeatureTypeValues() { * {@link ReferenceValueSetsSchemaType.FeatureTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFeatureTypeValues(ReferenceValueSetsSchemaType.FeatureTypeValues value) { this.featureTypeValues = value; } @@ -1367,7 +1374,7 @@ public void setFeatureTypeValues(ReferenceValueSetsSchemaType.FeatureTypeValues * {@link ReferenceValueSetsSchemaType.FeatureTypeGroupValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.FeatureTypeGroupValues getFeatureTypeGroupValues() { return featureTypeGroupValues; } @@ -1380,7 +1387,7 @@ public ReferenceValueSetsSchemaType.FeatureTypeGroupValues getFeatureTypeGroupVa * {@link ReferenceValueSetsSchemaType.FeatureTypeGroupValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setFeatureTypeGroupValues(ReferenceValueSetsSchemaType.FeatureTypeGroupValues value) { this.featureTypeGroupValues = value; } @@ -1393,7 +1400,7 @@ public void setFeatureTypeGroupValues(ReferenceValueSetsSchemaType.FeatureTypeGr * {@link ReferenceValueSetsSchemaType.IDRegDocDateTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.IDRegDocDateTypeValues getIDRegDocDateTypeValues() { return idRegDocDateTypeValues; } @@ -1406,7 +1413,7 @@ public ReferenceValueSetsSchemaType.IDRegDocDateTypeValues getIDRegDocDateTypeVa * {@link ReferenceValueSetsSchemaType.IDRegDocDateTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocDateTypeValues(ReferenceValueSetsSchemaType.IDRegDocDateTypeValues value) { this.idRegDocDateTypeValues = value; } @@ -1419,7 +1426,7 @@ public void setIDRegDocDateTypeValues(ReferenceValueSetsSchemaType.IDRegDocDateT * {@link ReferenceValueSetsSchemaType.IDRegDocTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.IDRegDocTypeValues getIDRegDocTypeValues() { return idRegDocTypeValues; } @@ -1432,7 +1439,7 @@ public ReferenceValueSetsSchemaType.IDRegDocTypeValues getIDRegDocTypeValues() { * {@link ReferenceValueSetsSchemaType.IDRegDocTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocTypeValues(ReferenceValueSetsSchemaType.IDRegDocTypeValues value) { this.idRegDocTypeValues = value; } @@ -1445,7 +1452,7 @@ public void setIDRegDocTypeValues(ReferenceValueSetsSchemaType.IDRegDocTypeValue * {@link ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues getIdentityFeatureLinkTypeValues() { return identityFeatureLinkTypeValues; } @@ -1458,7 +1465,7 @@ public ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues getIdentityFea * {@link ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIdentityFeatureLinkTypeValues(ReferenceValueSetsSchemaType.IdentityFeatureLinkTypeValues value) { this.identityFeatureLinkTypeValues = value; } @@ -1471,7 +1478,7 @@ public void setIdentityFeatureLinkTypeValues(ReferenceValueSetsSchemaType.Identi * {@link ReferenceValueSetsSchemaType.LegalBasisValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.LegalBasisValues getLegalBasisValues() { return legalBasisValues; } @@ -1484,7 +1491,7 @@ public ReferenceValueSetsSchemaType.LegalBasisValues getLegalBasisValues() { * {@link ReferenceValueSetsSchemaType.LegalBasisValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLegalBasisValues(ReferenceValueSetsSchemaType.LegalBasisValues value) { this.legalBasisValues = value; } @@ -1497,7 +1504,7 @@ public void setLegalBasisValues(ReferenceValueSetsSchemaType.LegalBasisValues va * {@link ReferenceValueSetsSchemaType.LegalBasisTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.LegalBasisTypeValues getLegalBasisTypeValues() { return legalBasisTypeValues; } @@ -1510,7 +1517,7 @@ public ReferenceValueSetsSchemaType.LegalBasisTypeValues getLegalBasisTypeValues * {@link ReferenceValueSetsSchemaType.LegalBasisTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLegalBasisTypeValues(ReferenceValueSetsSchemaType.LegalBasisTypeValues value) { this.legalBasisTypeValues = value; } @@ -1523,7 +1530,7 @@ public void setLegalBasisTypeValues(ReferenceValueSetsSchemaType.LegalBasisTypeV * {@link ReferenceValueSetsSchemaType.ListValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ListValues getListValues() { return listValues; } @@ -1536,7 +1543,7 @@ public ReferenceValueSetsSchemaType.ListValues getListValues() { * {@link ReferenceValueSetsSchemaType.ListValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setListValues(ReferenceValueSetsSchemaType.ListValues value) { this.listValues = value; } @@ -1549,7 +1556,7 @@ public void setListValues(ReferenceValueSetsSchemaType.ListValues value) { * {@link ReferenceValueSetsSchemaType.LocPartTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.LocPartTypeValues getLocPartTypeValues() { return locPartTypeValues; } @@ -1562,7 +1569,7 @@ public ReferenceValueSetsSchemaType.LocPartTypeValues getLocPartTypeValues() { * {@link ReferenceValueSetsSchemaType.LocPartTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartTypeValues(ReferenceValueSetsSchemaType.LocPartTypeValues value) { this.locPartTypeValues = value; } @@ -1575,7 +1582,7 @@ public void setLocPartTypeValues(ReferenceValueSetsSchemaType.LocPartTypeValues * {@link ReferenceValueSetsSchemaType.LocPartValueStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.LocPartValueStatusValues getLocPartValueStatusValues() { return locPartValueStatusValues; } @@ -1588,7 +1595,7 @@ public ReferenceValueSetsSchemaType.LocPartValueStatusValues getLocPartValueStat * {@link ReferenceValueSetsSchemaType.LocPartValueStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartValueStatusValues(ReferenceValueSetsSchemaType.LocPartValueStatusValues value) { this.locPartValueStatusValues = value; } @@ -1601,7 +1608,7 @@ public void setLocPartValueStatusValues(ReferenceValueSetsSchemaType.LocPartValu * {@link ReferenceValueSetsSchemaType.LocPartValueTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.LocPartValueTypeValues getLocPartValueTypeValues() { return locPartValueTypeValues; } @@ -1614,7 +1621,7 @@ public ReferenceValueSetsSchemaType.LocPartValueTypeValues getLocPartValueTypeVa * {@link ReferenceValueSetsSchemaType.LocPartValueTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocPartValueTypeValues(ReferenceValueSetsSchemaType.LocPartValueTypeValues value) { this.locPartValueTypeValues = value; } @@ -1627,7 +1634,7 @@ public void setLocPartValueTypeValues(ReferenceValueSetsSchemaType.LocPartValueT * {@link ReferenceValueSetsSchemaType.NamePartTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.NamePartTypeValues getNamePartTypeValues() { return namePartTypeValues; } @@ -1640,7 +1647,7 @@ public ReferenceValueSetsSchemaType.NamePartTypeValues getNamePartTypeValues() { * {@link ReferenceValueSetsSchemaType.NamePartTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setNamePartTypeValues(ReferenceValueSetsSchemaType.NamePartTypeValues value) { this.namePartTypeValues = value; } @@ -1653,7 +1660,7 @@ public void setNamePartTypeValues(ReferenceValueSetsSchemaType.NamePartTypeValue * {@link ReferenceValueSetsSchemaType.OrganisationValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.OrganisationValues getOrganisationValues() { return organisationValues; } @@ -1666,7 +1673,7 @@ public ReferenceValueSetsSchemaType.OrganisationValues getOrganisationValues() { * {@link ReferenceValueSetsSchemaType.OrganisationValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setOrganisationValues(ReferenceValueSetsSchemaType.OrganisationValues value) { this.organisationValues = value; } @@ -1679,7 +1686,7 @@ public void setOrganisationValues(ReferenceValueSetsSchemaType.OrganisationValue * {@link ReferenceValueSetsSchemaType.PartySubTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.PartySubTypeValues getPartySubTypeValues() { return partySubTypeValues; } @@ -1692,7 +1699,7 @@ public ReferenceValueSetsSchemaType.PartySubTypeValues getPartySubTypeValues() { * {@link ReferenceValueSetsSchemaType.PartySubTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPartySubTypeValues(ReferenceValueSetsSchemaType.PartySubTypeValues value) { this.partySubTypeValues = value; } @@ -1705,7 +1712,7 @@ public void setPartySubTypeValues(ReferenceValueSetsSchemaType.PartySubTypeValue * {@link ReferenceValueSetsSchemaType.PartyTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.PartyTypeValues getPartyTypeValues() { return partyTypeValues; } @@ -1718,7 +1725,7 @@ public ReferenceValueSetsSchemaType.PartyTypeValues getPartyTypeValues() { * {@link ReferenceValueSetsSchemaType.PartyTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setPartyTypeValues(ReferenceValueSetsSchemaType.PartyTypeValues value) { this.partyTypeValues = value; } @@ -1731,7 +1738,7 @@ public void setPartyTypeValues(ReferenceValueSetsSchemaType.PartyTypeValues valu * {@link ReferenceValueSetsSchemaType.RelationQualityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.RelationQualityValues getRelationQualityValues() { return relationQualityValues; } @@ -1744,7 +1751,7 @@ public ReferenceValueSetsSchemaType.RelationQualityValues getRelationQualityValu * {@link ReferenceValueSetsSchemaType.RelationQualityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setRelationQualityValues(ReferenceValueSetsSchemaType.RelationQualityValues value) { this.relationQualityValues = value; } @@ -1757,7 +1764,7 @@ public void setRelationQualityValues(ReferenceValueSetsSchemaType.RelationQualit * {@link ReferenceValueSetsSchemaType.RelationTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.RelationTypeValues getRelationTypeValues() { return relationTypeValues; } @@ -1770,7 +1777,7 @@ public ReferenceValueSetsSchemaType.RelationTypeValues getRelationTypeValues() { * {@link ReferenceValueSetsSchemaType.RelationTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setRelationTypeValues(ReferenceValueSetsSchemaType.RelationTypeValues value) { this.relationTypeValues = value; } @@ -1783,7 +1790,7 @@ public void setRelationTypeValues(ReferenceValueSetsSchemaType.RelationTypeValue * {@link ReferenceValueSetsSchemaType.ReliabilityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ReliabilityValues getReliabilityValues() { return reliabilityValues; } @@ -1796,7 +1803,7 @@ public ReferenceValueSetsSchemaType.ReliabilityValues getReliabilityValues() { * {@link ReferenceValueSetsSchemaType.ReliabilityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setReliabilityValues(ReferenceValueSetsSchemaType.ReliabilityValues value) { this.reliabilityValues = value; } @@ -1809,7 +1816,7 @@ public void setReliabilityValues(ReferenceValueSetsSchemaType.ReliabilityValues * {@link ReferenceValueSetsSchemaType.SanctionsProgramValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.SanctionsProgramValues getSanctionsProgramValues() { return sanctionsProgramValues; } @@ -1822,7 +1829,7 @@ public ReferenceValueSetsSchemaType.SanctionsProgramValues getSanctionsProgramVa * {@link ReferenceValueSetsSchemaType.SanctionsProgramValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsProgramValues(ReferenceValueSetsSchemaType.SanctionsProgramValues value) { this.sanctionsProgramValues = value; } @@ -1835,7 +1842,7 @@ public void setSanctionsProgramValues(ReferenceValueSetsSchemaType.SanctionsProg * {@link ReferenceValueSetsSchemaType.SanctionsTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.SanctionsTypeValues getSanctionsTypeValues() { return sanctionsTypeValues; } @@ -1848,7 +1855,7 @@ public ReferenceValueSetsSchemaType.SanctionsTypeValues getSanctionsTypeValues() * {@link ReferenceValueSetsSchemaType.SanctionsTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsTypeValues(ReferenceValueSetsSchemaType.SanctionsTypeValues value) { this.sanctionsTypeValues = value; } @@ -1861,7 +1868,7 @@ public void setSanctionsTypeValues(ReferenceValueSetsSchemaType.SanctionsTypeVal * {@link ReferenceValueSetsSchemaType.ScriptValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ScriptValues getScriptValues() { return scriptValues; } @@ -1874,7 +1881,7 @@ public ReferenceValueSetsSchemaType.ScriptValues getScriptValues() { * {@link ReferenceValueSetsSchemaType.ScriptValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setScriptValues(ReferenceValueSetsSchemaType.ScriptValues value) { this.scriptValues = value; } @@ -1887,7 +1894,7 @@ public void setScriptValues(ReferenceValueSetsSchemaType.ScriptValues value) { * {@link ReferenceValueSetsSchemaType.ScriptStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ScriptStatusValues getScriptStatusValues() { return scriptStatusValues; } @@ -1900,7 +1907,7 @@ public ReferenceValueSetsSchemaType.ScriptStatusValues getScriptStatusValues() { * {@link ReferenceValueSetsSchemaType.ScriptStatusValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setScriptStatusValues(ReferenceValueSetsSchemaType.ScriptStatusValues value) { this.scriptStatusValues = value; } @@ -1913,7 +1920,7 @@ public void setScriptStatusValues(ReferenceValueSetsSchemaType.ScriptStatusValue * {@link ReferenceValueSetsSchemaType.SubsidiaryBodyValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.SubsidiaryBodyValues getSubsidiaryBodyValues() { return subsidiaryBodyValues; } @@ -1926,7 +1933,7 @@ public ReferenceValueSetsSchemaType.SubsidiaryBodyValues getSubsidiaryBodyValues * {@link ReferenceValueSetsSchemaType.SubsidiaryBodyValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSubsidiaryBodyValues(ReferenceValueSetsSchemaType.SubsidiaryBodyValues value) { this.subsidiaryBodyValues = value; } @@ -1939,7 +1946,7 @@ public void setSubsidiaryBodyValues(ReferenceValueSetsSchemaType.SubsidiaryBodyV * {@link ReferenceValueSetsSchemaType.SupInfoTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.SupInfoTypeValues getSupInfoTypeValues() { return supInfoTypeValues; } @@ -1952,7 +1959,7 @@ public ReferenceValueSetsSchemaType.SupInfoTypeValues getSupInfoTypeValues() { * {@link ReferenceValueSetsSchemaType.SupInfoTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSupInfoTypeValues(ReferenceValueSetsSchemaType.SupInfoTypeValues value) { this.supInfoTypeValues = value; } @@ -1965,7 +1972,7 @@ public void setSupInfoTypeValues(ReferenceValueSetsSchemaType.SupInfoTypeValues * {@link ReferenceValueSetsSchemaType.TargetTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.TargetTypeValues getTargetTypeValues() { return targetTypeValues; } @@ -1978,7 +1985,7 @@ public ReferenceValueSetsSchemaType.TargetTypeValues getTargetTypeValues() { * {@link ReferenceValueSetsSchemaType.TargetTypeValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setTargetTypeValues(ReferenceValueSetsSchemaType.TargetTypeValues value) { this.targetTypeValues = value; } @@ -1991,7 +1998,7 @@ public void setTargetTypeValues(ReferenceValueSetsSchemaType.TargetTypeValues va * {@link ReferenceValueSetsSchemaType.ValidityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType.ValidityValues getValidityValues() { return validityValues; } @@ -2004,7 +2011,7 @@ public ReferenceValueSetsSchemaType.ValidityValues getValidityValues() { * {@link ReferenceValueSetsSchemaType.ValidityValues } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValidityValues(ReferenceValueSetsSchemaType.ValidityValues value) { this.validityValues = value; } @@ -2025,7 +2032,7 @@ public void setValidityValues(ReferenceValueSetsSchemaType.ValidityValues value) * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2042,11 +2049,11 @@ public void setValidityValues(ReferenceValueSetsSchemaType.ValidityValues value) @XmlType(name = "", propOrder = { "aliasType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class AliasTypeValues { - @XmlElement(name = "AliasType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AliasType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List aliasType; /** @@ -2071,7 +2078,7 @@ public static class AliasTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getAliasType() { if (aliasType == null) { aliasType = new ArrayList(); @@ -2090,7 +2097,7 @@ public java.util.List ge * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2102,18 +2109,18 @@ public java.util.List ge @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class AliasType { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -2124,7 +2131,7 @@ public static class AliasType { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -2137,7 +2144,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -2150,7 +2157,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -2163,7 +2170,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -2176,7 +2183,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -2189,7 +2196,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -2214,7 +2221,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2231,11 +2238,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "areaCodeType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class AreaCodeTypeValues { - @XmlElement(name = "AreaCodeType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AreaCodeType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List areaCodeType; /** @@ -2260,7 +2267,7 @@ public static class AreaCodeTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getAreaCodeType() { if (areaCodeType == null) { areaCodeType = new ArrayList(); @@ -2279,7 +2286,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2291,18 +2298,18 @@ public java.util.List * <attribute name="Description" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="AreaCodeTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2423,11 +2430,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "areaCode" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class AreaCodeValues { - @XmlElement(name = "AreaCode", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "AreaCode", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List areaCode; /** @@ -2452,7 +2459,7 @@ public static class AreaCodeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getAreaCode() { if (areaCode == null) { areaCode = new ArrayList(); @@ -2474,7 +2481,7 @@ public java.util.List getA * <attribute name="CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Description" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="AreaCodeTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2486,29 +2493,29 @@ public java.util.List getA @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class AreaCode { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "CountryID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger countryID; @XmlAttribute(name = "Description") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String description; @XmlAttribute(name = "AreaCodeTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger areaCodeTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -2519,7 +2526,7 @@ public static class AreaCode { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -2532,7 +2539,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -2545,7 +2552,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -2558,7 +2565,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -2571,7 +2578,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getCountryID() { return countryID; } @@ -2584,7 +2591,7 @@ public BigInteger getCountryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setCountryID(BigInteger value) { this.countryID = value; } @@ -2597,7 +2604,7 @@ public void setCountryID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getDescription() { return description; } @@ -2610,7 +2617,7 @@ public String getDescription() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDescription(String value) { this.description = value; } @@ -2623,7 +2630,7 @@ public void setDescription(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getAreaCodeTypeID() { return areaCodeTypeID; } @@ -2636,7 +2643,7 @@ public BigInteger getAreaCodeTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setAreaCodeTypeID(BigInteger value) { this.areaCodeTypeID = value; } @@ -2649,7 +2656,7 @@ public void setAreaCodeTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -2662,7 +2669,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -2687,7 +2694,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2704,11 +2711,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "calendarType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class CalendarTypeValues { - @XmlElement(name = "CalendarType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "CalendarType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List calendarType; /** @@ -2733,7 +2740,7 @@ public static class CalendarTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getCalendarType() { if (calendarType == null) { calendarType = new ArrayList(); @@ -2752,7 +2759,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2764,18 +2771,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2893,11 +2900,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "countryRelevance" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class CountryRelevanceValues { - @XmlElement(name = "CountryRelevance", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "CountryRelevance", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List countryRelevance; /** @@ -2922,7 +2929,7 @@ public static class CountryRelevanceValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getCountryRelevance() { if (countryRelevance == null) { countryRelevance = new ArrayList(); @@ -2941,7 +2948,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -2953,18 +2960,18 @@ public java.util.List * <attribute name="ISO3" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="ISO2" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3086,11 +3093,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "country" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class CountryValues { - @XmlElement(name = "Country", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Country", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List country; /** @@ -3115,7 +3122,7 @@ public static class CountryValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getCountry() { if (country == null) { country = new ArrayList(); @@ -3138,7 +3145,7 @@ public java.util.List getCou * <attribute name="IS03166-3Code" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="ISO3" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="ISO2" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3150,30 +3157,30 @@ public java.util.List getCou @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Country { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "Comment") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String comment; @XmlAttribute(name = "IS03166-3Code") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String is031663Code; @XmlAttribute(name = "ISO3") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String iso3; @XmlAttribute(name = "ISO2") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String iso2; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -3184,7 +3191,7 @@ public static class Country { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -3197,7 +3204,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -3210,7 +3217,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -3223,7 +3230,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -3236,7 +3243,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getComment() { return comment; } @@ -3249,7 +3256,7 @@ public String getComment() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(String value) { this.comment = value; } @@ -3262,7 +3269,7 @@ public void setComment(String value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getIS031663Code() { return is031663Code; } @@ -3275,7 +3282,7 @@ public String getIS031663Code() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIS031663Code(String value) { this.is031663Code = value; } @@ -3288,7 +3295,7 @@ public void setIS031663Code(String value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getISO3() { return iso3; } @@ -3301,7 +3308,7 @@ public String getISO3() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setISO3(String value) { this.iso3 = value; } @@ -3314,7 +3321,7 @@ public void setISO3(String value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getISO2() { return iso2; } @@ -3327,7 +3334,7 @@ public String getISO2() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setISO2(String value) { this.iso2 = value; } @@ -3340,7 +3347,7 @@ public void setISO2(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -3353,7 +3360,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -3379,7 +3386,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="OrganisationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3396,11 +3403,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "decisionMakingBody" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DecisionMakingBodyValues { - @XmlElement(name = "DecisionMakingBody", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DecisionMakingBody", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List decisionMakingBody; /** @@ -3425,7 +3432,7 @@ public static class DecisionMakingBodyValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getDecisionMakingBody() { if (decisionMakingBody == null) { decisionMakingBody = new ArrayList(); @@ -3445,7 +3452,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="OrganisationID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3457,22 +3464,22 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3617,11 +3624,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "detailReference" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DetailReferenceValues { - @XmlElement(name = "DetailReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DetailReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List detailReference; /** @@ -3646,7 +3653,7 @@ public static class DetailReferenceValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getDetailReference() { if (detailReference == null) { detailReference = new ArrayList(); @@ -3666,7 +3673,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="DetailCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3678,21 +3685,21 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3836,11 +3843,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "detailType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DetailTypeValues { - @XmlElement(name = "DetailType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DetailType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List detailType; /** @@ -3865,7 +3872,7 @@ public static class DetailTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getDetailType() { if (detailType == null) { detailType = new ArrayList(); @@ -3884,7 +3891,7 @@ public java.util.List * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -3896,18 +3903,18 @@ public java.util.List @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DetailType { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -3918,7 +3925,7 @@ public static class DetailType { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -3931,7 +3938,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -3944,7 +3951,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -3957,7 +3964,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -3970,7 +3977,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -3983,7 +3990,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -4008,7 +4015,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4025,11 +4032,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "docNameStatus" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DocNameStatusValues { - @XmlElement(name = "DocNameStatus", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DocNameStatus", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List docNameStatus; /** @@ -4054,7 +4061,7 @@ public static class DocNameStatusValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getDocNameStatus() { if (docNameStatus == null) { docNameStatus = new ArrayList(); @@ -4073,7 +4080,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4085,18 +4092,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4214,11 +4221,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "entryEventType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class EntryEventTypeValues { - @XmlElement(name = "EntryEventType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "EntryEventType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List entryEventType; /** @@ -4243,7 +4250,7 @@ public static class EntryEventTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getEntryEventType() { if (entryEventType == null) { entryEventType = new ArrayList(); @@ -4262,7 +4269,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4274,18 +4281,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4403,11 +4410,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "entryLinkType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class EntryLinkTypeValues { - @XmlElement(name = "EntryLinkType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "EntryLinkType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List entryLinkType; /** @@ -4432,7 +4439,7 @@ public static class EntryLinkTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getEntryLinkType() { if (entryLinkType == null) { entryLinkType = new ArrayList(); @@ -4451,7 +4458,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4463,18 +4470,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4592,11 +4599,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "exRefType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ExRefTypeValues { - @XmlElement(name = "ExRefType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ExRefType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List exRefType; /** @@ -4621,7 +4628,7 @@ public static class ExRefTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getExRefType() { if (exRefType == null) { exRefType = new ArrayList(); @@ -4640,7 +4647,7 @@ public java.util.List ge * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4652,18 +4659,18 @@ public java.util.List ge @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ExRefType { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -4674,7 +4681,7 @@ public static class ExRefType { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -4687,7 +4694,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -4700,7 +4707,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -4713,7 +4720,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -4726,7 +4733,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -4739,7 +4746,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -4764,7 +4771,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4781,11 +4788,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "featureTypeGroup" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class FeatureTypeGroupValues { - @XmlElement(name = "FeatureTypeGroup", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureTypeGroup", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List featureTypeGroup; /** @@ -4810,7 +4817,7 @@ public static class FeatureTypeGroupValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getFeatureTypeGroup() { if (featureTypeGroup == null) { featureTypeGroup = new ArrayList(); @@ -4829,7 +4836,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4841,18 +4848,18 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FeatureTypeGroupID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -4971,11 +4978,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "featureType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class FeatureTypeValues { - @XmlElement(name = "FeatureType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "FeatureType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List featureType; /** @@ -5000,7 +5007,7 @@ public static class FeatureTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getFeatureType() { if (featureType == null) { featureType = new ArrayList(); @@ -5020,7 +5027,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="FeatureTypeGroupID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5032,22 +5039,22 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5191,11 +5198,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "identityFeatureLinkType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IdentityFeatureLinkTypeValues { - @XmlElement(name = "IdentityFeatureLinkType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IdentityFeatureLinkType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List identityFeatureLinkType; /** @@ -5220,7 +5227,7 @@ public static class IdentityFeatureLinkTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getIdentityFeatureLinkType() { if (identityFeatureLinkType == null) { identityFeatureLinkType = new ArrayList(); @@ -5239,7 +5246,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5251,18 +5258,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5380,11 +5387,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "idRegDocDateType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IDRegDocDateTypeValues { - @XmlElement(name = "IDRegDocDateType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocDateType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List idRegDocDateType; /** @@ -5409,7 +5416,7 @@ public static class IDRegDocDateTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getIDRegDocDateType() { if (idRegDocDateType == null) { idRegDocDateType = new ArrayList(); @@ -5428,7 +5435,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5440,18 +5447,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5569,11 +5576,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "idRegDocType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IDRegDocTypeValues { - @XmlElement(name = "IDRegDocType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List idRegDocType; /** @@ -5598,7 +5605,7 @@ public static class IDRegDocTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getIDRegDocType() { if (idRegDocType == null) { idRegDocType = new ArrayList(); @@ -5617,7 +5624,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5629,18 +5636,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5758,11 +5765,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "legalBasisType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LegalBasisTypeValues { - @XmlElement(name = "LegalBasisType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LegalBasisType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List legalBasisType; /** @@ -5787,7 +5794,7 @@ public static class LegalBasisTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getLegalBasisType() { if (legalBasisType == null) { legalBasisType = new ArrayList(); @@ -5806,7 +5813,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5818,18 +5825,18 @@ public java.util.List * <attribute name="LegalBasisTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SanctionsProgramID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -5950,11 +5957,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "legalBasis" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LegalBasisValues { - @XmlElement(name = "LegalBasis", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LegalBasis", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List legalBasis; /** @@ -5979,7 +5986,7 @@ public static class LegalBasisValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getLegalBasis() { if (legalBasis == null) { legalBasis = new ArrayList(); @@ -6001,7 +6008,7 @@ public java.util.List * <attribute name="LegalBasisShortRef" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="LegalBasisTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SanctionsProgramID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6013,29 +6020,29 @@ public java.util.List @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LegalBasis { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "LegalBasisShortRef") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String legalBasisShortRef; @XmlAttribute(name = "LegalBasisTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger legalBasisTypeID; @XmlAttribute(name = "SanctionsProgramID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger sanctionsProgramID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -6046,7 +6053,7 @@ public static class LegalBasis { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -6059,7 +6066,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -6072,7 +6079,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -6085,7 +6092,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -6098,7 +6105,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getLegalBasisShortRef() { return legalBasisShortRef; } @@ -6111,7 +6118,7 @@ public String getLegalBasisShortRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLegalBasisShortRef(String value) { this.legalBasisShortRef = value; } @@ -6124,7 +6131,7 @@ public void setLegalBasisShortRef(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLegalBasisTypeID() { return legalBasisTypeID; } @@ -6137,7 +6144,7 @@ public BigInteger getLegalBasisTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLegalBasisTypeID(BigInteger value) { this.legalBasisTypeID = value; } @@ -6150,7 +6157,7 @@ public void setLegalBasisTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getSanctionsProgramID() { return sanctionsProgramID; } @@ -6163,7 +6170,7 @@ public BigInteger getSanctionsProgramID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsProgramID(BigInteger value) { this.sanctionsProgramID = value; } @@ -6176,7 +6183,7 @@ public void setSanctionsProgramID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -6189,7 +6196,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -6215,7 +6222,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Comment" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6232,11 +6239,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "list" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ListValues { - @XmlElement(name = "List", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "List", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List list; /** @@ -6261,7 +6268,7 @@ public static class ListValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getList() { if (list == null) { list = new ArrayList(); @@ -6281,7 +6288,7 @@ public java.util.List getList() { * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Comment" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6293,21 +6300,21 @@ public java.util.List getList() { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class List { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "Comment") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String comment; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -6318,7 +6325,7 @@ public static class List { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -6331,7 +6338,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -6344,7 +6351,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -6357,7 +6364,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -6370,7 +6377,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getComment() { return comment; } @@ -6383,7 +6390,7 @@ public String getComment() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(String value) { this.comment = value; } @@ -6396,7 +6403,7 @@ public void setComment(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -6409,7 +6416,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -6434,7 +6441,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6451,11 +6458,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "locPartType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocPartTypeValues { - @XmlElement(name = "LocPartType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List locPartType; /** @@ -6480,7 +6487,7 @@ public static class LocPartTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getLocPartType() { if (locPartType == null) { locPartType = new ArrayList(); @@ -6499,7 +6506,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6511,18 +6518,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6640,11 +6647,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "locPartValueStatus" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocPartValueStatusValues { - @XmlElement(name = "LocPartValueStatus", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartValueStatus", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List locPartValueStatus; /** @@ -6669,7 +6676,7 @@ public static class LocPartValueStatusValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getLocPartValueStatus() { if (locPartValueStatus == null) { locPartValueStatus = new ArrayList(); @@ -6688,7 +6695,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6700,18 +6707,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6829,11 +6836,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "locPartValueType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LocPartValueTypeValues { - @XmlElement(name = "LocPartValueType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LocPartValueType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List locPartValueType; /** @@ -6858,7 +6865,7 @@ public static class LocPartValueTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getLocPartValueType() { if (locPartValueType == null) { locPartValueType = new ArrayList(); @@ -6877,7 +6884,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -6889,18 +6896,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7018,11 +7025,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "namePartType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class NamePartTypeValues { - @XmlElement(name = "NamePartType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "NamePartType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List namePartType; /** @@ -7047,7 +7054,7 @@ public static class NamePartTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getNamePartType() { if (namePartType == null) { namePartType = new ArrayList(); @@ -7066,7 +7073,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7078,18 +7085,18 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7208,11 +7215,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "organisation" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class OrganisationValues { - @XmlElement(name = "Organisation", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Organisation", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List organisation; /** @@ -7237,7 +7244,7 @@ public static class OrganisationValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getOrganisation() { if (organisation == null) { organisation = new ArrayList(); @@ -7257,7 +7264,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="CountryID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7269,22 +7276,22 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="PartyTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7429,11 +7436,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "partySubType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class PartySubTypeValues { - @XmlElement(name = "PartySubType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "PartySubType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List partySubType; /** @@ -7458,7 +7465,7 @@ public static class PartySubTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getPartySubType() { if (partySubType == null) { partySubType = new ArrayList(); @@ -7478,7 +7485,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="PartyTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7490,22 +7497,22 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7649,11 +7656,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "partyType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class PartyTypeValues { - @XmlElement(name = "PartyType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "PartyType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List partyType; /** @@ -7678,7 +7685,7 @@ public static class PartyTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getPartyType() { if (partyType == null) { partyType = new ArrayList(); @@ -7697,7 +7704,7 @@ public java.util.List ge * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7709,18 +7716,18 @@ public java.util.List ge @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class PartyType { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -7731,7 +7738,7 @@ public static class PartyType { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -7744,7 +7751,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -7757,7 +7764,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -7770,7 +7777,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -7783,7 +7790,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -7796,7 +7803,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -7821,7 +7828,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7838,11 +7845,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "relationQuality" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class RelationQualityValues { - @XmlElement(name = "RelationQuality", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "RelationQuality", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List relationQuality; /** @@ -7867,7 +7874,7 @@ public static class RelationQualityValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getRelationQuality() { if (relationQuality == null) { relationQuality = new ArrayList(); @@ -7886,7 +7893,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -7898,18 +7905,18 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Symmetrical" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8028,11 +8035,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "relationType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class RelationTypeValues { - @XmlElement(name = "RelationType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "RelationType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List relationType; /** @@ -8057,7 +8064,7 @@ public static class RelationTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getRelationType() { if (relationType == null) { relationType = new ArrayList(); @@ -8077,7 +8084,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Symmetrical" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8089,21 +8096,21 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8239,11 +8246,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "reliability" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ReliabilityValues { - @XmlElement(name = "Reliability", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Reliability", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List reliability; /** @@ -8268,7 +8275,7 @@ public static class ReliabilityValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getReliability() { if (reliability == null) { reliability = new ArrayList(); @@ -8287,7 +8294,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8299,18 +8306,18 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SubsidiaryBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8429,11 +8436,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "sanctionsProgram" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsProgramValues { - @XmlElement(name = "SanctionsProgram", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsProgram", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List sanctionsProgram; /** @@ -8458,7 +8465,7 @@ public static class SanctionsProgramValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getSanctionsProgram() { if (sanctionsProgram == null) { sanctionsProgram = new ArrayList(); @@ -8478,7 +8485,7 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SubsidiaryBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8490,22 +8497,22 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8649,11 +8656,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "sanctionsType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsTypeValues { - @XmlElement(name = "SanctionsType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List sanctionsType; /** @@ -8678,7 +8685,7 @@ public static class SanctionsTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getSanctionsType() { if (sanctionsType == null) { sanctionsType = new ArrayList(); @@ -8697,7 +8704,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8709,18 +8716,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8838,11 +8845,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "scriptStatus" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ScriptStatusValues { - @XmlElement(name = "ScriptStatus", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ScriptStatus", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List scriptStatus; /** @@ -8867,7 +8874,7 @@ public static class ScriptStatusValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getScriptStatus() { if (scriptStatus == null) { scriptStatus = new ArrayList(); @@ -8886,7 +8893,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -8898,18 +8905,18 @@ public java.util.List * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9028,11 +9035,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "script" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ScriptValues { - @XmlElement(name = "Script", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Script", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List script; /** @@ -9057,7 +9064,7 @@ public static class ScriptValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getScript() { if (script == null) { script = new ArrayList(); @@ -9077,7 +9084,7 @@ public java.util.List getScrip * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ScriptCode" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9089,21 +9096,21 @@ public java.util.List getScrip @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Script { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "ScriptCode") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String scriptCode; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -9114,7 +9121,7 @@ public static class Script { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -9127,7 +9134,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -9140,7 +9147,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -9153,7 +9160,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -9166,7 +9173,7 @@ public void setID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getScriptCode() { return scriptCode; } @@ -9179,7 +9186,7 @@ public String getScriptCode() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setScriptCode(String value) { this.scriptCode = value; } @@ -9192,7 +9199,7 @@ public void setScriptCode(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -9205,7 +9212,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -9232,7 +9239,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="Notional" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="DecisionMakingBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9249,11 +9256,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "subsidiaryBody" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SubsidiaryBodyValues { - @XmlElement(name = "SubsidiaryBody", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SubsidiaryBody", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List subsidiaryBody; /** @@ -9278,7 +9285,7 @@ public static class SubsidiaryBodyValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getSubsidiaryBody() { if (subsidiaryBody == null) { subsidiaryBody = new ArrayList(); @@ -9299,7 +9306,7 @@ public java.util.List * <attribute name="Notional" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="DecisionMakingBodyID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9311,25 +9318,25 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9491,11 +9498,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "supInfoType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SupInfoTypeValues { - @XmlElement(name = "SupInfoType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SupInfoType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List supInfoType; /** @@ -9520,7 +9527,7 @@ public static class SupInfoTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getSupInfoType() { if (supInfoType == null) { supInfoType = new ArrayList(); @@ -9539,7 +9546,7 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9551,18 +9558,18 @@ public java.util.List * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9680,11 +9687,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "targetType" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class TargetTypeValues { - @XmlElement(name = "TargetType", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "TargetType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List targetType; /** @@ -9709,7 +9716,7 @@ public static class TargetTypeValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getTargetType() { if (targetType == null) { targetType = new ArrayList(); @@ -9728,7 +9735,7 @@ public java.util.List * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9740,18 +9747,18 @@ public java.util.List @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class TargetType { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -9762,7 +9769,7 @@ public static class TargetType { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -9775,7 +9782,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -9788,7 +9795,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -9801,7 +9808,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -9814,7 +9821,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -9827,7 +9834,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -9852,7 +9859,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9869,11 +9876,11 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "validity" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ValidityValues { - @XmlElement(name = "Validity", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Validity", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected java.util.List validity; /** @@ -9898,7 +9905,7 @@ public static class ValidityValues { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public java.util.List getValidity() { if (validity == null) { validity = new ArrayList(); @@ -9917,7 +9924,7 @@ public java.util.List getV * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -9929,18 +9936,18 @@ public java.util.List getV @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Validity { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -9951,7 +9958,7 @@ public static class Validity { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -9964,7 +9971,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -9977,7 +9984,7 @@ public void setValue(String value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -9990,7 +9997,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -10003,7 +10010,7 @@ public void setID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -10016,7 +10023,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Sanctions.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Sanctions.java index 369849f01..82b7c0200 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Sanctions.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Sanctions.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,14 +31,14 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="DateOfIssue" type="{http://www.un.org/sanctions/1.0}DateSchemaType"/> - * <element name="ReferenceValueSets" type="{http://www.un.org/sanctions/1.0}ReferenceValueSetsSchemaType"/> + * <element name="DateOfIssue" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateSchemaType"/> + * <element name="ReferenceValueSets" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ReferenceValueSetsSchemaType"/> * <element name="Locations"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Location" type="{http://www.un.org/sanctions/1.0}LocationSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Location" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}LocationSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -42,7 +49,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="IDRegDocument" type="{http://www.un.org/sanctions/1.0}IDRegDocumentSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="IDRegDocument" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -53,7 +60,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="DistinctParty" type="{http://www.un.org/sanctions/1.0}DistinctPartySchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="DistinctParty" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DistinctPartySchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -64,7 +71,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="ProfileRelationship" type="{http://www.un.org/sanctions/1.0}ProfileRelationshipSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ProfileRelationship" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ProfileRelationshipSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -75,7 +82,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SanctionsEntry" type="{http://www.un.org/sanctions/1.0}SanctionsEntrySchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="SanctionsEntry" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}SanctionsEntrySchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -86,7 +93,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SanctionsEntryLink" type="{http://www.un.org/sanctions/1.0}SanctionsEntryLinkSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="SanctionsEntryLink" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}SanctionsEntryLinkSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -113,41 +120,41 @@ "sanctionsEntries", "sanctionsEntryLinks" }) -@XmlRootElement(name = "Sanctions", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "Sanctions", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class Sanctions { - @XmlElement(name = "DateOfIssue", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DateOfIssue", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DateSchemaType dateOfIssue; - @XmlElement(name = "ReferenceValueSets", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ReferenceValueSets", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected ReferenceValueSetsSchemaType referenceValueSets; - @XmlElement(name = "Locations", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Locations", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.Locations locations; - @XmlElement(name = "IDRegDocuments", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocuments", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.IDRegDocuments idRegDocuments; - @XmlElement(name = "DistinctParties", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DistinctParties", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.DistinctParties distinctParties; - @XmlElement(name = "ProfileRelationships", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ProfileRelationships", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.ProfileRelationships profileRelationships; - @XmlElement(name = "SanctionsEntries", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsEntries", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.SanctionsEntries sanctionsEntries; - @XmlElement(name = "SanctionsEntryLinks", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsEntryLinks", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Sanctions.SanctionsEntryLinks sanctionsEntryLinks; @XmlAttribute(name = "Version", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger version; @XmlAttribute(name = "DeltaBaseVersion") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger deltaBaseVersion; /** @@ -158,7 +165,7 @@ public class Sanctions { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DateSchemaType getDateOfIssue() { return dateOfIssue; } @@ -171,7 +178,7 @@ public DateSchemaType getDateOfIssue() { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDateOfIssue(DateSchemaType value) { this.dateOfIssue = value; } @@ -184,7 +191,7 @@ public void setDateOfIssue(DateSchemaType value) { * {@link ReferenceValueSetsSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public ReferenceValueSetsSchemaType getReferenceValueSets() { return referenceValueSets; } @@ -197,7 +204,7 @@ public ReferenceValueSetsSchemaType getReferenceValueSets() { * {@link ReferenceValueSetsSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setReferenceValueSets(ReferenceValueSetsSchemaType value) { this.referenceValueSets = value; } @@ -210,7 +217,7 @@ public void setReferenceValueSets(ReferenceValueSetsSchemaType value) { * {@link Sanctions.Locations } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.Locations getLocations() { return locations; } @@ -223,7 +230,7 @@ public Sanctions.Locations getLocations() { * {@link Sanctions.Locations } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLocations(Sanctions.Locations value) { this.locations = value; } @@ -236,7 +243,7 @@ public void setLocations(Sanctions.Locations value) { * {@link Sanctions.IDRegDocuments } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.IDRegDocuments getIDRegDocuments() { return idRegDocuments; } @@ -249,7 +256,7 @@ public Sanctions.IDRegDocuments getIDRegDocuments() { * {@link Sanctions.IDRegDocuments } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setIDRegDocuments(Sanctions.IDRegDocuments value) { this.idRegDocuments = value; } @@ -262,7 +269,7 @@ public void setIDRegDocuments(Sanctions.IDRegDocuments value) { * {@link Sanctions.DistinctParties } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.DistinctParties getDistinctParties() { return distinctParties; } @@ -275,7 +282,7 @@ public Sanctions.DistinctParties getDistinctParties() { * {@link Sanctions.DistinctParties } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDistinctParties(Sanctions.DistinctParties value) { this.distinctParties = value; } @@ -288,7 +295,7 @@ public void setDistinctParties(Sanctions.DistinctParties value) { * {@link Sanctions.ProfileRelationships } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.ProfileRelationships getProfileRelationships() { return profileRelationships; } @@ -301,7 +308,7 @@ public Sanctions.ProfileRelationships getProfileRelationships() { * {@link Sanctions.ProfileRelationships } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setProfileRelationships(Sanctions.ProfileRelationships value) { this.profileRelationships = value; } @@ -314,7 +321,7 @@ public void setProfileRelationships(Sanctions.ProfileRelationships value) { * {@link Sanctions.SanctionsEntries } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.SanctionsEntries getSanctionsEntries() { return sanctionsEntries; } @@ -327,7 +334,7 @@ public Sanctions.SanctionsEntries getSanctionsEntries() { * {@link Sanctions.SanctionsEntries } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsEntries(Sanctions.SanctionsEntries value) { this.sanctionsEntries = value; } @@ -340,7 +347,7 @@ public void setSanctionsEntries(Sanctions.SanctionsEntries value) { * {@link Sanctions.SanctionsEntryLinks } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Sanctions.SanctionsEntryLinks getSanctionsEntryLinks() { return sanctionsEntryLinks; } @@ -353,7 +360,7 @@ public Sanctions.SanctionsEntryLinks getSanctionsEntryLinks() { * {@link Sanctions.SanctionsEntryLinks } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsEntryLinks(Sanctions.SanctionsEntryLinks value) { this.sanctionsEntryLinks = value; } @@ -366,7 +373,7 @@ public void setSanctionsEntryLinks(Sanctions.SanctionsEntryLinks value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getVersion() { return version; } @@ -379,7 +386,7 @@ public BigInteger getVersion() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setVersion(BigInteger value) { this.version = value; } @@ -392,7 +399,7 @@ public void setVersion(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getDeltaBaseVersion() { return deltaBaseVersion; } @@ -405,7 +412,7 @@ public BigInteger getDeltaBaseVersion() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaBaseVersion(BigInteger value) { this.deltaBaseVersion = value; } @@ -421,7 +428,7 @@ public void setDeltaBaseVersion(BigInteger value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="DistinctParty" type="{http://www.un.org/sanctions/1.0}DistinctPartySchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="DistinctParty" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DistinctPartySchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -434,11 +441,11 @@ public void setDeltaBaseVersion(BigInteger value) { @XmlType(name = "", propOrder = { "distinctParty" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class DistinctParties { - @XmlElement(name = "DistinctParty", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DistinctParty", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List distinctParty; /** @@ -463,7 +470,7 @@ public static class DistinctParties { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getDistinctParty() { if (distinctParty == null) { distinctParty = new ArrayList(); @@ -484,7 +491,7 @@ public List getDistinctParty() { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="IDRegDocument" type="{http://www.un.org/sanctions/1.0}IDRegDocumentSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="IDRegDocument" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}IDRegDocumentSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -497,11 +504,11 @@ public List getDistinctParty() { @XmlType(name = "", propOrder = { "idRegDocument" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class IDRegDocuments { - @XmlElement(name = "IDRegDocument", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "IDRegDocument", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List idRegDocument; /** @@ -526,7 +533,7 @@ public static class IDRegDocuments { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getIDRegDocument() { if (idRegDocument == null) { idRegDocument = new ArrayList(); @@ -547,7 +554,7 @@ public List getIDRegDocument() { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Location" type="{http://www.un.org/sanctions/1.0}LocationSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="Location" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}LocationSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -560,11 +567,11 @@ public List getIDRegDocument() { @XmlType(name = "", propOrder = { "location" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Locations { - @XmlElement(name = "Location", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Location", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List location; /** @@ -589,7 +596,7 @@ public static class Locations { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getLocation() { if (location == null) { location = new ArrayList(); @@ -610,7 +617,7 @@ public List getLocation() { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="ProfileRelationship" type="{http://www.un.org/sanctions/1.0}ProfileRelationshipSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ProfileRelationship" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ProfileRelationshipSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -623,11 +630,11 @@ public List getLocation() { @XmlType(name = "", propOrder = { "profileRelationship" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class ProfileRelationships { - @XmlElement(name = "ProfileRelationship", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ProfileRelationship", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List profileRelationship; /** @@ -652,7 +659,7 @@ public static class ProfileRelationships { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getProfileRelationship() { if (profileRelationship == null) { profileRelationship = new ArrayList(); @@ -673,7 +680,7 @@ public List getProfileRelationship() { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SanctionsEntry" type="{http://www.un.org/sanctions/1.0}SanctionsEntrySchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="SanctionsEntry" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}SanctionsEntrySchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -686,11 +693,11 @@ public List getProfileRelationship() { @XmlType(name = "", propOrder = { "sanctionsEntry" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsEntries { - @XmlElement(name = "SanctionsEntry", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsEntry", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List sanctionsEntry; /** @@ -715,7 +722,7 @@ public static class SanctionsEntries { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSanctionsEntry() { if (sanctionsEntry == null) { sanctionsEntry = new ArrayList(); @@ -736,7 +743,7 @@ public List getSanctionsEntry() { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SanctionsEntryLink" type="{http://www.un.org/sanctions/1.0}SanctionsEntryLinkSchemaType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="SanctionsEntryLink" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}SanctionsEntryLinkSchemaType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -749,11 +756,11 @@ public List getSanctionsEntry() { @XmlType(name = "", propOrder = { "sanctionsEntryLink" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsEntryLinks { - @XmlElement(name = "SanctionsEntryLink", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsEntryLink", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List sanctionsEntryLink; /** @@ -778,7 +785,7 @@ public static class SanctionsEntryLinks { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSanctionsEntryLink() { if (sanctionsEntryLink == null) { sanctionsEntryLink = new ArrayList(); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntryLinkSchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntryLinkSchemaType.java index 90ece42d9..611fcfd6b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntryLinkSchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntryLinkSchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,14 +28,14 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element name="Date" type="{http://www.un.org/sanctions/1.0}DateSchemaType"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element name="Date" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateSchemaType"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryA-SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryB-SanctionsEntryID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryLinkTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -37,37 +44,37 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SanctionsEntryLinkSchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "SanctionsEntryLinkSchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "date" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class SanctionsEntryLinkSchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "Date", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Date", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DateSchemaType date; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "EntryA-SanctionsEntryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger entryASanctionsEntryID; @XmlAttribute(name = "EntryB-SanctionsEntryID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger entryBSanctionsEntryID; @XmlAttribute(name = "EntryLinkTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger entryLinkTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -78,7 +85,7 @@ public class SanctionsEntryLinkSchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -91,7 +98,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -104,7 +111,7 @@ public void setComment(Comment value) { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DateSchemaType getDate() { return date; } @@ -117,7 +124,7 @@ public DateSchemaType getDate() { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDate(DateSchemaType value) { this.date = value; } @@ -130,7 +137,7 @@ public void setDate(DateSchemaType value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -143,7 +150,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -156,7 +163,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getEntryASanctionsEntryID() { return entryASanctionsEntryID; } @@ -169,7 +176,7 @@ public BigInteger getEntryASanctionsEntryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryASanctionsEntryID(BigInteger value) { this.entryASanctionsEntryID = value; } @@ -182,7 +189,7 @@ public void setEntryASanctionsEntryID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getEntryBSanctionsEntryID() { return entryBSanctionsEntryID; } @@ -195,7 +202,7 @@ public BigInteger getEntryBSanctionsEntryID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryBSanctionsEntryID(BigInteger value) { this.entryBSanctionsEntryID = value; } @@ -208,7 +215,7 @@ public void setEntryBSanctionsEntryID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getEntryLinkTypeID() { return entryLinkTypeID; } @@ -221,7 +228,7 @@ public BigInteger getEntryLinkTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryLinkTypeID(BigInteger value) { this.entryLinkTypeID = value; } @@ -234,7 +241,7 @@ public void setEntryLinkTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -247,7 +254,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntrySchemaType.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntrySchemaType.java index 4b52b2b10..6bd4263ca 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntrySchemaType.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/SanctionsEntrySchemaType.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -24,12 +31,12 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> * <element name="LimitationsToListing" minOccurs="0"> * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -39,13 +46,13 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element name="Date" type="{http://www.un.org/sanctions/1.0}DateSchemaType"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element name="Date" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateSchemaType"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryEventTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="LegalBasisID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -55,12 +62,12 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SanctionsTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -74,28 +81,28 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SupInfoTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}ProfileRelationshipReference" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}ProfileRelationshipReference" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ProfileID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="ListID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryProfileRef" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="EntryDeltaFlag" type="{http://www.un.org/sanctions/1.0}EntryDeltaFlagSchemaType" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="EntryDeltaFlag" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}EntryDeltaFlagSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -104,7 +111,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SanctionsEntrySchemaType", namespace = "http://www.un.org/sanctions/1.0", propOrder = { +@XmlType(name = "SanctionsEntrySchemaType", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", propOrder = { "comment", "limitationsToListing", "entryEvent", @@ -112,47 +119,47 @@ "supportingInfo", "profileRelationshipReference" }) -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class SanctionsEntrySchemaType { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "LimitationsToListing", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "LimitationsToListing", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected SanctionsEntrySchemaType.LimitationsToListing limitationsToListing; - @XmlElement(name = "EntryEvent", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "EntryEvent", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List entryEvent; - @XmlElement(name = "SanctionsMeasure", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SanctionsMeasure", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List sanctionsMeasure; - @XmlElement(name = "SupportingInfo", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "SupportingInfo", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List supportingInfo; - @XmlElement(name = "ProfileRelationshipReference", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "ProfileRelationshipReference", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected List profileRelationshipReference; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "ProfileID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger profileID; @XmlAttribute(name = "ListID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger listID; @XmlAttribute(name = "EntryProfileRef") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String entryProfileRef; @XmlAttribute(name = "EntryDeltaFlag") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected EntryDeltaFlagSchemaType entryDeltaFlag; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -163,7 +170,7 @@ public class SanctionsEntrySchemaType { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -176,7 +183,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -189,7 +196,7 @@ public void setComment(Comment value) { * {@link SanctionsEntrySchemaType.LimitationsToListing } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public SanctionsEntrySchemaType.LimitationsToListing getLimitationsToListing() { return limitationsToListing; } @@ -202,7 +209,7 @@ public SanctionsEntrySchemaType.LimitationsToListing getLimitationsToListing() { * {@link SanctionsEntrySchemaType.LimitationsToListing } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLimitationsToListing(SanctionsEntrySchemaType.LimitationsToListing value) { this.limitationsToListing = value; } @@ -229,7 +236,7 @@ public void setLimitationsToListing(SanctionsEntrySchemaType.LimitationsToListin * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getEntryEvent() { if (entryEvent == null) { entryEvent = new ArrayList(); @@ -259,7 +266,7 @@ public List getEntryEvent() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSanctionsMeasure() { if (sanctionsMeasure == null) { sanctionsMeasure = new ArrayList(); @@ -289,7 +296,7 @@ public List getSanctionsMeasure() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getSupportingInfo() { if (supportingInfo == null) { supportingInfo = new ArrayList(); @@ -319,7 +326,7 @@ public List getSupportingInfo() { * * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public List getProfileRelationshipReference() { if (profileRelationshipReference == null) { profileRelationshipReference = new ArrayList(); @@ -335,7 +342,7 @@ public List getProfileRelationshipReference() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -348,7 +355,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -361,7 +368,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getProfileID() { return profileID; } @@ -374,7 +381,7 @@ public BigInteger getProfileID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setProfileID(BigInteger value) { this.profileID = value; } @@ -387,7 +394,7 @@ public void setProfileID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getListID() { return listID; } @@ -400,7 +407,7 @@ public BigInteger getListID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setListID(BigInteger value) { this.listID = value; } @@ -413,7 +420,7 @@ public void setListID(BigInteger value) { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getEntryProfileRef() { return entryProfileRef; } @@ -426,7 +433,7 @@ public String getEntryProfileRef() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryProfileRef(String value) { this.entryProfileRef = value; } @@ -439,7 +446,7 @@ public void setEntryProfileRef(String value) { * {@link EntryDeltaFlagSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public EntryDeltaFlagSchemaType getEntryDeltaFlag() { return entryDeltaFlag; } @@ -452,7 +459,7 @@ public EntryDeltaFlagSchemaType getEntryDeltaFlag() { * {@link EntryDeltaFlagSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryDeltaFlag(EntryDeltaFlagSchemaType value) { this.entryDeltaFlag = value; } @@ -465,7 +472,7 @@ public void setEntryDeltaFlag(EntryDeltaFlagSchemaType value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -478,7 +485,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -494,13 +501,13 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element name="Date" type="{http://www.un.org/sanctions/1.0}DateSchemaType"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element name="Date" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DateSchemaType"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="EntryEventTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="LegalBasisID" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -513,29 +520,29 @@ public void setDeltaAction(DeltaActionSchemaType value) { "comment", "date" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class EntryEvent { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "Date", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Date", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DateSchemaType date; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "EntryEventTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger entryEventTypeID; @XmlAttribute(name = "LegalBasisID") @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger legalBasisID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -546,7 +553,7 @@ public static class EntryEvent { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -559,7 +566,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -572,7 +579,7 @@ public void setComment(Comment value) { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DateSchemaType getDate() { return date; } @@ -585,7 +592,7 @@ public DateSchemaType getDate() { * {@link DateSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDate(DateSchemaType value) { this.date = value; } @@ -598,7 +605,7 @@ public void setDate(DateSchemaType value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -611,7 +618,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -624,7 +631,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getEntryEventTypeID() { return entryEventTypeID; } @@ -637,7 +644,7 @@ public BigInteger getEntryEventTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setEntryEventTypeID(BigInteger value) { this.entryEventTypeID = value; } @@ -650,7 +657,7 @@ public void setEntryEventTypeID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getLegalBasisID() { return legalBasisID; } @@ -663,7 +670,7 @@ public BigInteger getLegalBasisID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setLegalBasisID(BigInteger value) { this.legalBasisID = value; } @@ -676,7 +683,7 @@ public void setLegalBasisID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -689,7 +696,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -706,7 +713,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -718,14 +725,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class LimitationsToListing { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -736,7 +743,7 @@ public static class LimitationsToListing { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -749,7 +756,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -762,7 +769,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -775,7 +782,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -793,12 +800,12 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.un.org/sanctions/1.0}Comment" minOccurs="0"/> - * <element ref="{http://www.un.org/sanctions/1.0}DatePeriod"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}Comment" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DatePeriod"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SanctionsTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -811,25 +818,25 @@ public void setDeltaAction(DeltaActionSchemaType value) { "comment", "datePeriod" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SanctionsMeasure { - @XmlElement(name = "Comment", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Comment", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected Comment comment; - @XmlElement(name = "DatePeriod", namespace = "http://www.un.org/sanctions/1.0", required = true) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DatePeriod", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML", required = true) + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DatePeriod datePeriod; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "SanctionsTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger sanctionsTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -840,7 +847,7 @@ public static class SanctionsMeasure { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public Comment getComment() { return comment; } @@ -853,7 +860,7 @@ public Comment getComment() { * {@link Comment } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setComment(Comment value) { this.comment = value; } @@ -866,7 +873,7 @@ public void setComment(Comment value) { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DatePeriod getDatePeriod() { return datePeriod; } @@ -879,7 +886,7 @@ public DatePeriod getDatePeriod() { * {@link DatePeriod } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDatePeriod(DatePeriod value) { this.datePeriod = value; } @@ -892,7 +899,7 @@ public void setDatePeriod(DatePeriod value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -905,7 +912,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -918,7 +925,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getSanctionsTypeID() { return sanctionsTypeID; } @@ -931,7 +938,7 @@ public BigInteger getSanctionsTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSanctionsTypeID(BigInteger value) { this.sanctionsTypeID = value; } @@ -944,7 +951,7 @@ public void setSanctionsTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -957,7 +964,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -979,16 +986,16 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> * </element> - * <element ref="{http://www.un.org/sanctions/1.0}DirectURL" minOccurs="0"/> + * <element ref="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DirectURL" minOccurs="0"/> * </sequence> * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> * <attribute name="SupInfoTypeID" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </restriction> * </complexContent> * </complexType> @@ -1001,25 +1008,25 @@ public void setDeltaAction(DeltaActionSchemaType value) { "text", "directURL" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class SupportingInfo { - @XmlElement(name = "Text", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "Text", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected SanctionsEntrySchemaType.SupportingInfo.Text text; - @XmlElement(name = "DirectURL", namespace = "http://www.un.org/sanctions/1.0") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @XmlElement(name = "DirectURL", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DirectURL directURL; @XmlAttribute(name = "ID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger id; @XmlAttribute(name = "SupInfoTypeID", required = true) @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger supInfoTypeID; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -1030,7 +1037,7 @@ public static class SupportingInfo { * {@link SanctionsEntrySchemaType.SupportingInfo.Text } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public SanctionsEntrySchemaType.SupportingInfo.Text getText() { return text; } @@ -1043,7 +1050,7 @@ public SanctionsEntrySchemaType.SupportingInfo.Text getText() { * {@link SanctionsEntrySchemaType.SupportingInfo.Text } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setText(SanctionsEntrySchemaType.SupportingInfo.Text value) { this.text = value; } @@ -1056,7 +1063,7 @@ public void setText(SanctionsEntrySchemaType.SupportingInfo.Text value) { * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DirectURL getDirectURL() { return directURL; } @@ -1069,7 +1076,7 @@ public DirectURL getDirectURL() { * {@link DirectURL } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDirectURL(DirectURL value) { this.directURL = value; } @@ -1082,7 +1089,7 @@ public void setDirectURL(DirectURL value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getID() { return id; } @@ -1095,7 +1102,7 @@ public BigInteger getID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setID(BigInteger value) { this.id = value; } @@ -1108,7 +1115,7 @@ public void setID(BigInteger value) { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getSupInfoTypeID() { return supInfoTypeID; } @@ -1121,7 +1128,7 @@ public BigInteger getSupInfoTypeID() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setSupInfoTypeID(BigInteger value) { this.supInfoTypeID = value; } @@ -1134,7 +1141,7 @@ public void setSupInfoTypeID(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1147,7 +1154,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } @@ -1162,7 +1169,7 @@ public void setDeltaAction(DeltaActionSchemaType value) { * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -1174,14 +1181,14 @@ public void setDeltaAction(DeltaActionSchemaType value) { @XmlType(name = "", propOrder = { "value" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public static class Text { @XmlValue - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected String value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -1192,7 +1199,7 @@ public static class Text { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public String getValue() { return value; } @@ -1205,7 +1212,7 @@ public String getValue() { * {@link String } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(String value) { this.value = value; } @@ -1218,7 +1225,7 @@ public void setValue(String value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -1231,7 +1238,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Year.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Year.java index 6e34a57a2..79fa3192d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Year.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/Year.java @@ -1,3 +1,10 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2024.06.17 at 11:26:16 AM CEST +// + package com.generalbytes.batm.server.extensions.extra.watchlists.ofac.tags; @@ -21,7 +28,7 @@ * <complexType> * <simpleContent> * <extension base="<http://www.w3.org/2001/XMLSchema>nonNegativeInteger"> - * <attribute name="DeltaAction" type="{http://www.un.org/sanctions/1.0}DeltaActionSchemaType" /> + * <attribute name="DeltaAction" type="{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML}DeltaActionSchemaType" /> * </extension> * </simpleContent> * </complexType> @@ -33,16 +40,16 @@ @XmlType(name = "", propOrder = { "value" }) -@XmlRootElement(name = "Year", namespace = "http://www.un.org/sanctions/1.0") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") +@XmlRootElement(name = "Year", namespace = "https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/ADVANCED_XML") +@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public class Year { @XmlValue @XmlSchemaType(name = "nonNegativeInteger") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected BigInteger value; @XmlAttribute(name = "DeltaAction") - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") protected DeltaActionSchemaType deltaAction; /** @@ -53,7 +60,7 @@ public class Year { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public BigInteger getValue() { return value; } @@ -66,7 +73,7 @@ public BigInteger getValue() { * {@link BigInteger } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setValue(BigInteger value) { this.value = value; } @@ -79,7 +86,7 @@ public void setValue(BigInteger value) { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public DeltaActionSchemaType getDeltaAction() { return deltaAction; } @@ -92,7 +99,7 @@ public DeltaActionSchemaType getDeltaAction() { * {@link DeltaActionSchemaType } * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2016-02-08T09:26:29+01:00", comments = "JAXB RI v2.2.4-2") + @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2024-06-17T11:26:16+02:00", comments = "JAXB RI v2.2.8-b130911.1802") public void setDeltaAction(DeltaActionSchemaType value) { this.deltaAction = value; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/sdn_advanced.xsd b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/sdn_advanced.xsd index 4f776102a..13dcef520 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/sdn_advanced.xsd +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/ofac/tags/sdn_advanced.xsd @@ -1,8 +1,8 @@ diff --git a/server_extensions_extra/src/test/resources/ofac_sdn_advanced.xml b/server_extensions_extra/src/test/resources/ofac_sdn_advanced.xml index fbee01b07..b0517914a 100644 --- a/server_extensions_extra/src/test/resources/ofac_sdn_advanced.xml +++ b/server_extensions_extra/src/test/resources/ofac_sdn_advanced.xml @@ -1,6 +1,7 @@ - + 2021 1 From d795f27ebd5e7c5423c9e92f9538f647f551c44f Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Mon, 17 Jun 2024 13:07:52 +0200 Subject: [PATCH 81/82] Increase project version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 90be89b04..b5aeb94f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.6.2 +projectVersion=1.6.3 # buildscript - common dependency versions bitrafaelVersion=1.0.44 From b13496a938f43a5d4de6227ff751f48306cbd371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pl=C3=A1nsk=C3=BD?= <67519977+d0by1@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:21:40 +0200 Subject: [PATCH 82/82] BATM-6312 Rename Tron TRC20 wallet to TRON TRC-20 TronGrid.io (#915) --- server_extensions_extra/src/main/resources/batm-extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index b8d78e6aa..3ecf57544 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -2310,7 +2310,7 @@ - +