Fixes some issues

52n-wps-algorithm-geotools/src/test/java/org/n52/wps/server/algorithm/SimpleBufferAlgorithmTest.java

@@ -87,8 +87,6 @@ public static void tearDownClass() {
 
     @Before
     public void setUp() {
-		MockMvcBuilders.webAppContextSetup(this.wac).build();
-		WPSConfig.getInstance().setConfigurationManager(this.wac.getBean(ConfigurationManager.class));
     }
 
     @After

52n-wps-algorithm/src/main/java/org/n52/wps/server/ServiceLoaderAlgorithmRepository.java

@@ -34,20 +34,20 @@ public class ServiceLoaderAlgorithmRepository implements IAlgorithmRepository {
 	public ServiceLoaderAlgorithmRepository() {
 		this.currentAlgorithms = loadAlgorithms();
 	}
-	
+
 	private Map<String, Class<? extends IAlgorithm>> loadAlgorithms() {
 		Map<String, Class<? extends IAlgorithm>> result = new HashMap<String, Class<? extends IAlgorithm>>();
 		ServiceLoader<IAlgorithm> loader = ServiceLoader.load(IAlgorithm.class);
-		
+
 		for (IAlgorithm ia : loader) {
 			logger.debug("Adding algorithm with identifier {} and class {}",
 					ia.getWellKnownName(), ia.getClass().getCanonicalName());
 			result.put(ia.getWellKnownName(), ia.getClass());
 		}
-		
+
 		return result;
 	}
-	
+
 	@Override
 	public Collection<String> getAlgorithmNames() {
 		return this.currentAlgorithms.keySet();

52n-wps-algorithm/src/main/java/org/n52/wps/server/UploadedAlgorithmRepository.java

@@ -18,6 +18,7 @@
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -37,9 +38,9 @@
 
 /**
  * A static repository to retrieve the available algorithms.
- * 
+ *
  * @author foerster, Bastian Schaeffer, University of Muenster
- * 
+ *
  */
 public class UploadedAlgorithmRepository implements
 		ITransactionalAlgorithmRepository {
@@ -52,13 +53,13 @@ public class UploadedAlgorithmRepository implements
 	public UploadedAlgorithmRepository() {
 		algorithmMap = new HashMap<String, String>();
 		processDescriptionMap = new HashMap<String, ProcessDescription>();
-		
+
 		ConfigurationModule uploadedAlgorithmRepoConfigModule = WPSConfig.getInstance().getConfigurationModuleForClass(this.getClass().getName(), ConfigurationCategory.REPOSITORY);
-		
+
 		// check if the repository is active
 		if(uploadedAlgorithmRepoConfigModule.isActive()){
-			List<AlgorithmEntry> algorithmEntries = uploadedAlgorithmRepoConfigModule.getAlgorithmEntries();			
-			
+			List<AlgorithmEntry> algorithmEntries = uploadedAlgorithmRepoConfigModule.getAlgorithmEntries();
+
 			for (AlgorithmEntry algorithmEntry : algorithmEntries) {
 				if(algorithmEntry.isActive()){
 					addAlgorithm(algorithmEntry.getAlgorithm());
@@ -111,7 +112,7 @@ public boolean containsAlgorithm(String className) {
 
 	private IAlgorithm loadAlgorithm(String algorithmClassName)
 			throws Exception {
-		
+
 		Class<?> algorithmClass = new CustomClassLoader("/uploaded").loadClass(algorithmClassName);
 		IAlgorithm algorithm = null;
 		if (IAlgorithm.class.isAssignableFrom(algorithmClass)) {
@@ -126,10 +127,10 @@ private IAlgorithm loadAlgorithm(String algorithmClassName)
 							+ algorithmClassName
 							+ " does not implement IAlgorithm or have a Algorithm annotation.");
 		}
-		
-		
+
+
         for (String supportedVersion : WPSConfig.SUPPORTED_VERSIONS) {
-            
+
     		if(!algorithm.processDescriptionIsValid(supportedVersion)) {
     			LOGGER.warn("Algorithm description is not valid: " + algorithmClassName);//TODO add version to exception/log
     			throw new Exception("Could not load algorithm " +algorithmClassName +". ProcessDescription Not Valid.");
@@ -138,11 +139,19 @@ private IAlgorithm loadAlgorithm(String algorithmClassName)
 		return algorithm;
 	}
 
-	public boolean addAlgorithm(Object processID) {
-		if (!(processID instanceof String)) {
+    @Override
+	public boolean addAlgorithm(Object item) {
+		if ( !(item instanceof String || item instanceof Class<?>)) {
 			return false;
 		}
-		String algorithmClassName = (String) processID;
+        String algorithmClassName;
+        if (item instanceof String) {
+            algorithmClassName = (String) item;
+        } else {
+            // TODO to be tested as custom class loader is being used
+            // which scans in /uploaded folder only
+            algorithmClassName = ((Class<?>) item).getName();
+        }
 
 		algorithmMap.put(algorithmClassName, algorithmClassName);
 		LOGGER.info("Algorithm class registered: " + algorithmClassName);
@@ -173,5 +182,5 @@ public ProcessDescription getProcessDescription(String processID) {
 
 	@Override
 	public void shutdown() {}
-	
+
 }

52n-wps-algorithm/src/test/java/org/n52/wps/server/AbstractSelfDescribingAlgorithmTest.java

@@ -33,14 +33,12 @@
  * @author tkunicki
  */
 public class AbstractSelfDescribingAlgorithmTest extends AbstractITClass {
-    
+
     public AbstractSelfDescribingAlgorithmTest() {
     }
 
     @Before
     public void setUp() throws Exception {
-		MockMvcBuilders.webAppContextSetup(this.wac).build();
-		WPSConfig.getInstance().setConfigurationManager(this.wac.getBean(ConfigurationManager.class));
     }
 
     @Test

52n-wps-client-lib/src/test/java/org/n52/wps/client/test/ExecuteRequestBuilderTest.java

@@ -60,28 +60,26 @@
 
 public class ExecuteRequestBuilderTest extends AbstractITClass{
 
-	private ProcessDescription processDescription;	
-	private ProcessDescriptionType processDescriptionType;	
+	private ProcessDescription processDescription;
+	private ProcessDescriptionType processDescriptionType;
 	private String inputID;
 	private String outputID;
 	private String url = "http://xyz.test.data";
 	private String complexDataString = "testString";
-	
+
 	@Before
 	public void setUp(){
-		MockMvcBuilders.webAppContextSetup(this.wac).build();
-		WPSConfig.getInstance().setConfigurationManager(this.wac.getBean(ConfigurationManager.class));	
 		processDescription = new MultiReferenceBinaryInputAlgorithm().getDescription();
-		processDescriptionType = ((ProcessDescriptionType)processDescription.getProcessDescriptionType(WPSConfig.VERSION_100));	
+		processDescriptionType = ((ProcessDescriptionType)processDescription.getProcessDescriptionType(WPSConfig.VERSION_100));
 		inputID = processDescriptionType.getDataInputs().getInputArray(0).getIdentifier().getStringValue();
 		outputID = processDescriptionType.getProcessOutputs().getOutputArray(0).getIdentifier().getStringValue();
 	}
-	
+
     @Test
     public void addComplexDataInputByReference() {
 
         ExecuteRequestBuilder executeRequestBuilder = new ExecuteRequestBuilder(processDescriptionType);
-    	
+
     	addTestDataByReference(executeRequestBuilder);
 
         ExecuteDocument request = executeRequestBuilder.getExecute();
@@ -90,151 +88,151 @@ public void addComplexDataInputByReference() {
         Assert.assertThat("generated doc contains input url", request.toString(), containsString(url));
         Assert.assertThat("document is valid", request.validate(), is(true));
     }
-    
+
     @Test
     public void addComplexDataInputString() {
-    	
+
     	ExecuteRequestBuilder executeRequestBuilder = new ExecuteRequestBuilder(processDescriptionType);
-    	
+
     	addTestDataString(executeRequestBuilder);
-    	
+
     	ExecuteDocument request = executeRequestBuilder.getExecute();
-    	
+
     	Assert.assertThat("generated doc contains input id", request.toString(), containsString(inputID));
     	Assert.assertThat("generated doc contains input string", request.toString(), containsString(complexDataString));
     	Assert.assertThat("document is valid", request.validate(), is(true));
     }
-    
+
     @Test
     public void setSupportedMimeTypeForOutput(){
         ExecuteRequestBuilder executeRequestBuilder = new ExecuteRequestBuilder(processDescriptionType);
-    	
+
     	addTestDataByReference(executeRequestBuilder);
-        
+
         String mimeType = getMimeType(processDescriptionType, false);
-        
+
         executeRequestBuilder.setMimeTypeForOutput(mimeType, outputID);
-        
+
         ExecuteDocument request = executeRequestBuilder.getExecute();
-        
+
         checkOutputIdentifier(request.getExecute(), outputID);
         checkOutputMimeType(request.getExecute(), mimeType);
         Assert.assertThat("document is valid", request.validate(), is(true));
-    	
+
     }
-    
+
     @Test
     public void setDefaultMimeTypeForOutput(){
     	ExecuteRequestBuilder executeRequestBuilder = new ExecuteRequestBuilder(processDescriptionType);
-    	
+
     	addTestDataByReference(executeRequestBuilder);
-    	
+
     	String mimeType = getMimeType(processDescriptionType, true);
-    			
+
     	ExecuteDocument request = executeRequestBuilder.getExecute();
-        
+
         executeRequestBuilder.setMimeTypeForOutput(mimeType, outputID);
-    	
+
         checkOutputIdentifier(request.getExecute(), outputID);
         checkOutputMimeType(request.getExecute(), mimeType);
     	Assert.assertThat("document is valid", request.validate(), is(true));
-    	
+
     }
-    
+
     private void addTestDataByReference(ExecuteRequestBuilder executeRequestBuilder){
-        
+
     	InputType inputType = InputType.Factory.newInstance();
 
         inputType.addNewIdentifier().setStringValue(inputID);
         inputType.addNewReference().setHref(url);
 
         executeRequestBuilder.addComplexData(inputType);
-    	
+
     }
-    
+
     private void addTestDataString(ExecuteRequestBuilder executeRequestBuilder){
-    	
+
     	try {
 			executeRequestBuilder.addComplexData(inputID, complexDataString, "", "", "text/plain");
 		} catch (WPSClientException e) {
 			e.printStackTrace();
 		}
-    	
+
     }
-    
+
     private String getMimeType(ProcessDescriptionType processDescriptionType, boolean isGetDefaultMimeType){
-    	
+
     	String result = "";
-    	
+
     	ProcessOutputs processOutputs = processDescriptionType.getProcessOutputs();
-    	
+
     	assertNotNull(processOutputs);
-    	
+
     	OutputDescriptionType outputDescriptionType = processOutputs.getOutputArray(0);
-    	
+
     	assertNotNull(outputDescriptionType);
-    	
+
     	SupportedComplexDataType complexDataType = outputDescriptionType.getComplexOutput();
-    	
+
     	assertNotNull(complexDataType);
-    	
+
     	if(isGetDefaultMimeType){
     		ComplexDataCombinationType defaultFormat = complexDataType.getDefault();
-    		
+
     		assertNotNull(defaultFormat);
-    		
+
     		ComplexDataDescriptionType format = defaultFormat.getFormat();
-    		
+
     		assertNotNull(format);
-    		
-    		result = format.getMimeType();    		
+
+    		result = format.getMimeType();
     	}else{
     		ComplexDataCombinationsType supportedFormats = complexDataType.getSupported();
-    		
+
     		assertNotNull(supportedFormats);
-    		
+
     		ComplexDataDescriptionType format = supportedFormats.getFormatArray(0);
-    		
+
     		assertNotNull(format);
-    		
-    		result = format.getMimeType();   
+
+    		result = format.getMimeType();
     	}
-    	
+
     	return result;
     }
 
     private void checkOutputMimeType(Execute execute, String mimeType){
-    	
+
     	DocumentOutputDefinitionType outputDefinitionType = getOutputDefinitionType(execute);
-    	
-    	assertTrue(outputDefinitionType.getMimeType() != null && outputDefinitionType.getMimeType().equals(mimeType)); 
-    	
+
+    	assertTrue(outputDefinitionType.getMimeType() != null && outputDefinitionType.getMimeType().equals(mimeType));
+
     }
-    
+
     private void checkOutputIdentifier(Execute execute, String identifier){
-    	
+
     	DocumentOutputDefinitionType outputDefinitionType = getOutputDefinitionType(execute);
-    	
-    	assertTrue(outputDefinitionType.getIdentifier() != null && outputDefinitionType.getIdentifier().getStringValue().equals(identifier)); 
-    	
+
+    	assertTrue(outputDefinitionType.getIdentifier() != null && outputDefinitionType.getIdentifier().getStringValue().equals(identifier));
+
     }
-    
+
     private DocumentOutputDefinitionType getOutputDefinitionType(Execute execute){
-    	
+
     	ResponseFormType responseFormType = execute.getResponseForm();
-    	
+
     	assertNotNull(responseFormType);
-    	
+
     	ResponseDocumentType responseDocumentType = responseFormType.getResponseDocument();
-    	
+
     	assertNotNull(responseDocumentType);
-    	
+
     	DocumentOutputDefinitionType outputDefinitionType = responseDocumentType.getOutputArray(0);
-    	
-    	assertNotNull(outputDefinitionType);  
-    	
+
+    	assertNotNull(outputDefinitionType);
+
     	return outputDefinitionType;
-    	
+
     }
-    
+
 }