Author: kwright
Date: Sat May 9 08:26:39 2015
New Revision: 1678472
URL: http://svn.apache.org/r1678472
Log:
Stopgap SearchBlox connector fix, pulled up from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 9 08:26:39 2015
@@ -123,4 +123,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471
Modified:
manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java?rev=1678472&r1=1678471&r2=1678472&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
Sat May 9 08:26:39 2015
@@ -91,11 +91,14 @@ public class SearchBloxConnector extends
private static final long BUILDER_DEFAULT_SOCKET_TIMEOUT = 60;
private static final long BUILDER_DEFAULT_CONNECTION_TIMEOUT = 60;
- private ResteasyClientBuilder restBuilder = null;
private SearchBloxClient client = null;
private String apiKey = null;
private String lastVersion = null;
+ private int poolSize = BUILDER_DEFAULT_POOL_SIZE;
+ private long socketTimeout = BUILDER_DEFAULT_SOCKET_TIMEOUT;
+ private long connectionTimeout = BUILDER_DEFAULT_CONNECTION_TIMEOUT;
+
public SearchBloxConnector() {
}
@@ -118,7 +121,6 @@ public class SearchBloxConnector extends
public void disconnect() throws ManifoldCFException {
if (client != null) {
apiKey = null;
- restBuilder = null;
client = null;
}
super.disconnect();
@@ -136,56 +138,22 @@ public class SearchBloxConnector extends
CREATION_ACTIVITY };
}
- protected synchronized void getSession(Map<String, List<String>> args,
String version) {
+ protected void getSession() {
if (client == null) {
String endpoint =
params.getParameter(SEARCHBLOX_ENDPOINT);
this.apiKey =
params.getParameter(SearchBloxDocument.API_KEY);
ResteasyClientBuilder builder = new
ResteasyClientBuilder();
- builder.connectionPoolSize(BUILDER_DEFAULT_POOL_SIZE);
- builder.socketTimeout(BUILDER_DEFAULT_SOCKET_TIMEOUT,
- TimeUnit.SECONDS);
- builder.establishConnectionTimeout(
- BUILDER_DEFAULT_CONNECTION_TIMEOUT,
TimeUnit.SECONDS);
- this.restBuilder = builder;
- client = new SearchBloxClient(apiKey, this.restBuilder,
endpoint);
+ builder.connectionPoolSize(poolSize);
+ builder.establishConnectionTimeout(connectionTimeout,
TimeUnit.SECONDS);
+ builder.socketTimeout(socketTimeout, TimeUnit.SECONDS);
+ client = new SearchBloxClient(apiKey, builder,
endpoint);
}
- if(args != null && !version.equals(lastVersion)){
-
- lastVersion = version;
-
- try{
- int poolSize =
- Integer.parseInt(args.get(
-
SearchBloxConfig.ATTRIBUTE_POOLSIZE).get(0));
- this.restBuilder.connectionPoolSize(poolSize);
- }catch(NumberFormatException e){
- Logging.connectors.error("Incorrect Argument
Value for Client Pool Size", e);
- }
-
- try{
- int connectionTimeout =
- Integer.parseInt(args.get(
-
SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION).get(0));
-
this.restBuilder.connectionPoolSize(connectionTimeout);
- }catch(NumberFormatException e){
- Logging.connectors.error("Incorrect Argument
Value for Client Connection Timeout", e);
- }
-
- try{
- int socketTimeout =
- Integer.parseInt(args.get(
-
SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET).get(0));
-
this.restBuilder.connectionPoolSize(socketTimeout);
- }catch(NumberFormatException e){
- Logging.connectors.error("Incorrect Argument
Value for Client Socket Timeout", e);
- }
- }
}
@Override
public String check() throws ManifoldCFException {
- getSession(null, null);
+ getSession();
try {
String format =
getConfiguration().getParameter(SEARCHBLOX_INDEXING_FORMAT);
if (client.ping(format)) {
@@ -309,10 +277,10 @@ public class SearchBloxConnector extends
SpecPacker sp = new
SpecPacker(pipelineDescription.getSpecification());
Map<String, List<String>> args = sp.getArgs();
// Establish a session
- getSession(args, pipelineDescription.getVersionString());
+ getSession();
SearchBloxDocument sbDoc = new SearchBloxDocument(this.apiKey,
- documentURI, document, sp.getArgs());
+ documentURI, document, args);
String format =
this.getConfiguration().getParameter(SEARCHBLOX_INDEXING_FORMAT);
long startTime = System.currentTimeMillis();
try {
@@ -372,7 +340,7 @@ public class SearchBloxConnector extends
SpecPacker packer = new SpecPacker(outputDescription);
Map<String, List<String>> args = packer.getArgs();
// Establish a session
- getSession(args, packer.toPackedString());
+ getSession();
SearchBloxDocument document = new
SearchBloxDocument(this.apiKey);
document.uid = documentURI;
