392. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:45:53 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

392.1 Files compared

# Location File Last Modified
1 eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\eHXE_Build3_2017-05-04.zip\NHIN_adapter\AdapterLIB\src\main\java\gov\va\med\nhin\adapter\datamanager\adapters QueryAggregatorDataAdapter.java Wed Apr 5 01:13:54 2017 UTC
2 eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\eHXE_Build3_2017-05-04.zip\NHIN_adapter\AdapterLIB\src\main\java\gov\va\med\nhin\adapter\datamanager\adapters QueryAggregatorDataAdapter.java Thu Jun 1 21:52:52 2017 UTC

392.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 140
Changed 1 2
Inserted 0 0
Removed 0 0

392.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

392.4 Active regular expressions

No regular expressions were active.

392.5 Comparison detail

  1   package go v.va.med.n hin.adapte r.datamana ger.adapte rs;
  2  
  3   import jav a.util.Arr ayList;
  4   import jav a.util.Lis t;
  5  
  6   import org .slf4j.Log ger;
  7   import org .slf4j.Log gerFactory ;
  8  
  9   import gov .va.med.nh in.adapter .datamanag er.DataAda pter;
  10   import gov .va.med.nh in.adapter .datamanag er.DataQue ry;
  11   import gov .va.med.nh in.adapter .datamanag er.QueryDo esNotExist Exception;
  12   import gov .va.med.nh in.adapter .utils.Nul lChecker;
  13  
  14   /**
  15    *
  16    * @author  
D NS    
  17    */
  18   public cla ss QueryAg gregatorDa taAdapter  implements  DataAdapt er
  19   {
  20           pr ivate stat ic final L ogger logg er = Logge rFactory.g etLogger(Q ueryAggreg atorDataAd apter.clas s.getName( ));
  21  
  22           @O verride
  23           pu blic List  getData(Da taQuery da taQuery)
  24           {
  25                    Arra yList ret  = new Arra yList();
  26                    Stri ng[] query Names = ge tQueryName s(dataQuer y);
  27  
  28                    if(q ueryNames  != null)
  29                    {
  30                             for(St ring query Name : que ryNames)
  31                             {
  32                                      try
  33                                      {
  34                                               DataQuery  query = se tUpQuery(d ataQuery,  queryName) ;
  35                                               ret.addAll (query.get Results()) ;
  36                                      }
  37                                      catch(Qu eryDoesNot ExistExcep tion qdnee )
  38                                      {
  39                                               logger.err or("Query  is not sup ported.",  qdnee);
  40                                      }
  41                             }
  42                    }
  43  
  44                    retu rn ret;
  45           }
  46  
  47           pr ivate Stri ng[] getQu eryNames(D ataQuery d ataQuery)
  48           {
  49                    Stri ng queryNa mes = (Str ing) dataQ uery.getPa rameter("q ueryNames" );
  50                    
  51                    if(N ullChecker .isNullOrE mpty(query Names))
  52                    {
  53                             queryN ames = dat aQuery.get Property(" queryNames ");
  54                    }
  55                    
  56                    retu rn NullChe cker.isNot NullOrEmpt y(queryNam es) ? quer yNames.spl it(",") :  null;
  57           }
  58  
  59           pr ivate Data Query setU pQuery(Dat aQuery dat aQuery, St ring query Name)
  60           {
  61                    Data Query ret  = dataQuer y.getDataM anager().g etQuery(qu eryName);
  62                    for( String par ameterName  : dataQue ry.getPara meterBySou rceNames() )
  63                    {
  64                             if(ret .isParamet er(paramet erName))
  65                             {
  66                                      ret.setP arameter(p arameterNa me, dataQu ery.getPar ameterBySo urce(param eterName)) ;
  67                             }
  68                    }
  69                    retu rn ret;
  70           }
  71   }