MATP-1102 Merge New Photon UI

admin/admin-api/src/main/java/org/marketcetera/admin/impl/SimplePermission.java

@@ -1,9 +1,14 @@
 package org.marketcetera.admin.impl;
 
+import java.util.Comparator;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.commons.lang3.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.marketcetera.admin.Permission;
 import org.marketcetera.persist.NDEntityBase;
 
@@ -20,7 +25,7 @@
 @XmlAccessorType(XmlAccessType.NONE)
 public class SimplePermission
         extends NDEntityBase
-        implements Permission
+        implements Permission,Comparator<SimplePermission>
 {
     /**
      * Create a new SimplePermission instance.
@@ -48,5 +53,38 @@ public String toString()
         builder.append("SimplePermission [name=").append(getName()).append(", description=").append(getDescription()).append("]");
         return builder.toString();
     }
+    /* (non-Javadoc)
+     * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+     */
+    @Override
+    public int compare(SimplePermission inO1,
+                       SimplePermission inO2)
+    {
+        return new CompareToBuilder().append(inO1.getName(),inO2.getName()).toComparison();
+
+    }
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        return new HashCodeBuilder().append(getName()).toHashCode();
+    }
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof SimplePermission)) {
+            return false;
+        }
+        SimplePermission other = (SimplePermission) obj;
+        return new EqualsBuilder().append(other.getName(),getName()).isEquals();
+    }
     private static final long serialVersionUID = 3085570489230392139L;
 }

core/pom.xml

@@ -75,10 +75,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.ow2.sirocco</groupId>
       <artifactId>sirocco-text-table-formatter</artifactId>

core/src/main/java/org/marketcetera/core/BaseClient.java

@@ -35,6 +35,18 @@ void stop()
      * @return a <code>boolean</code> value
      */
     boolean isRunning();
+    /**
+     * Add the given client status listener.
+     *
+     * @param inListener a <code>ClientStatusListener</code> value
+     */
+    void addClientStatusListener(ClientStatusListener inListener);
+    /**
+     * Remove the given client status listener.
+     *
+     * @param inListener a <code>ClientStatusListener</code> value
+     */
+    void removeClientStatusListener(ClientStatusListener inListener);
     /* (non-Javadoc)
      * @see java.io.Closeable#close()
      */

core/src/main/java/org/marketcetera/core/ClientStatusListener.java

@@ -0,0 +1,20 @@
+package org.marketcetera.core;
+
+/* $License$ */
+
+/**
+ * Registers for changes in the availability of a client.
+ *
+ * @author <a href="mailto:colin@marketcetera.com">Colin DuPlantis</a>
+ * @version $Id$
+ * @since $Release$
+ */
+public interface ClientStatusListener
+{
+    /**
+     * Receive the client status upon change.
+     *
+     * @param isAvailable a <code>boolean</code> value
+     */
+    void receiveClientStatus(boolean isAvailable);
+}

core/src/main/java/org/marketcetera/core/PlatformServices.java

@@ -1,10 +1,15 @@
 package org.marketcetera.core;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.UUID;
 
@@ -50,6 +55,38 @@ public void start()
                               "Starting {}",
                               getServiceName(getClass()));
     }
+    public static String getFileChecksum(File inFile)
+            throws NoSuchAlgorithmException, IOException
+    {
+        return getFileChecksum(MessageDigest.getInstance("SHA-256"),
+                               inFile);
+    }
+    public static String getFileChecksum(MessageDigest inDigest,
+                                         File inFile)
+            throws IOException
+    {
+        //Get file input stream for reading the file content
+        FileInputStream fis = new FileInputStream(inFile);
+        //Create byte array to read data in chunks
+        byte[] byteArray = new byte[1024];
+        int bytesCount = 0; 
+        //Read file data and update in message digest
+        while ((bytesCount = fis.read(byteArray)) != -1) {
+            inDigest.update(byteArray, 0, bytesCount);
+        };
+        //close the stream; We don't need it now.
+        fis.close();
+        //Get the hash's bytes
+        byte[] bytes = inDigest.digest();
+        //This bytes[] has bytes in decimal format;
+        //Convert it to hexadecimal format
+        StringBuilder sb = new StringBuilder();
+        for(int i=0; i< bytes.length ;i++) {
+            sb.append(Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1));
+        }
+        //return complete hash
+        return sb.toString();
+    }
     /**
      * Split the given value into its components where each component starts with a capital letter.
      *
@@ -272,4 +309,7 @@ public static Instrument getInstrument(String inFullSymbol)
      * hostname value
      */
     private static String hostname;
+    public static final CellStyle cellStyleRightAlign = new CellStyle(HorizontalAlign.right);
+    public static final CellStyle cellStyleLeftAlign = new CellStyle(HorizontalAlign.left);
+    public static final CellStyle cellStyleCenterAlign = new CellStyle(HorizontalAlign.center);
 }

core/src/main/java/org/marketcetera/core/notifications/MultiMethodNotificationExecutor.java

@@ -3,8 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import org.marketcetera.core.PlatformServices;
 import org.marketcetera.util.log.SLF4JLoggerProxy;
 
 /* $License$ */
@@ -21,6 +23,16 @@ public class MultiMethodNotificationExecutor
         extends AbstractNotificationExecutor
         implements NotificationExecutor
 {
+    /**
+     * Validate and start the object.
+     */
+    @PostConstruct
+    public void start()
+    {
+        SLF4JLoggerProxy.info(this,
+                              "Starting {}",
+                              PlatformServices.getServiceName(NotificationExecutor.class));
+    }
     /* (non-Javadoc)
      * @see com.marketcetera.ramius.strategy.NotificationExecutor#notify(org.marketcetera.core.notifications.INotification)
      */

core/src/main/java/org/marketcetera/core/notifications/NotificationExecutorMethod.java

@@ -3,7 +3,7 @@
 /* $License$ */
 
 /**
- *
+ * Provides a method for issuing notifications.
  *
  * @author <a href="mailto:colin@marketcetera.com">Colin DuPlantis</a>
  * @version $Id$

core/src/main/java/org/marketcetera/core/time/TimeFactoryImpl.java

@@ -9,6 +9,8 @@
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
 import org.marketcetera.util.misc.ClassVersion;
 import org.springframework.stereotype.Component;
 
@@ -138,4 +140,11 @@ public DateTime create(long inValue)
      */
     public static final DateTimeFormatter WALLCLOCK_MINUTES = new DateTimeFormatterBuilder().append(HOUR).append(COLON).append(MINUTE).toFormatter().withZone(ZONE);
     private static final DateTimeFormatter[] FORMATTERS = new DateTimeFormatter[] { FULL_SECONDS,WALLCLOCK_SECONDS,WALLCLOCK_MINUTES,WALLCLOCK_MILLISECONDS,US_DATE,INTL_DATE,FULL_MILLISECONDS_CONDENSED };
+    public static final PeriodFormatter periodFormatter = new PeriodFormatterBuilder().minimumPrintedDigits(2)
+            .appendYears().appendSeparator(":")
+            .appendMonths().appendSeparator(":")
+            .appendDays().appendSeparator(":").printZeroAlways()
+            .appendHours().appendSeparator(":")
+            .appendMinutes().appendSeparator(":")
+            .appendSeconds().toFormatter();
 }

core/src/main/java/org/marketcetera/persist/PageRequest.java

@@ -103,6 +103,17 @@ public PageRequest(int inPage,
         pageNumber = inPage;
         pageSize = inSize;
     }
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("PageRequest [pageNumber=").append(pageNumber).append(", pageSize=").append(pageSize)
+                .append(", sortOrder=").append(sortOrder).append("]");
+        return builder.toString();
+    }
     /**
      * page request which requests all data in a single page
      */

fork/commons-csv/pom.xml

@@ -73,19 +73,8 @@
   </properties>
 
   <build>
-      <sourceDirectory>src/java</sourceDirectory>
-      <testSourceDirectory>src/test</testSourceDirectory>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <configuration>
-                  <instructions>
-                      <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                  </instructions>
-              </configuration>
-          </plugin>
-      </plugins>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
   </build>
 
   <reporting>

marketdata/marketdata-rpc-server/src/main/java/org/marketcetera/marketdata/rpc/server/MarketDataRpcService.java

@@ -352,7 +352,7 @@ public void removeMarketDataStatusListener(MarketDataRpc.RemoveMarketDataStatusL
         private String buildRequestId(String inSessionId,
                                       String inRequestId)
         {
-            return new StringBuilder().append(inSessionId).append('-').append(inRequestId).toString();
+            return new StringBuilder().append("sessionId->").append(inSessionId).append("/requestId->").append(inRequestId).toString();
         }
     }
     /**

marketdata/marketdata-server/src/main/java/org/marketcetera/marketdata/service/MarketDataEventModuleConnector.java

@@ -1,7 +1,6 @@
 package org.marketcetera.marketdata.service;
 
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.marketcetera.event.Event;
@@ -55,7 +54,7 @@ public void onMarketDataRequestEvent(MarketDataRequestEvent inEvent)
                                "Received {}",
                                inEvent);
         String provider = inEvent.getMarketDataRequestProvider().orElse(null);
-        String requestId = UUID.randomUUID().toString(); // TODO does this need to be fixed? inEvent.getMarketDataRequestId();
+        String requestId = inEvent.getMarketDataRequestId();
         if(provider == null) {
             SLF4JLoggerProxy.debug(this,
                                    "No provider requested, issuing request to all providers");

marketdata/marketdata-server/src/main/java/org/marketcetera/marketdata/service/MarketDataServiceImpl.java

@@ -5,7 +5,6 @@
 import java.util.Deque;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import javax.annotation.PostConstruct;
 
@@ -91,6 +90,7 @@ public void reportMarketDataStatus(MarketDataStatus inMarketDataStatus)
                 PlatformServices.handleException(this,
                                                  "Reporting market data status",
                                                  e);
+                removeMarketDataStatusListener(listener);
             }
         }
     }
@@ -110,7 +110,7 @@ public String request(MarketDataRequest inRequest,
                           MarketDataListener inMarketDataListener)
     {
         String provider = inRequest.getProvider();
-        String requestId = UUID.randomUUID().toString();
+        String requestId = inRequest.getRequestId();
         MarketDataRequestEvent requestEvent = new SimpleMarketDataRequestEvent(inRequest,
                                                                                requestId,
                                                                                provider,

modules/cep/esper/pom.xml

@@ -44,18 +44,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-
-      <!-- Configure Eclipse IDE metadata. -->
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <pde>true</pde>
-          <manifest>null</manifest>
-          <resolveDependencies>false</resolveDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

modules/cep/system/pom.xml

@@ -39,16 +39,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- Configure Eclipse IDE metadata. -->
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <pde>true</pde>
-          <manifest>null</manifest>
-          <resolveDependencies>false</resolveDependencies>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

modules/marketdata/bogus/pom.xml

@@ -47,18 +47,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-
-      <!-- Configure Eclipse IDE metadata. -->
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <pde>true</pde>
-          <manifest>null</manifest>
-          <resolveDependencies>false</resolveDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

modules/misc/pom.xml

@@ -56,18 +56,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-
-      <!-- Configure Eclipse IDE metadata. -->
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <pde>true</pde>
-          <manifest>null</manifest>
-          <resolveDependencies>false</resolveDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>