conflict_resolution
stringlengths
27
16k
<<<<<<< private static String baseUrl; ======= private static String privacyUrl; >>>>>>> private static String privacyUrl; <<<<<<< nodeConfig( baseUrl, port, "node1", baseUrl, "src/test-acceptance/resources/key1.pub\", \"src/test-acceptance...
<<<<<<< nodeConfig( firstNodeBaseUrl, firstNodePort, "node1", secondNodeBaseUrl, "src/test-acceptance/resources/key1.pub", "src/test-acceptance/resources/key1.key"); ======= utils() .nodeConfig( firstNo...
<<<<<<< import net.consensys.orion.http.handler.tx.PushToHistoryHandler; ======= import net.consensys.orion.http.handler.set.SetPrivacyGroupHandler; >>>>>>> import net.consensys.orion.http.handler.tx.PushToHistoryHandler; import net.consensys.orion.http.handler.set.SetPrivacyGroupHandler; <<<<<<< Vertx vertx,...
<<<<<<< ======= >>>>>>>
<<<<<<< setFirstDayOfWeek(firstDayOfWeek); setSelectedDate(CalendarDay.today()); ======= setSelectedDate(new CalendarDay()); >>>>>>> setSelectedDate(CalendarDay.today()); <<<<<<< CalendarDay day = CalendarDay.from(calendar); dayView.setDay(day); ======= ...
<<<<<<< import edu.stanford.nlp.classify.LinearClassifier; import edu.stanford.nlp.util.Pair; ======= import edu.stanford.nlp.util.Pair; >>>>>>> import edu.stanford.nlp.classify.LinearClassifier; import edu.stanford.nlp.util.Pair; <<<<<<< //logWeights has already the priors which is the e...
<<<<<<< //conll.trainStanfordCRF(CNConstants.ALL, true, false,false); //CoNLL03Ner.evaluatingCRFResults(CNConstants.ALL); ======= conll.trainStanfordCRF(CNConstants.ALL, true, false,false); // CoNLL03Ner.evaluatingCRFResults(CNConstants.ALL); >>>>>>> //conll.trainStanfordCRF(C...
<<<<<<< //TODO Call enlave retrieve here byte[] payload = "Retrieved payload".getBytes(); String encodedPayload = Base64.getEncoder().encodeToString(payload); ======= byte[] payload = transactionService.receive(key, to); String encodedPayload = base64Decoder...
<<<<<<< //conll.trainStanfordCRF(CNConstants.ALL, true, false,false); ======= >>>>>>> //conll.trainStanfordCRF(CNConstants.ALL, true, false,false); <<<<<<< //conll.runningWeaklySupStanfordLC(CNConstants.PRNOUN,true,Integer.MAX_VALUE); conll.runningWeaklySupStanfordLC(CNConstants.PR...
<<<<<<< "weaklySupConll", "expGWord", "dev","priors","lc" ======= "weaklySupConll", "expGWord", "dev","priors","conv", "parse" >>>>>>> "weaklySupConll", "expGWord", "dev","priors","conv", "lc" <<<<<<< case 9: conll.trainLC(CNConstants.PRNOUN,true, false); break;...
<<<<<<< EncodedPayloadWithRecipients encryptPayload(byte[] message, PublicKey senderPublicKey, List<PublicKey> recipientPublicKeys); ======= EncodedPayload encryptPayload(byte[] message, PublicKey senderPubli...
<<<<<<< .knownServersFile(Objects.toString(sslConfig.getKnownServersFile())); } final InfluxConfig influxConfig = config.getServerConfig().getInfluxConfig(); ======= .knownServersFile(Objects.toString(sslConfig.getKnownServersFile())) ...
<<<<<<< ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Pet body, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to ...
<<<<<<< @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) ======= @ApiResponse(code = 200, message = "successful operation", response = Pet.class), ...
<<<<<<< import com.quorum.tessera.encryption.Nonce; import com.quorum.tessera.data.EncryptedTransactionDAO; import com.quorum.tessera.data.EncryptedRawTransactionDAO; import com.quorum.tessera.partyinfo.ResendResponse; import com.quorum.tessera.partyinfo.ResendRequestType; import com.quorum.tessera.partyinfo.ResendRequ...
<<<<<<< import com.github.nexus.configuration.ConfigurationFactory; import com.github.nexus.node.PartyInfoParser; import com.github.nexus.node.model.PartyInfo; ======= import com.github.nexus.api.Nexus; >>>>>>> import com.github.nexus.configuration.ConfigurationFactory; import com.github.nexus.node.PartyInfoParser;...
<<<<<<< public ResponseEntity<Client> testClassname(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Client body, @RequestHeader(value = "Accept", required = false) String accept) throws IOException { ======= public ResponseEntity<Client> testClassname(@ApiParam(value = "client m...
<<<<<<< public Response findPetsByStatus( @NotNull @QueryParam("status") List<String> status,@Context SecurityContext securityContext) ======= @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.cla...
<<<<<<< import com.quorum.tessera.encryption.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; ======= import com.quorum.tessera.encryption.Encryptor; import com.quorum.tessera.encryption.KeyManager; import com.quorum.tessera.encryption.MasterKey; import com.quorum.tessera.encryption.Nonce; import com.quor...
<<<<<<< import io.swagger.client.model.Client; import org.threeten.bp.OffsetDateTime; import org.threeten.bp.LocalDate; ======= >>>>>>> <<<<<<< ======= import io.swagger.client.model.Client; import org.joda.time.DateTime; import org.joda.time.LocalDate; >>>>>>> import io.swagger.client.model.Client; import org.t...
<<<<<<< import java.io.FileNotFoundException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stre...
<<<<<<< import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import org.joda.time.LocalDate; import io.swagger.model.OuterComposite; >>>>>>> import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import io.swagger.model.OuterComposite;
<<<<<<< import java.util.Map; import com.google.common.collect.ImmutableMap; import io.swagger.codegen.CodegenConstants; ======= import com.google.common.collect.ImmutableMap; import io.swagger.codegen.languages.JaxRSServerCodegen; import java.util.Map; >>>>>>> import com.google.common.collect.ImmutableMap; imp...
<<<<<<< @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2017-03-13T18:03:34.096+01:00") ======= >>>>>>>
<<<<<<< String[] authNames = new String[] { }; String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames); ======= String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, conten...
<<<<<<< final Set<MessageHash> affectedTransaction = ======= final Set<MessageHash> affectedTransactions = >>>>>>> final Set<MessageHash> affectedTransactions = <<<<<<< ReceiveResponse.Builder builder = ReceiveResponse.Builder.create() .withUne...
<<<<<<< import com.quorum.tessera.config.*; import com.quorum.tessera.config.builder.ConfigBuilder; ======= import com.moandjiezana.toml.Toml; import com.quorum.tessera.config.Config; import com.quorum.tessera.config.ConfigFactory; import com.quorum.tessera.config.KeyDataConfig; import com.quorum.tessera.config.SslA...
<<<<<<< @Override public String workdir() { return properties.getProperty("workdir"); } @Override public String socket() { return properties.getProperty("socket"); } ======= @Override public Set<String> whitelist() { return Stream.of(properties.getProperty("w...
<<<<<<< import javax.validation.constraints.*; ======= import io.swagger.annotations.*; @ApiModel(description="Describes the result of uploading an image resource") >>>>>>> import javax.validation.constraints.*; import io.swagger.annotations.*; @ApiModel(description="Describes the result of uploading an image res...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import javax.validation.Valid; >>>>>>> import org.threeten.bp.OffsetDateTime; import javax.validation.Valid; <<<<<<< public OffsetDateTime getShipDate() { ======= @Valid public DateTime getShipDate() { >>>>>>> @Valid...
<<<<<<< public static final String MEMCACHE_NAMESPACE = "mache"; public static final String BIGQUERY_JOB_ID_PARAM = "jobId"; public static final String RETRY_COUNT_PARAM = "retryCount"; ======= public static final String MEMCACHE_NAMESPACE = "mache"; public static final String MINUTES_HISTORY_PARAM = "minute...
<<<<<<< package io.swagger.api; import java.util.Map; import io.swagger.model.Order; import java.io.InputStream; import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipar...
<<<<<<< @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2017-03-13T18:03:34.096+01:00") ======= >>>>>>>
<<<<<<< import java.util.Arrays; ======= import java.util.List; >>>>>>> import java.util.Arrays; import java.util.List;
<<<<<<< return new CraftSlimeWorld(this.loader, worldName, new HashMap<>(chunks), extraData.clone(), version, properties.withReadOnly(true)); ======= world = new CraftSlimeWorld(loader == null ? this.loader : loader, worldName, new HashMap<>(chunks), extraData.clone(), v1_13, properties.withRe...
<<<<<<< /* * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source <<<<<<< TestObservationDAO dao = new TestObservationDA...
<<<<<<< String[] authNames = new String[] { "api_key" }; String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames); ======= String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams,...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import javax.validation.constraints.*; >>>>>>> import org.threeten.bp.OffsetDateTime; import javax.validation.constraints.*;
<<<<<<< mCompleteRange.bottom = d; ======= >>>>>>>
<<<<<<< public ResponseEntity<String> loginUser( @NotNull@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username, @NotNull@ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", req...
<<<<<<< public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("order_id") String orderId, @RequestHeader(value = "Accept", required = false) String accept) { ======= public ResponseEntity<Void> deleteOrder(@ApiParam(value = "...
<<<<<<< import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import org.joda.time.LocalDate; import javax.validation.Valid; >>>>>>> import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import javax.validation.Valid; <<<<<<< public Offs...
<<<<<<< private String basePath = "http://petstore.swagger.io/v2"; ======= private String basePath = "http://petstore.swagger.io:80/v2"; private boolean lenientOnJson = false; >>>>>>> private String basePath = "http://petstore.swagger.io:80/v2";
<<<<<<< embeddedTemplateDir = templateDir = "JavaJaxRS"; apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; ======= apiPackage = System.getProperty("swagger.codegen.jaxrs.apipackage", "io.swagger.api"); modelPackage = System.getProperty("swagger.codegen.jaxrs.mod...
<<<<<<< String[] authNames = new String[] { "petstore_auth" }; String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames); ======= String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formP...
<<<<<<< ======= import com.jcloisterzone.Player; import com.jcloisterzone.action.TilePlacementAction; >>>>>>> import com.jcloisterzone.action.TilePlacementAction;
<<<<<<< public static final String USE_COLLECTION = "useCollection"; public static final String USE_COLLECTION_DESC = "Deserialize array types to Collection<T> instead of List<T>."; public static final String RETURN_ICOLLECTION = "returnICollection"; public static final String RETURN_ICOLLECTION_DESC =...
<<<<<<< Assert.assertEquals(property1.baseType, "Children"); Assert.assertNull(property1.required); ======= Assert.assertEquals(property1.baseType, "models.Children"); Assert.assertFalse(property1.required); >>>>>>> Assert.assertEquals(property1.baseType, "Children"); ...
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< ======= public String toVarName(String name) { name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. name = org.openapitools.codegen.utils.StringUtils.dashize(name); return name; } @Over...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import javax.validation.Valid; >>>>>>> import org.threeten.bp.OffsetDateTime; import javax.validation.Valid; <<<<<<< public OffsetDateTime getDateTime() { ======= @Valid public DateTime getDateTime() { >>>>>>> @Valid ...
<<<<<<< if ("retrofit2".equals(getLibrary())) { supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java")); } } else if("jersey2".equals(getLibrary())) { ======= } else if ("jersey2".equals(getLibrary()) || "resteasy".equals(getLibrary(...
<<<<<<< public PetApiController(ObjectMapper objectMapper) { this.objectMapper = objectMapper; } public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Pet body, @RequestHeader(value = "Accept", required = ...
<<<<<<< @ApiModelProperty(example = "null", value = "") public OffsetDateTime getShipDate() { ======= @ApiModelProperty(value = "") public DateTime getShipDate() { >>>>>>> @ApiModelProperty(value = "") public OffsetDateTime getShipDate() {
<<<<<<< ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Pet body, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to ...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import javax.validation.Valid; >>>>>>> import org.threeten.bp.OffsetDateTime; import javax.validation.Valid; <<<<<<< public OffsetDateTime getDateTime() { ======= @Valid public DateTime getDateTime() { >>>>>>> @Valid...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import java.io.IOException; import org.joda.time.DateTime; >>>>>>> import java.io.IOException; import org.threeten.bp.OffsetDateTime;
<<<<<<< ======= import org.apache.http.Header; import org.apache.http.HttpHost; >>>>>>> import org.apache.http.Header; import org.apache.http.HttpHost; <<<<<<< import org.apache.http.auth.AuthState; import org.apache.http.auth.UsernamePasswordCredentials; ======= import org.apache.http.client.CookieStore; import ...
<<<<<<< String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType); ======= String[] authNames = new String[] { }; String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNam...
<<<<<<< import us.codecraft.webmagic.proxy.Proxy; import us.codecraft.webmagic.proxy.SimpleProxyPool; ======= import org.apache.http.auth.UsernamePasswordCredentials; >>>>>>> import us.codecraft.webmagic.proxy.Proxy; import us.codecraft.webmagic.proxy.SimpleProxyPool; import org.apache.http.auth.UsernamePasswordCred...
<<<<<<< /* * Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
<<<<<<< import java.util.ArrayList; import java.util.List; import java.util.Map; ======= >>>>>>> import java.util.Map; <<<<<<< public Map<String, List<String>> getHeaders() { return headers; } public void setHeaders(Map<String, List<String>> headers) { this.headers = headers; } ...
<<<<<<< @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) ======= @ApiResponse(code = 200, message = "successful operation", response = Pet.class), ...
<<<<<<< public void setSupportJava6(boolean value) { this.supportJava6 = value; } ======= >>>>>>> public void setSupportJava6(boolean value) { this.supportJava6 = value; }
<<<<<<< public String invokeAPI(String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType) throws ApiException { ======= public String invokeAPI(String path, String method, Map<String, String> query...
<<<<<<< cliOptions.add(new CliOption(USE_ANDROID_MAVEN_GRADLE_PLUGIN, "A flag to toggle android-maven gradle plugin.", BooleanProperty.TYPE).defaultValue(Boolean.TRUE.toString())); supportedLibraries.put("<default>", "HTTP client: Apache HttpClient 4.3.6. JSON processing: Gson 2.3.1"); ...
<<<<<<< @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2017-03-13T18:03:34.096+01:00") ======= >>>>>>>
<<<<<<< .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(GsonCustomConverterFactory.create(json.getGson())); ======= .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) .addConverterFactory(...
<<<<<<< ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that nee...
<<<<<<< supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.go")); supportingFiles.add(new SupportingFile("api_client.mustache", "", "api_client.go")); ======= supportingFiles.add(new SupportingFile("configuration.mustache", packageName, "configuration.go")); ...
<<<<<<< protected String artifactVersion = "1.0.0"; protected String rootNamespace; protected String invokerNamespace; protected String modelNamespace; protected String apiNamespace; ======= protected String artifactVersion = null; >>>>>>> protected String artifactVersion = null; prot...
<<<<<<< private String getApiFilenameFromClassname(String classname) { String name = classname.substring(0, classname.length() - "Service".length()); return toApiFilename(name); } private String getModelnameFromModelFilename(String filename) { String name = filename.substring((model...
<<<<<<< /** * A map of language-specific parameters as passed with the -c option to the command line */ @Parameter(name = "configOptions") private Map configOptions; ======= /** * Path to json configuration file. */ @Parameter(name = "configurationFile", required = false) p...
<<<<<<< ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User...
<<<<<<< @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2017-03-13T18:03:34.096+01:00") ======= >>>>>>>
<<<<<<< String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType); ======= String[] authNames = new String[] { "petstore_auth" }; String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, content...
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< public Application findById(Integer id) { return (Application) super.findById(id); } public Application get(Integer id) { return (Application) super.get(id); } void save(Application entity) { super.save(entity); } void remove(Application entity) { s...
<<<<<<< ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody User body, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User...
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< import org.hyperic.hq.common.TimeframeBoundriesException; import org.hyperic.hq.measurement.server.session.TimeframeSizeException; ======= import org.hyperic.hq.common.TimeframeBoundriesException; >>>>>>> import org.hyperic.hq.common.TimeframeBoundriesException; import org.hyperic.hq.measurement.server.sessi...
<<<<<<< public Collection<ResourceType> getPSSTypes(); public Collection<Resource> getOrphanedResources(); ======= public Collection<Resource> getRemovableChildren(AuthzSubject subject, Resource parent); >>>>>>> public Collection<ResourceType> getPSSTypes(); public Col...
<<<<<<< { df.setMaximumFractionDigits(MAX_FRACTION_DIGITS); ======= static { df.setMaximumFractionDigits(3); >>>>>>> static { df.setMaximumFractionDigits(MAX_FRACTION_DIGITS);
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import javax.validation.Valid; >>>>>>> import org.threeten.bp.OffsetDateTime; import javax.validation.Valid; <<<<<<< public OffsetDateTime getShipDate() { ======= @Valid public DateTime getShipDate() { >>>>>>> @Valid ...
<<<<<<< ======= import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.R...
<<<<<<< String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType); ======= String[] authNames = new String[] { "api_key" }; String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, contentType, ...
<<<<<<< ======= protected boolean withXml = false; protected String dateLibrary = "joda"; >>>>>>> protected boolean withXml = false; <<<<<<< if (additionalProperties.containsKey(DATE_LIBRARY)) { setDateLibrary(additionalProperties.get("dateLibrary").toString()); } if...
<<<<<<< @Override public String toEnumValue(String value, String datatype) { if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) { return value; } else { return "\'" + escapeText(value) + "\'"; } } @Override public St...
<<<<<<< @Transactional(readOnly=true) public Map<String, Integer> getResourceTypeCountMap(int sessionId, Integer groupId) throws PermissionException, ======= public Map<String, Number> getResourceTypeCountMap(int sessionId, Integer groupId) throws PermissionException, >>>>>>> @Transactional(readOnly=...
<<<<<<< import io.swagger.client.model.Client; import org.threeten.bp.OffsetDateTime; import org.threeten.bp.LocalDate; ======= >>>>>>> <<<<<<< ======= import io.swagger.client.model.Client; import org.joda.time.DateTime; import org.joda.time.LocalDate; >>>>>>> import io.swagger.client.model.Client; import org.t...
<<<<<<< public static final String SWAGGER_DOCKET_CONFIG = "false"; ======= public static final String USE_OPTIONAL = "false"; >>>>>>> public static final String SWAGGER_DOCKET_CONFIG = "false"; public static final String USE_OPTIONAL = "false"; <<<<<<< options.put(SpringCodegen.SWAGGER_DOCK...
<<<<<<< public String toVarName(String name) { // sanitize name name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // remove dollar sign name = name.replaceAll("$", ""); // if it's all uppper case, conver...
<<<<<<< import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import org.joda.time.LocalDate; import io.swagger.model.OuterComposite; >>>>>>> import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import io.swagger.model.OuterComposite;
<<<<<<< import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; ======= import org.joda.time.DateTime; import org.joda.time.LocalDate; import io.swagger.model.OuterComposite; >>>>>>> import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import io.swagger.model.OuterComposite;
<<<<<<< /* * Swagger Petstore * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * * NOTE: This class is auto generated by the swagger code gen...
<<<<<<< ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Pet body, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to ...
<<<<<<< ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("order_id") String orderId, @RequestHeader(value = "Accept", required = false) String accept); ======= ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that ne...
<<<<<<< public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("order_id") String orderId, @RequestHeader(value = "Accept", required = false) String accept) { ======= public ResponseEntity<Void> deleteOrder(@ApiParam(value = "...
<<<<<<< import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.joda.*; import io.swagger.client.ApiClient; import io.swagger.client.ApiException; import io.swagger.client.Configuration; ======= import io.swagger.TestUtils; >>>>>>> import com.fasterx...