Skip to content

Commit 7eaceb6

Browse files
rchougulerchougule
committed
chore: optimizing imports. Indentation for smaller files
1 parent 7e2d4a7 commit 7eaceb6

28 files changed

+455
-474
lines changed

‎src/main/java/com/browserstack/automate/ci/common/AutomateTestCase.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.browserstack.automate.ci.common;
22

3-
import org.apache.commons.lang.StringUtils;
4-
53
import com.browserstack.automate.ci.common.logger.PluginLogger;
4+
import org.apache.commons.lang.StringUtils;
65

76
import java.io.Serializable;
87
import java.util.regex.Matcher;
@@ -50,10 +49,6 @@ public AutomateTestCase(String sessionId, String packageName, String className,
5049
this.testHash = null;
5150
}
5251

53-
public boolean hasTestHash() {
54-
return (testHash != null && testHash.length() > 0);
55-
}
56-
5752
public static String stripTestParams(String testCaseName) {
5853
if (StringUtils.isEmpty(testCaseName)) {
5954
return null;
@@ -122,4 +117,8 @@ private static AutomateTestCase parseTestCasePath(final String testCasePath, fin
122117

123118
return null;
124119
}
120+
121+
public boolean hasTestHash() {
122+
return (testHash != null && testHash.length() > 0);
123+
}
125124
}

‎src/main/java/com/browserstack/automate/ci/common/BrowserStackBuildWrapperOperations.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package com.browserstack.automate.ci.common;
22

3-
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
4-
import java.io.File;
5-
import java.io.IOException;
6-
import java.io.PrintStream;
7-
import java.util.ArrayList;
8-
import java.util.Map;
9-
import org.apache.commons.lang.StringUtils;
10-
import org.apache.tools.ant.FileScanner;
11-
import org.apache.tools.ant.types.FileSet;
123
import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
134
import com.browserstack.automate.ci.jenkins.local.JenkinsBrowserStackLocal;
145
import com.browserstack.automate.ci.jenkins.local.LocalConfig;
@@ -23,6 +14,17 @@
2314
import hudson.security.ACL;
2415
import hudson.util.FormValidation;
2516
import hudson.util.ListBoxModel;
17+
import org.apache.commons.lang.StringUtils;
18+
import org.apache.tools.ant.FileScanner;
19+
import org.apache.tools.ant.types.FileSet;
20+
21+
import java.io.File;
22+
import java.io.IOException;
23+
import java.io.PrintStream;
24+
import java.util.ArrayList;
25+
import java.util.Map;
26+
27+
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
2628

2729
public class BrowserStackBuildWrapperOperations {
2830
private BrowserStackCredentials credentials;

‎src/main/java/com/browserstack/automate/ci/common/BrowserStackEnvVars.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.browserstack.automate.ci.common;
22

33
public interface BrowserStackEnvVars {
4-
String BROWSERSTACK_USER = "BROWSERSTACK_USER";
5-
String BROWSERSTACK_USERNAME = "BROWSERSTACK_USERNAME";
6-
String BROWSERSTACK_ACCESSKEY = "BROWSERSTACK_ACCESSKEY";
7-
String BROWSERSTACK_ACCESS_KEY = "BROWSERSTACK_ACCESS_KEY";
8-
String BROWSERSTACK_LOCAL = "BROWSERSTACK_LOCAL";
9-
String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
10-
String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";
11-
String BROWSERSTACK_BUILD_NAME = "BROWSERSTACK_BUILD_NAME";
12-
String BROWSERSTACK_APP_ID = "BROWSERSTACK_APP_ID";
4+
String BROWSERSTACK_USER = "BROWSERSTACK_USER";
5+
String BROWSERSTACK_USERNAME = "BROWSERSTACK_USERNAME";
6+
String BROWSERSTACK_ACCESSKEY = "BROWSERSTACK_ACCESSKEY";
7+
String BROWSERSTACK_ACCESS_KEY = "BROWSERSTACK_ACCESS_KEY";
8+
String BROWSERSTACK_LOCAL = "BROWSERSTACK_LOCAL";
9+
String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
10+
String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";
11+
String BROWSERSTACK_BUILD_NAME = "BROWSERSTACK_BUILD_NAME";
12+
String BROWSERSTACK_APP_ID = "BROWSERSTACK_APP_ID";
1313
}

‎src/main/java/com/browserstack/automate/ci/common/analytics/Analytics.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.browserstack.automate.ci.common.analytics;
22

3-
import org.apache.commons.io.IOUtils;
4-
import org.apache.commons.lang.StringUtils;
5-
63
import com.brsanthu.googleanalytics.EventHit;
74
import com.brsanthu.googleanalytics.GoogleAnalytics;
85
import com.brsanthu.googleanalytics.GoogleAnalyticsRequest;
96
import com.brsanthu.googleanalytics.TimingHit;
107
import hudson.Plugin;
118
import hudson.PluginWrapper;
129
import jenkins.model.Jenkins;
10+
import org.apache.commons.io.IOUtils;
11+
import org.apache.commons.lang.StringUtils;
1312

1413
import java.io.IOException;
1514
import java.io.InputStream;

‎src/main/java/com/browserstack/automate/ci/common/constants/Constants.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ public static final class SessionInfo {
2828
public static final String URL = "url";
2929
}
3030

31-
public static final String PIPELINE = "Pipeline";
32-
public static final String NON_PIPELINE = "NonPipeline";
33-
3431
// Report
3532
public static final class ReportStatus {
3633
public static final String SUCCESS = "Success";

‎src/main/java/com/browserstack/automate/ci/jenkins/AppUploaderBuilder.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package com.browserstack.automate.ci.jenkins;
22

3-
import java.io.IOException;
4-
import java.io.PrintStream;
5-
import java.util.HashMap;
6-
import java.util.Map;
7-
import javax.annotation.Nonnull;
8-
import org.apache.commons.lang.StringUtils;
9-
import org.kohsuke.stapler.DataBoundConstructor;
10-
import org.kohsuke.stapler.QueryParameter;
113
import com.browserstack.automate.ci.common.BrowserStackEnvVars;
124
import com.browserstack.automate.ci.common.logger.PluginLogger;
135
import com.browserstack.automate.ci.common.uploader.AppUploaderHelper;
@@ -19,6 +11,15 @@
1911
import hudson.tasks.BuildStepDescriptor;
2012
import hudson.tasks.Builder;
2113
import hudson.util.FormValidation;
14+
import org.apache.commons.lang.StringUtils;
15+
import org.kohsuke.stapler.DataBoundConstructor;
16+
import org.kohsuke.stapler.QueryParameter;
17+
18+
import javax.annotation.Nonnull;
19+
import java.io.IOException;
20+
import java.io.PrintStream;
21+
import java.util.HashMap;
22+
import java.util.Map;
2223

2324
public class AppUploaderBuilder extends Builder {
2425

‎src/main/java/com/browserstack/automate/ci/jenkins/AutomateTestAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.browserstack.automate.ci.jenkins;
22

3-
import org.kohsuke.stapler.bind.JavaScriptMethod;
4-
import org.kohsuke.stapler.export.Exported;
53
import com.browserstack.appautomate.AppAutomateClient;
64
import com.browserstack.automate.AutomateClient;
75
import com.browserstack.automate.ci.common.analytics.Analytics;
@@ -19,6 +17,8 @@
1917
import hudson.model.Run;
2018
import hudson.tasks.junit.CaseResult;
2119
import hudson.tasks.junit.TestAction;
20+
import org.kohsuke.stapler.bind.JavaScriptMethod;
21+
import org.kohsuke.stapler.export.Exported;
2222

2323
/**
2424
* A {@link TestAction} extension to display the BrowserStack Automate video for the session.

‎src/main/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisher.java‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package com.browserstack.automate.ci.jenkins;
22

3-
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
4-
import static com.browserstack.automate.ci.common.logger.PluginLogger.logDebug;
5-
6-
7-
import javax.annotation.Nonnull;
8-
9-
import org.kohsuke.stapler.DataBoundConstructor;
10-
113
import com.browserstack.automate.ci.common.AutomateTestCase;
124
import com.browserstack.automate.ci.common.analytics.Analytics;
135
import hudson.Extension;
@@ -23,18 +15,21 @@
2315
import hudson.tasks.junit.TestDataPublisher;
2416
import hudson.tasks.junit.TestResult;
2517
import hudson.tasks.junit.TestResultAction;
18+
import org.kohsuke.stapler.DataBoundConstructor;
2619

2720
import java.io.IOException;
2821
import java.util.HashMap;
2922
import java.util.List;
3023
import java.util.Map;
3124

32-
public class AutomateTestDataPublisher extends TestDataPublisher {
33-
private static final String TAG = "[BrowserStack]";
34-
private static final String REPORT_FILE_PATTERN = "**/browserstack-reports/REPORT-*.xml";
25+
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
26+
import static com.browserstack.automate.ci.common.logger.PluginLogger.logDebug;
3527

28+
public class AutomateTestDataPublisher extends TestDataPublisher {
3629
@Extension(ordinal = 1000) // JENKINS-12161
3730
public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
31+
private static final String TAG = "[BrowserStack]";
32+
private static final String REPORT_FILE_PATTERN = "**/browserstack-reports/REPORT-*.xml";
3833

3934
@DataBoundConstructor
4035
public AutomateTestDataPublisher() {
@@ -43,12 +38,16 @@ public AutomateTestDataPublisher() {
4338
Analytics.trackReportingEvent(true);
4439
}
4540

41+
public static String getTestCaseName(CaseResult caseResult) {
42+
return caseResult.getClassName() + "." + AutomateTestCase.stripTestParams(caseResult.getDisplayName());
43+
}
44+
4645
@Override
4746
public TestResultAction.Data getTestData(AbstractBuild<?, ?> abstractBuild, Launcher launcher, BuildListener buildListener, TestResult testResult) throws IOException, InterruptedException {
4847
FilePath filePath = abstractBuild.getWorkspace();
49-
if(filePath == null) {
48+
if (filePath == null) {
5049
return null;
51-
}else {
50+
} else {
5251
return contributeTestData(abstractBuild, filePath, launcher, buildListener, testResult);
5352
}
5453
}
@@ -94,10 +93,6 @@ public TestResultAction.Data contributeTestData(Run<?, ?> run, FilePath workspac
9493
return automateActionData;
9594
}
9695

97-
public static String getTestCaseName(CaseResult caseResult) {
98-
return caseResult.getClassName() + "." + AutomateTestCase.stripTestParams(caseResult.getDisplayName());
99-
}
100-
10196
private static class DescriptorImpl extends Descriptor<TestDataPublisher> {
10297

10398
@Override

‎src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import hudson.model.Action;
44

55
public class BrowserStackBuildAction implements Action {
6-
6+
77
private BrowserStackCredentials browserStackCredentials;
88

99
public BrowserStackBuildAction(BrowserStackCredentials browserStackCredentials) {
@@ -37,5 +37,5 @@ public String getUrlName() {
3737
return null;
3838
}
3939

40-
40+
4141
}

‎src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
package com.browserstack.automate.ci.jenkins;
22

3-
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
4-
import java.io.IOException;
5-
import java.io.PrintStream;
6-
import java.util.Map;
7-
8-
import com.browserstack.automate.ci.common.constants.Constants;
9-
import com.browserstack.automate.ci.common.tracking.PluginsTracker;
10-
import hudson.model.*;
11-
import org.apache.commons.lang.StringUtils;
12-
import org.kohsuke.stapler.DataBoundConstructor;
133
import com.browserstack.automate.ci.common.BrowserStackBuildWrapperOperations;
144
import com.browserstack.automate.ci.common.analytics.Analytics;
5+
import com.browserstack.automate.ci.common.constants.Constants;
6+
import com.browserstack.automate.ci.common.tracking.PluginsTracker;
157
import com.browserstack.automate.ci.jenkins.local.BrowserStackLocalUtils;
168
import com.browserstack.automate.ci.jenkins.local.JenkinsBrowserStackLocal;
179
import com.browserstack.automate.ci.jenkins.local.LocalConfig;
1810
import hudson.EnvVars;
1911
import hudson.Launcher;
12+
import hudson.model.AbstractBuild;
13+
import hudson.model.AbstractItem;
14+
import hudson.model.BuildListener;
15+
import hudson.model.BuildableItemWithBuildWrappers;
16+
import hudson.model.Descriptor;
17+
import hudson.model.Job;
2018
import hudson.tasks.BuildWrapper;
2119
import hudson.util.DescribableList;
20+
import org.apache.commons.lang.StringUtils;
21+
import org.kohsuke.stapler.DataBoundConstructor;
22+
23+
import java.io.IOException;
24+
import java.io.PrintStream;
25+
import java.util.Map;
26+
27+
import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
2228

2329

2430
public class BrowserStackBuildWrapper extends BuildWrapper {

0 commit comments

Comments
 (0)