You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2019/08/16 08:45:14 UTC
[oodt] branch development updated: [OODT-1018] OPSUI throwing
NotSerializableException on several classes (#103)
This is an automated email from the ASF dual-hosted git repository.
magicaltrout pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/oodt.git
The following commit(s) were added to refs/heads/development by this push:
new 3458cdd [OODT-1018] OPSUI throwing NotSerializableException on several classes (#103)
3458cdd is described below
commit 3458cdd1a413c627fe351da4f56f481e96abd204
Author: Yasith Jayawardana <ya...@icloud.com>
AuthorDate: Fri Aug 16 04:45:09 2019 -0400
[OODT-1018] OPSUI throwing NotSerializableException on several classes (#103)
* make ProductPage, ProductType, Reference, CrawlerStatus and WorkflowInstancePage serializable
* implemment serializable in classes at org.apache.oodt.pcs.health
* Implement Serializable on FileManagerUtils, ResourceManagerUtils and WorkflowManagerUtils
* add ExtractorSpec, FMClient, RMClient and WMClient to Serializable
---
.../main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java | 3 ++-
.../main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java | 3 ++-
.../main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java | 3 ++-
.../src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java | 3 ++-
.../java/org/apache/oodt/cas/filemgr/system/FileManagerClient.java | 3 ++-
pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlInfo.java | 4 +++-
pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java | 4 +++-
.../java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java | 4 +++-
pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerStatus.java | 4 +++-
.../src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java | 4 +++-
.../src/main/java/org/apache/oodt/pcs/health/PCSDaemonStatus.java | 4 +++-
.../main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java | 4 +++-
.../main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java | 3 ++-
.../main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java | 4 +++-
pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java | 3 ++-
.../src/main/java/org/apache/oodt/pcs/util/ResourceManagerUtils.java | 3 ++-
.../src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java | 3 ++-
.../org/apache/oodt/cas/resource/system/ResourceManagerClient.java | 3 ++-
.../org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java | 3 ++-
.../org/apache/oodt/cas/workflow/system/WorkflowManagerClient.java | 3 ++-
20 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java
index 2019ae7..e276642 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java
@@ -18,6 +18,7 @@
package org.apache.oodt.cas.filemgr.structs;
//JDK imports
+import java.io.Serializable;
import java.util.Properties;
/**
@@ -29,7 +30,7 @@ import java.util.Properties;
* a {@link FilemgrMetExtractor}.
* </p>.
*/
-public class ExtractorSpec {
+public class ExtractorSpec implements Serializable {
private String className;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java
index 84b3601..40824fb 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java
@@ -17,6 +17,7 @@
package org.apache.oodt.cas.filemgr.structs;
+import java.io.Serializable;
import java.util.Collections;
//JDK imports
import java.util.List;
@@ -32,7 +33,7 @@ import java.util.Vector;
* </p>
*
*/
-public class ProductPage {
+public class ProductPage implements Serializable {
/* the number of this page */
private int pageNum = -1;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java
index 4458fba..ddbcdbc 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java
@@ -17,6 +17,7 @@
package org.apache.oodt.cas.filemgr.structs;
+import java.io.Serializable;
import java.util.Collections;
//JDK imports
import java.util.List;
@@ -39,7 +40,7 @@ import org.apache.oodt.cas.metadata.Metadata;
* </p>
*
*/
-public class ProductType {
+public class ProductType implements Serializable {
/* the unique ID representing this product type */
private String productTypeId = null;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
index 7811c70..178cfe0 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
@@ -29,6 +29,7 @@ import org.apache.tika.mime.MimeTypesFactory;
import java.io.File;
import java.io.FileInputStream;
+import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -45,7 +46,7 @@ import java.util.logging.Logger;
* </p>
*
*/
-public class Reference {
+public class Reference implements Serializable {
private static Logger LOG = Logger.getLogger(Reference.class.getName());
/* the item's original location */
private String origReference = null;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManagerClient.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManagerClient.java
index c0fa46a..23667ca 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManagerClient.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/FileManagerClient.java
@@ -37,6 +37,7 @@ import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.Closeable;
import java.io.IOException;
+import java.io.Serializable;
import java.net.URL;
import java.util.List;
@@ -47,7 +48,7 @@ import java.util.List;
* <p>Interface of client for FileManager RPC logic. All methods that are used for
* RPC transfer.</p>
*/
-public interface FileManagerClient extends Closeable {
+public interface FileManagerClient extends Closeable, Serializable {
public boolean refreshConfigAndPolicy();
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlInfo.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlInfo.java
index c4be09d..9e3c7f2 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlInfo.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlInfo.java
@@ -17,6 +17,8 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
* Information about a crawler: its <code>crawlerName</code> and
* <code>crawlerPort</code>.
@@ -24,7 +26,7 @@ package org.apache.oodt.pcs.health;
* @author mattmann
* @version $Revision$
*/
-public class CrawlInfo {
+public class CrawlInfo implements Serializable {
private String crawlerName;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
index 000683e..c22afe8 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
@@ -18,6 +18,8 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
*
* Health of a PCS Crawler in terms of the number of crawls performed, and
@@ -27,7 +29,7 @@ package org.apache.oodt.pcs.health;
* @version $Revision$
*
*/
-public class CrawlerHealth {
+public class CrawlerHealth implements Serializable {
private String crawlerName;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
index 535d1f2..3f650f9 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
@@ -17,6 +17,8 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
*
* Met keys read from the {@link CrawlPropertiesFile}.
@@ -24,7 +26,7 @@ package org.apache.oodt.pcs.health;
* @author mattmann
* @version $Revision$
*/
-public interface CrawlerPropertiesMetKeys {
+public interface CrawlerPropertiesMetKeys extends Serializable {
String CRAWLER_INFO_GROUP = "CrawlerInfo";
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerStatus.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerStatus.java
index 53604df..32edc31 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerStatus.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerStatus.java
@@ -17,13 +17,15 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
* Provides status about a Crawler to the {@link PCSHealthMonitor}.
*
* @author mattmann
* @version $Revision$
*/
-public class CrawlerStatus {
+public class CrawlerStatus implements Serializable {
private CrawlInfo info;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
index 4406d70..25c99d0 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
@@ -18,6 +18,8 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
*
* A container representing Job health status in the PCS
@@ -25,7 +27,7 @@ package org.apache.oodt.pcs.health;
* @author mattmann
* @version $Revision$
*/
-public class JobHealthStatus {
+public class JobHealthStatus implements Serializable {
private String status;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSDaemonStatus.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSDaemonStatus.java
index 777d48e..a24c8f4 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSDaemonStatus.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSDaemonStatus.java
@@ -16,6 +16,8 @@
*/
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
* @author mattmann
* @version $Revision$
@@ -25,7 +27,7 @@ package org.apache.oodt.pcs.health;
* File Manager, the Workflow Manager, or the Resource Manager)
* </p>.
*/
-public class PCSDaemonStatus {
+public class PCSDaemonStatus implements Serializable {
private String daemonName;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
index 245e0da..d792065 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
@@ -17,13 +17,15 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
* Met keys for the {@link PCSHealthMonitor} tool
*
* @author mattmann
* @version $Revision$
*/
-public interface PCSHealthMonitorMetKeys {
+public interface PCSHealthMonitorMetKeys extends Serializable {
String HEADER_AND_FOOTER = "--------------------------------------";
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
index a85420a..caf68c5 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
@@ -21,6 +21,7 @@ package org.apache.oodt.pcs.health;
import org.apache.oodt.commons.date.DateUtils;
//JDK imports
+import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -33,7 +34,7 @@ import java.util.List;
* @author mattmann
* @version $Revision$
*/
-public class PCSHealthMonitorReport {
+public class PCSHealthMonitorReport implements Serializable {
private Date generationDate;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
index d4837f3..2345a66 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
@@ -17,6 +17,8 @@
package org.apache.oodt.pcs.health;
+import java.io.Serializable;
+
/**
*
* Met keys for the {@link WorkflowStatesFile}
@@ -24,7 +26,7 @@ package org.apache.oodt.pcs.health;
* @author mattmann
* @version $Revision$
*/
-public interface WorkflowStatesMetKeys {
+public interface WorkflowStatesMetKeys extends Serializable {
String WORKFLOW_STATES_GROUP = "WorkflowStatesGroup";
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
index f36431e..eec9ccd 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
@@ -36,6 +36,7 @@ import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.File;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -55,7 +56,7 @@ import java.util.logging.Logger;
* @version $Revision$
*
*/
-public class FileManagerUtils implements PCSConfigMetadata {
+public class FileManagerUtils implements PCSConfigMetadata, Serializable {
/* our log stream */
private static Logger LOG = Logger
.getLogger(FileManagerUtils.class.getName());
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/ResourceManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/ResourceManagerUtils.java
index d509d2a..cfae5c9 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/ResourceManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/ResourceManagerUtils.java
@@ -18,6 +18,7 @@
package org.apache.oodt.pcs.util;
//JDK imports
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
@@ -36,7 +37,7 @@ import org.apache.oodt.cas.resource.system.rpc.ResourceManagerFactory;
* @version $Revision$
*
*/
-public class ResourceManagerUtils {
+public class ResourceManagerUtils implements Serializable {
/* our resource manager client */
private ResourceManagerClient client;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
index 5db8e05..d9f5b51 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
@@ -22,6 +22,7 @@ import org.apache.oodt.cas.workflow.system.WorkflowManagerClient;
import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory;
import org.apache.xmlrpc.XmlRpcClient;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
@@ -38,7 +39,7 @@ import java.util.logging.Logger;
* @author mattmann
* @version $Revision$
*/
-public class WorkflowManagerUtils {
+public class WorkflowManagerUtils implements Serializable {
/* our workflow manager client */
private WorkflowManagerClient client;
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/ResourceManagerClient.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/ResourceManagerClient.java
index d5cacbe..d54749c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/ResourceManagerClient.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/ResourceManagerClient.java
@@ -26,10 +26,11 @@ import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+import java.io.Serializable;
import java.net.URL;
import java.util.List;
-public interface ResourceManagerClient {
+public interface ResourceManagerClient extends Serializable {
boolean isJobComplete(String jobId) throws JobRepositoryException;
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java
index 516c415..baf3cd1 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java
@@ -19,6 +19,7 @@
package org.apache.oodt.cas.workflow.structs;
//JDK imports
+import java.io.Serializable;
import java.util.List;
import java.util.Vector;
@@ -30,7 +31,7 @@ import java.util.Vector;
* Describe your class here
* </p>.
*/
-public class WorkflowInstancePage {
+public class WorkflowInstancePage implements Serializable {
/* the number of this page */
private int pageNum = -1;
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/WorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/WorkflowManagerClient.java
index ed0cfd1..784b828 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/WorkflowManagerClient.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/WorkflowManagerClient.java
@@ -25,6 +25,7 @@ import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
import java.io.Closeable;
+import java.io.Serializable;
import java.net.URL;
import java.util.List;
import java.util.Vector;
@@ -37,7 +38,7 @@ import java.util.Vector;
* Base interface for client RPC implementation.
* </p>
*/
-public interface WorkflowManagerClient extends Closeable {
+public interface WorkflowManagerClient extends Closeable, Serializable {
boolean refreshRepository()
throws Exception;