Author: kwright
Date: Fri Mar 24 11:34:35 2017
New Revision: 1788411
URL: http://svn.apache.org/viewvc?rev=1788411&view=rev
Log:
Finish off porting conffluence connector
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Attachment.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/ConfluenceResponse.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Label.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Space.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Spaces.java
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/builder/ConfluenceResourceBuilder.java
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Fri Mar 24 11:34:35 2017
@@ -19,6 +19,7 @@ package org.apache.manifoldcf.crawler.co
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.StringReader;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Locale;
@@ -60,9 +61,10 @@ import org.apache.manifoldcf.crawler.con
import org.apache.manifoldcf.crawler.connectors.confluence.model.Space;
import org.apache.manifoldcf.crawler.connectors.confluence.model.Spaces;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.builder.ConfluenceResourceBuilder;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -337,21 +339,15 @@ public class ConfluenceClient {
throws Exception {
String stringEntity = EntityUtils.toString(entity);
- JSONObject responseObject;
- try {
- responseObject = new JSONObject(stringEntity);
- ConfluenceResponse<T> response = ConfluenceResponse
- .fromJson(responseObject, builder);
- if (response.getResults().size() == 0) {
- logger.debug("[Processing] No {} found in the Confluence response",
builder.getType().getSimpleName());
- }
-
- return response;
- } catch (JSONException e) {
- logger.debug("Error parsing JSON response");
- throw new Exception();
+ final JSONParser parser = new JSONParser();
+ final JSONObject responseObject = (JSONObject)parser.parse(new
StringReader(stringEntity));
+ ConfluenceResponse<T> response = ConfluenceResponse
+ .fromJson(responseObject, builder);
+ if (response.getResults().size() == 0) {
+ logger.debug("[Processing] No {} found in the Confluence response",
builder.getType().getSimpleName());
}
+ return response;
}
/**
@@ -590,16 +586,11 @@ public class ConfluenceClient {
private MutablePage pageFromHttpEntity(HttpEntity entity) throws Exception {
String stringEntity = EntityUtils.toString(entity);
- JSONObject responseObject;
- try {
- responseObject = new JSONObject(stringEntity);
- @SuppressWarnings("unchecked")
- MutablePage response =
((ConfluenceResourceBuilder<MutablePage>)MutablePage.builder()).fromJson(responseObject,
new MutablePage());
- return response;
- } catch (JSONException e) {
- logger.debug("Error parsing JSON page response data");
- throw new Exception("Error parsing JSON page response data");
- }
+ final JSONParser parser = new JSONParser();
+ final JSONObject responseObject = (JSONObject)parser.parse(new
StringReader(stringEntity));
+ @SuppressWarnings("unchecked")
+ MutablePage response =
((ConfluenceResourceBuilder<MutablePage>)MutablePage.builder()).fromJson(responseObject,
new MutablePage());
+ return response;
}
/**
@@ -611,17 +602,12 @@ public class ConfluenceClient {
private MutableAttachment attachmentFromHttpEntity(HttpEntity entity)
throws Exception {
String stringEntity = EntityUtils.toString(entity);
- JSONObject responseObject;
- try {
- responseObject = new JSONObject(stringEntity);
- MutableAttachment response = (MutableAttachment) Attachment
- .builder()
- .fromJson(responseObject, new MutableAttachment());
- return response;
- } catch (JSONException e) {
- logger.debug("Error parsing JSON page response data");
- throw new Exception("Error parsing JSON page response data");
- }
+ final JSONParser parser = new JSONParser();
+ final JSONObject responseObject = (JSONObject)parser.parse(new
StringReader(stringEntity));;
+ MutableAttachment response = (MutableAttachment) Attachment
+ .builder()
+ .fromJson(responseObject, new MutableAttachment());
+ return response;
}
/**
@@ -681,10 +667,10 @@ public class ConfluenceClient {
url, username, space.getKey());
HttpPost httpPost = createPostRequest(url);
- JSONArray jsonArray = new JSONArray();
- jsonArray.put(space.getKey());
- jsonArray.put(username);
- StringEntity stringEntity = new StringEntity(jsonArray.toString());
+ final JSONArray jsonArray = new JSONArray();
+ jsonArray.add(space.getKey());
+ jsonArray.add(username);
+ StringEntity stringEntity = new StringEntity(jsonArray.toJSONString());
httpPost.setEntity(stringEntity);
HttpResponse response = httpClient.execute(httpPost);
if (response.getStatusLine().getStatusCode() != 200) {
@@ -700,36 +686,22 @@ public class ConfluenceClient {
private Spaces spacesFromHttpEntity(HttpEntity entity) throws Exception {
String stringEntity = EntityUtils.toString(entity);
+ final JSONParser parser = new JSONParser();
+ final JSONArray responseObject = (JSONArray)parser.parse(new
StringReader(stringEntity));
+ Spaces response = Spaces.fromJson(responseObject);
- JSONArray responseObject;
- try {
- responseObject = new JSONArray(stringEntity);
- Spaces response = Spaces.fromJson(responseObject);
-
- return response;
- } catch (JSONException e) {
- logger.debug("Error parsing JSON spaces response data");
- throw new Exception("Error parsing JSON spaces response data");
- }
-
+ return response;
}
private List<String> permissionsFromHttpEntity(HttpEntity entity) throws
Exception {
String stringEntity = EntityUtils.toString(entity);
-
- JSONArray responseObject;
- List<String> permissions = Lists.newArrayList();
- try {
- responseObject = new JSONArray(stringEntity);
- for(int i=0,len=responseObject.length();i<len;i++) {
- permissions.add(responseObject.getString(i));
- }
-
- return permissions;
- } catch (JSONException e) {
- logger.debug("Error parsing JSON space permissions response data");
- throw new Exception("Error parsing JSON space permissions respnse data");
+ final JSONParser parser = new JSONParser();
+ final JSONArray responseObject = (JSONArray)parser.parse(new
StringReader(stringEntity));
+ final List<String> permissions = Lists.newArrayList();
+ for(int i=0,len=responseObject.size();i<len;i++) {
+ permissions.add(responseObject.get(i).toString());
}
+ return permissions;
}
}
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Attachment.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Attachment.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Attachment.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Attachment.java
Fri Mar 24 11:34:35 2017
@@ -21,8 +21,10 @@ import java.io.InputStream;
import java.util.Map;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.builder.ConfluenceResourceBuilder;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
/**
* <p>
@@ -95,27 +97,23 @@ public class Attachment extends Page {
public Attachment fromJson(JSONObject jsonPage, Attachment attachment) {
((ConfluenceResourceBuilder<Page>) Page.builder()).fromJson(jsonPage,
attachment);
- try {
- /*
- * Download URL
- */
-
- JSONObject links = (JSONObject) jsonPage.get(Page.KEY_LINKS);
- if (links != null) {
- attachment.downloadUrl = links.optString(KEY_DOWNLOAD, "");
- }
-
- /*
- * Extensions
- */
- JSONObject extensions = (JSONObject) jsonPage
- .get(KEY_EXTENSIONS);
- if (extensions != null) {
- attachment.mediaType = extensions.optString(
- Page.KEY_MEDIATYPE, "");
- }
- } catch (JSONException e) {
- e.printStackTrace();
+ /*
+ * Download URL
+ */
+
+ JSONObject links = (JSONObject) jsonPage.get(Page.KEY_LINKS);
+ if (links != null) {
+ attachment.downloadUrl =
(links.get(KEY_DOWNLOAD)==null)?"":links.get(KEY_DOWNLOAD).toString();
+ }
+
+ /*
+ * Extensions
+ */
+ JSONObject extensions = (JSONObject) jsonPage
+ .get(KEY_EXTENSIONS);
+ if (extensions != null) {
+ final Object o = extensions.get(Page.KEY_MEDIATYPE);
+ attachment.mediaType = (o==null)?"":o.toString();
}
return attachment;
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/ConfluenceResponse.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/ConfluenceResponse.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/ConfluenceResponse.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/ConfluenceResponse.java
Fri Mar 24 11:34:35 2017
@@ -21,9 +21,8 @@ import java.util.ArrayList;
import java.util.List;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.builder.ConfluenceResourceBuilder;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
public class ConfluenceResponse<T extends ConfluenceResource> {
@@ -57,29 +56,21 @@ public class ConfluenceResponse<T extend
public static <T extends ConfluenceResource> ConfluenceResponse<T>
fromJson(JSONObject response, ConfluenceResourceBuilder<T> builder) {
List<T> resources = new ArrayList<T>();
- try {
- JSONArray jsonArray = response.getJSONArray("results");
- for(int i=0,size=jsonArray.length(); i<size;i++) {
- JSONObject jsonPage = jsonArray.getJSONObject(i);
- T resource = (T) builder.fromJson(jsonPage);
- resources.add(resource);
- }
-
- int limit = response.getInt("limit");
- int start = response.getInt("start");
- Boolean isLast = false;
- JSONObject links = response.getJSONObject("_links");
- if(links != null) {
- isLast = links.optString("next",
"undefined").equalsIgnoreCase("undefined");
- }
-
- return new ConfluenceResponse<T>(resources, start, limit, isLast);
+ JSONArray jsonArray = (JSONArray)response.get("results");
+ for(int i=0,size=jsonArray.size(); i<size;i++) {
+ JSONObject jsonPage = (JSONObject)jsonArray.get(i);
+ T resource = (T) builder.fromJson(jsonPage);
+ resources.add(resource);
+ }
- } catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ int limit = ((Long)response.get("limit")).intValue();
+ int start = ((Long)response.get("start")).intValue();
+ Boolean isLast = false;
+ JSONObject links = (JSONObject)response.get("_links");
+ if(links != null) {
+ isLast = (links.get("next")==null);
}
-
- return new ConfluenceResponse<T>(new ArrayList<T>(), 0,0,false);
+
+ return new ConfluenceResponse<T>(resources, start, limit, isLast);
}
}
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Label.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Label.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Label.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Label.java
Fri Mar 24 11:34:35 2017
@@ -18,7 +18,7 @@
package org.apache.manifoldcf.crawler.connectors.confluence.model;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.builder.ConfluenceResourceBuilder;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
/**
* <p>
@@ -84,9 +84,9 @@ public class Label extends ConfluenceRes
public Label fromJson(JSONObject jsonPage, Label label) {
- label.id = jsonPage.optString(KEY_ID, "");
- label.prefix = jsonPage.optString(KEY_PREFIX, "");
- label.name = jsonPage.optString(KEY_NAME, "");
+ label.id =
(jsonPage.get(KEY_ID)==null)?"":jsonPage.get(KEY_ID).toString();
+ label.prefix =
(jsonPage.get(KEY_PREFIX)==null)?"":jsonPage.get(KEY_PREFIX).toString();
+ label.name =
(jsonPage.get(KEY_NAME)==null)?"":jsonPage.get(KEY_NAME).toString();
label.delegated = jsonPage;
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java
Fri Mar 24 11:34:35 2017
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.manifoldcf.core.common.DateParser;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.builder.ConfluenceResourceBuilder;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -268,101 +268,81 @@ public class Page extends ConfluenceReso
public Page fromJson(JSONObject jsonPage, Page page) {
- try {
- String id = jsonPage.getString(KEY_ID);
- String type = jsonPage.getString(KEY_TYPE);
- String title = jsonPage.getString(KEY_TITLE);
-
- page.delegated = jsonPage;
-
- /* Init Page fields */
- page.id = id;
- page.type = PageType.fromName(type);
- page.title = title;
-
- page.space = processSpace(jsonPage);
-
- /*
- * Url & WebUrl
- */
- JSONObject links = (JSONObject) jsonPage.get(KEY_LINKS);
- if (links != null) {
- page.url = links.optString(KEY_SELF, "");
- String webUrl = (String) links.optString(KEY_WEBUI, "");
- page.urlContext = (String) links.optString(KEY_CONTEXT, "");
- page.baseUrl = (String) links.optString(KEY_BASE, "");
- page.webUrl = page.baseUrl + webUrl;
+ String id = jsonPage.get(KEY_ID).toString();
+ String type = jsonPage.get(KEY_TYPE).toString();
+ String title = jsonPage.get(KEY_TITLE).toString();
+
+ page.delegated = jsonPage;
+
+ /* Init Page fields */
+ page.id = id;
+ page.type = PageType.fromName(type);
+ page.title = title;
+
+ page.space = processSpace(jsonPage);
+
+ /*
+ * Url & WebUrl
+ */
+ JSONObject links = (JSONObject) jsonPage.get(KEY_LINKS);
+ if (links != null) {
+ page.url =
(links.get(KEY_SELF)==null)?"":links.get(KEY_SELF).toString();
+ String webUrl =
(links.get(KEY_WEBUI)==null)?"":links.get(KEY_WEBUI).toString();
+ page.urlContext =
(links.get(KEY_CONTEXT)==null)?"":links.get(KEY_CONTEXT).toString();
+ page.baseUrl =
(links.get(KEY_BASE)==null)?"":links.get(KEY_BASE).toString();
+ page.webUrl = page.baseUrl + webUrl;
- }
-
- /*
- * Created By and created Date
- */
- JSONObject history = (JSONObject) jsonPage
- .optJSONObject(KEY_HISTORY);
- if (history != null) {
-
- page.createdDate = DateParser.parseISO8601Date(history
- .optString(KEY_CREATED_DATE, ""));
- JSONObject createdBy = (JSONObject) history
- .optJSONObject(KEY_CREATED_BY);
- if (createdBy != null) {
- page.creator = createdBy
- .optString(KEY_DISPLAY_NAME, "");
- page.creatorUsername = createdBy.optString(
- KEY_USER_NAME, "");
- }
+ }
+ /*
+ * Created By and created Date
+ */
+ JSONObject history = (JSONObject) jsonPage.get(KEY_HISTORY);
+ if (history != null) {
+
+ page.createdDate =
DateParser.parseISO8601Date((history.get(KEY_CREATED_DATE)==null)?"":history.get(KEY_CREATED_DATE).toString());
+ JSONObject createdBy = (JSONObject) history.get(KEY_CREATED_BY);
+ if (createdBy != null) {
+ page.creator =
(createdBy.get(KEY_DISPLAY_NAME)==null)?"":createdBy.get(KEY_DISPLAY_NAME).toString();
+ page.creatorUsername =
(createdBy.get(KEY_USER_NAME)==null)?"":createdBy.get(KEY_USER_NAME).toString();
}
- /*
- * Last modifier and Last modified date
- */
- JSONObject version = (JSONObject) jsonPage
- .optJSONObject(KEY_VERSION);
- if (version != null) {
- JSONObject by = version.getJSONObject(KEY_BY);
- if (by != null) {
- page.lastModifier = by.optString(KEY_DISPLAY_NAME);
- page.lastModifierUsername = by.optString(KEY_USER_NAME,
- "");
- }
-
- page.lastModified = DateParser.parseISO8601Date(version
- .optString(KEY_WHEN, ""));
- }
+ }
- /*
- * Page Content
- */
- JSONObject body = (JSONObject) jsonPage.optJSONObject(KEY_BODY);
- if (body != null) {
- JSONObject view = (JSONObject) body.optJSONObject(KEY_VIEW);
- if (view != null) {
- page.content = view.optString(KEY_VALUE, null);
- page.length = page.content.getBytes(StandardCharsets.UTF_8).length;
- }
+ /*
+ * Last modifier and Last modified date
+ */
+ JSONObject version = (JSONObject) jsonPage.get(KEY_VERSION);
+ if (version != null) {
+ JSONObject by = (JSONObject) version.get(KEY_BY);
+ if (by != null) {
+ page.lastModifier =
(by.get(KEY_DISPLAY_NAME)==null)?"":by.get(KEY_DISPLAY_NAME).toString();
+ page.lastModifierUsername =
(by.get(KEY_USER_NAME)==null)?"":by.get(KEY_USER_NAME).toString();
}
- return page;
-
- } catch (JSONException e) {
- e.printStackTrace();
+ page.lastModified =
DateParser.parseISO8601Date((version.get(KEY_WHEN)==null)?"":version.get(KEY_WHEN).toString());
}
- return new Page();
+ /*
+ * Page Content
+ */
+ JSONObject body = (JSONObject) jsonPage.get(KEY_BODY);
+ if (body != null) {
+ JSONObject view = (JSONObject) body.get(KEY_VIEW);
+ if (view != null) {
+ page.content =
(view.get(KEY_VALUE)==null)?"":view.get(KEY_VALUE).toString();
+ page.length = page.content.getBytes(StandardCharsets.UTF_8).length;
+ }
+ }
+ return page;
}
private static String processSpace(JSONObject page) {
/* Page */
- try {
- JSONObject space = (JSONObject) page.get(KEY_SPACE);
- if (space != null)
- return space.optString(KEY_KEY, "");
- } catch (JSONException e) {
- return "";
- }
+ JSONObject space = (JSONObject) page.get(KEY_SPACE);
+ if (space != null)
+ return (space.get(KEY_KEY)==null)?"":space.get(KEY_KEY).toString();
return "";
}
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Space.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Space.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Space.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Space.java
Fri Mar 24 11:34:35 2017
@@ -17,7 +17,7 @@
package org.apache.manifoldcf.crawler.connectors.confluence.model;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
public class Space {
@@ -62,10 +62,10 @@ public class Space {
public static Space fromJson(JSONObject spaceJson) {
Space space = new Space();
- space.key = spaceJson.optString(KEY_KEY, "");
- space.name = spaceJson.optString(KEY_NAME, "");
- space.type = spaceJson.optString(KEY_TYPE, "");
- space.url = spaceJson.optString(KEY_URL, "");
+ space.key =
(spaceJson.get(KEY_KEY)==null)?"":spaceJson.get(KEY_KEY).toString();
+ space.name =
(spaceJson.get(KEY_NAME)==null)?"":spaceJson.get(KEY_NAME).toString();
+ space.type =
(spaceJson.get(KEY_TYPE)==null)?"":spaceJson.get(KEY_TYPE).toString();
+ space.url =
(spaceJson.get(KEY_URL)==null)?"":spaceJson.get(KEY_URL).toString();
return space;
}
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Spaces.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Spaces.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Spaces.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Spaces.java
Fri Mar 24 11:34:35 2017
@@ -19,9 +19,8 @@ package org.apache.manifoldcf.crawler.co
import java.util.ArrayList;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,16 +35,10 @@ public class Spaces extends ArrayList<Sp
public static Spaces fromJson(JSONArray jsonSpaces) {
Spaces spaces = new Spaces();
- for(int i=0,len=jsonSpaces.length();i<len;i++) {
- try {
- JSONObject spaceJson = jsonSpaces.getJSONObject(i);
- Space space = Space.fromJson(spaceJson);
- spaces.add(space);
- } catch (JSONException e) {
- logger.debug("Error obtaining JSON item from spaces. Item {} is not a
JSON Object", i);
- e.printStackTrace();
- continue;
- }
+ for(int i=0,len=jsonSpaces.size();i<len;i++) {
+ JSONObject spaceJson = (JSONObject)jsonSpaces.get(i);
+ Space space = Space.fromJson(spaceJson);
+ spaces.add(space);
}
return spaces;
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/builder/ConfluenceResourceBuilder.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/builder/ConfluenceResourceBuilder.java?rev=1788411&r1=1788410&r2=1788411&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/builder/ConfluenceResourceBuilder.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/builder/ConfluenceResourceBuilder.java
Fri Mar 24 11:34:35 2017
@@ -18,7 +18,7 @@
package org.apache.manifoldcf.crawler.connectors.confluence.model.builder;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.ConfluenceResource;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
/**
* <p>ConfluenceResourceBuilder interface</p>
