Merge branch 'master' of https://github.com/jateeter/OpenESPI-Common-java

Author: jateeter

src/main/java/org/energyos/espi/common/domain/Routes.java

@@ -22,8 +22,8 @@ public class Routes {
     public static final String LOGIN = "/login";
     public static final String ROOT = "/";
 
-    public static final String MANAGE = "/manage";
-    public static final String MANAGE_CONFIGURATION = "/manage.config";
+    public static final String DATA_CUSTODIAN_MANAGE = "/management";
+    public static final String THIRD_PARTY_MANAGE = "/management";
 
     public static final String DATA_CUSTODIAN_API_FEED = "/api/feed";
     public static final String DATA_CUSTODIAN_AUTHORIZATION = "/espi/1_1/resource/Authorization/{authorizationId}";
@@ -147,4 +147,3 @@ public static String getDataCustodianRESTSubscriptionGetURL(String subscriptionH
         return DATA_CUSTODIAN_REST_SUBSCRIPTION_GET.replace("{subscriptionHashedId}", subscriptionHashedId);
     }
 }
-

src/main/java/org/energyos/espi/common/domain/Subscription.java

@@ -190,6 +190,6 @@ public void unlink() {
     }
 
     public boolean equals (Subscription s) {
-    	return (this.getId() == s.getId());
+    	return (this.getId().equals(s.getId()));
     }
 }

src/main/java/org/energyos/espi/common/models/atom/ContentType.java

@@ -471,6 +471,8 @@ public void setResource(IdentifiedObject resource) {
         	setAuthorization((Authorization) resource);
         } else if (resource instanceof Subscription) {
         	setSubscription((Subscription) resource);
+        } else if (resource instanceof RetailCustomer) {
+        	setRetailCustomer((RetailCustomer) resource);
         }
     }
 

src/main/java/org/energyos/espi/common/service/ApplicationInformationService.java

@@ -11,51 +11,35 @@
 
 public interface ApplicationInformationService {
 
+	/**
+	 * @param kind String indicating [ DATA_CUSTODIAN_ADMIN | THIRD_PARTY | UPLOAD_ADMIN ]
+	 * @return List of ApplicationInformation Resources
+	 */
 	public List<ApplicationInformation> findByKind(String kind);
 
-	// TODO: likely deprecated
-	public String feedFor(List<ApplicationInformation> applicationInformations);
-
-	public String entryFor(ApplicationInformation applicationInformation);
-
-	public ApplicationInformation findById(Long id);
-
+	/**
+	 * Find an ApplicationInformation resource by using it's clientId.
+	 * 
+	 * @param clientId String uniquely identifying a specific ApplicationInformation.clientI
+	 * @return an ApplicationInformation resource
+	 */
 	public ApplicationInformation findByClientId(String clientId);
 
-//	public ClientDetails loadClientByClientId(String clientId);
-
+	/**
+	 * Find an Application Information resource by using it's dataCustodianId.
+	 * 
+	 * @param String dataCustodianClientId
+	 * @return an ApplicationInformation resource
+	 */
 	public ApplicationInformation findByDataCustodianClientId(
 			String dataCustodianClientId);
 
-	public List<ApplicationInformation> findAll();
-
-	// persistence management services
-	public void persist(ApplicationInformation applicationInformation);
-
-	public void merge(ApplicationInformation applicationInformation);
-
-	// accessor services
-	public ApplicationInformation findByURI(String uri);
-
-	public EntryType findEntryType(Long applicationInformationId);
-
-	public EntryTypeIterator findEntryTypeIterator();
-
-	public void add(ApplicationInformation applicationInformation);
-
-	public void delete(ApplicationInformation applicationInformation);
-
-	// import-export services
+	/**
+	 * Import and XML stream, unmarshalling into an ApplicationInformation resource
+	 * 
+	 * @param stream
+	 * @return an ApplicationInformation resource
+	 */
 	public ApplicationInformation importResource(InputStream stream);
 
-	public ApplicationInformation findByUUID(UUID uuid);
-
-	public void setApplicationInformation(ApplicationInformation applicationInformation);
-
-	public String getDataCustodianResourceEndpoint();
-	
-	public String getAuthorizationServerTokenEndpoint();
-	
-	public String getThirdPartyNotifyURI();
-
 }

src/main/java/org/energyos/espi/common/service/impl/ApplicationInformationServiceImpl.java

@@ -37,10 +37,6 @@
                 noRollbackFor = {javax.persistence.NoResultException.class, org.springframework.dao.EmptyResultDataAccessException.class })
 
 public class ApplicationInformationServiceImpl implements ApplicationInformationService {
-
-    // the cached operational object for this service
-	// 
-	private ApplicationInformation applicationInformation;
 
     @Autowired
     private ApplicationInformationRepository applicationInformationRepository;
@@ -50,48 +46,11 @@ public class ApplicationInformationServiceImpl implements ApplicationInformation
 
     @Autowired
     private ImportService importService;
-    
-    @Override
-    public String getDataCustodianResourceEndpoint() {
-    	if (this.applicationInformation == null) {
-    		// default it to the seed value
-    		this.setApplicationInformation(this.findById(1L));
-    	}
-    	return applicationInformation.getDataCustodianResourceEndpoint();
-    	// return "http://localhost:8080/DataCustodian/espi/1_1/resource";
-    }    
-
-	@Override
-	public String getAuthorizationServerTokenEndpoint() {
-    	if (this.applicationInformation == null) {
-    		// default it to the seed value
-    		this.setApplicationInformation(this.findById(1L));
-    	}
-    	return applicationInformation.getAuthorizationServerTokenEndpoint();
-    	// return "http://localhost:8080/DataCustodian/oauth/token";
-	}    
-
+       
     @Override
     public List<ApplicationInformation> findByKind(String kind) {
         return applicationInformationRepository.findByKind(kind);
     }
-	
-	
-    @Override
-    public List<ApplicationInformation> findAll() {
-        return applicationInformationRepository.findAll();
-    }
-
-    @Override
-    public ApplicationInformation findById(Long id) {
-        return applicationInformationRepository.findById(id);
-    }
-
-
-    @Override
-    public void persist(ApplicationInformation applicationInformation) {
-    	applicationInformationRepository.persist(applicationInformation);
-    }
 
     @Override
     public ApplicationInformation findByClientId(String clientId) {
@@ -103,86 +62,6 @@ public ApplicationInformation findByDataCustodianClientId(String dataCustodianCl
         return applicationInformationRepository.findByDataCustodianClientId(dataCustodianClientId);
     }
 
-    @Override
-    public ApplicationInformation findByUUID(UUID uuid) {
-        return applicationInformationRepository.findByUUID(uuid);
-    }
-    
-//    @Override
-//    public ClientDetails loadClientByClientId(String clientId) {
-//        return findByClientId(clientId);
-//    }
-
-	@Override
-	public String feedFor(List<ApplicationInformation> applicationInformations) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String entryFor(ApplicationInformation applicationInformation) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void add(ApplicationInformation applicationInformation) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void delete(ApplicationInformation applicationInformation) {
-	       applicationInformationRepository.deleteById(applicationInformation.getId());
-		
-	}
-
-	@Override
-	public void merge(ApplicationInformation applicationInformation) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public ApplicationInformation findByURI(String uri) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public EntryType findEntryType(Long applicationInformationId) {
-		EntryType result = null;
-		try {
-			// TODO - this is sub-optimal (but defers the need to understand creation of an EntryType
-			List<Long> temp = new ArrayList<Long>();
-			ApplicationInformation applicationInformation = applicationInformationRepository.findById(applicationInformationId);
-			temp.add(applicationInformation.getId());
-			result = (new EntryTypeIterator(resourceService, temp, ApplicationInformation.class)).nextEntry(ApplicationInformation.class);
-		} catch (Exception e) {
-			// TODO need a log file entry as we are going to return a null if
-			// it's not found
-			result = null;
-		}
-		return result;		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public EntryTypeIterator findEntryTypeIterator() {
-		EntryTypeIterator result = null;
-		try {
-			// TODO - this is sub-optimal (but defers the need to understand creation of an EntryType
-			List<Long> temp = new ArrayList<Long>();
-			temp = applicationInformationRepository.findAllIds();
-			result = (new EntryTypeIterator(resourceService, temp, ApplicationInformation.class));
-		} catch (Exception e) {
-			// TODO need a log file entry as we are going to return a null if
-			// it's not found
-			result = null;
-		}
-		return result;
-	}
-
 	@Override
 	public ApplicationInformation importResource(InputStream stream) {
 
@@ -196,21 +75,6 @@ public ApplicationInformation importResource(InputStream stream) {
 		return applicationInformation;
 	}
 
-	@Override
-	public String getThirdPartyNotifyURI() {
-		ApplicationInformation applicationInformation;
-		// TODO note the assumption on the first (seed) entry
-		applicationInformation = resourceService.findById(1L, ApplicationInformation.class);
-		return applicationInformation.getThirdPartyNotifyUri();
-	}
-
-    public void setApplicationInformation(ApplicationInformation applicationInformation) {
-        this.applicationInformation = applicationInformation;
-   }
-
-   public ApplicationInformation getApplicationInformation () {
-        return this.applicationInformation;
-   }
    public void setApplicationInformationRepository(ApplicationInformationRepository applicationInformationRepository) {
         this.applicationInformationRepository = applicationInformationRepository;
    }
@@ -223,8 +87,9 @@ public void setResourceService(ResourceService resourceService) {
    }
 
    public ResourceService getResourceService () {
-        return this.resourceService;
-   }
+       return this.resourceService;
+  }
+   
    public void setImportService(ImportService importService) {
         this.importService = importService;
    }