git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' (JAL-4102 2.11.2.6 patch release) into features/r2_11_2_alphaf...
[jalview.git]
/
src
/
jalview
/
fts
/
core
/
FTSRestClient.java
diff --git
a/src/jalview/fts/core/FTSRestClient.java
b/src/jalview/fts/core/FTSRestClient.java
index
b262f64
..
62dd13f
100644
(file)
--- a/
src/jalview/fts/core/FTSRestClient.java
+++ b/
src/jalview/fts/core/FTSRestClient.java
@@
-26,13
+26,14
@@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
import java.util.Objects;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
import java.util.Objects;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
-import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
-import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
import jalview.fts.api.FTSRestClientI;
import jalview.fts.api.FTSRestClientI;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
/**
* Base class providing implementation for common methods defined in
/**
* Base class providing implementation for common methods defined in
@@
-58,9
+59,7
@@
public abstract class FTSRestClient implements FTSRestClientI
private int defaultResponsePageSize = 100;
private int defaultResponsePageSize = 100;
- protected String mockQuery = null;
-
- protected String mockResponse = null;
+ protected HashMap<String, String> mockQueries = null;
protected FTSRestClient()
{
protected FTSRestClient()
{
@@
-73,7
+72,7
@@
public abstract class FTSRestClient implements FTSRestClientI
InputStream in = getClass().getResourceAsStream(fileName);
InputStream in = getClass().getResourceAsStream(fileName);
- try (BufferedReader br = new BufferedReader(new InputStreamReader(in)))
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(in)))
{
String line;
while ((line = br.readLine()) != null)
{
String line;
while ((line = br.readLine()) != null)
@@
-145,7
+144,7
@@
public abstract class FTSRestClient implements FTSRestClientI
@Override
public String toString()
{
@Override
public String toString()
{
- return lineData[0];
+ return getName();
}
@Override
}
@Override
@@
-172,7
+171,8
@@
public abstract class FTSRestClient implements FTSRestClientI
public DataTypeI getDataType()
{
final String[] dataTypeString = lineData[2].split("\\|");
public DataTypeI getDataType()
{
final String[] dataTypeString = lineData[2].split("\\|");
- final String classString = dataTypeString[0].toUpperCase();
+ final String classString = dataTypeString[0]
+ .toUpperCase(Locale.ROOT);
return new DataTypeI()
{
return new DataTypeI()
{
@@
-183,7
+183,7
@@
public abstract class FTSRestClient implements FTSRestClientI
if (dataTypeString.length > 1
&& dataTypeString[1] != null)
{
if (dataTypeString.length > 1
&& dataTypeString[1] != null)
{
- switch (dataTypeString[1].toUpperCase())
+ switch (dataTypeString[1].toUpperCase(Locale.ROOT))
{
case "T":
case "TRUE":
{
case "T":
case "TRUE":
@@
-291,8
+291,8
@@
public abstract class FTSRestClient implements FTSRestClientI
FTSDataColumnI that = (FTSDataColumnI) otherObject;
return otherObject == null ? false
: this.getCode().equals(that.getCode())
FTSDataColumnI that = (FTSDataColumnI) otherObject;
return otherObject == null ? false
: this.getCode().equals(that.getCode())
- && this.getName().equals(that.getName())
- && this.getGroup().equals(that.getGroup());
+ && this.getName().equals(that.getName())
+ && this.getGroup().equals(that.getGroup());
}
};
}
};
@@
-433,10
+433,16
@@
public abstract class FTSRestClient implements FTSRestClientI
"Couldn't find data column with name : " + nameOrCode);
}
"Couldn't find data column with name : " + nameOrCode);
}
- public static void createMockFTSRestClient(FTSRestClient instance,String workingQuery,
- String jsonResponse)
+ /**
+ *
+ * @param instance
+ * @param mocks
+ * {{working query, working response}, ...}
+ */
+ public static void createMockFTSRestClient(FTSRestClient instance,
+ String[][] mocks)
{
{
- instance.setMock(workingQuery,jsonResponse);
+ instance.setMock(mocks);
}
@Override
}
@Override
@@
-494,8
+500,7
@@
public abstract class FTSRestClient implements FTSRestClientI
public static void unMock(FTSRestClient instance)
{
public static void unMock(FTSRestClient instance)
{
- instance.mockQuery =null;
- instance.mockResponse =null;
+ instance.mockQueries = null;
}
protected String getResourceFile(String fileName)
}
protected String getResourceFile(String fileName)
@@
-522,15
+527,23
@@
public abstract class FTSRestClient implements FTSRestClientI
return defaultResponsePageSize;
}
return defaultResponsePageSize;
}
- protected void setMock(String workingQuery, String jsonResponse)
+ protected void setMock(String[][] mocks)
{
{
- mockQuery=workingQuery;
- mockResponse = jsonResponse;
+ if (mocks == null)
+ {
+ mockQueries = null;
+ return;
+ }
+ mockQueries = new HashMap<String, String>();
+ for (String[] mock : mocks)
+ {
+ mockQueries.put(mock[0], mock[1]);
+ }
}
protected boolean isMocked()
{
}
protected boolean isMocked()
{
- return mockQuery != null && mockResponse!=null;
+ return mockQueries != null;
}
@Override
}
@Override
@@
-543,7
+556,8
@@
public abstract class FTSRestClient implements FTSRestClientI
columnNames = new String[] { "", "Display", "Group" };
break;
default:
columnNames = new String[] { "", "Display", "Group" };
break;
default:
- // non structure sources don't return any other kind of preferences columns
+ // non structure sources don't return any other kind of preferences
+ // columns
break;
}
return columnNames;
break;
}
return columnNames;