Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development

Former-commit-id: 4b16e5325f63bb7dde3d5a49770fd4c30b69266b

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CreateSubscriptionDlg.java

@@ -141,6 +141,7 @@ import com.raytheon.viz.ui.presenter.components.ComboBoxConf;
  * Sept 30, 2013  1797     dhladky     separated Time from GriddedTime
  * Oct 11, 2013   2386     mpduff      Refactor DD Front end.
  * Oct 15, 2013   2477     mpduff      Fix bug in group settings.
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -1545,6 +1546,10 @@ public class CreateSubscriptionDlg extends CaveSWTDialog {
      *            The subscription to get the registry id
      */
     private void setSubscriptionId(Subscription sub) {
+        if (sub.getOriginatingSite() == null) {
+            LocalizationManager lm = LocalizationManager.getInstance();
+            sub.setOriginatingSite(lm.getCurrentSite());
+        }
         String id = RegistryUtil.getRegistryObjectKey(sub);
         sub.setId(id);
     }

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java

@@ -131,6 +131,7 @@ import com.raytheon.viz.ui.presenter.IDisplay;
  * Jun 14, 2013 2108       mpduff       Refactored DataSizeUtils.
  * Oct 11, 2013   2386     mpduff       Refactor DD Front end.
  * Oct 15, 2013   2477     mpduff       Remove debug code.
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * </pre>
  * 
  * @author mpduff
@@ -539,6 +540,7 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements
 
         sub.setOwner((create) ? LocalizationManager.getInstance()
                 .getCurrentUser() : this.subscription.getOwner());
+        sub.setOriginatingSite(LocalizationManager.getInstance().getCurrentSite());
 
         return setupCommonSubscriptionAttributes(sub, defaultRoute);
     }

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java

@@ -46,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 21, 2013 2020       mpduff       Rename UserSubscription to SiteSubscription.
  * Oct 2,  2013 1797       dhladky      Generics start
  * Oct 11, 2013 2460       dhladky      Restored Adhoc's to registryObject store, WFO only
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -57,7 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 @RegistryObject({ Subscription.PROVIDER_NAME_SLOT, Subscription.NAME_SLOT,
-    Subscription.DATA_SET_SLOT, Subscription.OWNER_SLOT })
+    Subscription.DATA_SET_SLOT, Subscription.OWNER_SLOT, Subscription.ORIGINATING_SITE_SLOT })
 public class AdhocSubscription<T extends Time, C extends Coverage> extends SiteSubscription<T, C>  {
 
     private static final long serialVersionUID = -2200080380095632486L;

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/InitialPendingSharedSubscription.java

@@ -41,6 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * ------------ ---------- ----------- --------------------------
  * Apr 02, 2013 1841       djohnson    Initial creation
  * Sept 30, 2013 1797      dhladky     Generics
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -53,7 +54,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @RegistryObject(value = { Subscription.PROVIDER_NAME_SLOT,
         Subscription.NAME_SLOT, Subscription.DATA_SET_SLOT,
         Subscription.OWNER_SLOT,
-        InitialPendingSubscription.CHANGE_REQUEST_ID_SLOT })
+        InitialPendingSubscription.CHANGE_REQUEST_ID_SLOT,
+        Subscription.ORIGINATING_SITE_SLOT})
 public class InitialPendingSharedSubscription<T extends Time, C extends Coverage> extends SharedSubscription<T, C>
         implements InitialPendingSubscription<T, C> {
     private static final long serialVersionUID = 2779084460608459754L;

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/InitialPendingSiteSubscription.java

@@ -58,7 +58,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @RegistryObject(value = { Subscription.PROVIDER_NAME_SLOT,
         Subscription.NAME_SLOT, Subscription.DATA_SET_SLOT,
         Subscription.OWNER_SLOT,
-        InitialPendingSubscription.CHANGE_REQUEST_ID_SLOT })
+        InitialPendingSubscription.CHANGE_REQUEST_ID_SLOT,
+        Subscription.ORIGINATING_SITE_SLOT})
 public class InitialPendingSiteSubscription<T extends Time, C extends Coverage> extends SiteSubscription<T, C> implements
         InitialPendingSubscription<T, C> {
     private static final long serialVersionUID = 2779084460608459754L;
@@ -138,4 +139,5 @@ public class InitialPendingSiteSubscription<T extends Time, C extends Coverage>
     public Subscription<T, C> subscription() {
         return new SiteSubscription<T, C>(this);
     }
+
 }

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/RecurringSubscription.java

@@ -60,6 +60,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  * May 15, 2013 1040       mpduff       Changed to use Set for office id.
  * May 21, 2013 2020       mpduff       Rename UserSubscription to SiteSubscription.
  * Sept 30,2013 1797       dhladky      Generics
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -115,6 +116,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
         this.setRoute(sub.getRoute());
         this.setLatencyInMinutes(sub.getLatencyInMinutes());
         this.setEnsemble(sub.getEnsemble());
+        this.setOriginatingSite(sub.getOriginatingSite());
 
         // Set the registry id
         this.setId(RegistryUtil.getRegistryObjectKey(this));
@@ -250,6 +252,11 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
     @XmlAttribute
     @DynamicSerializeElement
     private int latencyInMinutes;
+    
+    @XmlAttribute
+    @DynamicSerializeElement
+    @SlotAttribute(Subscription.ORIGINATING_SITE_SLOT)
+    private String originatingSite;
 
     /**
      * Get subscription name.
@@ -783,6 +790,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
             builder.append(getName(), other.getName());
             builder.append(getDataSetName(), other.getDataSetName());
             builder.append(getOwner(), other.getOwner());
+            builder.append(getOriginatingSite(), other.getOriginatingSite());
 
             return builder.isEquals();
         }
@@ -796,6 +804,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
         builder.append(getName());
         builder.append(getDataSetName());
         builder.append(getOwner());
+        builder.append(getOriginatingSite());
 
         return builder.toHashCode();
     }
@@ -803,7 +812,7 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
     @Override
     public String toString() {
         return getName() + "::" + getProvider() + "::" + getDataSetName()
-                + "::" + getOwner();
+                + "::" + getOwner()+ "::"+getOriginatingSite();
     }
 
     /**
@@ -931,4 +940,12 @@ public abstract class RecurringSubscription<T extends Time, C extends Coverage>
     public void setEnsemble(Ensemble ensemble) {
         this.ensemble = ensemble;
     }
+    
+    public void setOriginatingSite(String originatingSite) {
+        this.originatingSite = originatingSite;
+    }
+    
+    public String getOriginatingSite() {
+        return originatingSite;
+    }
 }

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SharedSubscription.java

@@ -39,6 +39,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 15, 2013 1040       mpduff      Added addOfficeId.
  * May 29, 2013 1650       djohnson    Add setOwner() so reflection works.
  * Sept 30, 2013 1797      dhladky     Generics
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -49,7 +50,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @XmlAccessorType(XmlAccessType.NONE)
 @RegistryObject(value = { Subscription.PROVIDER_NAME_SLOT,
         Subscription.NAME_SLOT, Subscription.DATA_SET_SLOT,
-        Subscription.OWNER_SLOT })
+        Subscription.OWNER_SLOT,
+        Subscription.ORIGINATING_SITE_SLOT})
 @DynamicSerialize
 public class SharedSubscription<T extends Time, C extends Coverage> extends RecurringSubscription<T, C> {
 

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

@@ -62,6 +62,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Jun 13, 2013 2095        djohnson    Duplicate 13.5.1 change so bandwidth manager deletes subscriptions correctly.
  * Jun 24, 2013 2106        djohnson    Add copy constructor.
  * Sept 30, 2013 1797       dhladky     Some Generics
+ * Oct 23, 2013   2484     dhladky     Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -72,7 +73,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 @RegistryObject({ Subscription.PROVIDER_NAME_SLOT, Subscription.NAME_SLOT,
-        Subscription.DATA_SET_SLOT, Subscription.OWNER_SLOT })
+        Subscription.DATA_SET_SLOT, Subscription.OWNER_SLOT,
+        Subscription.ORIGINATING_SITE_SLOT})
 @DynamicSerialize
 public class SiteSubscription<T extends Time, C extends Coverage> extends RecurringSubscription<T, C> {
     private static final long serialVersionUID = -6422673887457060034L;

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java

@@ -40,6 +40,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
  * May 15, 2013 1040       mpduff       Changed officeId to a set.
  * Jul 11, 2013 2106       djohnson     SubscriptionPriority allows comparison.
  * Sept 30,2013 1797       dhladky      Abstracted and genericized.
+ * Oct 23, 2013 2484       dhladky      Unique ID for subscriptions updated.
  * 
  * </pre>
  * 
@@ -141,6 +142,9 @@ public interface Subscription<T extends Time, C extends Coverage> {
 
     /** Route slot */
     String ROUTE_SLOT = "route";
+    
+    /** Originating Site slot */
+    String ORIGINATING_SITE_SLOT = "originatingSite";
 
     /**
      * Get subscription name.
@@ -614,4 +618,16 @@ public interface Subscription<T extends Time, C extends Coverage> {
      *            Office Id to add
      */
     void addOfficeID(String officeId);
+    
+    /**
+     * Gets the original site the subscription was created as
+     * @return
+     */
+    String getOriginatingSite();
+    
+    /**
+     * Sets the originating Site the subscription was created as
+     * @param originatingSite
+     */
+    void setOriginatingSite(String originatingSite);
 }