FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/dao/impl/AppExceptionDaoImpl.java'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/enums/SortOrder.java'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/exception/ExceptionLoggingResolver.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/exception/PulseException.java =================================================================== diff -u -r42d7d7e996381694ea90cd53d2273817109c5d82 -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/exception/PulseException.java (.../PulseException.java) (revision 42d7d7e996381694ea90cd53d2273817109c5d82) +++ src/main/java/com/napa/pulse/exception/PulseException.java (.../PulseException.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -8,7 +8,6 @@ private static final long serialVersionUID = 1L; public PulseException(String message, Exception e) { - //super(message); LOGGER.error("Error occured - threw PulseException: ", e); } @@ -17,4 +16,4 @@ LOGGER.error(message); } -} +} \ No newline at end of file FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/repository/AppExceptionRepository.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/repository/ExportColumnNameRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/ExportColumnNameRepository.java (.../ExportColumnNameRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/ExportColumnNameRepository.java (.../ExportColumnNameRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,13 +1,12 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.ExportColumn; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.ExportColumn; - @Repository public interface ExportColumnNameRepository extends CrudRepository { - + Iterable findByExportTypeOrderByColumnOrder(String exportType); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/FleetVINRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/FleetVINRepository.java (.../FleetVINRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/FleetVINRepository.java (.../FleetVINRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,11 +1,10 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.FleetVin; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.FleetVin; - @Repository public interface FleetVINRepository extends CrudRepository { -} +} \ No newline at end of file FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/repository/IFIUMatchExpressionRepository.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/repository/InvCollTemplateRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/InvCollTemplateRepository.java (.../InvCollTemplateRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/InvCollTemplateRepository.java (.../InvCollTemplateRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,13 +1,12 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.InvestmentCollectionTemplate; import org.springframework.data.repository.CrudRepository; -import com.napa.pulse.entity.pulseui.InvestmentCollectionTemplate; - public interface InvCollTemplateRepository extends CrudRepository { Iterable findAllByOrderByName(); Iterable findByActiveOrderByName(boolean active); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/InvestmentCollectionRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/InvestmentCollectionRepository.java (.../InvestmentCollectionRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/InvestmentCollectionRepository.java (.../InvestmentCollectionRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,16 +1,15 @@ package com.napa.pulse.repository; -import java.util.List; - +import com.napa.pulse.entity.pulseui.InvestmentCollection; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.InvestmentCollection; +import java.util.List; @Repository public interface InvestmentCollectionRepository extends CrudRepository { Iterable loadBySiteId(@Param("siteIds") List siteIds); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/MajorAccountRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/MajorAccountRepository.java (.../MajorAccountRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/MajorAccountRepository.java (.../MajorAccountRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,20 +1,19 @@ package com.napa.pulse.repository; -import java.util.List; - +import com.napa.pulse.entity.pulseui.MajorAccount; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.MajorAccount; +import java.util.List; @Repository public interface MajorAccountRepository extends CrudRepository { @Query("select majorAccount from MajorAccount majorAccount, Site site where majorAccount.id = site.majorAccountId and site.siteId in :siteIds") - MajorAccount findOneBySiteIds(@Param("siteIds") ListsiteIds); + MajorAccount findOneBySiteIds(@Param("siteIds") List siteIds); Iterable findByActive(boolean active); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/PricingProfileRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/PricingProfileRepository.java (.../PricingProfileRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/PricingProfileRepository.java (.../PricingProfileRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,8 +1,8 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.PricingProfile; import org.springframework.data.repository.CrudRepository; -import com.napa.pulse.entity.pulseui.PricingProfile; public interface PricingProfileRepository extends CrudRepository { -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/PulseSystemRepository.java =================================================================== diff -u -rcb57a639061a73da339bf4ebbca305dd634e4b54 -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/PulseSystemRepository.java (.../PulseSystemRepository.java) (revision cb57a639061a73da339bf4ebbca305dd634e4b54) +++ src/main/java/com/napa/pulse/repository/PulseSystemRepository.java (.../PulseSystemRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,13 +1,12 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.PulseSystem; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.PulseSystem; - @Repository public interface PulseSystemRepository extends CrudRepository { Boolean existsPulseSystemByFeatureTypeAndFeatureEnabled(String featureType, Integer featureEnabled); -} +} \ No newline at end of file FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/repository/SiteGroupRepository.java'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/repository/SiteGroupTypeRepository.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/repository/SiteRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/SiteRepository.java (.../SiteRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/SiteRepository.java (.../SiteRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,23 +1,21 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.Site; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.Site; - @Repository public interface SiteRepository extends CrudRepository { @Query("select site1 from Site site1, Site site2 where site1.majorAccountId is null and site1.productAvailability.abbreviation = site2.productAvailability.abbreviation and site2.siteType = 'DC' and site2.siteId = :dcId order by site1.siteName") Iterable getAllServicingStoresForDc(@Param("dcId") int dcId); @Query("select site from Site site where siteType = 'DC' order by productAvailability.abbreviation") - Iterable findAllServicingDcs(); - + Iterable findAllServicingDcs(); + @Query("select site from Site site where activeFlag = 'N' order by siteName") - Iterable findInactiveSites(); - + Iterable findInactiveSites(); } \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/StoreTypeRepository.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/StoreTypeRepository.java (.../StoreTypeRepository.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/repository/StoreTypeRepository.java (.../StoreTypeRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,13 +1,12 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.StoreType; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.StoreType; - @Repository public interface StoreTypeRepository extends CrudRepository { - + Iterable findAllByOrderByUiOrder(); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/repository/TranslationItemRepository.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/repository/TranslationItemRepository.java (.../TranslationItemRepository.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/repository/TranslationItemRepository.java (.../TranslationItemRepository.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,11 +1,12 @@ package com.napa.pulse.repository; +import com.napa.pulse.entity.pulseui.TranslationItem; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.napa.pulse.entity.pulseui.TranslationItem; - @Repository public interface TranslationItemRepository extends CrudRepository { + Iterable findAllByOrderByKeyAsc(); -} + +} \ No newline at end of file FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/repository/UserLoginRepository.java'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 419bb8b3593f009c43a549eab13cf4dabeb56762 refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/rowmappers/HierarchypartRowMapper.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/rowmappers/IntegerRowMapper.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/rowmappers/IntegerRowMapper.java (.../IntegerRowMapper.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/rowmappers/IntegerRowMapper.java (.../IntegerRowMapper.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,17 +1,19 @@ package com.napa.pulse.rowmappers; +import org.springframework.jdbc.core.RowMapper; + import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.jdbc.core.RowMapper; - /** * RowMapper for Integer column - * + * * @author Diana Ivan Created: Mar 18, 2015 */ -public class IntegerRowMapper implements RowMapper{ - public Integer mapRow(ResultSet rs, int rowNum) throws SQLException { - return rs.getInt(1); - } -} +public class IntegerRowMapper implements RowMapper { + + public Integer mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getInt(1); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/rowmappers/StructVarrayRowMapper.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/rowmappers/StructVarrayRowMapper.java (.../StructVarrayRowMapper.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/rowmappers/StructVarrayRowMapper.java (.../StructVarrayRowMapper.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -1,20 +1,22 @@ package com.napa.pulse.rowmappers; +import org.springframework.jdbc.core.RowMapper; + import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.jdbc.core.RowMapper; - /** * RowMapper for Varray of Struct (Object[]) - * + * * @author Diana Ivan Created: Mar 26, 2015 */ -public class StructVarrayRowMapper implements RowMapper{ - public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException { - oracle.sql.ARRAY varr = (oracle.sql.ARRAY) rs.getObject(1); - Object[] structs = (Object[]) varr.getArray(); - - return structs; - } -} +public class StructVarrayRowMapper implements RowMapper { + + public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException { + oracle.sql.ARRAY varr = (oracle.sql.ARRAY) rs.getObject(1); + Object[] structs = (Object[]) varr.getArray(); + + return structs; + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/security/model/JwtResponse.java =================================================================== diff -u -rb50a112972d09bcc3b29febfda25ac86f76c6234 -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/security/model/JwtResponse.java (.../JwtResponse.java) (revision b50a112972d09bcc3b29febfda25ac86f76c6234) +++ src/main/java/com/napa/pulse/security/model/JwtResponse.java (.../JwtResponse.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -16,4 +16,4 @@ return this.token; } -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/security/model/JwtUserData.java =================================================================== diff -u -r5507ac88ef2722aeee2d7425583302cc41dd7194 -r419bb8b3593f009c43a549eab13cf4dabeb56762 --- src/main/java/com/napa/pulse/security/model/JwtUserData.java (.../JwtUserData.java) (revision 5507ac88ef2722aeee2d7425583302cc41dd7194) +++ src/main/java/com/napa/pulse/security/model/JwtUserData.java (.../JwtUserData.java) (revision 419bb8b3593f009c43a549eab13cf4dabeb56762) @@ -8,25 +8,15 @@ private static final long serialVersionUID = -1164449767302022025L; private Integer userId; - private String username; - private String firstName; - private String lastName; - private Integer roleId; - private String language; - private Integer businessUnit; - private List roleAccessList; - private List siteTypeList; - private String ticket; - private Integer deferSessionCreateThreshold; public Integer getUserId() { @@ -117,4 +107,4 @@ this.deferSessionCreateThreshold = deferSessionCreateThreshold; } -} +} \ No newline at end of file