You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/03/16 08:26:27 UTC
camel git commit: Fix CS
Repository: camel
Updated Branches:
refs/heads/master fbb189763 -> 3d780020c
Fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d780020
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d780020
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d780020
Branch: refs/heads/master
Commit: 3d780020c297fff0882c74eaf95d883a74130cd5
Parents: fbb1897
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Mar 16 09:26:21 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Mar 16 09:26:21 2017 +0100
----------------------------------------------------------------------
.../apache/camel/maven/CamelSalesforceMojo.java | 5 ++--
.../maven/CamelSalesforceMojoOutputTest.java | 25 ++++++++++----------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d780020/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 08ee1ab..e9151f3 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -93,12 +93,11 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
*/
@Mojo(name = "generate", requiresProject = false, defaultPhase = LifecyclePhase.GENERATE_SOURCES)
public class CamelSalesforceMojo extends AbstractMojo {
-
- private static final String UTF_8 = "UTF-8";
-
// default connect and call timeout
protected static final int DEFAULT_TIMEOUT = 60000;
+ private static final String UTF_8 = "UTF-8";
+
private static final String JAVA_EXT = ".java";
private static final String PACKAGE_NAME_PATTERN = "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
http://git-wip-us.apache.org/repos/asf/camel/blob/3d780020/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
index 3728e1b..a30f5de 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
@@ -44,12 +44,21 @@ public class CamelSalesforceMojoOutputTest {
private static final String TEST_CALCULATED_FORMULA_FILE = "complex_calculated_formula.json";
private static final String FIXED_DATE = "Thu Mar 09 16:15:49 ART 2017";
- private CamelSalesforceMojo mojo;
- private CamelSalesforceMojo.GeneratorUtility utility = new CamelSalesforceMojo.GeneratorUtility(false);
-
@Rule
public TemporaryFolder temp = new TemporaryFolder();
+ @Parameter(0)
+ public String json;
+
+ @Parameter(1)
+ public SObjectDescription description;
+
+ @Parameter(2)
+ public String source;
+
+ private CamelSalesforceMojo mojo;
+ private CamelSalesforceMojo.GeneratorUtility utility = new CamelSalesforceMojo.GeneratorUtility(false);
+
@Parameters(name = "json = {0}, source = {2}")
public static Iterable<Object[]> parameters() throws IOException {
return Arrays.asList(pair(TEST_CASE_FILE, "Case.java"),
@@ -64,15 +73,6 @@ public class CamelSalesforceMojoOutputTest {
return new Object[] {json, createSObjectDescription(json), source};
}
- @Parameter(0)
- public String json;
-
- @Parameter(1)
- public SObjectDescription description;
-
- @Parameter(2)
- public String source;
-
@Before
public void setUp() throws Exception {
mojo = new CamelSalesforceMojo();
@@ -103,5 +103,4 @@ public class CamelSalesforceMojoOutputTest {
return mapper.readValue(inputStream, SObjectDescription.class);
}
}
-
}