SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added improvement after code review: stripFirstChar().

Browse Source 
Removed unused imports.
Removed unnecessary TODO item.
This commit is contained in:
Olga Maciaszek-Sharma
2016-02-23 20:49:39 +01:00
parent 190cd5bc15
commit 8279dceb65
13 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy
View File

@@ -3,7 +3,6 @@ package io.codearte.accurest.builder
import groovy.json.StringEscapeUtils
import groovy.transform.PackageScope
import groovy.transform.TypeChecked
import io.codearte.accurest.config.TestFramework
import io.codearte.accurest.dsl.GroovyDsl
import io.codearte.accurest.dsl.internal.ExecutionProperty
import io.codearte.accurest.dsl.internal.Header

1
accurest-core/src/main/groovy/io/codearte/accurest/builder/JaxRsClientJUnitMethodBodyBuilder.groovy
View File

@@ -1,6 +1,5 @@
package io.codearte.accurest.builder
import io.codearte.accurest.config.TestFramework
import io.codearte.accurest.dsl.GroovyDsl
import io.codearte.accurest.dsl.internal.Header
import io.codearte.accurest.dsl.internal.QueryParameter

9
accurest-core/src/main/groovy/io/codearte/accurest/builder/MethodBodyBuilder.groovy
View File

@@ -20,7 +20,6 @@ import io.codearte.accurest.util.JsonToJsonPathsConverter
import io.codearte.accurest.util.MapConverter
import static io.codearte.accurest.util.ContentUtils.extractValue
import static io.codearte.accurest.util.ContentUtils.getGroovyMultipartFileParameterContent
import static io.codearte.accurest.util.ContentUtils.recognizeContentTypeFromContent
import static io.codearte.accurest.util.ContentUtils.recognizeContentTypeFromHeader
@@ -187,7 +186,7 @@ abstract class MethodBodyBuilder {
protected void processText(BlockBuilder blockBuilder, String property, String value) {
if (value.startsWith('$')) {
value = value.substring(1).replaceAll('\\$value', "responseBody$property")
value = stripFirstChar(value).replaceAll('\\$value', "responseBody$property")
blockBuilder.addLine(value)
addColonIfRequired(blockBuilder)
} else {
@@ -195,6 +194,10 @@ abstract class MethodBodyBuilder {
}
}
private String stripFirstChar(String s) {
return s.substring(1);
}
protected void processBodyElement(BlockBuilder blockBuilder, String property, Object value) {
}
@@ -210,7 +213,7 @@ abstract class MethodBodyBuilder {
}
protected String trimRepeatedQuotes(String toTrim) {
return toTrim.startsWith('"') ? toTrim.replaceAll('"', '') : toTrim // TODO: implement for JUnit
return toTrim.startsWith('"') ? toTrim.replaceAll('"', '') : toTrim
}
protected Object extractServerValueFromBody(bodyValue) {

8
accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/QueryParameter.groovy
View File

@@ -1,10 +1,10 @@
package io.codearte.accurest.dsl.internal;
package io.codearte.accurest.dsl.internal
import groovy.transform.CompileStatic;
import groovy.transform.EqualsAndHashCode;
import groovy.transform.CompileStatic
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
import static io.codearte.accurest.util.ValidateUtils.validateServerValueIsAvailable;
import static io.codearte.accurest.util.ValidateUtils.validateServerValueIsAvailable
@EqualsAndHashCode(includeFields = true)
@ToString(includePackage = false, includeFields = true, ignoreNulls = true, includeNames = true)

4
accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/UrlPath.groovy
View File

@@ -1,8 +1,8 @@
package io.codearte.accurest.dsl.internal
import groovy.transform.CompileStatic;
import groovy.transform.CompileStatic
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString;
import groovy.transform.ToString
@ToString(includePackage = false, includeFields = true, includeNames = true)
@EqualsAndHashCode(includeFields = true)

1
accurest-core/src/main/groovy/io/codearte/accurest/file/ContractFileScanner.groovy
View File

@@ -2,7 +2,6 @@ package io.codearte.accurest.file
import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.ListMultimap
import com.google.common.collect.Multimap
import org.apache.commons.io.FilenameUtils
import java.nio.file.FileSystem

2
accurest-core/src/test/groovy/io/codearte/accurest/builder/MockMvcMethodBodyBuilderSpec.groovy
View File

@@ -1,9 +1,7 @@
package io.codearte.accurest.builder
import io.codearte.accurest.dsl.GroovyDsl
import io.codearte.accurest.dsl.WireMockStubStrategy
import io.codearte.accurest.dsl.WireMockStubVerifier
import io.codearte.accurest.file.Contract
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification

1
accurest-core/src/test/groovy/io/codearte/accurest/file/ContractFileScannerSpec.groovy
View File

@@ -1,7 +1,6 @@
package io.codearte.accurest.file
import com.google.common.collect.ListMultimap
import com.google.common.collect.Multimap
import spock.lang.Specification
import java.nio.file.Path

4
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleJerseyProjectSpec.groovy
View File

@@ -6,7 +6,6 @@ import spock.lang.Stepwise
import java.nio.file.Files
import java.nio.file.Path
import static java.nio.charset.StandardCharsets.UTF_8
import static java.nio.charset.StandardCharsets.UTF_8
@Stepwise
@@ -19,7 +18,8 @@ class SampleJerseyProjectSpec extends IntegrationSpec {
void setup() {
copyResources("functionalTest/sampleJerseyProject", "")
runTasksSuccessfully('clean') //delete accidental output when previously importing SimpleBoot into Idea to tweak it
runTasksSuccessfully('clean')
//delete accidental output when previously importing SimpleBoot into Idea to tweak it
}
def "should pass basic flow for Spock"() {

2
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleProjectSpec.groovy
View File

@@ -2,12 +2,10 @@ package io.codearte.accurest.plugin
import nebula.test.IntegrationSpec
import spock.lang.Stepwise
import spock.lang.Unroll
import java.nio.file.Files
import java.nio.file.Path
import static java.nio.charset.StandardCharsets.UTF_8
import static java.nio.charset.StandardCharsets.UTF_8
@Stepwise

1
accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/src/main/java/com/blogspot/toomuchcoding/frauddetection/Application.java
View File

@@ -1,6 +1,5 @@
package com.blogspot.toomuchcoding.frauddetection;
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.glassfish.jersey.server.ResourceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

2
accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/src/test/java/com/blogspot/toomuchcoding/MvcTest.java
View File

@@ -1,4 +1,5 @@
package com.blogspot.toomuchcoding;
import com.blogspot.toomuchcoding.frauddetection.Application;
import com.blogspot.toomuchcoding.frauddetection.FraudRestApplication;
import org.eclipse.jetty.server.Server;
@@ -14,7 +15,6 @@ import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import static org.springframework.util.SocketUtils.findAvailableTcpPort;

2
accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/test/java/com/blogspot/toomuchcoding/MvcTest.java
View File

@@ -1,8 +1,6 @@
package com.blogspot.toomuchcoding;
import com.blogspot.toomuchcoding.frauddetection.FraudDetectionController;
import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
import spock.lang.Specification;
import org.junit.Before;
public class MvcTest {