conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
import com.apollocurrency.aplwallet.apl.core.app.Blockchain;
import com.apollocurrency.aplwallet.apl.core.app.CollectionUtil;
import com.apollocurrency.aplwallet.apl.core.db.DbIterator;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.CollectionUtil;
import com.apollocurrency.aplwallet.apl.core.db.DbIterator; |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.monetary.Currency;
import com.apollocurrency.aplwallet.apl.core.transaction.types.ms.MonetarySystemTransactionType;
=======
import com.apollocurrency.aplwallet.apl.core.entity.state.currency.Currency;
import com.apollocurrency.aplwallet.apl.core.monetary.MonetarySystem;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.monetary.Currency;
import com.apollocurrency.aplwallet.apl.core.transaction.types.ms.MonetarySystemTransactionType;
import com.apollocurrency.aplwallet.apl.core.entity.state.currency.Currency;
import com.apollocurrency.aplwallet.apl.core.monetary.MonetarySystem; |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
=======
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.signature.Signature;
import com.apollocurrency.aplwallet.apl.core.signature.SignatureParser;
import com.apollocurrency.aplwallet.apl.core.signature.SignatureToolFactory;
import com.apollocurrency.aplwallet.apl.core.transaction.Payment;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.signature.Signature;
import com.apollocurrency.aplwallet.apl.core.signature.SignatureParser;
import com.apollocurrency.aplwallet.apl.core.signature.SignatureToolFactory;
import com.apollocurrency.aplwallet.apl.core.transaction.Payment;
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionTypeFactory;
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionTypes;
=======
import com.apollocurrency.aplwallet.apl.core.transaction.UnsupportedTransactionVersion;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionTypeFactory;
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionTypes;
import com.apollocurrency.aplwallet.apl.core.transaction.UnsupportedTransactionVersion; |
<<<<<<<
private AccountService lookupAccountService(){
if ( accountService == null) {
accountService = CDI.current().select(AccountService.class).get();
=======
static BlockImpl parseBlock(JSONObject blockData) throws AplException.NotValidException {
try {
int version = ((Long) blockData.get("version")).intValue();
int timestamp = ((Long) blockData.get("timestamp")).intValue();
long previousBlock = Convert.parseUnsignedLong((String) blockData.get("previousBlock"));
long totalAmountATM = blockData.containsKey("totalAmountATM") ? Convert.parseLong(blockData.get("totalAmountATM")) : Convert.parseLong(blockData.get("totalAmountNQT"));
long totalFeeATM = blockData.containsKey("totalFeeATM") ? Convert.parseLong(blockData.get("totalFeeATM")) : Convert.parseLong(blockData.get("totalFeeNQT"));
int payloadLength = ((Long) blockData.get("payloadLength")).intValue();
byte[] payloadHash = Convert.parseHexString((String) blockData.get("payloadHash"));
byte[] generatorPublicKey = Convert.parseHexString((String) blockData.get("generatorPublicKey"));
byte[] generationSignature = Convert.parseHexString((String) blockData.get("generationSignature"));
byte[] blockSignature = Convert.parseHexString((String) blockData.get("blockSignature"));
byte[] previousBlockHash = version == 1 ? null : Convert.parseHexString((String) blockData.get("previousBlockHash"));
Object timeoutJsonValue = blockData.get("timeout");
int timeout = !requireTimeout(version) ? 0 : ((Long) timeoutJsonValue).intValue();
List<Transaction> blockTransactions = new ArrayList<>();
for (Object transactionData : (JSONArray) blockData.get("transactions")) {
blockTransactions.add(TransactionImpl.parseTransaction((JSONObject) transactionData));
}
BlockImpl block = new BlockImpl(version, timestamp, previousBlock, totalAmountATM, totalFeeATM, payloadLength, payloadHash, generatorPublicKey,
generationSignature, blockSignature, previousBlockHash, timeout, blockTransactions);
if (!block.checkSignature()) {
throw new AplException.NotValidException("Invalid block signature");
}
return block;
} catch (RuntimeException e) {
LOG.debug("Failed to parse block: " + blockData.toJSONString());
LOG.debug("Exception: " + e.getMessage());
throw e;
}
}
static boolean requireTimeout(int version) {
return Block.ADAPTIVE_BLOCK_VERSION == version || Block.INSTANT_BLOCK_VERSION == version;
}
private AccountService lookupAccountService() {
if (accountService == null) {
accountService = CDI.current().select(AccountServiceImpl.class).get();
>>>>>>>
static BlockImpl parseBlock(JSONObject blockData) throws AplException.NotValidException {
try {
int version = ((Long) blockData.get("version")).intValue();
int timestamp = ((Long) blockData.get("timestamp")).intValue();
long previousBlock = Convert.parseUnsignedLong((String) blockData.get("previousBlock"));
long totalAmountATM = blockData.containsKey("totalAmountATM") ? Convert.parseLong(blockData.get("totalAmountATM")) : Convert.parseLong(blockData.get("totalAmountNQT"));
long totalFeeATM = blockData.containsKey("totalFeeATM") ? Convert.parseLong(blockData.get("totalFeeATM")) : Convert.parseLong(blockData.get("totalFeeNQT"));
int payloadLength = ((Long) blockData.get("payloadLength")).intValue();
byte[] payloadHash = Convert.parseHexString((String) blockData.get("payloadHash"));
byte[] generatorPublicKey = Convert.parseHexString((String) blockData.get("generatorPublicKey"));
byte[] generationSignature = Convert.parseHexString((String) blockData.get("generationSignature"));
byte[] blockSignature = Convert.parseHexString((String) blockData.get("blockSignature"));
byte[] previousBlockHash = version == 1 ? null : Convert.parseHexString((String) blockData.get("previousBlockHash"));
Object timeoutJsonValue = blockData.get("timeout");
int timeout = !requireTimeout(version) ? 0 : ((Long) timeoutJsonValue).intValue();
List<Transaction> blockTransactions = new ArrayList<>();
for (Object transactionData : (JSONArray) blockData.get("transactions")) {
blockTransactions.add(TransactionImpl.parseTransaction((JSONObject) transactionData));
}
BlockImpl block = new BlockImpl(version, timestamp, previousBlock, totalAmountATM, totalFeeATM, payloadLength, payloadHash, generatorPublicKey,
generationSignature, blockSignature, previousBlockHash, timeout, blockTransactions);
if (!block.checkSignature()) {
throw new AplException.NotValidException("Invalid block signature");
}
return block;
} catch (RuntimeException e) {
LOG.debug("Failed to parse block: " + blockData.toJSONString());
LOG.debug("Exception: " + e.getMessage());
throw e;
}
}
static boolean requireTimeout(int version) {
return Block.ADAPTIVE_BLOCK_VERSION == version || Block.INSTANT_BLOCK_VERSION == version;
}
private AccountService lookupAccountService() {
if (accountService == null) {
accountService = CDI.current().select(AccountService.class).get(); |
<<<<<<<
private static AccountTable accountTable;
private static ConcurrentMap<DbKey, byte[]> publicKeyCache = null;
=======
private static AccountInfoTable accountInfoTable;
private static AccountAssetTable accountAssetTable;
private static AccountCurrencyTable accountCurrencyTable;
private static AccountLeaseTable accountLeaseTable;
private static AccountPropertyTable accountPropertyTable;
private static GenesisPublicKeyTable genesisPublicKeyTable;
private static AccountTable accountTable;
private static ConcurrentMap<DbKey, byte[]> publicKeyCache = null;
>>>>>>>
private static GenesisPublicKeyTable genesisPublicKeyTable;
private static AccountTable accountTable;
private static ConcurrentMap<DbKey, byte[]> publicKeyCache = null;
<<<<<<<
accountTable.delete(this, true, blockchain.getHeight());
=======
accountTable.delete(this, true);
>>>>>>>
accountTable.delete(this, true, blockchain.getHeight()); |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.service.state.exchange.ExchangeRequestService;
=======
import com.apollocurrency.aplwallet.apl.core.service.state.currency.CurrencyExchangeOfferFacade;
import com.apollocurrency.aplwallet.apl.core.service.state.echange.ExchangeService;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.service.state.currency.CurrencyExchangeOfferFacade;
import com.apollocurrency.aplwallet.apl.core.service.state.echange.ExchangeService;
import com.apollocurrency.aplwallet.apl.core.service.state.exchange.ExchangeRequestService;
<<<<<<<
private ExchangeRequestService exchangeRequestService;
=======
private AssetTransferService assetTransferService;
private CurrencyExchangeOfferFacade currencyExchangeOfferFacade;
>>>>>>>
private AssetTransferService assetTransferService;
private CurrencyExchangeOfferFacade currencyExchangeOfferFacade;
private ExchangeRequestService exchangeRequestService;
<<<<<<<
public ExchangeRequestService lookupExchangeRequestService() {
if (exchangeRequestService == null) {
exchangeRequestService = CDI.current().select(ExchangeRequestService.class).get();
}
return exchangeRequestService;
}
=======
public AssetTransferService lookupAssetTransferService() {
if (assetTransferService == null) {
assetTransferService = CDI.current().select(AssetTransferService.class).get();
}
return assetTransferService;
}
>>>>>>>
public AssetTransferService lookupAssetTransferService() {
if (assetTransferService == null) {
assetTransferService = CDI.current().select(AssetTransferService.class).get();
}
return assetTransferService;
}
public ExchangeRequestService lookupExchangeRequestService() {
if (exchangeRequestService == null) {
exchangeRequestService = CDI.current().select(ExchangeRequestService.class).get();
}
return exchangeRequestService;
} |
<<<<<<<
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
import com.apollocurrency.aplwallet.apl.core.account.service.AccountService;
import com.apollocurrency.aplwallet.apl.core.account.service.AccountServiceImpl;
=======
>>>>>>>
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
import com.apollocurrency.aplwallet.apl.core.account.service.AccountService;
import com.apollocurrency.aplwallet.apl.core.account.service.AccountServiceImpl; |
<<<<<<<
try (AccumuloClient c = createAccumuloClient()) {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
Map<String,Set<Text>> groups = new HashMap<>();
groups.put("lg1", Collections.singleton(new Text("foo")));
groups.put("dg", Collections.emptySet());
c.tableOperations().setLocalityGroups(tableName, groups);
IteratorSetting setting = new IteratorSetting(30, RowDeletingIterator.class);
c.tableOperations().attachIterator(tableName, setting, EnumSet.of(IteratorScope.majc));
c.tableOperations().setProperty(tableName, Property.TABLE_MAJC_RATIO.getKey(), "100");
=======
Connector c = getConnector();
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
Map<String,Set<Text>> groups = new HashMap<>();
groups.put("lg1", Collections.singleton(new Text("foo")));
c.tableOperations().setLocalityGroups(tableName, groups);
IteratorSetting setting = new IteratorSetting(30, RowDeletingIterator.class);
c.tableOperations().attachIterator(tableName, setting, EnumSet.of(IteratorScope.majc));
c.tableOperations().setProperty(tableName, Property.TABLE_MAJC_RATIO.getKey(), "100");
>>>>>>>
try (AccumuloClient c = createAccumuloClient()) {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
Map<String,Set<Text>> groups = new HashMap<>();
groups.put("lg1", Collections.singleton(new Text("foo")));
c.tableOperations().setLocalityGroups(tableName, groups);
IteratorSetting setting = new IteratorSetting(30, RowDeletingIterator.class);
c.tableOperations().attachIterator(tableName, setting, EnumSet.of(IteratorScope.majc));
c.tableOperations().setProperty(tableName, Property.TABLE_MAJC_RATIO.getKey(), "100"); |
<<<<<<<
.dbDir(dp != null ? dp.getDbDir().toAbsolutePath().toString() : "./unit-test-db") // for unit tests
.dbFileName(Constants.APPLICATION_DIR_NAME)
=======
.dbDir(dp != null ? dp.getDbDir().toAbsolutePath().toString() : "emptyDirProvider") // for unit tests
.dbFileName(dbFileName)
>>>>>>>
.dbDir(dp != null ? dp.getDbDir().toAbsolutePath().toString() : "./unit-test-db") // for unit tests
.dbFileName(dbFileName) |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.account.Account;
import com.apollocurrency.aplwallet.apl.core.account.LedgerEvent;
=======
import javax.enterprise.inject.spi.CDI;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.account.Account;
import com.apollocurrency.aplwallet.apl.core.account.LedgerEvent;
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.DigitalGoodsStore;
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
=======
import com.apollocurrency.aplwallet.apl.core.app.BlockchainImpl;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
<<<<<<<
=======
Blockchain blockchain = CDI.current().select(BlockchainImpl.class).get();;
>>>>>>>
<<<<<<<
public void changePrice(long goodsId, long priceATM) {
Goods goods = Goods.goodsTable.get(Goods.goodsDbKeyFactory.newKey(goodsId));
if (! goods.isDelisted()) {
goods.changePrice(priceATM);
} else {
throw new IllegalStateException("Can't change price of delisted goods");
}
}
=======
*/
>>>>>>>
public void changePrice(long goodsId, long priceATM) {
DGSGoods goods = goodsTable.get(goodsId);
if (!goods.isDelisted()) {
changePrice(goods, priceATM);
} else {
throw new IllegalStateException("Can't change price of delisted goods");
}
} |
<<<<<<<
=======
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_0;
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_1;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import com.apollocurrency.aplwallet.apl.core.account.Account;
import com.apollocurrency.aplwallet.apl.core.account.AccountTable;
import com.apollocurrency.aplwallet.apl.core.account.GenesisPublicKeyTable;
import com.apollocurrency.aplwallet.apl.core.account.PublicKeyTable;
>>>>>>>
<<<<<<<
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_0;
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_1;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
=======
import javax.inject.Inject;
>>>>>>>
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_0;
import static com.apollocurrency.aplwallet.apl.data.IndexTestData.TRANSACTION_INDEX_1;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionSerializer;
=======
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
import com.apollocurrency.aplwallet.apl.core.transaction.TransactionSerializer;
<<<<<<<
private static ShardDao shardDao;
private static AccountService accountService;
private static TransactionSerializer transactionSerializer;
=======
>>>>>>>
private static ShardDao shardDao;
private static AccountService accountService;
private static TransactionSerializer transactionSerializer;
<<<<<<<
public static BlockImpl parseBlock(JSONObject blockData) throws AplException.NotValidException {
try {
int version = ((Long) blockData.get("version")).intValue();
int timestamp = ((Long) blockData.get("timestamp")).intValue();
long previousBlock = Convert.parseUnsignedLong((String) blockData.get("previousBlock"));
long totalAmountATM = blockData.containsKey("totalAmountATM") ? Convert.parseLong(blockData.get("totalAmountATM")) : Convert.parseLong(blockData.get("totalAmountNQT"));
long totalFeeATM = blockData.containsKey("totalFeeATM") ? Convert.parseLong(blockData.get("totalFeeATM")) : Convert.parseLong(blockData.get("totalFeeNQT"));
int payloadLength = ((Long) blockData.get("payloadLength")).intValue();
byte[] payloadHash = Convert.parseHexString((String) blockData.get("payloadHash"));
byte[] generatorPublicKey = Convert.parseHexString((String) blockData.get("generatorPublicKey"));
byte[] generationSignature = Convert.parseHexString((String) blockData.get("generationSignature"));
byte[] blockSignature = Convert.parseHexString((String) blockData.get("blockSignature"));
byte[] previousBlockHash = version == 1 ? null : Convert.parseHexString((String) blockData.get("previousBlockHash"));
Object timeoutJsonValue = blockData.get("timeout");
int timeout = !requireTimeout(version) ? 0 : ((Long) timeoutJsonValue).intValue();
List<Transaction> blockTransactions = new ArrayList<>();
for (Object transactionData : (JSONArray) blockData.get("transactions")) {
// TODO merge develop and adapt transaction parsing
// blockTransactions.add(TransactionImpl.parseTransaction((JSONObject) transactionData));
throw new IllegalStateException("Transaction parsing was not implemented correctly");
}
BlockImpl block = new BlockImpl(version, timestamp, previousBlock, totalAmountATM, totalFeeATM, payloadLength, payloadHash, generatorPublicKey,
generationSignature, blockSignature, previousBlockHash, timeout, blockTransactions);
if (!block.checkSignature()) {
throw new AplException.NotValidException("Invalid block signature");
}
return block;
} catch (RuntimeException e) {
LOG.debug("Failed to parse block: " + blockData.toJSONString());
LOG.debug("Exception: " + e.getMessage());
throw e;
}
}
=======
>>>>>>>
<<<<<<<
private AccountService lookupAccountService() {
if (accountService == null) {
accountService = CDI.current().select(AccountService.class).get();
}
return accountService;
}
private BlockchainConfig lookupBlockchainConfig() {
if (blockchainConfig == null) {
blockchainConfig = CDI.current().select(BlockchainConfig.class).get();
}
return blockchainConfig;
}
private TransactionSerializer lookupTransactionSerializer() {
if (transactionSerializer == null) {
transactionSerializer = CDI.current().select(TransactionSerializer.class).get();
}
return transactionSerializer;
}
=======
>>>>>>> |
<<<<<<<
private static FeeCalculator feeCalculator = CDI.current().select(FeeCalculator.class).get();
=======
private static ShufflingService shufflingService = CDI.current().select(ShufflingServiceImpl.class).get();
private static FeeCalculator feeCalculator = new FeeCalculator();
>>>>>>>
private static ShufflingService shufflingService = CDI.current().select(ShufflingServiceImpl.class).get();
private static FeeCalculator feeCalculator = |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.Block;
import com.apollocurrency.aplwallet.apl.core.app.observer.events.BlockEvent;
import com.apollocurrency.aplwallet.apl.core.app.observer.events.BlockEventType;
=======
import com.apollocurrency.aplwallet.apl.core.app.observer.events.TrimEvent;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.Block;
import com.apollocurrency.aplwallet.apl.core.app.observer.events.BlockEvent;
import com.apollocurrency.aplwallet.apl.core.app.observer.events.BlockEventType;
import com.apollocurrency.aplwallet.apl.core.app.observer.events.TrimEvent;
<<<<<<<
import javax.enterprise.event.ObservesAsync;
=======
import java.util.concurrent.ExecutionException;
import javax.enterprise.event.ObservesAsync;
>>>>>>>
import javax.enterprise.event.ObservesAsync; |
<<<<<<<
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
=======
import static org.mockito.Mockito.never;
>>>>>>>
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.never;
<<<<<<<
Random random = Mockito.mock(Random.class);
=======
Random random = mock(Random.class);
>>>>>>>
Random random = mock(Random.class); |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.EpochTime;
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
=======
import com.apollocurrency.aplwallet.apl.core.app.TimeService;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.TimeService;
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
<<<<<<<
public DexController(DexService service, DexOfferTransactionCreator dexOfferTransactionCreator, EpochTime epochTime, DexEthService dexEthService,
EthereumWalletService ethereumWalletService, DexMatcherServiceImpl dexMatcherService, DexOfferProcessor dexOfferProcessor, DexSmartContractService dexSmartContractService) {
=======
public DexController(DexService service, DexOfferTransactionCreator dexOfferTransactionCreator, TimeService timeService, DexEthService dexEthService,
EthereumWalletService ethereumWalletService, DexMatcherServiceImpl dexMatcherService) {
>>>>>>>
public DexController(DexService service, DexOfferTransactionCreator dexOfferTransactionCreator, TimeService epochTime, DexEthService dexEthService,
EthereumWalletService ethereumWalletService, DexMatcherServiceImpl dexMatcherService, DexOfferProcessor dexOfferProcessor, DexSmartContractService dexSmartContractService) {
<<<<<<<
Integer currentTime = epochTime.getEpochTime();
=======
Integer currentTime = timeService.getEpochTime();
JSONStreamAware response = null;
>>>>>>>
Integer currentTime = timeService.getEpochTime(); |
<<<<<<<
private static Blockchain blockchain;
private static TransactionSerializer transactionSerializer;
=======
>>>>>>>
private static Blockchain blockchain;
private static TransactionSerializer transactionSerializer;
<<<<<<<
public JSONObject getJSONObject() {
JSONObject json = new JSONObject();
json.put("version", version);
json.put("stringId", stringId);
json.put("timestamp", timestamp);
json.put("previousBlock", Long.toUnsignedString(previousBlockId));
json.put("totalAmountATM", totalAmountATM);
json.put("totalFeeATM", totalFeeATM);
json.put("payloadLength", payloadLength);
json.put("payloadHash", Convert.toHexString(payloadHash));
json.put("generatorId", Long.toUnsignedString(generatorId));
json.put("generatorPublicKey", Convert.toHexString(getGeneratorPublicKey()));
json.put("generationSignature", Convert.toHexString(generationSignature));
json.put("previousBlockHash", Convert.toHexString(previousBlockHash));
json.put("blockSignature", Convert.toHexString(blockSignature));
json.put("timeout", timeout);
JSONArray transactionsData = new JSONArray();
getOrLoadTransactions().forEach(transaction -> transactionsData.add(lookupTransactionSerializer().toJson(transaction)));
json.put("transactions", transactionsData);
return json;
}
@Override
=======
>>>>>>>
<<<<<<<
}
}
public void loadTransactions() {
for (Transaction transaction : getOrLoadTransactions()) {
transaction.bytes();
=======
((TransactionImpl) transaction).bytes();
>>>>>>>
transaction.bytes();
<<<<<<<
private void calculateBaseTarget(Block previousBlock, HeightConfig config, Shard lastShard) {
long prevBaseTarget = previousBlock.getBaseTarget();
int blockchainHeight = previousBlock.getHeight();
if (blockchainHeight > 2 && blockchainHeight % 2 == 0) {
int blocktimeAverage = getBlockTimeAverage(previousBlock, lastShard);
int blockTime = config.getBlockTime();
if (blocktimeAverage > blockTime) {
int maxBlocktimeLimit = config.getMaxBlockTimeLimit();
baseTarget = (prevBaseTarget * Math.min(blocktimeAverage, maxBlocktimeLimit)) / blockTime;
} else {
int minBlocktimeLimit = config.getMinBlockTimeLimit();
baseTarget = prevBaseTarget - prevBaseTarget * Constants.BASE_TARGET_GAMMA
* (blockTime - Math.max(blocktimeAverage, minBlocktimeLimit)) / (100 * blockTime);
}
long maxBaseTarget = config.getMaxBaseTarget();
if (baseTarget < 0 || baseTarget > maxBaseTarget) {
baseTarget = maxBaseTarget;
}
long minBaseTarget = config.getMinBaseTarget();
if (baseTarget < minBaseTarget) {
baseTarget = config.getMinBaseTarget();
}
} else {
baseTarget = prevBaseTarget;
}
cumulativeDifficulty = previousBlock.getCumulativeDifficulty().add(Convert.two64.divide(BigInteger.valueOf(baseTarget)));
}
private int getBlockTimeAverage(Block previousBlock, Shard lastShard) {
int blockchainHeight = previousBlock.getHeight();
Block shardInitialBlock = lookupBlockchain().getShardInitialBlock();
int lastBlockTimestamp = getPrevTimestamp(shardInitialBlock.getHeight(), blockchainHeight - 2, lastShard);
if (version != Block.LEGACY_BLOCK_VERSION) {
int intermediateTimestamp = getPrevTimestamp(shardInitialBlock.getHeight(), blockchainHeight - 1, lastShard);
int intermediateTimeout = getPrevTimeout(shardInitialBlock.getHeight(), blockchainHeight - 1, lastShard);
int thisBlockActualTime = this.timestamp - previousBlock.getTimestamp() - this.timeout;
int previousBlockTime = previousBlock.getTimestamp() - previousBlock.getTimeout() - intermediateTimestamp;
int secondAvgBlockTime = intermediateTimestamp
- intermediateTimeout - lastBlockTimestamp;
return (thisBlockActualTime + previousBlockTime + secondAvgBlockTime) / 3;
} else {
return (this.timestamp - lastBlockTimestamp) / 3;
}
}
private int getPrevTimestamp(int shardInitialHeight, int blockHeight, Shard lastShard) {
int diff = shardInitialHeight - blockHeight;
if (diff > 2) {
throw new IllegalArgumentException("Unable to retrieve block timestamp for height " + blockHeight + " current shard height " + shardInitialHeight);
}
if (diff > 0) {
int[] blockTimestamps = lastShard.getBlockTimestamps();
return blockTimestamps[diff - 1];
}
return lookupBlockchain().getBlockAtHeight(blockHeight).getTimestamp();
}
private int getPrevTimeout(int shardInitialHeight, int blockHeight, Shard lastShard) {
int diff = shardInitialHeight - blockHeight;
if (diff > 2) {
throw new IllegalArgumentException("Unable to retrieve block timeout for height " + blockHeight + " current shard height " + shardInitialHeight);
}
if (diff > 0) {
int[] blockTimeouts = lastShard.getBlockTimeouts();
return blockTimeouts[diff - 1];
}
return lookupBlockchain().getBlockAtHeight(blockHeight).getTimeout();
}
private Blockchain lookupBlockchain() {
if (blockchain == null) {
blockchain = CDI.current().select(Blockchain.class).get();
}
return blockchain;
}
private TransactionSerializer lookupTransactionSerializer() {
if (transactionSerializer == null) {
transactionSerializer = CDI.current().select(TransactionSerializer.class).get();
}
return transactionSerializer;
}
=======
>>>>>>> |
<<<<<<<
=======
import static com.apollocurrency.aplwallet.apl.core.http.JSONResponses.incorrect;
import static com.apollocurrency.aplwallet.apl.util.Constants.MAX_ORDER_DURATION_SEC;
import com.apollocurrency.aplwallet.apl.core.account.Account;
>>>>>>>
import static com.apollocurrency.aplwallet.apl.core.http.JSONResponses.incorrect;
import static com.apollocurrency.aplwallet.apl.util.Constants.MAX_ORDER_DURATION_SEC;
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.account.model.Account;
import com.apollocurrency.aplwallet.apl.core.app.EpochTime;
=======
import com.apollocurrency.aplwallet.apl.core.app.TimeService;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.account.model.Account;
import com.apollocurrency.aplwallet.apl.core.app.TimeService; |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.ShufflingParticipant;
import com.apollocurrency.aplwallet.apl.core.transaction.types.shuffling.ShufflingTransactionType;
import com.apollocurrency.aplwallet.apl.core.app.ShufflingTransaction;
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
=======
import com.apollocurrency.aplwallet.apl.core.transaction.ShufflingTransaction;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.ShufflingParticipant;
import com.apollocurrency.aplwallet.apl.core.transaction.types.shuffling.ShufflingTransactionType;
import com.apollocurrency.aplwallet.apl.core.app.ShufflingTransaction;
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
import com.apollocurrency.aplwallet.apl.core.transaction.ShufflingTransaction;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction; |
<<<<<<<
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getDataForInterval;
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getTestDataForInterval;
=======
import com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils;
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getDataForIntervalFromOffers;
>>>>>>>
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getDataForInterval;
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getTestDataForInterval;
import com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils;
import static com.apollocurrency.aplwallet.apl.exchange.utils.TradingViewUtils.getDataForIntervalFromOffers; |
<<<<<<<
static final Logger logger = LoggerFactory.getLogger(ApiSplitFilter.class);
=======
>>>>>>> |
<<<<<<<
new BlockchainProperties(0, 255, 1, 60, 67, 53, 30000000000L),
new BlockchainProperties(2000, 300, 2, 4, 1, 30000000000L,
new ConsensusSettings(ConsensusSettings.Type.POS,
=======
new BlockchainProperties(0, 255, 160, 60, 67, 53, 30000000000L),
new BlockchainProperties(2000, 300, 160, 2, 4, 1, 30000000000L, new ConsensusSettings(ConsensusSettings.Type.POS,
>>>>>>>
new BlockchainProperties(0, 255, 160, 1, 60, 67, 53, 30000000000L),
new BlockchainProperties(2000, 300, 160, 2, 4, 1, 30000000000L,
new ConsensusSettings(ConsensusSettings.Type.POS,
<<<<<<<
new BlockchainProperties(42300, 300, 2, 4, 1, 30000000000L,
new ShardingSettings(true),
=======
new BlockchainProperties(42300, 300, 160, 2, 4, 1, 30000000000L, new ShardingSettings(true), new ConsensusSettings(new AdaptiveForgingSettings(true, 10, 0))),
new BlockchainProperties(100000, 300, 160, 2, 4, 1, 30000000000L, new ShardingSettings(true, 1_000_000),
>>>>>>>
new BlockchainProperties(42300, 300, 160, 2, 4, 1, 30000000000L,
new ShardingSettings(true),
<<<<<<<
new BlockchainProperties(100000, 300, 1, 2, 4, 1, 30000000000L,
new ShardingSettings(true, 1_000_000),
new ConsensusSettings(new AdaptiveForgingSettings(true, 10, 0)),
new TransactionFeeSettings( Map.of((short)0x0000, (short)0, (short)0x0001, (short)0, (short)0x0101,(short)0))),
new BlockchainProperties(100100, 300, 5, 7, 2, 30000000000L,
new ShardingSettings(true, "SHA-512"))
=======
new BlockchainProperties(100100, 300, 160, 5, 7, 2, 30000000000L, new ShardingSettings(true, "SHA-512"))
>>>>>>>
new BlockchainProperties(100000, 300, 160, 1, 2, 4, 1, 30000000000L,
new ShardingSettings(true, 1_000_000),
new ConsensusSettings(new AdaptiveForgingSettings(true, 10, 0)),
new TransactionFeeSettings( Map.of((short)0x0000, (short)0, (short)0x0001, (short)0, (short)0x0101,(short)0))),
new BlockchainProperties(100100, 300, 160, 5, 7, 2, 30000000000L,
new ShardingSettings(true, "SHA-512"))
<<<<<<<
new BlockchainProperties(0, 2000, 10, 2, 3, 1, (long) 1e8)
=======
new BlockchainProperties(0, 2000, 160, 2, 3, 1, (long) 1e8)
>>>>>>>
new BlockchainProperties(0, 2000, 160, 10, 2, 3, 1, (long) 1e8) |
<<<<<<<
.addBeans(MockBean.of(mock(AccountTable.class), AccountTable.class))
=======
.addBeans(MockBean.of(mock(BlockIndexService.class), BlockIndexService.class, BlockIndexServiceImpl.class))
>>>>>>>
.addBeans(MockBean.of(mock(AccountTable.class), AccountTable.class))
.addBeans(MockBean.of(mock(BlockIndexService.class), BlockIndexService.class, BlockIndexServiceImpl.class))
<<<<<<<
//Account.init(extension.getDatabaseManager(), mock(PropertiesHolder.class), mock(BlockchainProcessor.class), mock(BlockchainConfig.class), blockchain, mock(GlobalSync.class), publicKeyTable, accountTable, null);
=======
Account.init(extension.getDatabaseManager(), mock(PropertiesHolder.class), mock(BlockchainProcessor.class), mock(BlockchainConfig.class), blockchain, mock(GlobalSync.class), publicKeyTable, accountTable, null, null);
>>>>>>>
//Account.init(extension.getDatabaseManager(), mock(PropertiesHolder.class), mock(BlockchainProcessor.class), mock(BlockchainConfig.class), blockchain, mock(GlobalSync.class), publicKeyTable, accountTable, null); |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
=======
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
<<<<<<<
import javax.servlet.http.HttpServletRequest;
=======
import javax.enterprise.inject.Vetoed;
>>>>>>>
import javax.enterprise.inject.Vetoed;
import javax.servlet.http.HttpServletRequest; |
<<<<<<<
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verifyZeroInteractions;
=======
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
>>>>>>>
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
<<<<<<<
verifyZeroInteractions(zip, dirProvider, blockchainConfig);
}*/
=======
verifyZeroInteractions(zip, dirProvider);
}
>>>>>>>
verifyZeroInteractions(zip, dirProvider);
}*/ |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.Generator;
import com.apollocurrency.aplwallet.apl.core.dao.TransactionalDataSource;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.peer.PeersService;
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainImpl;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessor;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessorImpl;
=======
import com.apollocurrency.aplwallet.apl.core.app.AplException;
import com.apollocurrency.aplwallet.apl.core.dao.TransactionalDataSource;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.peer.PeersService;
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.service.appdata.GeneratorService;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessor;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.Generator;
import com.apollocurrency.aplwallet.apl.core.dao.TransactionalDataSource;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.peer.PeersService;
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainImpl;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessor;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessorImpl;
import com.apollocurrency.aplwallet.apl.core.app.AplException;
import com.apollocurrency.aplwallet.apl.core.dao.TransactionalDataSource;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.peer.PeersService;
import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
import com.apollocurrency.aplwallet.apl.core.service.appdata.GeneratorService;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.Blockchain;
import com.apollocurrency.aplwallet.apl.core.service.blockchain.BlockchainProcessor;
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.service.blockchain.TransactionProcessorImpl;
import com.apollocurrency.aplwallet.apl.core.transaction.types.update.UpdateTransactionType;
=======
import com.apollocurrency.aplwallet.apl.core.transaction.Update;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.service.blockchain.TransactionProcessorImpl;
import com.apollocurrency.aplwallet.apl.core.transaction.types.update.UpdateTransactionType;
import com.apollocurrency.aplwallet.apl.core.transaction.Update; |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
import com.apollocurrency.aplwallet.apl.core.transaction.types.update.UpdateTransactionType;
=======
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.transaction.Update;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.app.Transaction;
import com.apollocurrency.aplwallet.apl.core.transaction.types.update.UpdateTransactionType;
import com.apollocurrency.aplwallet.apl.core.entity.blockchain.Transaction;
import com.apollocurrency.aplwallet.apl.core.transaction.Update; |
<<<<<<<
TransactionTestData td = new TransactionTestData();
=======
private BlockSerializer blockSerializer = mock(BlockSerializer.class);
>>>>>>>
TransactionTestData td = new TransactionTestData();
private BlockSerializer blockSerializer = mock(BlockSerializer.class);
<<<<<<<
TaggedDataDao.class,
AppendixApplierRegistry.class,
AppendixValidatorRegistry.class,
TransactionRowMapper.class,
TransactionSerializerImpl.class,
TransactionBuilder.class,
=======
TaggedDataTable.class,
>>>>>>>
TaggedDataDao.class,
AppendixApplierRegistry.class,
AppendixValidatorRegistry.class,
TransactionRowMapper.class,
TransactionSerializerImpl.class,
TransactionBuilder.class,
TaggedDataTable.class,
<<<<<<<
.addBeans(MockBean.of(mock(PrunableLoadingService.class), PrunableLoadingService.class))
.addBeans(MockBean.of(td.getTransactionTypeFactory(), TransactionTypeFactory.class))
=======
.addBeans(MockBean.of(blockSerializer, BlockSerializer.class))
>>>>>>>
.addBeans(MockBean.of(mock(PrunableLoadingService.class), PrunableLoadingService.class))
.addBeans(MockBean.of(td.getTransactionTypeFactory(), TransactionTypeFactory.class))
.addBeans(MockBean.of(blockSerializer, BlockSerializer.class)) |
<<<<<<<
import com.apollocurrency.aplwallet.apl.core.account.*;
=======
import com.apollocurrency.aplwallet.apl.core.account.model.*;
import com.apollocurrency.aplwallet.apl.core.account.service.*;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.account.model.*;
import com.apollocurrency.aplwallet.apl.core.account.service.*;
<<<<<<<
=======
import com.apollocurrency.aplwallet.apl.core.rest.service.AccountBalanceService;
>>>>>>>
import com.apollocurrency.aplwallet.apl.core.rest.service.AccountBalanceService;
<<<<<<<
private BalanceService balanceService = CDI.current().select(BalanceService.class).get();
=======
private AccountBalanceService accountBalanceService = CDI.current().select(AccountBalanceService.class).get();
private AccountInfoService accountInfoService = CDI.current().select(AccountInfoServiceImpl.class).get();
private AccountLeaseService accountLeaseService = CDI.current().select(AccountLeaseServiceImpl.class).get();
private AccountAssetService accountAssetService = CDI.current().select(AccountAssetServiceImpl.class).get();
private AccountCurrencyService accountCurrencyService = CDI.current().select(AccountCurrencyServiceImpl.class).get();
>>>>>>>
private AccountBalanceService accountBalanceService = CDI.current().select(AccountBalanceService.class).get();
private AccountInfoService accountInfoService = CDI.current().select(AccountInfoServiceImpl.class).get();
private AccountLeaseService accountLeaseService = CDI.current().select(AccountLeaseServiceImpl.class).get();
private AccountAssetService accountAssetService = CDI.current().select(AccountAssetServiceImpl.class).get();
private AccountCurrencyService accountCurrencyService = CDI.current().select(AccountCurrencyServiceImpl.class).get();
<<<<<<<
Balances balances = balanceService.getAccountBalances(account, includeEffectiveBalance);
=======
Balances balances = accountBalanceService.getAccountBalances(account, includeEffectiveBalance);
>>>>>>>
Balances balances = accountBalanceService.getAccountBalances(account, includeEffectiveBalance); |
<<<<<<<
//Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable);
=======
Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable, null);
>>>>>>>
//Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable, null);
<<<<<<<
//Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable);
=======
Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable, null);
>>>>>>>
//Account.init(extension.getDatabaseManager(), new PropertiesHolder(), null, null, blockchain, null, null, accountTable, null); |
<<<<<<<
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.util.*;
import com.apollocurrency.aplwallet.apl.core.account.*;
import com.apollocurrency.aplwallet.apl.core.account.dao.*;
import com.apollocurrency.aplwallet.apl.core.account.dao.AccountAssetTable;
import com.apollocurrency.aplwallet.apl.core.account.dao.AccountLedgerTable;
import com.apollocurrency.aplwallet.apl.core.account.service.*;
=======
import com.apollocurrency.aplwallet.apl.core.account.Account;
import com.apollocurrency.aplwallet.apl.core.account.AccountAssetTable;
import com.apollocurrency.aplwallet.apl.core.account.AccountCurrencyTable;
import com.apollocurrency.aplwallet.apl.core.account.AccountInfoTable;
import com.apollocurrency.aplwallet.apl.core.account.AccountLedgerTable;
import com.apollocurrency.aplwallet.apl.core.account.AccountTable;
import com.apollocurrency.aplwallet.apl.core.account.GenesisPublicKeyTable;
import com.apollocurrency.aplwallet.apl.core.account.PhasingOnly;
import com.apollocurrency.aplwallet.apl.core.account.PublicKeyTable;
import com.apollocurrency.aplwallet.apl.core.account.dao.AccountGuaranteedBalanceTable;
>>>>>>>
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.util.*;
import com.apollocurrency.aplwallet.apl.core.account.*;
import com.apollocurrency.aplwallet.apl.core.account.dao.*;
import com.apollocurrency.aplwallet.apl.core.account.dao.AccountAssetTable;
import com.apollocurrency.aplwallet.apl.core.account.dao.AccountLedgerTable;
import com.apollocurrency.aplwallet.apl.core.account.service.*;
<<<<<<<
=======
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import javax.inject.Inject;
>>>>>>>
<<<<<<<
EpochTime.class, BlockDaoImpl.class, TransactionDaoImpl.class
)
=======
TimeServiceImpl.class, BlockDaoImpl.class, TransactionDaoImpl.class,
GenesisPublicKeyTable.class)
>>>>>>>
TimeServiceImpl.class, BlockDaoImpl.class, TransactionDaoImpl.class,
GenesisPublicKeyTable.class)
<<<<<<<
=======
AccountTable accountTable;
@Inject
PrunableMessageTable messageTable;
@Inject
TaggedDataDao taggedDataDao;
@Inject
PropertiesHolder propertiesHolder;
@Inject
>>>>>>>
AccountTable accountTable;
@Inject
PrunableMessageTable messageTable;
@Inject
TaggedDataDao taggedDataDao;
@Inject
PropertiesHolder propertiesHolder;
@Inject |
<<<<<<<
public static final Long SHARD_PERCENTAGE_FULL = 100L;
public static final String DB_BACKUP_FORMAT = "BACKUP-BEFORE-%s.zip";
=======
>>>>>>>
public static final String DB_BACKUP_FORMAT = "BACKUP-BEFORE-%s.zip"; |
<<<<<<<
import java.util.ArrayList;
import java.util.List;
import javax.enterprise.inject.spi.CDI;
import javax.inject.Singleton;
=======
>>>>>>> |
<<<<<<<
super(schema);
this.fieldPointers = new int[schema.numFields()];
=======
this.schema = schema;
this.fieldPointers = new long[schema.numFields()];
>>>>>>>
super(schema);
this.fieldPointers = new long[schema.numFields()];
<<<<<<<
public int getPosition(String fieldName) {
int fieldPosition = getSchema().getPosition(fieldName);
=======
public long getPosition(String fieldName) {
int fieldPosition = schema.getPosition(fieldName);
>>>>>>>
public long getPosition(String fieldName) {
int fieldPosition = getSchema().getPosition(fieldName); |
<<<<<<<
public void check(GHPullRequest pr){
if(target == null) target = pr.getBase().getRef(); // If this instance was created before target was introduced (before v1.8), it can be null.
if(source == null) source = pr.getHead().getRef(); // If this instance was created before target was introduced (before v1.8), it can be null.
if(authorEmail == null) {
// If this instance was create before authorEmail was introduced (before v1.10), it can be null.
obtainAuthorEmail(pr);
}
if(isUpdated(pr)){
logger.log(Level.INFO, "Pull request builder: pr #{0} was updated on {1} at {2} by {3} ({4})", new Object[]{id, reponame, updated, author, authorEmail});
// the title could have been updated since the original PR was opened
title = pr.getTitle();
int commentsChecked = checkComments(pr);
boolean newCommit = checkCommit(pr.getHead().getSha());
if(!newCommit && commentsChecked == 0){
logger.log(Level.INFO, "Pull request was updated on repo {0} but there aren't any new comments nor commits - that may mean that commit status was updated.", reponame);
}
updated = pr.getUpdatedAt();
}
checkMergeable(pr);
tryBuild();
}
public void check(GHIssueComment comment) {
try {
checkComment(comment);
updated = comment.getUpdatedAt();
} catch (IOException ex) {
logger.log(Level.SEVERE, "Couldn't check comment #" + comment.getId(), ex);
return;
}
tryBuild();
}
=======
public void check(GHPullRequest pr) {
if (target == null) {
target = pr.getBase().getRef(); // If this instance was created before target was introduced (before v1.8), it can be null.
}
if (isUpdated(pr)) {
logger.log(Level.INFO, "Pull request builder: pr #{0} was updated on {1} at {2} by {3}", new Object[]{id, reponame, updated, author});
// the title could have been updated since the original PR was opened
title = pr.getTitle();
int commentsChecked = checkComments(pr);
boolean newCommit = checkCommit(pr.getHead().getSha());
if (!newCommit && commentsChecked == 0) {
logger.log(Level.INFO, "Pull request was updated on repo {0} but there aren't any new comments nor commits - that may mean that commit status was updated.", reponame);
}
updated = pr.getUpdatedAt();
}
tryBuild(pr);
}
public void check(GHIssueComment comment) {
try {
checkComment(comment);
updated = comment.getUpdatedAt();
} catch (IOException ex) {
logger.log(Level.SEVERE, "Couldn't check comment #" + comment.getId(), ex);
return;
}
GHPullRequest pr = null;
try {
pr = repo.getPullRequest(id);
} catch (IOException e) {
logger.log(Level.SEVERE, "Couldn't get GHPullRequest for checking mergeable state");
}
tryBuild(pr);
}
>>>>>>>
public void check(GHPullRequest pr) {
if(target == null) target = pr.getBase().getRef(); // If this instance was created before target was introduced (before v1.8), it can be null.
if(source == null) source = pr.getHead().getRef(); // If this instance was created before target was introduced (before v1.8), it can be null.
if (isUpdated(pr)) {
logger.log(Level.INFO, "Pull request builder: pr #{0} was updated on {1} at {2} by {3}", new Object[]{id, reponame, updated, author});
// the title could have been updated since the original PR was opened
title = pr.getTitle();
int commentsChecked = checkComments(pr);
boolean newCommit = checkCommit(pr.getHead().getSha());
if (!newCommit && commentsChecked == 0) {
logger.log(Level.INFO, "Pull request was updated on repo {0} but there aren't any new comments nor commits - that may mean that commit status was updated.", reponame);
}
updated = pr.getUpdatedAt();
}
tryBuild(pr);
}
public void check(GHIssueComment comment) {
try {
checkComment(comment);
updated = comment.getUpdatedAt();
} catch (IOException ex) {
logger.log(Level.SEVERE, "Couldn't check comment #" + comment.getId(), ex);
return;
}
GHPullRequest pr = null;
try {
pr = repo.getPullRequest(id);
} catch (IOException e) {
logger.log(Level.SEVERE, "Couldn't get GHPullRequest for checking mergeable state");
}
tryBuild(pr);
} |
<<<<<<<
=======
import hudson.util.ListBoxModel.Option;
>>>>>>>
import hudson.util.ListBoxModel.Option;
<<<<<<<
private String secret;
=======
private GhprbGitHubAuth gitHubApiAuth;
>>>>>>>
private String secret;
private GhprbGitHubAuth gitHubApiAuth;
<<<<<<<
String msgSuccess,
String msgFailure,
String secret,
=======
String msgSuccess,
String msgFailure,
String commitStatusContext,
String gitHubAuthId,
>>>>>>>
String msgSuccess,
String msgFailure,
String commitStatusContext,
String gitHubAuthId,
String secret,
<<<<<<<
public String getSecret() {
return secret;
}
=======
public String getProject() {
return project;
}
>>>>>>>
public String getSecret() {
return secret;
}
public String getProject() {
return project;
} |
<<<<<<<
List<GhprbBranch> whiteListTargetBranches,
String commitStatusContext) throws ANTLRException {
=======
String commentFilePath,
List<GhprbBranch> whiteListTargetBranches,
Boolean allowMembersOfWhitelistedOrgsAsAdmin) throws ANTLRException {
>>>>>>>
String commentFilePath,
List<GhprbBranch> whiteListTargetBranches,
Boolean allowMembersOfWhitelistedOrgsAsAdmin,
String commitStatusContext) throws ANTLRException {
<<<<<<<
this.commitStatusContext = commitStatusContext;
=======
this.commentFilePath = commentFilePath;
this.allowMembersOfWhitelistedOrgsAsAdmin = allowMembersOfWhitelistedOrgsAsAdmin;
>>>>>>>
this.commitStatusContext = commitStatusContext;
this.commentFilePath = commentFilePath;
this.allowMembersOfWhitelistedOrgsAsAdmin = allowMembersOfWhitelistedOrgsAsAdmin;
<<<<<<<
private String commitStatusContext = "";
=======
private Boolean autoCloseFailedPullRequests = false;
private String username;
private String password;
private String accessToken;
private String adminlist;
private String publishedURL;
private String requestForTestingPhrase;
>>>>>>>
private String commitStatusContext = "";
private Boolean autoCloseFailedPullRequests = false;
private String username;
private String password;
private String accessToken;
private String adminlist;
private String publishedURL;
private String requestForTestingPhrase;
<<<<<<<
commitStatusContext = formData.getString("commitStatusContext");
=======
>>>>>>>
commitStatusContext = formData.getString("commitStatusContext"); |
<<<<<<<
private String secret;
=======
private DescribableList<GhprbExtension, GhprbExtensionDescriptor> extensions;
public DescribableList<GhprbExtension, GhprbExtensionDescriptor> getExtensions() {
if (extensions == null) {
extensions = new DescribableList<GhprbExtension, GhprbExtensionDescriptor>(Saveable.NOOP,Util.fixNull(extensions));
extensions.add(new GhprbSimpleStatus(null));
}
return extensions;
}
private void setExtensions(List<GhprbExtension> extensions) {
DescribableList<GhprbExtension, GhprbExtensionDescriptor> rawList = new DescribableList<GhprbExtension, GhprbExtensionDescriptor>(
Saveable.NOOP,Util.fixNull(extensions));
// Filter out items that we only want one of, like the status updater.
this.extensions = Ghprb.onlyOneEntry(rawList,
GhprbCommitStatus.class
);
// Now make sure we have at least one of the types we need one of.
Ghprb.addIfMissing(this.extensions, new GhprbSimpleStatus(""), GhprbCommitStatus.class);
}
>>>>>>>
private String secret;
private DescribableList<GhprbExtension, GhprbExtensionDescriptor> extensions;
public DescribableList<GhprbExtension, GhprbExtensionDescriptor> getExtensions() {
if (extensions == null) {
extensions = new DescribableList<GhprbExtension, GhprbExtensionDescriptor>(Saveable.NOOP,Util.fixNull(extensions));
extensions.add(new GhprbSimpleStatus(null));
}
return extensions;
}
private void setExtensions(List<GhprbExtension> extensions) {
DescribableList<GhprbExtension, GhprbExtensionDescriptor> rawList = new DescribableList<GhprbExtension, GhprbExtensionDescriptor>(
Saveable.NOOP,Util.fixNull(extensions));
// Filter out items that we only want one of, like the status updater.
this.extensions = Ghprb.onlyOneEntry(rawList,
GhprbCommitStatus.class
);
// Now make sure we have at least one of the types we need one of.
Ghprb.addIfMissing(this.extensions, new GhprbSimpleStatus(""), GhprbCommitStatus.class);
}
<<<<<<<
String msgSuccess,
String msgFailure,
String secret,
String commitStatusContext) throws ANTLRException {
=======
String msgSuccess,
String msgFailure,
String commitStatusContext,
List<GhprbExtension> extensions
) throws ANTLRException {
>>>>>>>
String msgSuccess,
String msgFailure,
String secret,
List<GhprbExtension> extensions
) throws ANTLRException {
<<<<<<<
this.msgSuccess = msgSuccess;
this.msgFailure = msgFailure;
this.secret = secret;
=======
setExtensions(extensions);
configVersion = 1;
>>>>>>>
this.secret = secret;
setExtensions(extensions);
configVersion = 1;
<<<<<<<
public String getMsgSuccess() {
return msgSuccess;
}
public String getMsgFailure() {
return msgFailure;
}
public String getSecret() {
return secret;
}
=======
>>>>>>>
public String getSecret() {
return secret;
} |
<<<<<<<
if (helper == null) {
logger.log(Level.INFO, "Helper is null, unable to run trigger");
return;
}
=======
if (helper == null) {
logger.log(Level.SEVERE, "Helper is null, unable to run trigger");
return;
}
>>>>>>>
if (helper == null) {
logger.log(Level.SEVERE, "Helper is null, unable to run trigger");
return;
}
<<<<<<<
logger.log(Level.FINE, "Running trigger for {0}", project);
=======
>>>>>>>
logger.log(Level.FINE, "Running trigger for {0}", project); |
<<<<<<<
Accumulo.init(fs, instance, conf, app);
Master master = new Master(instance, conf, fs, hostname);
DistributedTrace.enable(hostname, app, conf.getSystemConfiguration());
=======
MetricsSystemHelper.configure(Master.class.getSimpleName());
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
DistributedTrace.enable(hostname, app, conf.getConfiguration());
>>>>>>>
MetricsSystemHelper.configure(Master.class.getSimpleName());
Accumulo.init(fs, instance, conf, app);
Master master = new Master(instance, conf, fs, hostname);
DistributedTrace.enable(hostname, app, conf.getSystemConfiguration()); |
<<<<<<<
private String unstableAs = GHCommitState.FAILURE.name();
private Boolean autoCloseFailedPullRequests = false;
=======
private String msgSuccess;
private String msgFailure;
>>>>>>>
private String unstableAs = GHCommitState.FAILURE.name();
private Boolean autoCloseFailedPullRequests = false;
private String msgSuccess;
private String msgFailure;
<<<<<<<
unstableAs = formData.getString("unstableAs");
autoCloseFailedPullRequests = formData.getBoolean("autoCloseFailedPullRequests");
=======
msgSuccess = formData.getString("msgSuccess");
msgFailure = formData.getString("msgFailure");
>>>>>>>
unstableAs = formData.getString("unstableAs");
autoCloseFailedPullRequests = formData.getBoolean("autoCloseFailedPullRequests");
msgSuccess = formData.getString("msgSuccess");
msgFailure = formData.getString("msgFailure");
<<<<<<<
public String getUnstableAs() {
return unstableAs;
}
=======
public String getMsgSuccess() {
return msgSuccess;
}
public String getMsgFailure() {
return msgFailure;
}
>>>>>>>
public String getUnstableAs() {
return unstableAs;
}
public String getMsgSuccess() {
return msgSuccess;
}
public String getMsgFailure() {
return msgFailure;
} |
<<<<<<<
Logger.getLogger(GhprbPullRequest.class.getName()).log(Level.INFO, "Author of #{0} {1} on {2} not in whitelist!", new Object[]{id, author, ghprbRepo.getName()});
addComment("Can one of the admins verify this patch?");
=======
Logger.getLogger(GhprbPullRequest.class.getName()).log(Level.INFO, "Author of #{0} {1} not in whitelist!", new Object[]{id, author});
addComment(repo.getDefaultComment());
>>>>>>>
Logger.getLogger(GhprbPullRequest.class.getName()).log(Level.INFO, "Author of #{0} {1} on {2} not in whitelist!", new Object[]{id, author, ghprbRepo.getName()});
addComment(repo.getDefaultComment()); |
<<<<<<<
values.add(new StringParameterValue("ghprbPullLink",String.valueOf(repo.getRepoUrl()+"/pull/"+cause.getPullID())));
return this.job.scheduleBuild2(0,cause,new ParametersAction(values));
=======
// add the previous pr BuildData as an action so that the correct change log is generated by the GitSCM plugin
// note that this will be removed from the Actions list after the job is completed so that the old (and incorrect)
// one isn't there
return this.job.scheduleBuild2(0,cause,new ParametersAction(values),findPreviousBuildForPullId(pullIdPv));
}
/**
* Find the previous BuildData for the given pull request number; this may return null
*/
private BuildData findPreviousBuildForPullId(StringParameterValue pullIdPv) {
// find the previous build for this particular pull requet, it may not be the last build
for (Run<?,?> r : job.getBuilds()) {
ParametersAction pa = r.getAction(ParametersAction.class);
if (pa != null) {
for (ParameterValue pv : pa.getParameters()) {
if (pv.equals(pullIdPv)) {
for (BuildData bd : r.getActions(BuildData.class)) {
return bd;
}
}
}
}
}
return null;
>>>>>>>
values.add(new StringParameterValue("ghprbPullLink",String.valueOf(repo.getRepoUrl()+"/pull/"+cause.getPullID())));
// add the previous pr BuildData as an action so that the correct change log is generated by the GitSCM plugin
// note that this will be removed from the Actions list after the job is completed so that the old (and incorrect)
// one isn't there
return this.job.scheduleBuild2(0,cause,new ParametersAction(values),findPreviousBuildForPullId(pullIdPv));
}
/**
* Find the previous BuildData for the given pull request number; this may return null
*/
private BuildData findPreviousBuildForPullId(StringParameterValue pullIdPv) {
// find the previous build for this particular pull requet, it may not be the last build
for (Run<?,?> r : job.getBuilds()) {
ParametersAction pa = r.getAction(ParametersAction.class);
if (pa != null) {
for (ParameterValue pv : pa.getParameters()) {
if (pv.equals(pullIdPv)) {
for (BuildData bd : r.getActions(BuildData.class)) {
return bd;
}
}
}
}
}
return null; |
<<<<<<<
=======
* Identifies stale or missing collections in the database and queues them for syncing
*/
public static void queue(Database db) {
Log.d(TAG, "Clearing dirty queue before repopulation");
queue.clear();
ItemCollection coll;
String[] cols = Database.COLLCOLS;
String[] args = {APIRequest.API_CLEAN};
Cursor cur = db.query("collections", cols, "dirty!=?", args, null, null, null, null);
if (cur == null) {
Log.d(TAG, "No dirty items found in database");
queue.clear();
return;
}
do {
Log.d(TAG, "Adding collection to dirty queue");
coll = load(cur);
queue.add(coll);
} while (cur.moveToNext());
if (cur != null) cur.close();
}
/**
>>>>>>>
<<<<<<<
} while (cur.moveToNext());
cur.close();
=======
} while (cur.moveToNext());
if (cur != null) cur.close();
>>>>>>>
} while (cursor.moveToNext());
cursor.close();
<<<<<<<
} while (cursor.moveToNext());
cursor.close();
=======
} while (cursor.moveToNext());
if (cursor != null) cursor.close();
>>>>>>>
} while (cursor.moveToNext());
cursor.close(); |
<<<<<<<
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IAtomContainerSet;
=======
import org.openscience.cdk.interfaces.IAtomContainer;
>>>>>>>
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IAtomContainerSet;
<<<<<<<
if (IAtomContainer.class.equals(interfaces[i])) return true;
=======
if (IMolecule.class.equals(interfaces[i])) return true;
if (IAtomContainer.class.equals(interfaces[i])) return true;
>>>>>>>
if (IAtomContainer.class.equals(interfaces[i])) return true;
if (IAtomContainer.class.equals(interfaces[i])) return true;
<<<<<<<
} else if (object instanceof IAtomContainer) {
return (T)readAtomContainer((IAtomContainer)object);
=======
} else if (object instanceof IMolecule) {
return (T)readMolecule((IMolecule)object);
} else if (object instanceof IAtomContainer) {
return (T)readMolecule(object.getBuilder().newInstance(IMolecule.class, object));
>>>>>>>
} else if (object instanceof IAtomContainer) {
return (T)readAtomContainer((IAtomContainer)object); |
<<<<<<<
Namespace.ID namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(), oldName, tableOp);
=======
String namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(), oldName,
tableOp);
>>>>>>>
Namespace.ID namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(),
oldName, tableOp);
<<<<<<<
Namespace.ID namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(), namespace, tableOp);
=======
String namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(), namespace,
tableOp);
>>>>>>>
Namespace.ID namespaceId = ClientServiceHandler.checkNamespaceId(master.getInstance(),
namespace, tableOp);
<<<<<<<
final String oldTableName = validateTableNameArgument(arguments.get(0), tableOp, NOT_SYSTEM);
String newTableName = validateTableNameArgument(arguments.get(1), tableOp, new Validator<String>() {
@Override
public boolean test(String argument) {
// verify they are in the same namespace
String oldNamespace = Tables.qualify(oldTableName).getFirst();
return oldNamespace.equals(Tables.qualify(argument).getFirst());
}
@Override
public String invalidMessage(String argument) {
return "Cannot move tables to a new namespace by renaming. The namespace for " + oldTableName + " does not match " + argument;
}
});
Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), oldTableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
final String oldTableName = validateTableNameArgument(arguments.get(0), tableOp,
NOT_SYSTEM);
String newTableName = validateTableNameArgument(arguments.get(1), tableOp,
new Validator<String>() {
@Override
public boolean apply(String argument) {
// verify they are in the same namespace
String oldNamespace = Tables.qualify(oldTableName).getFirst();
return oldNamespace.equals(Tables.qualify(argument).getFirst());
}
@Override
public String invalidMessage(String argument) {
return "Cannot move tables to a new namespace by renaming. The namespace for "
+ oldTableName + " does not match " + argument;
}
});
String tableId = ClientServiceHandler.checkTableId(master.getInstance(), oldTableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
final String oldTableName = validateTableNameArgument(arguments.get(0), tableOp,
NOT_SYSTEM);
String newTableName = validateTableNameArgument(arguments.get(1), tableOp,
new Validator<String>() {
@Override
public boolean test(String argument) {
// verify they are in the same namespace
String oldNamespace = Tables.qualify(oldTableName).getFirst();
return oldNamespace.equals(Tables.qualify(argument).getFirst());
}
@Override
public String invalidMessage(String argument) {
return "Cannot move tables to a new namespace by renaming. The namespace for "
+ oldTableName + " does not match " + argument;
}
});
Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), oldTableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
Master.log.debug("Creating merge op: {} {} {}", tableId, startRow, endRow);
master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.MERGE, namespaceId, tableId, startRow, endRow)), autoCleanup);
=======
Master.log.debug("Creating merge op: " + tableId + " " + startRow + " " + endRow);
master.fate.seedTransaction(opid, new TraceRepo<>(
new TableRangeOp(MergeInfo.Operation.MERGE, namespaceId, tableId, startRow, endRow)),
autoCleanup);
>>>>>>>
Master.log.debug("Creating merge op: {} {} {}", tableId, startRow, endRow);
master.fate.seedTransaction(opid, new TraceRepo<>(
new TableRangeOp(MergeInfo.Operation.MERGE, namespaceId, tableId, startRow, endRow)),
autoCleanup);
<<<<<<<
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
final Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
List<IteratorSetting> iterators = IteratorUtil.decodeIteratorSettings(ByteBufferUtil.toBytes(arguments.get(3)));
CompactionStrategyConfig compactionStrategy = CompactionStrategyConfigUtil.decode(ByteBufferUtil.toBytes(arguments.get(4)));
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
List<IteratorSetting> iterators = IteratorUtil
.decodeIteratorSettings(ByteBufferUtil.toBytes(arguments.get(3)));
CompactionStrategyConfig compactionStrategy = CompactionStrategyConfigUtil
.decode(ByteBufferUtil.toBytes(arguments.get(4)));
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
List<IteratorSetting> iterators = IteratorUtil
.decodeIteratorSettings(ByteBufferUtil.toBytes(arguments.get(3)));
CompactionStrategyConfig compactionStrategy = CompactionStrategyConfigUtil
.decode(ByteBufferUtil.toBytes(arguments.get(4)));
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
=======
String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
String namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
>>>>>>>
Table.ID tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName,
tableOp);
Namespace.ID namespaceId = getNamespaceIdFromTableId(tableOp, tableId);
<<<<<<<
private Namespace.ID getNamespaceIdFromTableId(TableOperation tableOp, Table.ID tableId) throws ThriftTableOperationException {
Namespace.ID namespaceId;
=======
private String getNamespaceIdFromTableId(TableOperation tableOp, String tableId)
throws ThriftTableOperationException {
String namespaceId;
>>>>>>>
private Namespace.ID getNamespaceIdFromTableId(TableOperation tableOp, Table.ID tableId)
throws ThriftTableOperationException {
Namespace.ID namespaceId;
<<<<<<<
throw new ThriftTableOperationException(tableId.canonicalID(), null, tableOp, TableOperationExceptionType.NOTFOUND, e.getMessage());
=======
throw new ThriftTableOperationException(tableId, null, tableOp,
TableOperationExceptionType.NOTFOUND, e.getMessage());
>>>>>>>
throw new ThriftTableOperationException(tableId.canonicalID(), null, tableOp,
TableOperationExceptionType.NOTFOUND, e.getMessage());
<<<<<<<
private void throwIfTableMissingSecurityException(ThriftSecurityException e, Table.ID tableId, String tableName, TableOperation op)
throws ThriftTableOperationException {
=======
private void throwIfTableMissingSecurityException(ThriftSecurityException e, String tableId,
String tableName, TableOperation op) throws ThriftTableOperationException {
>>>>>>>
private void throwIfTableMissingSecurityException(ThriftSecurityException e, Table.ID tableId,
String tableName, TableOperation op) throws ThriftTableOperationException {
<<<<<<<
throw new ThriftTableOperationException(tableId.canonicalID(), tableName, op, TableOperationExceptionType.NOTFOUND, "Table no longer exists");
=======
throw new ThriftTableOperationException(tableId, tableName, op,
TableOperationExceptionType.NOTFOUND, "Table no longer exists");
>>>>>>>
throw new ThriftTableOperationException(tableId.canonicalID(), tableName, op,
TableOperationExceptionType.NOTFOUND, "Table no longer exists");
<<<<<<<
private Table.ID validateTableIdArgument(ByteBuffer tableIdArg, TableOperation op, Validator<Table.ID> userValidator) throws ThriftTableOperationException {
Table.ID tableId = tableIdArg == null ? null : ByteBufferUtil.toTableId(tableIdArg);
=======
private String validateTableIdArgument(ByteBuffer tableIdArg, TableOperation op,
Validator<String> userValidator) throws ThriftTableOperationException {
String tableId = tableIdArg == null ? null : ByteBufferUtil.toString(tableIdArg);
>>>>>>>
private Table.ID validateTableIdArgument(ByteBuffer tableIdArg, TableOperation op,
Validator<Table.ID> userValidator) throws ThriftTableOperationException {
Table.ID tableId = tableIdArg == null ? null : ByteBufferUtil.toTableId(tableIdArg);
<<<<<<<
throw new ThriftTableOperationException(tableId.canonicalID(), null, op, TableOperationExceptionType.INVALID_NAME, why);
=======
throw new ThriftTableOperationException(tableId, null, op,
TableOperationExceptionType.INVALID_NAME, why);
>>>>>>>
throw new ThriftTableOperationException(tableId.canonicalID(), null, op,
TableOperationExceptionType.INVALID_NAME, why); |
<<<<<<<
=======
import org.openscience.cdk.DefaultChemObjectBuilder;
import org.openscience.cdk.Molecule;
>>>>>>>
import org.openscience.cdk.DefaultChemObjectBuilder;
<<<<<<<
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.silent.AtomContainer;
=======
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IMolecule;
import org.openscience.cdk.interfaces.IPseudoAtom;
import org.openscience.cdk.nonotify.NNMolecule;
>>>>>>>
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.silent.AtomContainer;
import org.openscience.cdk.interfaces.IPseudoAtom; |
<<<<<<<
=======
}
String text = "Type: " + cardData.getTypeInfo();
if (cardData.getTypeDetailInfo() != null)
text += " (" + cardData.getTypeDetailInfo() + ")";
text += "\n" + cardData.getHumanReadableText();
((TextView) findViewById(R.id.editTxt_editCardView_CardData)).setText(text);
>>>>>>>
} |
<<<<<<<
import pgo.errors.TopLevelIssueContext;
import pgo.model.golang.Module;
import pgo.model.pcal.Algorithm;
import pgo.model.tla.PGoTLAModule;
import pgo.model.type.PGoType;
import pgo.modules.TLAModuleLoader;
=======
import pgo.model.golang.GoProgram;
>>>>>>>
import pgo.errors.TopLevelIssueContext;
import pgo.model.golang.Module;
import pgo.model.pcal.Algorithm;
import pgo.model.tla.PGoTLAModule;
import pgo.model.type.PGoType;
import pgo.modules.TLAModuleLoader;
<<<<<<<
TopLevelIssueContext ctx = new TopLevelIssueContext();
TLAModuleLoader loader = new TLAModuleLoader(Collections.singletonList(Paths.get(opts.infile).getParent()));
logger.info("Parsing TLA+ module");
PGoTLAModule tlaModule = TLAParsingPass.perform(ctx, Paths.get(opts.infile));
checkErrors(ctx);
logger.info("Cleaning up PlusCal AST");
Algorithm pcalAlgorithm = PlusCalConversionPass.perform(ctx, pcal);
checkErrors(ctx);
/*logger.info("Parsing PGo annotations");
PGoAnnotationParser annotations = AnnotationParsingPass.perform(pcal);
checkErrors(ctx);*/
logger.info("Checking compile options for sanity");
CheckOptionsPass.perform(ctx, pcalAlgorithm, opts);
checkErrors(ctx);
logger.info("Expanding PlusCal macros");
pcalAlgorithm = PlusCalMacroExpansionPass.perform(ctx, pcalAlgorithm);
checkErrors(ctx);
logger.info("Resolving TLA+ and PlusCal scoping");
DefinitionRegistry registry = PGoScopingPass.perform(ctx, tlaModule, pcalAlgorithm, loader);
checkErrors(ctx);
logger.info("Inferring types");
Map<UID, PGoType> typeMap = TypeInferencePass.perform(ctx, registry, pcalAlgorithm);
checkErrors(ctx);
Module module = CodeGenPass.perform(pcalAlgorithm, registry, typeMap);
System.out.println(module);
/*logger.info("Entering Stage Four: Inferring atomicity constraints");
PGoTransStageAtomicity s4 = new PGoTransStageAtomicity(s3);
logger.info("Entering Stage Five: Generating Go AST");
PGoTransStageGoGen s5 = new PGoTransStageGoGen(s4);
logger.info("Entering Stage Six: Generating Go Code");*/
=======
logger.info("Entering Stage One: Inferring intermediate data structures");
PGoTransStageInitParse s1 = new PGoTransStageInitParse(pcal, opts.net);
logger.info("Entering Stage Two: Parsing TLA expressions");
PGoTransStageTLAParse s2 = new PGoTransStageTLAParse(s1);
logger.info("Entering Stage Three: Inferring types");
PGoTransStageType s3 = new PGoTransStageType(s2);
logger.info("Entering Stage Four: Inferring atomicity constraints");
PGoTransStageAtomicity s4 = new PGoTransStageAtomicity(s3);
logger.info("Entering Stage Five: Generating Go AST");
PGoTransStageGoGen s5 = new PGoTransStageGoGen(s4);
logger.info("Entering Stage Six: Generating Go Code");
GoProgram go = s5.getGo();
>>>>>>>
TopLevelIssueContext ctx = new TopLevelIssueContext();
TLAModuleLoader loader = new TLAModuleLoader(Collections.singletonList(Paths.get(opts.inputFilePath).getParent()));
logger.info("Parsing TLA+ module");
PGoTLAModule tlaModule = TLAParsingPass.perform(ctx, Paths.get(opts.inputFilePath));
checkErrors(ctx);
logger.info("Cleaning up PlusCal AST");
Algorithm pcalAlgorithm = PlusCalConversionPass.perform(ctx, pcal);
checkErrors(ctx);
/*logger.info("Parsing PGo annotations");
PGoAnnotationParser annotations = AnnotationParsingPass.perform(pcal);
checkErrors(ctx);*/
logger.info("Checking compile options for sanity");
CheckOptionsPass.perform(ctx, pcalAlgorithm, opts);
checkErrors(ctx);
logger.info("Expanding PlusCal macros");
pcalAlgorithm = PlusCalMacroExpansionPass.perform(ctx, pcalAlgorithm);
checkErrors(ctx);
logger.info("Resolving TLA+ and PlusCal scoping");
DefinitionRegistry registry = PGoScopingPass.perform(ctx, tlaModule, pcalAlgorithm, loader);
checkErrors(ctx);
logger.info("Inferring types");
Map<UID, PGoType> typeMap = TypeInferencePass.perform(ctx, registry, pcalAlgorithm);
checkErrors(ctx);
Module module = CodeGenPass.perform(pcalAlgorithm, registry, typeMap);
System.out.println(module);
/*logger.info("Entering Stage Four: Inferring atomicity constraints");
PGoTransStageAtomicity s4 = new PGoTransStageAtomicity(s3);
logger.info("Entering Stage Five: Generating Go AST");
PGoTransStageGoGen s5 = new PGoTransStageGoGen(s4);
logger.info("Entering Stage Six: Generating Go Code");*/
<<<<<<<
IOUtil.WriteStringVectorToFile(getGoLines(), opts.buildDir + "/" + opts.buildFile);
=======
IOUtil.WriteStringVectorToFile(go.toGo(), opts.buildDir + "/" + opts.buildFile);
>>>>>>>
IOUtil.WriteStringVectorToFile(getGoLines(), opts.buildDir + "/" + opts.buildFile);
<<<<<<<
private static void checkErrors(TopLevelIssueContext ctx) throws PGoTransException {
if (ctx.hasErrors()) {
throw new PGoTransException(ctx.format());
}
}
private static List<String> getGoLines() {
return null; // TODO
}
private static void copyPackages(PGoOptions opts) throws IOException {
FileUtils.copyDirectory(new File("src/go/pgo"), new File(opts.buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/go/github.com/emirpasic"),
new File(opts.buildDir + "/src/github.com/emirpasic"));
}
private static void setUpLogging(PGoOptions opts) {
=======
private static void setUpLogging(PGoOptions opts) {
>>>>>>>
private static void checkErrors(TopLevelIssueContext ctx) throws PGoTransException {
if (ctx.hasErrors()) {
throw new PGoTransException(ctx.format());
}
}
private static List<String> getGoLines() {
return null; // TODO
}
private static void setUpLogging(PGoOptions opts) {
<<<<<<<
=======
}
private static void copyPackages(PGoOptions opts) throws IOException {
FileUtils.copyDirectory(new File("src/go/pgo"), new File(opts.buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/go/github.com/emirpasic"),
new File(opts.buildDir + "/src/github.com/emirpasic"));
>>>>>>>
}
private static void copyPackages(PGoOptions opts) throws IOException {
FileUtils.copyDirectory(new File("src/go/pgo"), new File(opts.buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/go/github.com/emirpasic"),
new File(opts.buildDir + "/src/github.com/emirpasic")); |
<<<<<<<
public abstract T visit(InvalidModularPlusCalIssue invalidModularPlusCalIssue) throws E;
=======
public abstract T visit(UnknownArchetypeTargetIssue unknownArchetypeTargetIssue) throws E;
public abstract T visit(UnknownMappingTargetIssue unknownMappingTargetIssue) throws E;
public abstract T visit(InstanceArgumentCountMismatchIssue instanceArgumentCountMismatchIssue) throws E;
public abstract T visit(MismatchedRefMappingIssue mismatchedRefMappingIssue) throws E;
>>>>>>>
public abstract T visit(InvalidModularPlusCalIssue invalidModularPlusCalIssue) throws E;
public abstract T visit(UnknownArchetypeTargetIssue unknownArchetypeTargetIssue) throws E;
public abstract T visit(UnknownMappingTargetIssue unknownMappingTargetIssue) throws E;
public abstract T visit(InstanceArgumentCountMismatchIssue instanceArgumentCountMismatchIssue) throws E;
public abstract T visit(MismatchedRefMappingIssue mismatchedRefMappingIssue) throws E; |
<<<<<<<
PGoTLASet tla = new PGoTLASet(new Vector<>(), 0);
Expression expected = new FunctionCall("datatypes.NewSet", new Vector<>());
=======
PGoTLASet tla = new PGoTLASet(new Vector<TLAToken>(), 0);
Expression expected = new FunctionCall("pgoutil.NewSet", new Vector<>());
>>>>>>>
PGoTLASet tla = new PGoTLASet(new Vector<TLAToken>(), 0);
Expression expected = new FunctionCall("datatypes.NewSet", new Vector<>()); |
<<<<<<<
private static void copyPackages(String buildDir) throws IOException {
FileUtils.copyDirectory(new File("src/go/pgo"), new File(buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/go/github.com/emirpasic"),
new File(buildDir + "/src/github.com/emirpasic"));
=======
private static void copyPackages(PGoOptions opts) throws IOException {
FileUtils.copyDirectory(new File("src/runtime/pgo"), new File(opts.buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/runtime/github.com/emirpasic"),
new File(opts.buildDir + "/src/github.com/emirpasic"));
>>>>>>>
private static void copyPackages(String buildDir) throws IOException {
FileUtils.copyDirectory(new File("src/runtime/pgo"), new File(buildDir + "/src/pgo"));
FileUtils.copyDirectory(new File("src/runtime/github.com/emirpasic"),
new File(buildDir + "/src/github.com/emirpasic")); |
<<<<<<<
=======
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Vector;
>>>>>>>
<<<<<<<
public static abstract class Visitor<T> {
=======
public static abstract class Walker<T> {
// the result storage
protected T result;
// whether to stop traversing
protected boolean earlyTerm;
protected abstract void init();
public T getResult(List<AST> body) throws PGoTransException {
walk(body);
return result;
}
public T getResult(AST body) throws PGoTransException {
walk(body);
return result;
}
public Walker() {
init();
}
/**
* Walks the ast
*
* @param ast
*/
protected void walk(List<AST> ast) throws PGoTransException {
if (ast == null || earlyTerm) {
return;
}
for (AST a : ast) {
if (earlyTerm) {
break;
}
walk(a);
}
}
protected void walk(AST a) throws PGoTransException {
if (a == null || earlyTerm) {
return;
}
if (a instanceof Uniprocess) {
Uniprocess ua = (Uniprocess) a;
visit(ua);
} else if (a instanceof Multiprocess) {
Multiprocess ma = (Multiprocess) a;
visit(ma);
} else if (a instanceof Procedure) {
Procedure p = (Procedure) a;
visit(p);
} else if (a instanceof Process) {
Process p = (Process) a;
visit(p);
} else if (a instanceof VarDecl) {
visit((VarDecl) a);
} else if (a instanceof PVarDecl) {
visit((PVarDecl) a);
} else if (a instanceof LabeledStmt) {
LabeledStmt ls = (LabeledStmt) a;
visit(ls);
} else if (a instanceof While) {
While w = (While) a;
visit(w);
} else if (a instanceof Assign) {
Assign as = (Assign) a;
visit(as);
} else if (a instanceof SingleAssign) {
SingleAssign sa = (SingleAssign) a;
visit(sa);
} else if (a instanceof Lhs) {
visit((Lhs) a);
} else if (a instanceof If) {
If ifast = (If) a;
visit(ifast);
} else if (a instanceof Either) {
Either ei = (Either) a;
visit(ei);
} else if (a instanceof With) {
With with = (With) a;
visit(with);
} else if (a instanceof When) {
visit((When) a);
} else if (a instanceof PrintS) {
visit((PrintS) a);
} else if (a instanceof Assert) {
visit((Assert) a);
} else if (a instanceof Skip) {
visit((Skip) a);
} else if (a instanceof LabelIf) {
LabelIf lif = (LabelIf) a;
visit(lif);
} else if (a instanceof LabelEither) {
LabelEither le = (LabelEither) a;
visit(le);
} else if (a instanceof Clause) {
Clause c = (Clause) a;
visit(c);
} else if (a instanceof Call) {
visit((Call) a);
} else if (a instanceof Return) {
visit((Return) a);
} else if (a instanceof CallReturn) {
visit((CallReturn) a);
} else if (a instanceof Goto) {
visit((Goto) a);
} else if (a instanceof Macro) {
Macro m = (Macro) a;
visit(m);
} else if (a instanceof MacroCall) {
visit((MacroCall) a);
}
}
>>>>>>>
public static abstract class Visitor<T> {
<<<<<<<
=======
/**
* Determines whether the given body of code contains an assignment
* operation to the variable of name
*
* @param body
* @param name
* @return
*/
public static boolean containsAssignmentToVar(Vector<AST> body, String name) {
Walker<Boolean> av = new Walker<Boolean>() {
@Override
protected void init() {
result = false;
}
@Override
public void visit(Lhs lhs) {
if (lhs.var.equals(name)) {
result = true;
earlyTerm = true;
}
}
};
try {
return av.getResult(body);
} catch (PGoTransException e) {
assert (false); // shouldn't throw
}
return false;
}
/**
* Finds all the function calls (procedure and macro calls) made in body of
* code
*
* @param body
* @return
*/
public static Vector<String> collectFunctionCalls(Vector<AST> body) {
Walker<Vector<String>> av = new Walker<Vector<String>>() {
@Override
protected void init() {
result = new Vector<String>();
}
@Override
public void visit(Call call) {
result.add(call.to);
}
@Override
public void visit(CallReturn call) {
result.add(call.to);
}
@Override
public void visit(MacroCall mc) {
// TODO pluscal actually already expanded the macro. we need to
// handle it before this is useful. Right now, this will never
// be reached as MacroCalls are replaced with the actual code
result.add(mc.name);
}
};
try {
return av.getResult(body);
} catch (PGoTransException e) {
assert (false);
}
return null;
}
/**
* Finds all the labels that are used in goto statements.
* @param body
*/
public static Set<String> collectUsedLabels(List<AST> body) {
Walker<Set<String>> av = new Walker<Set<String>>() {
@Override
protected void init() {
result = new HashSet<>();
}
@Override
protected void visit(Goto g) {
result.add(g.to);
}
};
try {
return av.getResult(body);
} catch (PGoTransException e) {
assert false;
}
return null;
}
>>>>>>>
/**
* Class that can be passed to walk(AST, Visitor<T>) in order to process arbitrary AST nodes.
*
* T is the result type
*
*/
public static abstract class Visitor<T> {
// =================================================
// The below are functions to visit each individual AST node type
// The argument to visit is guaranteed to not be null.
public abstract T visit(Uniprocess ua) throws PGoException;
public abstract T visit(Multiprocess ma) throws PGoException;
public abstract T visit(Procedure p) throws PGoException;
public abstract T visit(Process p) throws PGoException;
public abstract T visit(PVarDecl a) throws PGoException;
public abstract T visit(VarDecl a) throws PGoException;
public abstract T visit(LabeledStmt ls) throws PGoException;
public abstract T visit(While w) throws PGoException;
public abstract T visit(Assign as) throws PGoException;
public abstract T visit(SingleAssign sa) throws PGoException;
public abstract T visit(Lhs lhs) throws PGoException;
public abstract T visit(If ifast) throws PGoException;
public abstract T visit(Either ei) throws PGoException;
public abstract T visit(With with) throws PGoException;
public abstract T visit(When when) throws PGoException;
public abstract T visit(PrintS ps) throws PGoException;
public abstract T visit(Assert as) throws PGoException;
public abstract T visit(Skip s) throws PGoException;
public abstract T visit(LabelIf lif) throws PGoException;
public abstract T visit(LabelEither le) throws PGoException;
public abstract T visit(Clause c) throws PGoException;
public abstract T visit(Call c) throws PGoException;
public abstract T visit(Return r) throws PGoException;
public abstract T visit(CallReturn cr) throws PGoException;
public abstract T visit(Goto g) throws PGoException;
public abstract T visit(Macro m) throws PGoException;
public abstract T visit(MacroCall m) throws PGoException;
} |
<<<<<<<
=======
import pgo.model.intermediate.PGoType;
>>>>>>>
<<<<<<<
public <T> T accept(Visitor<T> visitor) {
return visitor.visit(this);
}
/*@Override
public Vector<String> toGo() {
=======
public List<String> toGo() {
>>>>>>>
public <T> T accept(Visitor<T> visitor) {
return visitor.visit(this);
}
/*@Override
public List<String> toGo() {
<<<<<<<
Vector<String> result = new Vector<>();
result.add(out.toString());
return result;
}*/
=======
return Collections.singletonList(out.toString());
}
>>>>>>>
return Collections.singletonList(out.toString());
}*/ |
<<<<<<<
=======
* Get null as date - this should throw or be unusable on the client side, depending on date representation
>>>>>>>
* Get null as date - this should throw or be unusable on the client side, depending on date representation
<<<<<<<
=======
* Get null as date - this should throw or be unusable on the client side, depending on date representation
>>>>>>>
* Get null as date - this should throw or be unusable on the client side, depending on date representation
<<<<<<<
=======
* Get null as date-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time
<<<<<<<
=======
* Get null as date-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time |
<<<<<<<
TKeyValue _elem26; // required
_elem26 = new TKeyValue();
_elem26.read(iprot);
struct.results.add(_elem26);
=======
TKeyValue _elem18;
_elem18 = new TKeyValue();
_elem18.read(iprot);
struct.results.add(_elem18);
>>>>>>>
TKeyValue _elem26;
_elem26 = new TKeyValue();
_elem26.read(iprot);
struct.results.add(_elem26);
<<<<<<<
TKeyExtent _key29; // required
List<TRange> _val30; // required
_key29 = new TKeyExtent();
_key29.read(iprot);
=======
TKeyExtent _key21;
List<TRange> _val22;
_key21 = new TKeyExtent();
_key21.read(iprot);
>>>>>>>
TKeyExtent _key29;
List<TRange> _val30;
_key29 = new TKeyExtent();
_key29.read(iprot);
<<<<<<<
TRange _elem33; // required
_elem33 = new TRange();
_elem33.read(iprot);
_val30.add(_elem33);
=======
TRange _elem25;
_elem25 = new TRange();
_elem25.read(iprot);
_val22.add(_elem25);
>>>>>>>
TRange _elem33;
_elem33 = new TRange();
_elem33.read(iprot);
_val30.add(_elem33);
<<<<<<<
TKeyExtent _elem36; // required
_elem36 = new TKeyExtent();
_elem36.read(iprot);
struct.fullScans.add(_elem36);
=======
TKeyExtent _elem28;
_elem28 = new TKeyExtent();
_elem28.read(iprot);
struct.fullScans.add(_elem28);
>>>>>>>
TKeyExtent _elem36;
_elem36 = new TKeyExtent();
_elem36.read(iprot);
struct.fullScans.add(_elem36);
<<<<<<<
TKeyValue _elem47; // required
_elem47 = new TKeyValue();
_elem47.read(iprot);
struct.results.add(_elem47);
=======
TKeyValue _elem39;
_elem39 = new TKeyValue();
_elem39.read(iprot);
struct.results.add(_elem39);
>>>>>>>
TKeyValue _elem47;
_elem47 = new TKeyValue();
_elem47.read(iprot);
struct.results.add(_elem47);
<<<<<<<
TKeyExtent _key50; // required
List<TRange> _val51; // required
_key50 = new TKeyExtent();
_key50.read(iprot);
=======
TKeyExtent _key42;
List<TRange> _val43;
_key42 = new TKeyExtent();
_key42.read(iprot);
>>>>>>>
TKeyExtent _key50;
List<TRange> _val51;
_key50 = new TKeyExtent();
_key50.read(iprot);
<<<<<<<
TRange _elem54; // required
_elem54 = new TRange();
_elem54.read(iprot);
_val51.add(_elem54);
=======
TRange _elem46;
_elem46 = new TRange();
_elem46.read(iprot);
_val43.add(_elem46);
>>>>>>>
TRange _elem54;
_elem54 = new TRange();
_elem54.read(iprot);
_val51.add(_elem54);
<<<<<<<
TKeyExtent _elem57; // required
_elem57 = new TKeyExtent();
_elem57.read(iprot);
struct.fullScans.add(_elem57);
=======
TKeyExtent _elem49;
_elem49 = new TKeyExtent();
_elem49.read(iprot);
struct.fullScans.add(_elem49);
>>>>>>>
TKeyExtent _elem57;
_elem57 = new TKeyExtent();
_elem57.read(iprot);
struct.fullScans.add(_elem57); |
<<<<<<<
Validator.validate(filter);
Call<ResponseBody> call = service.getWithFilter(client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
=======
Call<ResponseBody> call = service.getWithFilter(this.client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
>>>>>>>
Validator.validate(filter);
Call<ResponseBody> call = service.getWithFilter(this.client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
<<<<<<<
public ServiceCall getWithFilterAsync(OdataFilter filter, Integer top, String orderby, final ServiceCallback<Void> serviceCallback) {
Validator.validate(filter, serviceCallback);
Call<ResponseBody> call = service.getWithFilter(client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> getWithFilterAsync(OdataFilter filter, Integer top, String orderby, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.getWithFilter(this.client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
>>>>>>>
public ServiceCall getWithFilterAsync(OdataFilter filter, Integer top, String orderby, final ServiceCallback<Void> serviceCallback) {
Validator.validate(filter, serviceCallback);
Call<ResponseBody> call = service.getWithFilter(this.client.getMapperAdapter().serializeRaw(filter), top, orderby, this.client.getAcceptLanguage());
final ServiceCall serviceCall = new ServiceCall(call); |
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. |
<<<<<<<
=======
* Get complex types with array property while server doesn't provide a response payload
>>>>>>>
* Get complex types with array property while server doesn't provide a response payload
<<<<<<<
=======
* Get complex types with array property while server doesn't provide a response payload
>>>>>>>
* Get complex types with array property while server doesn't provide a response payload |
<<<<<<<
Call<ResponseBody> call = service.paramDate(scenario, client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.paramDate(scenario, this.client.getMapperAdapter().serializeRaw(value));
>>>>>>>
Call<ResponseBody> call = service.paramDate(scenario, this.client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.paramDatetime(scenario, client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.paramDatetime(scenario, this.client.getMapperAdapter().serializeRaw(value));
>>>>>>>
Call<ResponseBody> call = service.paramDatetime(scenario, this.client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.paramEnum(scenario, client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.paramEnum(scenario, this.client.getMapperAdapter().serializeRaw(value));
>>>>>>>
Call<ResponseBody> call = service.paramEnum(scenario, this.client.getMapperAdapter().serializeRaw(value));
final ServiceCall serviceCall = new ServiceCall(call); |
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null. |
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}} |
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3' |
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}] |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>' |
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00 |
<<<<<<<
=======
* Get null as date - this should throw or be unusable on the client side, depending on date representation
>>>>>>>
* Get null as date - this should throw or be unusable on the client side, depending on date representation
<<<<<<<
=======
* Get null as date - this should throw or be unusable on the client side, depending on date representation
>>>>>>>
* Get null as date - this should throw or be unusable on the client side, depending on date representation
<<<<<<<
=======
* Get null as date-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time
<<<<<<<
=======
* Get null as date-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time |
<<<<<<<
Call<ResponseBody> responseDatetime(@Header("scenario") String scenario);
=======
Response responseDatetime(@Header("scenario") String scenario) throws ServiceException;
@POST("/header/response/prim/datetime")
void responseDatetimeAsync(@Header("scenario") String scenario, ServiceResponseCallback cb);
@POST("/header/param/prim/duration")
Response paramDuration(@Header("scenario") String scenario, @Header("value") Period value) throws ServiceException;
@POST("/header/param/prim/duration")
void paramDurationAsync(@Header("scenario") String scenario, @Header("value") Period value, ServiceResponseCallback cb);
@POST("/header/response/prim/duration")
Response responseDuration(@Header("scenario") String scenario) throws ServiceException;
@POST("/header/response/prim/duration")
void responseDurationAsync(@Header("scenario") String scenario, ServiceResponseCallback cb);
@POST("/header/param/prim/byte")
Response paramByte(@Header("scenario") String scenario, @Header("value") String value) throws ServiceException;
>>>>>>>
Call<ResponseBody> responseDatetime(@Header("scenario") String scenario);
@POST("/header/param/prim/duration")
Call<ResponseBody> paramDuration(@Header("scenario") String scenario, @Header("value") Period value);
@POST("/header/response/prim/duration")
Call<ResponseBody> responseDuration(@Header("scenario") String scenario);
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 1 or "scenario": "negative", "value": -2
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 1 or "scenario": "negative", "value": -2
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 1 or "scenario": "negative", "value": -2
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 1 or "scenario": "negative", "value": -2
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 105 or "scenario": "negative", "value": -2
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 105 or "scenario": "negative", "value": -2
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 105 or "scenario": "negative", "value": -2
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 105 or "scenario": "negative", "value": -2
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 0.07 or "scenario": "negative", "value": -3.0
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 0.07 or "scenario": "negative", "value": -3.0
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 0.07 or "scenario": "negative", "value": -3.0
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 0.07 or "scenario": "negative", "value": -3.0
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 7e120 or "scenario": "negative", "value": -3.0
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 7e120 or "scenario": "negative", "value": -3.0
<<<<<<<
=======
* Send a post request with header values "scenario": "positive", "value": 7e120 or "scenario": "negative", "value": -3.0
>>>>>>>
* Send a post request with header values "scenario": "positive", "value": 7e120 or "scenario": "negative", "value": -3.0
<<<<<<<
=======
* Send a post request with header values "scenario": "true", "value": true or "scenario": "false", "value": false
>>>>>>>
* Send a post request with header values "scenario": "true", "value": true or "scenario": "false", "value": false
<<<<<<<
=======
* Send a post request with header values "scenario": "true", "value": true or "scenario": "false", "value": false
>>>>>>>
* Send a post request with header values "scenario": "true", "value": true or "scenario": "false", "value": false
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "The quick brown fox jumps over the lazy dog" or "scenario": "null", "value": null or "scenario": "empty", "value": ""
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "The quick brown fox jumps over the lazy dog" or "scenario": "null", "value": null or "scenario": "empty", "value": ""
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "The quick brown fox jumps over the lazy dog" or "scenario": "null", "value": null or "scenario": "empty", "value": ""
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "The quick brown fox jumps over the lazy dog" or "scenario": "null", "value": null or "scenario": "empty", "value": ""
<<<<<<<
=======
* Get a response with header values "The quick brown fox jumps over the lazy dog" or null or ""
>>>>>>>
* Get a response with header values "The quick brown fox jumps over the lazy dog" or null or ""
<<<<<<<
=======
* Get a response with header values "The quick brown fox jumps over the lazy dog" or null or ""
>>>>>>>
* Get a response with header values "The quick brown fox jumps over the lazy dog" or null or ""
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "2010-01-01" or "scenario": "min", "value": "0001-01-01"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "2010-01-01" or "scenario": "min", "value": "0001-01-01"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "2010-01-01" or "scenario": "min", "value": "0001-01-01"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "2010-01-01" or "scenario": "min", "value": "0001-01-01"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "2010-01-01T12:34:56Z" or "scenario": "min", "value": "0001-01-01T00:00:00Z"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "2010-01-01T12:34:56Z" or "scenario": "min", "value": "0001-01-01T00:00:00Z"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "2010-01-01T12:34:56Z" or "scenario": "min", "value": "0001-01-01T00:00:00Z"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "2010-01-01T12:34:56Z" or "scenario": "min", "value": "0001-01-01T00:00:00Z"
<<<<<<<
=======
* Get a response with header values "2010-01-01T12:34:56Z" or "0001-01-01T00:00:00Z"
>>>>>>>
* Get a response with header values "2010-01-01T12:34:56Z" or "0001-01-01T00:00:00Z"
<<<<<<<
=======
* Get a response with header values "2010-01-01T12:34:56Z" or "0001-01-01T00:00:00Z"
>>>>>>>
* Get a response with header values "2010-01-01T12:34:56Z" or "0001-01-01T00:00:00Z"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param value Send a post request with header values "P123DT22H14M12.011S"
* @throws ServiceException the exception wrapped in ServiceException if failed.
*/
void paramDuration(String scenario, Period value) throws ServiceException;
/**
* Send a post request with header values "scenario": "valid", "value": "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param value Send a post request with header values "P123DT22H14M12.011S"
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
*/
void paramDurationAsync(String scenario, Period value, final ServiceCallback<Void> serviceCallback);
/**
* Get a response with header values "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @throws ServiceException the exception wrapped in ServiceException if failed.
*/
void responseDuration(String scenario) throws ServiceException;
/**
* Get a response with header values "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
*/
void responseDurationAsync(String scenario, final ServiceCallback<Void> serviceCallback);
/**
* Send a post request with header values "scenario": "valid", "value": "啊齄丂狛狜隣郎隣兀﨩"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param value Send a post request with header values "P123DT22H14M12.011S"
* @throws ServiceException the exception wrapped in ServiceException if failed.
*/
void paramDuration(String scenario, Period value) throws ServiceException;
/**
* Send a post request with header values "scenario": "valid", "value": "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param value Send a post request with header values "P123DT22H14M12.011S"
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @return the {@link Call} object
*/
Call<ResponseBody> paramDurationAsync(String scenario, Period value, final ServiceCallback<Void> serviceCallback);
/**
* Get a response with header values "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @throws ServiceException the exception wrapped in ServiceException if failed.
*/
void responseDuration(String scenario) throws ServiceException;
/**
* Get a response with header values "P123DT22H14M12.011S"
*
* @param scenario Send a post request with header values "scenario": "valid"
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @return the {@link Call} object
*/
Call<ResponseBody> responseDurationAsync(String scenario, final ServiceCallback<Void> serviceCallback);
/**
* Send a post request with header values "scenario": "valid", "value": "啊齄丂狛狜隣郎隣兀﨩"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "啊齄丂狛狜隣郎隣兀﨩"
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "啊齄丂狛狜隣郎隣兀﨩"
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "GREY" or "scenario": "null", "value": null
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "GREY" or "scenario": "null", "value": null
<<<<<<<
=======
* Send a post request with header values "scenario": "valid", "value": "GREY" or "scenario": "null", "value": null
>>>>>>>
* Send a post request with header values "scenario": "valid", "value": "GREY" or "scenario": "null", "value": null
<<<<<<<
=======
* Send x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 in the header of the request
>>>>>>>
* Send x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 in the header of the request
<<<<<<<
=======
* Send x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 in the header of the request
>>>>>>>
* Send x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 in the header of the request |
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload |
<<<<<<<
=======
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
>>>>>>>
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
<<<<<<<
=======
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
>>>>>>>
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code |
<<<<<<<
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
=======
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumValid(client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
<<<<<<<
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
=======
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumNull(client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
<<<<<<<
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
=======
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateNull(client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
<<<<<<<
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
=======
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateTimeNull(client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery)); |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>' |
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}] |
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00 |
<<<<<<<
import com.google.common.base.Preconditions;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
=======
>>>>>>>
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; |
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload |
<<<<<<<
=======
* Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client
>>>>>>>
* Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client
<<<<<<<
=======
* Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client
>>>>>>>
* Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client |
<<<<<<<
=======
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
>>>>>>>
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
<<<<<<<
=======
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
>>>>>>>
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code |
<<<<<<<
=======
* Get complex types with array property while server doesn't provide a response payload
>>>>>>>
* Get complex types with array property while server doesn't provide a response payload
<<<<<<<
=======
* Get complex types with array property while server doesn't provide a response payload
>>>>>>>
* Get complex types with array property while server doesn't provide a response payload |
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format |
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model |
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model |
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3' |
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}} |
<<<<<<<
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateValid(client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateTimeValid(client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvNull(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvNull(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvEmpty(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvEmpty(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringSsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
=======
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
<<<<<<<
public ServiceCall arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringSsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
>>>>>>>
public ServiceCall arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringTsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
=======
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
<<<<<<<
public ServiceCall arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringTsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
>>>>>>>
public ServiceCall arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringPipesValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
=======
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
<<<<<<<
public ServiceCall arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringPipesValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
>>>>>>>
public ServiceCall arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
final ServiceCall serviceCall = new ServiceCall(call); |
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. |
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null. |
<<<<<<<
=======
import java.util.Optional;
import java.util.stream.Collectors;
>>>>>>>
<<<<<<<
=======
public void stopBackup() {
LOGGER.info("Stopping backup");
try {
this.persistentBackupContext.delete();
cassandraTasks.remove(cassandraTasks.getBackupSnapshotTasks().keySet());
cassandraTasks.remove(cassandraTasks.getBackupUploadTasks().keySet());
} catch (PersistenceException e) {
LOGGER.error(
"Error deleting backup context from persistence store. Reason: {}",
e);
}
this.backupContext = null;
}
>>>>>>>
public void stopBackup() {
LOGGER.info("Stopping backup");
try {
// TODO: Clear backup context from PropertyStore
cassandraTasks.remove(cassandraTasks.getBackupSnapshotTasks().keySet());
cassandraTasks.remove(cassandraTasks.getBackupUploadTasks().keySet());
} catch (PersistenceException e) {
LOGGER.error(
"Error deleting backup context from persistence store. Reason: {}",
e);
}
this.backupContext = null;
} |
<<<<<<<
import com.mesosphere.dcos.cassandra.scheduler.backup.BackupManager;
=======
import com.mesosphere.dcos.cassandra.common.client.ExecutorClient;
>>>>>>>
import com.mesosphere.dcos.cassandra.common.client.ExecutorClient;
import com.mesosphere.dcos.cassandra.scheduler.backup.BackupManager;
<<<<<<<
private IdentityManager identityManager;
private ConfigurationManager configurationManager;
private MesosConfig mesosConfig;
private PlanManager planManager;
private PlanScheduler planScheduler;
private CassandraRepairScheduler repairScheduler;
private OfferAccepter offerAccepter;
private PersistentOfferRequirementProvider offerRequirementProvider;
private CassandraTasks cassandraTasks;
private EventBus eventBus;
private BackupManager backupManager;
=======
private final IdentityManager identityManager;
private final ConfigurationManager configurationManager;
private final MesosConfig mesosConfig;
private final CassandraPlanManager planManager;
private final PlanScheduler planScheduler;
private final CassandraRepairScheduler repairScheduler;
private final OfferAccepter offerAccepter;
private final PersistentOfferRequirementProvider offerRequirementProvider;
private final CassandraTasks cassandraTasks;
private final Reconciler reconciler;
private final EventBus eventBus;
private final ExecutorClient client;
>>>>>>>
private BackupManager backupManager;
private final IdentityManager identityManager;
private final ConfigurationManager configurationManager;
private final MesosConfig mesosConfig;
private final CassandraPlanManager planManager;
private final PlanScheduler planScheduler;
private final CassandraRepairScheduler repairScheduler;
private final OfferAccepter offerAccepter;
private final PersistentOfferRequirementProvider offerRequirementProvider;
private final CassandraTasks cassandraTasks;
private final Reconciler reconciler;
private final EventBus eventBus;
private final ExecutorClient client;
<<<<<<<
ConfigurationManager configurationManager,
IdentityManager identityManager,
MesosConfig mesosConfig,
PersistentOfferRequirementProvider offerRequirementProvider,
CassandraTasks cassandraTasks,
EventBus eventBus,
BackupManager backupManager) {
=======
final ConfigurationManager configurationManager,
final IdentityManager identityManager,
final MesosConfig mesosConfig,
final PersistentOfferRequirementProvider offerRequirementProvider,
final CassandraPlanManager planManager,
final CassandraTasks cassandraTasks,
final Reconciler reconciler,
final ExecutorClient client,
final EventBus eventBus) {
>>>>>>>
final ConfigurationManager configurationManager,
final IdentityManager identityManager,
final MesosConfig mesosConfig,
final PersistentOfferRequirementProvider offerRequirementProvider,
final CassandraPlanManager planManager,
final CassandraTasks cassandraTasks,
final Reconciler reconciler,
final ExecutorClient client,
final EventBus eventBus,
final BackupManager backupManager) {
<<<<<<<
=======
offerAccepter = new OfferAccepter(Arrays.asList(
new LogOperationRecorder(),
new PersistentOperationRecorder(cassandraTasks)));
planScheduler = new DefaultPlanScheduler(offerAccepter);
repairScheduler = new CassandraRepairScheduler(offerRequirementProvider,
offerAccepter, cassandraTasks);
this.client = client;
this.planManager = planManager;
this.reconciler = reconciler;
>>>>>>>
offerAccepter = new OfferAccepter(Arrays.asList(
new LogOperationRecorder(),
new PersistentOperationRecorder(cassandraTasks)));
planScheduler = new DefaultPlanScheduler(offerAccepter);
repairScheduler = new CassandraRepairScheduler(offerRequirementProvider,
offerAccepter, cassandraTasks);
this.client = client;
this.planManager = planManager;
this.reconciler = reconciler;
<<<<<<<
// Schedule next block from install/update plan
=======
LOGGER.info("Current execution block = {}",
(currentBlock != null) ? currentBlock.toString() :
"No block");
if(currentBlock == null){
LOGGER.info("Current plan {} interrupted.",
(planManager.isInterrupted()) ? "is" : "is not");
}
>>>>>>>
LOGGER.info("Current execution block = {}",
(currentBlock != null) ? currentBlock.toString() :
"No block");
if(currentBlock == null){
LOGGER.info("Current plan {} interrupted.",
(planManager.isInterrupted()) ? "is" : "is not");
} |
<<<<<<<
updatedConfig,
config.getClusterTaskConfig(),
config.getExecutorConfig(),
=======
updatedCassandraConfig,
updatedExecutorConfig,
>>>>>>>
updatedCassandraConfig,
config.getClusterTaskConfig(),
updatedExecutorConfig, |
<<<<<<<
import com.mesosphere.dcos.cassandra.common.tasks.backup.BackupSnapshotTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.BackupUploadTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.DownloadSnapshotTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.RestoreSnapshotTask;
import com.mesosphere.dcos.cassandra.common.util.TaskUtils;
=======
>>>>>>>
import com.mesosphere.dcos.cassandra.common.tasks.backup.BackupSnapshotTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.BackupUploadTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.DownloadSnapshotTask;
import com.mesosphere.dcos.cassandra.common.tasks.backup.RestoreSnapshotTask;
import com.mesosphere.dcos.cassandra.common.util.TaskUtils;
<<<<<<<
private static final Logger LOGGER = LoggerFactory.getLogger(CassandraTasks.class);
=======
private static final Logger LOGGER = LoggerFactory.getLogger(
CassandraTasks.class);
private static final Set<Protos.TaskState> terminalStates = new HashSet<>(
Arrays.asList(
Protos.TaskState.TASK_ERROR,
Protos.TaskState.TASK_FAILED,
Protos.TaskState.TASK_FINISHED,
Protos.TaskState.TASK_KILLED,
Protos.TaskState.TASK_LOST));
>>>>>>>
private static final Logger LOGGER = LoggerFactory.getLogger(CassandraTasks.class);
private static final Set<Protos.TaskState> terminalStates = new HashSet<>(
Arrays.asList(
Protos.TaskState.TASK_ERROR,
Protos.TaskState.TASK_FAILED,
Protos.TaskState.TASK_FINISHED,
Protos.TaskState.TASK_KILLED,
Protos.TaskState.TASK_LOST));
<<<<<<<
public Map<String, BackupSnapshotTask> getBackupSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.BACKUP_SNAPSHOT).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(BackupSnapshotTask) entry.getValue())));
}
public Map<String, BackupUploadTask> getBackupUploadTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.BACKUP_UPLOAD).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(BackupUploadTask) entry.getValue())));
}
public Map<String, DownloadSnapshotTask> getDownloadSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.SNAPSHOT_DOWNLOAD).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(DownloadSnapshotTask) entry.getValue())));
}
public Map<String, RestoreSnapshotTask> getRestoreSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.SNAPSHOT_RESTORE).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(RestoreSnapshotTask) entry.getValue())));
}
public CassandraDaemonTask createDaemon() throws PersistenceException {
=======
public CassandraDaemonTask createDaemon(String name) throws
PersistenceException {
>>>>>>>
public Map<String, BackupSnapshotTask> getBackupSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.BACKUP_SNAPSHOT).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(BackupSnapshotTask) entry.getValue())));
}
public Map<String, BackupUploadTask> getBackupUploadTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.BACKUP_UPLOAD).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(BackupUploadTask) entry.getValue())));
}
public Map<String, DownloadSnapshotTask> getDownloadSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.SNAPSHOT_DOWNLOAD).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(DownloadSnapshotTask) entry.getValue())));
}
public Map<String, RestoreSnapshotTask> getRestoreSnapshotTasks() {
return tasks.entrySet().stream().filter(entry -> entry.getValue()
.getType() == CassandraTask.TYPE.SNAPSHOT_RESTORE).collect
(Collectors.toMap(entry -> entry.getKey(), entry -> (
(RestoreSnapshotTask) entry.getValue())));
}
public CassandraDaemonTask createDaemon(String name) throws
PersistenceException {
<<<<<<<
private CassandraTaskExecutor getExecutorFromNodeId(int num) {
// Get the executorInfo from store
final Optional<String> taskId = tasks.keySet().stream().filter(entry -> TaskUtils.taskIdToNodeId(entry) == num).findFirst();
if (!taskId.isPresent()) {
return null;
}
final CassandraTask cassandraTask = tasks.get(taskId.get());
return cassandraTask.getExecutor();
}
public BackupSnapshotTask createBackupSnapshotTask(int num, BackupContext backupContext) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final BackupSnapshotTask task = configuration.createBackupSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
BackupSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
backupContext
);
synchronized (persistent) {
update(task);
}
return task;
}
public BackupUploadTask createBackupUploadTask(int num, BackupContext backupContext) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final BackupUploadTask task = configuration.createBackupUploadTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
BackupUploadTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
backupContext
);
synchronized (persistent) {
update(task);
}
return task;
}
public DownloadSnapshotTask createDownloadSnapshotTask(int num, RestoreContext context) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final DownloadSnapshotTask task = configuration.createDownloadSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
DownloadSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
context
);
synchronized (persistent) {
update(task);
}
return task;
}
public RestoreSnapshotTask createRestoreSnapshotTask(int num, RestoreContext context) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final RestoreSnapshotTask task = configuration.createRestoreSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
RestoreSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
context
);
synchronized (persistent) {
update(task);
}
return task;
}
public CassandraDaemonTask createDaemon(Protos.Offer offer) throws
=======
public CassandraDaemonTask getOrCreateDaemon(String name) throws
>>>>>>>
private CassandraTaskExecutor getExecutorFromNodeId(int num) {
// Get the executorInfo from store
final Optional<String> taskId = tasks.keySet().stream().filter(entry -> TaskUtils.taskIdToNodeId(entry) == num).findFirst();
if (!taskId.isPresent()) {
return null;
}
final CassandraTask cassandraTask = tasks.get(taskId.get());
return cassandraTask.getExecutor();
}
public BackupSnapshotTask createBackupSnapshotTask(int num, BackupContext backupContext) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final BackupSnapshotTask task = configuration.createBackupSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
BackupSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
backupContext
);
synchronized (persistent) {
update(task);
}
return task;
}
public BackupUploadTask createBackupUploadTask(int num, BackupContext backupContext) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final BackupUploadTask task = configuration.createBackupUploadTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
BackupUploadTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
backupContext
);
synchronized (persistent) {
update(task);
}
return task;
}
public DownloadSnapshotTask createDownloadSnapshotTask(int num, RestoreContext context) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final DownloadSnapshotTask task = configuration.createDownloadSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
DownloadSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
context
);
synchronized (persistent) {
update(task);
}
return task;
}
public RestoreSnapshotTask createRestoreSnapshotTask(int num, RestoreContext context) throws PersistenceException {
final CassandraTaskExecutor executor = getExecutorFromNodeId(num);
final Identity identity = this.identity.get();
final RestoreSnapshotTask task = configuration.createRestoreSnapshotTask(
identity.getId().get(),
"", /* SlaveId */
executor,
"", /* Hostname */
RestoreSnapshotTask.NAME_PREFIX + num,
identity.getRole(),
identity.getPrincipal(),
context
);
synchronized (persistent) {
update(task);
}
return task;
}
public CassandraDaemonTask getOrCreateDaemon(String name) throws
<<<<<<<
public boolean needsConfigUpdate(final CassandraDaemonTask daemon) {
=======
public boolean needsConfigUpdate(final CassandraDaemonTask daemon) {
>>>>>>>
public boolean needsConfigUpdate(final CassandraDaemonTask daemon) {
<<<<<<<
LOGGER.info("Updated task {}", updated);
} else {
=======
LOGGER.debug("Updated task {}", updated);
} else {
>>>>>>>
LOGGER.info("Updated task {}", updated);
} else { |
<<<<<<<
=======
import org.apache.mesos.state.CuratorStateStore;
import org.apache.mesos.state.State;
>>>>>>>
<<<<<<<
private void removeTask(final String name) throws PersistenceException {
stateStore.clearTask(name);
=======
private void removeTask(String name) throws PersistenceException {
persistent.remove(name);
stateStore.clearTask(name);
>>>>>>>
private void removeTask(final String name) throws PersistenceException {
stateStore.clearTask(name);
<<<<<<<
public CassandraDaemonTask reconfigureDeamon(
final CassandraDaemonTask daemon) throws PersistenceException, ConfigStoreException {
synchronized (stateStore) {
=======
public CassandraDaemonTask reconfigureDaemon(
final CassandraDaemonTask daemon) throws PersistenceException {
synchronized (persistent) {
>>>>>>>
public CassandraDaemonTask reconfigureDaemon(
final CassandraDaemonTask daemon) throws PersistenceException, ConfigStoreException {
synchronized (stateStore) {
<<<<<<<
public boolean isTerminated(CassandraTask task) {
try {
final String name = task.getName();
final Collection<String> taskNames = stateStore.fetchTaskNames();
if (CollectionUtils.isNotEmpty(taskNames) && taskNames.contains(name)) {
final Protos.TaskStatus status = stateStore.fetchStatus(name);
return CassandraDaemonStatus.isTerminated(status.getState());
}
} catch (StateStoreException e) {
LOGGER.error(e.getMessage(), e);
=======
public void remove(String name) throws PersistenceException {
synchronized (persistent) {
if (tasks.containsKey(name)) {
removeTask(name);
}
}
}
public void remove(Set<String> names) throws PersistenceException {
for (String name : names) {
remove(name);
>>>>>>>
public boolean isTerminated(CassandraTask task) {
try {
final String name = task.getName();
final Collection<String> taskNames = stateStore.fetchTaskNames();
if (CollectionUtils.isNotEmpty(taskNames) && taskNames.contains(name)) {
final Protos.TaskStatus status = stateStore.fetchStatus(name);
return CassandraDaemonStatus.isTerminated(status.getState());
}
} catch (StateStoreException e) {
LOGGER.error(e.getMessage(), e); |
<<<<<<<
public static final String PREFIX = "node-";
=======
>>>>>>>
<<<<<<<
public String getNodeName() {
return PREFIX + id;
}
=======
>>>>>>> |
<<<<<<<
WalkingFailureDetectionControlModule failureDetectionControlModule, double minimumTransferTime,
DoubleProvider unloadDuration, DoubleProvider unloadWeight, YoVariableRegistry parentRegistry)
=======
WalkingFailureDetectionControlModule failureDetectionControlModule, DoubleProvider minimumTransferTime,
YoVariableRegistry parentRegistry)
>>>>>>>
WalkingFailureDetectionControlModule failureDetectionControlModule, DoubleProvider minimumTransferTime,
DoubleProvider unloadDuration, DoubleProvider unloadWeight, YoVariableRegistry parentRegistry) |
<<<<<<<
private final SensorDataContext sensorDataContext = new SensorDataContext();
public DRCEstimatorThread(String robotName, DRCRobotSensorInformation sensorInformation, RobotContactPointParameters<RobotSide> contactPointParameters,
=======
public DRCEstimatorThread(String robotName, HumanoidRobotSensorInformation sensorInformation, RobotContactPointParameters<RobotSide> contactPointParameters,
>>>>>>>
private final SensorDataContext sensorDataContext = new SensorDataContext();
public DRCEstimatorThread(String robotName, HumanoidRobotSensorInformation sensorInformation, RobotContactPointParameters<RobotSide> contactPointParameters, |
<<<<<<<
penalizationHeatmapStepScorer = new PenalizationHeatmapStepScorer(parentRegistry, null, parameters);
=======
penalizationHeatmapStepScorer = new PenalizationHeatmapStepScorer(parentRegistry, null);
>>>>>>>
penalizationHeatmapStepScorer = new PenalizationHeatmapStepScorer(parentRegistry, null);
<<<<<<<
=======
double maximumStepWidth = parameters.getMaximumStepWidth();
if (((robotSide == RobotSide.LEFT) && (stepFromParentInSoleFrame.getY() > maximumStepWidth))
|| ((robotSide == RobotSide.RIGHT) && (stepFromParentInSoleFrame.getY() < -maximumStepWidth)))
{
notifyListenerNodeUnderConsiderationWasRejected(nodeToExpand, BipedalFootstepPlannerNodeRejectionReason.STEP_TOO_WIDE);
return false;
}
>>>>>>>
double maximumStepWidth = parameters.getMaximumStepWidth();
if (((robotSide == RobotSide.LEFT) && (stepFromParentInSoleFrame.getY() > maximumStepWidth))
|| ((robotSide == RobotSide.RIGHT) && (stepFromParentInSoleFrame.getY() < -maximumStepWidth)))
{
notifyListenerNodeUnderConsiderationWasRejected(nodeToExpand, BipedalFootstepPlannerNodeRejectionReason.STEP_TOO_WIDE);
return false;
}
<<<<<<<
if (totalArea.getDoubleValue() < parameters.getMinimumFootholdPercent() * footArea.getDoubleValue())
{
notifyListenerNodeUnderConsiderationWasRejected(nodeToExpand, BipedalFootstepPlannerNodeRejectionReason.NOT_ENOUGH_AREA);
return false;
}
=======
if (totalArea.getDoubleValue() < parameters.getMinimumFootholdPercent() * footArea.getDoubleValue())
{
notifyListenerNodeUnderConsiderationWasRejected(nodeToExpand, BipedalFootstepPlannerNodeRejectionReason.NOT_ENOUGH_AREA);
return false;
>>>>>>>
if (totalArea.getDoubleValue() < parameters.getMinimumFootholdPercent() * footArea.getDoubleValue())
{
notifyListenerNodeUnderConsiderationWasRejected(nodeToExpand, BipedalFootstepPlannerNodeRejectionReason.NOT_ENOUGH_AREA);
return false; |
<<<<<<<
import us.ihmc.SdfLoader.models.FullHumanoidRobotModel;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.ChestTrajectoryControllerCommand;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.GoHomeControllerCommand;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.StopAllTrajectoryControllerCommand;
=======
import us.ihmc.SdfLoader.models.FullHumanoidRobotModel;
import us.ihmc.SdfLoader.models.FullRobotModel;
>>>>>>>
import us.ihmc.SdfLoader.models.FullHumanoidRobotModel;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.ChestTrajectoryControllerCommand;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.GoHomeControllerCommand;
import us.ihmc.commonWalkingControlModules.controllerAPI.input.command.StopAllTrajectoryControllerCommand;
<<<<<<<
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.feedbackController.FeedbackControlCommand;
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.feedbackController.OrientationFeedbackControlCommand;
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.solver.InverseDynamicsCommand;
import us.ihmc.humanoidRobotics.communication.packets.walking.GoHomeMessage.BodyPart;
import us.ihmc.robotics.controllers.YoOrientationPIDGainsInterface;
=======
import us.ihmc.commonWalkingControlModules.momentumBasedController.TaskspaceConstraintData;
import us.ihmc.commonWalkingControlModules.packetConsumers.ChestOrientationProvider;
import us.ihmc.commonWalkingControlModules.packetConsumers.ChestTrajectoryMessageSubscriber;
import us.ihmc.commonWalkingControlModules.packetConsumers.StopAllTrajectoryMessageSubscriber;
import us.ihmc.humanoidRobotics.communication.packets.walking.ChestTrajectoryMessage;
import us.ihmc.robotics.controllers.YoOrientationPIDGains;
>>>>>>>
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.feedbackController.FeedbackControlCommand;
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.feedbackController.OrientationFeedbackControlCommand;
import us.ihmc.commonWalkingControlModules.momentumBasedController.dataObjects.solver.InverseDynamicsCommand;
import us.ihmc.humanoidRobotics.communication.packets.walking.GoHomeMessage.BodyPart;
import us.ihmc.robotics.controllers.YoOrientationPIDGainsInterface;
<<<<<<<
import us.ihmc.robotics.math.trajectories.waypoints.MultipleWaypointsOrientationTrajectoryGenerator;
=======
import us.ihmc.robotics.math.frames.YoFrameVector;
import us.ihmc.robotics.math.trajectories.OrientationTrajectoryGeneratorInMultipleFrames;
import us.ihmc.robotics.math.trajectories.SimpleOrientationTrajectoryGenerator;
import us.ihmc.robotics.math.trajectories.waypoints.MultipleWaypointsOrientationTrajectoryGenerator;
>>>>>>>
import us.ihmc.robotics.math.trajectories.waypoints.MultipleWaypointsOrientationTrajectoryGenerator;
<<<<<<<
=======
import us.ihmc.robotics.screwTheory.ScrewTools;
import us.ihmc.robotics.screwTheory.SpatialAccelerationVector;
import us.ihmc.robotics.screwTheory.TwistCalculator;
>>>>>>>
<<<<<<<
=======
this.chestTrajectoryMessageSubscriber = chestTrajectoryMessageSubscriber;
this.stopAllTrajectoryMessageSubscriber = stopAllTrajectoryMessageSubscriber;
this.chestOrientationProvider = chestOrientationProvider;
>>>>>>>
<<<<<<<
FullHumanoidRobotModel fullRobotModel = momentumBasedController.getFullRobotModel();
RigidBody chest = fullRobotModel.getChest();
RigidBody elevator = fullRobotModel.getElevator();
chestFrame = chest.getBodyFixedFrame();
=======
FullHumanoidRobotModel fullRobotModel = momentumBasedController.getFullRobotModel();
RigidBody chest = fullRobotModel.getChest();
chestFrame = chest.getBodyFixedFrame();
TwistCalculator twistCalculator = momentumBasedController.getTwistCalculator();
double controlDT = momentumBasedController.getControlDT();
chestOrientationControlModule = new ChestOrientationControlModule(pelvisZUpFrame, chest, twistCalculator, controlDT, chestControlGains, registry);
yoControlledAngularAcceleration = new YoFrameVector("controlledChestAngularAcceleration", chestFrame, registry);
if (chestOrientationProvider != null || chestTrajectoryMessageSubscriber != null)
{
isTrajectoryStopped = new BooleanYoVariable("isChestOrientationTrajectoryStopped", registry);
isTrackingOrientation = new BooleanYoVariable("isTrackingOrientation", registry);
receivedNewChestOrientationTime = new DoubleYoVariable("receivedNewChestOrientationTime", registry);
>>>>>>>
FullHumanoidRobotModel fullRobotModel = momentumBasedController.getFullRobotModel();
RigidBody chest = fullRobotModel.getChest();
RigidBody elevator = fullRobotModel.getElevator();
chestFrame = chest.getBodyFixedFrame();
<<<<<<<
public void initialize()
=======
private final FrameOrientation desiredOrientation = new FrameOrientation();
private final FrameVector desiredAngularVelocity = new FrameVector(ReferenceFrame.getWorldFrame());
private final FrameVector feedForwardAngularAcceleration = new FrameVector(ReferenceFrame.getWorldFrame());
private final FrameVector controlledAngularAcceleration = new FrameVector();
public void compute()
>>>>>>>
public void initialize()
<<<<<<<
if (!isTrajectoryStopped.getBooleanValue())
=======
chestOrientationControlModule.compute();
TaskspaceConstraintData taskspaceConstraintData = chestOrientationControlModule.getTaskspaceConstraintData();
if (yoControlledAngularAcceleration != null)
>>>>>>>
if (!isTrajectoryStopped.getBooleanValue()) |
<<<<<<<
Assert.assertEquals(table, risplit.getTableName());
Assert.assertEquals(isolated, risplit.isIsolatedScan());
Assert.assertEquals(localIters, risplit.usesLocalIterators());
Assert.assertEquals(fetchColumns, risplit.getFetchedColumns());
Assert.assertEquals(level, risplit.getLogLevel());
=======
assertEquals(getAdminPrincipal(), risplit.getPrincipal());
assertEquals(table, risplit.getTableName());
assertEquals(getAdminToken(), risplit.getToken());
assertEquals(auths, risplit.getAuths());
assertEquals(getConnector().getInstance().getInstanceName(), risplit.getInstanceName());
assertEquals(isolated, risplit.isIsolatedScan());
assertEquals(localIters, risplit.usesLocalIterators());
assertEquals(fetchColumns, risplit.getFetchedColumns());
assertEquals(level, risplit.getLogLevel());
>>>>>>>
assertEquals(table, risplit.getTableName());
assertEquals(isolated, risplit.isIsolatedScan());
assertEquals(localIters, risplit.usesLocalIterators());
assertEquals(fetchColumns, risplit.getFetchedColumns());
assertEquals(level, risplit.getLogLevel());
<<<<<<<
=======
@Test
public void testPartialFailedInputSplitDelegationToConfiguration() throws Exception {
String table = getUniqueNames(1)[0];
Connector c = getConnector();
c.tableOperations().create(table);
BatchWriter bw = c.createBatchWriter(table, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
m.put(new Text(), new Text(), new Value(String.format("%09x", i).getBytes()));
bw.addMutation(m);
}
bw.close();
assertEquals(1,
MRTester.main(new String[] {table, BadPasswordSplitsAccumuloInputFormat.class.getName()}));
assertEquals(1, assertionErrors.get(table + "_map").size());
// We should fail when the RecordReader fails to get the next key/value pair, because the record
// reader is set up with a clientcontext, rather than a
// connector, so it doesn't do fast-fail on bad credentials
assertEquals(2, assertionErrors.get(table + "_cleanup").size());
}
/**
* AccumuloInputFormat which returns an "empty" RangeInputSplit
*/
public static class BadPasswordSplitsAccumuloInputFormat extends AccumuloInputFormat {
@Override
public List<InputSplit> getSplits(JobContext context) throws IOException {
List<InputSplit> splits = super.getSplits(context);
for (InputSplit split : splits) {
// @formatter:off
org.apache.accumulo.core.client.mapreduce.RangeInputSplit rangeSplit =
(org.apache.accumulo.core.client.mapreduce.RangeInputSplit) split;
// @formatter:on
rangeSplit.setToken(new PasswordToken("anythingelse"));
}
return splits;
}
}
>>>>>>> |
<<<<<<<
boolean acceptable = checkIfNodeAcceptableScoreAndAddToList(goalNode, nodesToAdd, new Vector3d(), 0.0, smallestCostToGoal);
=======
boolean acceptable = checkIfNodeAcceptableCostAndAddToList(goalNode, nodesToAdd, new Vector3d(), 0.0);
>>>>>>>
boolean acceptable = checkIfNodeAcceptableCostAndAddToList(goalNode, nodesToAdd, new Vector3d(), 0.0, smallestCostToGoal);
<<<<<<<
checkIfNodeAcceptableScoreAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
=======
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw);
>>>>>>>
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
<<<<<<<
checkIfNodeAcceptableScoreAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
=======
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw);
>>>>>>>
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
<<<<<<<
checkIfNodeAcceptableScoreAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
=======
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw);
>>>>>>>
checkIfNodeAcceptableCostAndAddToList(childNode, nodesToAdd, idealStepVector, idealStepYaw, smallestCostToGoal);
<<<<<<<
private boolean checkIfNodeAcceptableScoreAndAddToList(BipedalFootstepPlannerNode node, ArrayList<BipedalFootstepPlannerNode> nodesToAdd,
Vector3d idealStepVector, double idealStepYaw, double smallestCostToGoal)
=======
private boolean checkIfNodeAcceptableCostAndAddToList(BipedalFootstepPlannerNode node, ArrayList<BipedalFootstepPlannerNode> nodesToAdd,
Vector3d idealStepVector, double idealStepYaw)
>>>>>>>
private boolean checkIfNodeAcceptableCostAndAddToList(BipedalFootstepPlannerNode node, ArrayList<BipedalFootstepPlannerNode> nodesToAdd,
Vector3d idealStepVector, double idealStepYaw, double smallestCostToGoal)
<<<<<<<
score -= 10.0;
// PrintTools.info("Scored node: " + score);
node.setSingleStepScore(score);
=======
node.setSingleStepCost(cost);
>>>>>>>
score -= 10.0;
node.setSingleStepCost(cost); |
<<<<<<<
private final FiducialDetectorBehaviorService fiducialDetectorBehaviorService;
private IHMCROS2Publisher<DoorLocationPacket> publisher;
private final DoorOpenDetectorBehaviorService doorOpenDetectorBehaviorService;
private final IHMCROS2Publisher<HeadTrajectoryMessage> headTrajectoryPublisher;
private final HumanoidReferenceFrames referenceFrames;
=======
private final FiducialDetectorBehaviorService fiducialDetectorBehaviorService;
private IHMCROS2Publisher<DoorLocationPacket> doorToBehaviorPublisher;
private IHMCROS2Publisher<DoorLocationPacket> doorToUIPublisher;
private final DoorOpenDetectorBehaviorService doorOpenDetectorBehaviorService;
private final IHMCROS2Publisher<HeadTrajectoryMessage> headTrajectoryPublisher;
private final HumanoidReferenceFrames referenceFrames;
>>>>>>>
private final FiducialDetectorBehaviorService fiducialDetectorBehaviorService;
private IHMCROS2Publisher<DoorLocationPacket> doorToBehaviorPublisher;
private IHMCROS2Publisher<DoorLocationPacket> doorToUIPublisher;
private final DoorOpenDetectorBehaviorService doorOpenDetectorBehaviorService;
private final IHMCROS2Publisher<HeadTrajectoryMessage> headTrajectoryPublisher;
private final HumanoidReferenceFrames referenceFrames;
<<<<<<<
publisher = createBehaviorOutputPublisher(DoorLocationPacket.class);
=======
doorToBehaviorPublisher = createBehaviorOutputPublisher(DoorLocationPacket.class);
doorToUIPublisher = createBehaviorInputPublisher(DoorLocationPacket.class);
>>>>>>>
doorToBehaviorPublisher = createBehaviorOutputPublisher(DoorLocationPacket.class);
doorToUIPublisher = createBehaviorInputPublisher(DoorLocationPacket.class);
<<<<<<<
BehaviorDispatcher.messager.submitMessage(MessengerAPI.State, getStateMachine().getCurrentBehaviorKey().toString());
=======
>>>>>>>
BehaviorDispatcher.messager.submitMessage(MessengerAPI.State, getStateMachine().getCurrentBehaviorKey().toString());
<<<<<<<
publisher = createBehaviorInputPublisher(DoorLocationPacket.class);
if (doorOpenDetectorBehaviorService.newPose != null)
{
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
doorOpenDetectorBehaviorService.newPose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
}
if (isDoorOpen != doorOpenDetectorBehaviorService.isDoorOpen())
{
isDoorOpen = doorOpenDetectorBehaviorService.isDoorOpen();
if (isDoorOpen)
publishTextToSpeech("Door is Open");
else
publishTextToSpeech("Door is Closed");
}
if (fiducialDetectorBehaviorService.getGoalHasBeenLocated())
{
FramePose3D tmpFP = new FramePose3D();
fiducialDetectorBehaviorService.getReportedGoalPoseWorldFrame(tmpFP);
tmpFP.appendPitchRotation(Math.toRadians(90));
tmpFP.appendYawRotation(0);
tmpFP.appendRollRotation(Math.toRadians(-90));
tmpFP.appendPitchRotation(-tmpFP.getPitch());
FramePose3D doorFrame = new FramePose3D(tmpFP);
doorFrame.appendTranslation(0.025875, 0.68183125, -1.1414125);
Pose3D pose = new Pose3D(doorFrame.getPosition(), doorFrame.getOrientation());
//publishTextToSpeech("Recieved Door Location From fiducial");
pose.appendYawRotation(Math.toRadians(-90));
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
pose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
publisher.publish(HumanoidMessageTools.createDoorLocationPacket(pose));
}
=======
if (doorOpenDetectorBehaviorService.newPose != null)
{
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
doorOpenDetectorBehaviorService.newPose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
}
if (isDoorOpen != doorOpenDetectorBehaviorService.isDoorOpen())
{
isDoorOpen = doorOpenDetectorBehaviorService.isDoorOpen();
if (isDoorOpen)
publishTextToSpeech("Door is Open");
else
publishTextToSpeech("Door is Closed");
}
if (fiducialDetectorBehaviorService.getGoalHasBeenLocated())
{
FramePose3D tmpFP = new FramePose3D();
fiducialDetectorBehaviorService.getReportedGoalPoseWorldFrame(tmpFP);
tmpFP.appendPitchRotation(Math.toRadians(90));
tmpFP.appendYawRotation(0);
tmpFP.appendRollRotation(Math.toRadians(-90));
tmpFP.appendPitchRotation(-tmpFP.getPitch());
FramePose3D doorFrame = new FramePose3D(tmpFP);
doorFrame.appendTranslation(0.025875, 0.68183125, -1.1414125);
Pose3D pose = new Pose3D(doorFrame.getPosition(), doorFrame.getOrientation());
//publishTextToSpeech("Recieved Door Location From fiducial");
pose.appendYawRotation(Math.toRadians(-90));
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
pose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
doorToBehaviorPublisher.publish(HumanoidMessageTools.createDoorLocationPacket(pose));
doorToUIPublisher.publish(HumanoidMessageTools.createDoorLocationPacket(pose));
}
>>>>>>>
if (doorOpenDetectorBehaviorService.newPose != null)
{
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
doorOpenDetectorBehaviorService.newPose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
}
if (isDoorOpen != doorOpenDetectorBehaviorService.isDoorOpen())
{
isDoorOpen = doorOpenDetectorBehaviorService.isDoorOpen();
if (isDoorOpen)
publishTextToSpeech("Door is Open");
else
publishTextToSpeech("Door is Closed");
}
if (fiducialDetectorBehaviorService.getGoalHasBeenLocated())
{
FramePose3D tmpFP = new FramePose3D();
fiducialDetectorBehaviorService.getReportedGoalPoseWorldFrame(tmpFP);
tmpFP.appendPitchRotation(Math.toRadians(90));
tmpFP.appendYawRotation(0);
tmpFP.appendRollRotation(Math.toRadians(-90));
tmpFP.appendPitchRotation(-tmpFP.getPitch());
FramePose3D doorFrame = new FramePose3D(tmpFP);
doorFrame.appendTranslation(0.025875, 0.68183125, -1.1414125);
Pose3D pose = new Pose3D(doorFrame.getPosition(), doorFrame.getOrientation());
//publishTextToSpeech("Recieved Door Location From fiducial");
pose.appendYawRotation(Math.toRadians(-90));
Point3D location = new Point3D();
Quaternion orientation = new Quaternion();
pose.get(location, orientation);
publishUIPositionCheckerPacket(location, orientation);
doorToBehaviorPublisher.publish(HumanoidMessageTools.createDoorLocationPacket(pose));
doorToUIPublisher.publish(HumanoidMessageTools.createDoorLocationPacket(pose));
}
<<<<<<<
if (DEBUG)
{
publishTextToSpeech("walk to door action");
}
=======
lookDown();
if (DEBUG)
{
publishTextToSpeech("walk to door action");
}
>>>>>>>
lookDown();
if (DEBUG)
{
publishTextToSpeech("walk to door action");
}
<<<<<<<
lookDown();
doorOpenDetectorBehaviorService.reset();
doorOpenDetectorBehaviorService.run(true);
System.out.println("SETTING OPEN DOOR ACTION INPUT " + searchForDoorBehavior.getLocation());
if (DEBUG)
{
publishTextToSpeech("open door action");
}
=======
lookDown();
if (DEBUG)
{
publishTextToSpeech("open door action");
}
>>>>>>>
lookDown();
if (DEBUG)
{
publishTextToSpeech("open door action");
}
<<<<<<<
double footZ2 = referenceFrames.getFootFrame(RobotSide.LEFT).getTransformToWorldFrame().getTranslationZ();
=======
>>>>>>>
<<<<<<<
FootstepDataMessage fs1 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5864031335585762, 0.592160790421584, -footZ2),
=======
FootstepDataMessage fs1 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5864031335585762+offsetLeftRight, 0.592160790421584, -0),
>>>>>>>
FootstepDataMessage fs1 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5864031335585762+offsetLeftRight, 0.592160790421584, -0),
<<<<<<<
FootstepDataMessage fs2 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.4053278408799188, 0.23597592988662308, -footZ2),
=======
FootstepDataMessage fs2 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.4053278408799188+offsetLeftRight, 0.23597592988662308, -0),
>>>>>>>
FootstepDataMessage fs2 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.4053278408799188+offsetLeftRight, 0.23597592988662308, -0),
<<<<<<<
FootstepDataMessage fs3 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5924372369454293, -0.26851462759487155, -footZ2),
=======
FootstepDataMessage fs3 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5924372369454293+offsetLeftRight, -0.26851462759487155, -0),
>>>>>>>
FootstepDataMessage fs3 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5924372369454293+offsetLeftRight, -0.26851462759487155, -0),
<<<<<<<
FootstepDataMessage fs4 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.36887783182356804, -0.7234607322382425, -footZ2),
=======
FootstepDataMessage fs4 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.36887783182356804+offsetLeftRight, -0.7234607322382425, -0),
>>>>>>>
FootstepDataMessage fs4 = createRelativeFootStep(doorPose, startStep.getOppositeSide(), new Point3D(0.36887783182356804+offsetLeftRight, -0.7234607322382425, -0),
<<<<<<<
FootstepDataMessage fs5 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5896714303877739, -0.7199905519593679, -footZ2),
=======
FootstepDataMessage fs5 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5896714303877739+offsetLeftRight, -0.7199905519593679, -0),
>>>>>>>
FootstepDataMessage fs5 = createRelativeFootStep(doorPose, startStep, new Point3D(0.5896714303877739+offsetLeftRight, -0.7199905519593679, -0), |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.