diff --git a/build.gradle b/build.gradle index 442280f..d351e6e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ allprojects { google() jcenter() maven { url "https://jitpack.io" } // for MPAndroidChard, not on jcenter yet + maven { url "https://dl.bintray.com/edu-cornell-tech-foundry/SDLRSX" } } } diff --git a/rsrp/build.gradle b/rsrp/build.gradle index 252d3cf..9a50e16 100644 --- a/rsrp/build.gradle +++ b/rsrp/build.gradle @@ -27,10 +27,15 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + //noinspection GradleCompatible implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.google.code.gson:gson:2.8.2' implementation 'org.researchstack:backbone:1.1.2' + compile 'edu.cornell.tech.foundry:sdl_rsx:0.0.7' + compile 'edu.cornell.tech.foundry:sdl_rsx_rsrpsupport:0.0.3' + compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1' + compile 'org.apache.commons:commons-lang3:3.6' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVConvertible.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVConvertible.java new file mode 100644 index 0000000..a5b699f --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVConvertible.java @@ -0,0 +1,14 @@ +package org.researchsuite.rsrp.CSVBackend; + +/** + * Created by Christina on 1/31/2018. + */ + +public interface CSVConvertible { + + String getTypeString(); + String getHeader(); + + +} + diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVEncodable.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVEncodable.java new file mode 100644 index 0000000..2b056da --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/CSVEncodable.java @@ -0,0 +1,6 @@ +package org.researchsuite.rsrp.CSVBackend; + +public interface CSVEncodable extends CSVConvertible { + + String[] toRecords(); +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/RSRPCSVBackend.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/RSRPCSVBackend.java new file mode 100644 index 0000000..3e39749 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/RSRPCSVBackend.java @@ -0,0 +1,294 @@ +package org.researchsuite.rsrp.CSVBackend; + +import android.content.Context; +import android.os.Environment; + +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.utils.URIBuilder; +import org.researchsuite.rsrp.Core.RSRPBackEnd; +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + + +public class RSRPCSVBackend implements RSRPBackEnd { + + public URI outputDirectory; + + public RSRPCSVBackend(URI outputDirectory){ + + this.outputDirectory = outputDirectory; + + Boolean isDirectory = false; + + if(shouldCreateDirectory(outputDirectory)){ + this.createDirectory(outputDirectory); + + } + + } + + public Boolean shouldCreateDirectory(URI outputDirectory){ + + File dir = new File(Environment.getExternalStorageDirectory() + outputDirectory.getPath()); + if(dir.exists()){ + if(dir.isDirectory()){ + return false; + } + else { + this.removeDirectory(outputDirectory); + } + } + + return true; + + } + + + private void createDirectory(URI directory){ + File dir = new File(Environment.getExternalStorageDirectory() + directory.getPath()); + try { + dir.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + private void removeDirectory(URI directory){ + File dir = new File(Environment.getExternalStorageDirectory() + directory.getPath()); + dir.delete(); + } + + private void removeItem(String itemName){ + + URIBuilder uriBuilder = null; + try { + uriBuilder = new URIBuilder(this.outputDirectory.toString()); + URI uri = uriBuilder.setPath(uriBuilder.getPath() + itemName) + .build() + .normalize(); + File dir = new File(Environment.getExternalStorageDirectory() + uri.getPath()); + dir.delete(); + + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + + public void removeFileForType(String typeIdentifier){ + + String stringToAppend = typeIdentifier + ".csv"; + + URIBuilder uriBuilder = null; + try { + uriBuilder = new URIBuilder(this.outputDirectory.toString()); + URI uri = uriBuilder.setPath(uriBuilder.getPath() + stringToAppend) + .build() + .normalize(); + File dir = new File(Environment.getExternalStorageDirectory() + uri.getPath()); + dir.delete(); + + } catch (URISyntaxException e) { + e.printStackTrace(); + } + + } + + public void removeAll() { + + this.removeDirectory(this.outputDirectory); + this.createDirectory(this.outputDirectory); + + } + + public void destroy() { + this.removeDirectory(this.outputDirectory); + } + + private void addFile(String itemName, String text) { + + URIBuilder uriBuilder = null; + String stringToAppend = itemName + ".csv"; + try { + uriBuilder = new URIBuilder(this.outputDirectory.toString()); + URI fileURL = uriBuilder.setPath(uriBuilder.getPath() + stringToAppend) + .build() + .normalize(); + + File dataFile = new File (fileURL); + FileOutputStream fOut = null; + try { + fOut = new FileOutputStream(dataFile); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + OutputStreamWriter myOutWriter = new OutputStreamWriter(fOut); + try { + myOutWriter.append(text); + myOutWriter.close(); + fOut.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } catch (URISyntaxException e){ + e.printStackTrace(); + } + + //TODO: remember to set android permission for storage: android.permission.WRITE_EXTERNAL_STORAGE + + } + + public URL [] getFileURLs() { + + return null; + } + + public URL getFileURLForType(String typeIdentifier){ + + URIBuilder uriBuilder = null; + try { + uriBuilder = new URIBuilder(this.outputDirectory.toString()); + URI uri = uriBuilder.setPath(uriBuilder.getPath() + typeIdentifier + ".csv") + .build() + .normalize(); + File fileUrl = new File(Environment.getExternalStorageDirectory() + uri.getPath()); + if (fileUrl.exists()){ + try { + return fileUrl.toURI().toURL(); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + else { + return null; + } + } catch (URISyntaxException e) { + e.printStackTrace(); + } + + return null; + + + } + + private File getOrCreateFileForType(String typeIdentifier, String header){ + + URIBuilder uriBuilder = null; + String stringToAppend = typeIdentifier + ".csv"; + try { + uriBuilder = new URIBuilder(this.outputDirectory.toString()); + URI uri = uriBuilder.setPath(uriBuilder.getPath() + stringToAppend) + .build() + .normalize(); + File fileUrl = new File(Environment.getExternalStorageDirectory() + uri.getPath()); + + if(fileUrl.exists()){ + return fileUrl; + } + else { + try { + fileUrl.createNewFile(); + FileOutputStream fOut = null; + try { + fOut = new FileOutputStream(fileUrl); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + OutputStreamWriter myOutWriter = new OutputStreamWriter(fOut); + try { + myOutWriter.append(header); + myOutWriter.append("\n"); + myOutWriter.close(); + fOut.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } catch (IOException e) { + e.printStackTrace(); + } + return fileUrl; + } + + } catch (URISyntaxException e){ + + } + + return null; + } + + public void add(CSVEncodable[] csvRecords){ + + CSVEncodable first = csvRecords[0]; + + + //TODO: complete this + + } + + public void add(CSVEncodable encodable){ + + String [] records = encodable.toRecords(); + if (records.length == 0){ + return; + } + + this.add(encodable.getTypeString(),encodable.getHeader(),records,true); + + } + + public Boolean add(String typeString, String header, String[] records, Boolean shouldAddToQueue){ + + File fileHandle = this.getOrCreateFileForType(typeString,header); + String joinedRecords = StringUtils.join(records); + + if(fileHandle != null) { + + FileOutputStream fOut = null; + try { + fOut = new FileOutputStream(fileHandle,true); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + OutputStreamWriter myOutWriter = new OutputStreamWriter(fOut); + try { + myOutWriter.append(joinedRecords); + myOutWriter.append("\n"); + myOutWriter.close(); + fOut.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + return true; + } + else if (shouldAddToQueue){ + // TODO: ADD TO TEMPQUEUE + return true; + } + else { + return false; + } + } + + private void syncElements() { + + } + + @Override + public void add(Context context, RSRPIntermediateResult intermediateResult) { + + CSVEncodable datapoint = (CSVEncodable) intermediateResult; + if (datapoint != null){ + this.add(datapoint); + } + + } +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/TempQueueElement.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/TempQueueElement.java new file mode 100644 index 0000000..52473cc --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend/TempQueueElement.java @@ -0,0 +1,20 @@ +package org.researchsuite.rsrp.CSVBackend; + +/** + * Created by Christina on 1/31/2018. + */ + +public class TempQueueElement { + + public String typeString; + public String header; + public String[] records; + + public TempQueueElement(String typeString, String header, String[] records){ + this.typeString = typeString; + this.header = header; + this.records = records; + } + + +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRaw.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRaw.java new file mode 100644 index 0000000..1afd377 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRaw.java @@ -0,0 +1,37 @@ +package org.researchsuite.rsrp.CSVBackend_RSRPSupport; + +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; + +import java.util.Map; +import java.util.UUID; + +/** + * Created by jameskizer on 4/19/17. + */ + +public class YADLFullRaw extends RSRPIntermediateResult { + public static String TYPE = "YADLFullRaw"; + + private Map resultMap; + private Map schemaID; + + public YADLFullRaw( + UUID uuid, + String taskIdentifier, + UUID taskRunUUID, + Map schemaID, + Map resultMap) { + + super(TYPE, uuid, taskIdentifier, taskRunUUID); + this.schemaID = schemaID; + this.resultMap = resultMap; + } + + public Map getResultMap() { + return resultMap; + } + + public Map getSchemaID() { + return schemaID; + } +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVEncodable.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVEncodable.java new file mode 100644 index 0000000..4cb6358 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVEncodable.java @@ -0,0 +1,82 @@ +package org.researchsuite.rsrp.CSVBackend_RSRPSupport; + +import org.apache.commons.lang3.StringUtils; +import org.researchsuite.rsrp.CSVBackend.CSVEncodable; + +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +/** + * Created by Christina on 2/1/2018. + */ + +public class YADLFullRawCSVEncodable extends YADLFullRaw implements CSVEncodable { + + public YADLFullRawCSVEncodable(UUID uuid, String taskIdentifier, UUID taskRunUUID, Map schemaID, Map resultMap) { + super(uuid, taskIdentifier, taskRunUUID, schemaID, resultMap); + } + + public static String TYPE = "YADLFullRawCSVEncodable"; + + @Override + public String[] toRecords() { + + String time = "time"; // TODO: get time now for this field + Collection resultMapValuesCollection = this.getResultMap().values(); + String[] resultMapValues = Arrays.copyOf(resultMapValuesCollection.toArray(), resultMapValuesCollection.toArray().length, String[].class); + + String resultMapJoined = StringUtils.join(resultMapValues,","); + String resultMapWithTime = getTimestamp() + "," + resultMapJoined; + String[] resultMapJoinedArray = new String[]{resultMapWithTime}; + + return resultMapJoinedArray; + } + + @Override + public String getTypeString() { + return this.getTaskIdentifier(); + } + + @Override + public String getHeader() { + + String[] yadlHeader = new String[]{"timestamp","BedToChair","Dressing","Housework","Lifting","Shopping","ShortWalk","WalkingUpStairs"}; + String yadlHeaderJoined = StringUtils.join(yadlHeader,","); + return yadlHeaderJoined; + } + + private String getTimestamp () { + Calendar calendar = Calendar.getInstance(Locale.getDefault()); + int hour = calendar.get(Calendar.HOUR_OF_DAY); + int minute = calendar.get(Calendar.MINUTE); + int second = calendar.get(Calendar.SECOND); + int date = calendar.get(Calendar.DAY_OF_MONTH); + int month = calendar.get(Calendar.MONTH); + int year = calendar.get(Calendar.YEAR); + int zone = calendar.get(Calendar.ZONE_OFFSET); + + StringBuilder timestampBuilder = new StringBuilder(); + timestampBuilder.append(year); + timestampBuilder.append("-"); + timestampBuilder.append(month); + timestampBuilder.append("-"); + timestampBuilder.append(date); + timestampBuilder.append("T"); + timestampBuilder.append(hour); + timestampBuilder.append(":"); + timestampBuilder.append(minute); + timestampBuilder.append(":"); + timestampBuilder.append(second); + timestampBuilder.append("-"); + timestampBuilder.append(zone); + + String timestamp = timestampBuilder.toString(); + + return timestamp; + } + +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVTransformer.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVTransformer.java new file mode 100644 index 0000000..e965a88 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLFullRawCSVTransformer.java @@ -0,0 +1,65 @@ +package org.researchsuite.rsrp.CSVBackend_RSRPSupport; + +import android.support.annotation.Nullable; + +import org.researchstack.backbone.result.StepResult; +import org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * Created by Christina on 2/1/2018. + */ + +public class YADLFullRawCSVTransformer implements RSRPFrontEnd { + @Nullable + @Override + public RSRPIntermediateResult transform(String taskIdentifier, UUID taskRunUUID, Map parameters) { + Object schemaID = parameters.get("schemaID"); + if (schemaID == null || !(schemaID instanceof Map)) { + return null; + } + + StepResult firstResult = null; + Map resultMap = new HashMap<>(); + for (Map.Entry entry : parameters.entrySet()) { + if (entry.getValue() instanceof StepResult) { + StepResult result = (StepResult) entry.getValue(); + if (firstResult==null) { firstResult = result; } + Object answer = result.getResult(); + if (answer instanceof String) { + String[] parts = result.getIdentifier().split("\\."); + String identifier = parts[parts.length-1]; + resultMap.put(identifier, (String)answer); + } + } + } + + YADLFullRawCSVEncodable yadlFull = new YADLFullRawCSVEncodable( + UUID.randomUUID(), + taskIdentifier, + taskRunUUID, + (Map)schemaID, + resultMap); + + yadlFull.setStartDate( firstResult != null ? firstResult.getStartDate() : new Date() ); + yadlFull.setEndDate(firstResult != null ? firstResult.getEndDate() : new Date()); + + // YADLFullRaw yadlFullRaw = (YADLFullRaw) yadlFull; + // YADLFullRawCSVEncodable yadlFullRawCSVEncodable = (YADLFullRawCSVEncodable) yadlFullRaw; + + + return yadlFull; + + } + + @Override + public boolean supportsType(String type) { + if (type.equals(org.researchsuite.rsrp.CSVBackend_RSRPSupport.YADLFullRawCSVEncodable.TYPE)) return true; + else return false; + } +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRaw.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRaw.java new file mode 100644 index 0000000..d92dec5 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRaw.java @@ -0,0 +1,59 @@ +package org.researchsuite.rsrp.CSVBackend_RSRPSupport; + +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; + +import java.util.Map; +import java.util.UUID; + +/** + * Created by jameskizer on 4/19/17. + */ + +public class YADLSpotRaw extends RSRPIntermediateResult { + public static String TYPE = "YADLSpotRaw"; + + private Map schemaID; + private String[] selected; + private String[] notSelected; + private String[] excluded; + private Map resultMap; + + public YADLSpotRaw( + UUID uuid, + String taskIdentifier, + UUID taskRunUUID, + Map schemaID, + String[] selected, + String[] notSelected, + String[] excluded, + Map resultMap + ) { + + super(TYPE, uuid, taskIdentifier, taskRunUUID); + this.schemaID = schemaID; + this.selected = selected; + this.notSelected = notSelected; + this.excluded = excluded; + this.resultMap = resultMap; + } + + public Map getSchemaID() { + return schemaID; + } + + public String[] getSelected() { + return selected; + } + + public String[] getNotSelected() { + return notSelected; + } + + public String[] getExcluded() { + return excluded; + } + + public Map getResultMap() { + return resultMap; + } +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRawCSVEncodable.java b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRawCSVEncodable.java new file mode 100644 index 0000000..87f1529 --- /dev/null +++ b/rsrp/src/main/java/org/researchsuite/rsrp/CSVBackend_RSRPSupport/YADLSpotRawCSVEncodable.java @@ -0,0 +1,103 @@ +package org.researchsuite.rsrp.CSVBackend_RSRPSupport; + +import org.apache.commons.lang3.StringUtils; +import org.researchsuite.rsrp.CSVBackend.CSVEncodable; + +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +/** + * Created by Christina on 2/1/2018. + */ + +public class YADLSpotRawCSVEncodable extends YADLSpotRaw implements CSVEncodable { + + public YADLSpotRawCSVEncodable(UUID uuid, String taskIdentifier, UUID taskRunUUID, Map schemaID, String[] selected, String[] notSelected, String[] excluded, Map resultMap) { + super(uuid, taskIdentifier, taskRunUUID, schemaID, selected, notSelected, excluded, resultMap); + } + + public static String TYPE = "YADLSpotRawCSVEncodable"; + + @Override + public String[] toRecords() { + + String time = "time"; // TODO: add time now in this field + + Collection resultMapValuesCollection = this.getResultMap().values(); + String[] resultMapValues = Arrays.copyOf(resultMapValuesCollection.toArray(), resultMapValuesCollection.toArray().length, String[].class); + + // String resultMapJoined = StringUtils.join(resultMapValues,","); + + String[] selected = this.getSelected(); + String[] notSelected = this.getNotSelected(); + String[] excluded = this.getExcluded(); + + StringBuilder recordBuilder = new StringBuilder(); + + String[] yadlHeader = new String[]{"timestamp","BedtoChair","Dressing","Housework","Lifting","Shopping","ShortWalk","Walkingupstairs"}; + + for(int i=0; i parameters) { + Object schemaID = parameters.get("schemaID"); + if (schemaID == null || !(schemaID instanceof Map)) { + return null; + } + + Object resultObject = parameters.get("result"); + if (resultObject == null || + !(resultObject instanceof StepResult) || + !(((StepResult)resultObject).getResult() instanceof RSXMultipleImageSelectionSurveyResult)) { + return null; + } + + RSXMultipleImageSelectionSurveyResult yadlSpotResult = (RSXMultipleImageSelectionSurveyResult)((StepResult)resultObject).getResult(); + + Map resultMap = new HashMap<>(); + + for (int i=0; i)schemaID, + yadlSpotResult.getSelectedIdentifiers(), + yadlSpotResult.getNotSelectedIdentifiers(), + yadlSpotResult.getExcludedIdentifiers(), + resultMap + ); + + yadlSpot.setStartDate(((StepResult)resultObject).getStartDate()); + yadlSpot.setEndDate(((StepResult)resultObject).getEndDate()); + + return yadlSpot; + } + + @Override + public boolean supportsType(String type) { + if (type.equals(org.researchsuite.rsrp.CSVBackend_RSRPSupport.YADLSpotRawCSVEncodable.TYPE)) return true; + else return false; + } +} diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPBackEnd.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPBackEnd.java similarity index 83% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPBackEnd.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPBackEnd.java index 3aacef8..40c8252 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPBackEnd.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPBackEnd.java @@ -1,4 +1,4 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; import android.content.Context; diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFakeFrontEnd.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFakeFrontEnd.java similarity index 78% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPFakeFrontEnd.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFakeFrontEnd.java index ecb9da6..d3b45b8 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFakeFrontEnd.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFakeFrontEnd.java @@ -1,10 +1,10 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; + +import org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; import java.util.Map; import java.util.UUID; -import org.researchsuite.rsrp.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; - /** * Created by jameskizer on 2/4/17. */ diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/RSRPFrontEndService.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/RSRPFrontEndService.java similarity index 89% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/RSRPFrontEndService.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/RSRPFrontEndService.java index 02c6d7b..2a1da18 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/RSRPFrontEndService.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/RSRPFrontEndService.java @@ -1,12 +1,13 @@ -package org.researchsuite.rsrp.RSRPFrontEndServiceProvider; +package org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider; import android.support.annotation.Nullable; -import com.google.gson.JsonObject; - import org.researchstack.backbone.result.StepResult; import org.researchstack.backbone.result.TaskResult; -import org.researchstack.backbone.step.Step; +import org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; +import org.researchsuite.rsrp.Core.RSRPResultTransform; +import org.researchsuite.rsrp.Core.RSRPResultTransformInputMapping; import java.util.ArrayList; import java.util.HashMap; @@ -17,11 +18,6 @@ import java.util.ServiceLoader; import java.util.UUID; -import org.researchsuite.rsrp.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; -import org.researchsuite.rsrp.RSRPIntermediateResult; -import org.researchsuite.rsrp.RSRPResultTransform; -import org.researchsuite.rsrp.RSRPResultTransformInputMapping; - /** * Created by jameskizer on 2/2/17. diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java similarity index 66% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java index 1ef2a71..2e328fe 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPFrontEndServiceProvider/spi/RSRPFrontEnd.java @@ -1,12 +1,12 @@ -package org.researchsuite.rsrp.RSRPFrontEndServiceProvider.spi; +package org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider.spi; import android.support.annotation.Nullable; +import org.researchsuite.rsrp.Core.RSRPIntermediateResult; + import java.util.Map; import java.util.UUID; -import org.researchsuite.rsrp.RSRPIntermediateResult; - /** * Created by jameskizer on 2/2/17. */ @@ -16,7 +16,7 @@ public interface RSRPFrontEnd { public RSRPIntermediateResult transform( String taskIdentifier, UUID taskRunUUID, - Map parameters); + Map parameters); public boolean supportsType(String type); diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPIntermediateResult.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPIntermediateResult.java similarity index 97% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPIntermediateResult.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPIntermediateResult.java index 23e4671..f84d2c9 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPIntermediateResult.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPIntermediateResult.java @@ -1,4 +1,4 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; import java.io.Serializable; import java.util.Date; diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransform.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransform.java similarity index 92% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransform.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransform.java index 24fc865..66b0dab 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransform.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransform.java @@ -1,4 +1,4 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; import java.io.Serializable; import java.util.List; diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransformInputMapping.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransformInputMapping.java similarity index 93% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransformInputMapping.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransformInputMapping.java index 4fe2761..e6f5860 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultTransformInputMapping.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultTransformInputMapping.java @@ -1,4 +1,4 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; import java.io.Serializable; diff --git a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultsProcessor.java b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultsProcessor.java similarity index 79% rename from rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultsProcessor.java rename to rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultsProcessor.java index 69f3cdf..05e7228 100644 --- a/rsrp/src/main/java/org/researchsuite/rsrp/RSRPResultsProcessor.java +++ b/rsrp/src/main/java/org/researchsuite/rsrp/Core/RSRPResultsProcessor.java @@ -1,17 +1,14 @@ -package org.researchsuite.rsrp; +package org.researchsuite.rsrp.Core; import android.content.Context; import android.util.Log; -import org.researchstack.backbone.ResourcePathManager; import org.researchstack.backbone.result.TaskResult; +import org.researchsuite.rsrp.Core.RSRPFrontEndServiceProvider.RSRPFrontEndService; import java.util.List; import java.util.UUID; -import org.researchsuite.rsrp.RSRPFrontEndServiceProvider.RSRPFrontEndService; -import org.researchsuite.rsrp.RSRPFrontEndServiceProvider.spi.RSRPFrontEnd; - /** * Created by jameskizer on 2/3/17. */