-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor: move network upload tasks to NetUtils
- Loading branch information
1 parent
d66a4d9
commit 92a8c6d
Showing
6 changed files
with
128 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...etesterjenkins/JenkinsLocalOperation.java → ...er/common/util/JenkinsLocalOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
src/main/java/com/mobileenerlytics/eagle/tester/common/util/Log.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/main/java/com/mobileenerlytics/eagle/tester/common/util/NetUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package com.mobileenerlytics.eagle.tester.common.util; | ||
|
|
||
| import com.mobileenerlytics.eagle.tester.jenkins.eagletesterjenkins.EagleWrapper; | ||
| import org.glassfish.jersey.media.multipart.FormDataContentDisposition; | ||
| import org.glassfish.jersey.media.multipart.FormDataMultiPart; | ||
| import org.glassfish.jersey.media.multipart.MultiPartFeature; | ||
| import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; | ||
|
|
||
| import javax.ws.rs.client.Client; | ||
| import javax.ws.rs.client.ClientBuilder; | ||
| import javax.ws.rs.client.Entity; | ||
| import javax.ws.rs.client.WebTarget; | ||
| import javax.ws.rs.core.MediaType; | ||
| import javax.ws.rs.core.Response; | ||
| import java.io.*; | ||
| import java.util.Map; | ||
|
|
||
| public class NetUtils { | ||
| public static Response upload(File fileToUpload, final String url, EagleWrapper.DescriptorImpl desc, | ||
| Map<String, String> fields) throws FileNotFoundException { | ||
| // Upload traces to server | ||
| Client client = getClient(desc); | ||
| WebTarget webTarget = client.target(url); | ||
| FormDataMultiPart multiPart = new FormDataMultiPart(); | ||
| for(Map.Entry<String, String> field: fields.entrySet()) { | ||
| multiPart.field(field.getKey(), field.getValue()); | ||
| } | ||
| multiPart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE); | ||
|
|
||
| InputStream fileInStream = new FileInputStream(fileToUpload); | ||
|
|
||
| FileDataBodyPart fileDataBodyPart = new FileDataBodyPart(fileToUpload.getName(), | ||
| fileToUpload, MediaType.APPLICATION_OCTET_STREAM_TYPE); | ||
| fileDataBodyPart.setContentDisposition( | ||
| FormDataContentDisposition.name("file") | ||
| .fileName(fileToUpload.getName()).build()); | ||
| multiPart.bodyPart(fileDataBodyPart); | ||
|
|
||
| return webTarget.request() | ||
| .post(Entity.entity(multiPart, multiPart.getMediaType())); | ||
| // .post(Entity.entity(fileInStream, MediaType.MULTIPART_FORM_DATA_TYPE)); | ||
|
|
||
| } | ||
|
|
||
| public static boolean authenticate(EagleWrapper.DescriptorImpl desc) { | ||
| Client client = getClient(desc); | ||
| String url = "https://tester.mobileenerlytics.com/api/auth/"; | ||
| WebTarget webTarget = client.target(url); | ||
| Response response = webTarget.request().get(); | ||
| if (200 == response.getStatusInfo().getStatusCode()) { | ||
| Log.i("Authed ~"); | ||
| return true; | ||
| } | ||
| Log.w("Failed to authenticate. Check username, password"); | ||
| return false; | ||
| } | ||
|
|
||
| public static Client getClient(EagleWrapper.DescriptorImpl descriptor) { | ||
| return ClientBuilder.newBuilder() | ||
| .register(MultiPartFeature.class) | ||
| .register(new AuthFilter(descriptor)) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/test/java/com/mobileenerlytics/eagle/tester/common/util/NetTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package com.mobileenerlytics.eagle.tester.common.util; | ||
|
|
||
| import com.mobileenerlytics.eagle.tester.jenkins.eagletesterjenkins.EagleWrapper; | ||
| //import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.RandomAccessFile; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class NetTests { | ||
| // @Test | ||
| public void uploadTest() throws IOException { | ||
| Path filePath = Files.createTempFile("upload", ".zip"); | ||
| File file = filePath.toFile(); | ||
| RandomAccessFile f = new RandomAccessFile(file, "rw"); | ||
| long length = 1024 * 1024 * 1024; | ||
| // length *= 4; // 4 GB file | ||
| f.setLength(length); | ||
| final String url = "http://localhost:38673/api/upload/version_energy"; | ||
|
|
||
| Map<String, String> fields = new HashMap<>(); | ||
| fields.put("device", "d"); | ||
| fields.put("pkg", "pkg"); | ||
| fields.put("project_name", "pn"); | ||
| fields.put("author_name", "an"); | ||
| fields.put("author_email", "ae"); | ||
| fields.put("branch", "b"); | ||
| fields.put("commit", "c"); | ||
| fields.put("cur_version", "cv"); | ||
|
|
||
| NetUtils.upload(file, url, new EagleWrapper.DescriptorImpl(), fields); | ||
| } | ||
| } |