http clients stuff should work now

Author: atimgraves

…tp/IoTOutputHttiClientRequestFilter.java …tp/IoTOutputHttpClientRequestFilter.javaIoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/IoTOutputHttiClientRequestFilter.java renamed to IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/IoTOutputHttpClientRequestFilter.java IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/IoTOutputHttiClientRequestFilter.java renamed to IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/IoTOutputHttpClientRequestFilter.java

@@ -49,12 +49,12 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 
 @ClientFilter(patterns = { "${messagehandler.output.iotoutputhttpclient:/api/v1/iotdata}/**"})
 @Log
-public class IoTOutputHttiClientRequestFilter {
+public class IoTOutputHttpClientRequestFilter {
 	private final String username;
 	private final String password;
 
 	@Inject
-	public IoTOutputHttiClientRequestFilter(IoTOutputHttpClientSettings clientSettings) {
+	public IoTOutputHttpClientRequestFilter(IoTOutputHttpClientSettings clientSettings) {
 		this.username = clientSettings.getUsername();
 		this.password = new String(Base64.getDecoder().decode(clientSettings.getPassword()));
 	}
@@ -67,6 +67,6 @@ public void doFilter(MutableHttpRequest<?> request) {
 
 	@EventListener
 	public void onStartup(StartupEvent event) {
-		log.info("Startup event received for IoTOutputHttiClientRequestFilter username=" + this.username);
+		log.info("Startup event received for IoTOutputHttpClientRequestFilter username=" + this.username);
 	}
 }

IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/IoTOutputHttpClientSettings.java

@@ -43,10 +43,8 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 @Data
 public class IoTOutputHttpClientSettings {
 	public static final String PREFIX = "messagehandler.output.iotoutputhttpclient";
-	// @Property(name = IoTOutputHttpClientSettings.PREFIX + ".username",
-	// defaultValue = "")
+	// as we are operating as a configuration then the fields are set based on the
+	// config tree
 	private String username;
-	// @Property(name = IoTOutputHttpClientSettings.PREFIX + ".password",
-	// defaultValue = "")
 	private String password;
 }

IoTDBJDBC/src/main/java/com/oracle/demo/timg/iot/iotdbjdbc/messagehandler/outputs/http/RawDataHttpOutput.java

@@ -55,53 +55,53 @@ public class RawDataHttpOutput implements RawDataMessageHandler {
 	private final IoTOutputHttpClient httpClient;
 	private final int order;
 	private final HttpOutputType type;
+	private final boolean sentDataIsCompleted;
 
 	@Inject
 	public RawDataHttpOutput(IoTOutputHttpClient httpClient,
-			@Property(name = "messagehandler.output.rawdata.httpclient.enabled.order") int order,
-			@Property(name = "messagehandler.output.rawdata.httpclient.enabled.type", defaultValue = "STRING") HttpOutputType type) {
+			@Property(name = "messagehandler.output.rawdata.httpclient.order") int order,
+			@Property(name = "messagehandler.output.rawdata.httpclient.type", defaultValue = "STRING") HttpOutputType type,
+			@Property(name = "messagehandler.output.rawdata.httpclient.sentdataiscompleted", defaultValue = "true") boolean sentDataIsCompleted) {
 		this.httpClient = httpClient;
 		this.order = order;
 		this.type = type;
+		this.sentDataIsCompleted = sentDataIsCompleted;
 	}
 
 	@Override
 	public RawData[] processRawData(RawData input) throws Exception {
 		log.finer(() -> "RawData is " + input);
+		boolean result;
 		switch (type) {
 		case BASE64_BYTES: {
 			String bodyContent = Base64.getEncoder().encodeToString(input.getContent());
-			boolean result = httpClient.postRawDataAsBase64(input.getDigitalTwinInstanceId(), input.getEndpoint(),
+			result = httpClient.postRawDataAsBase64(input.getDigitalTwinInstanceId(), input.getEndpoint(),
 					input.getContentType(), bodyContent);
-			RawData results[] = new RawData[1];
-			results[0] = input;
-			return results;
+			break;
 		}
 		case STRING: {
 			if (input.getMediaType().isTextBased()) {
-				boolean result = httpClient.postRawDataAsBase64(input.getDigitalTwinInstanceId(), input.getEndpoint(),
+				result = httpClient.postRawDataAsString(input.getDigitalTwinInstanceId(), input.getEndpoint(),
 						input.getContentType(), input.getContentString());
-
-				RawData results[] = new RawData[1];
-				results[0] = input;
-				return results;
 			} else {
-				throw new NotAStringBasedMediaType("Media type "+)
+				throw new NotAStringBasedMediaType("Media type " + input.getMediaType());
 			}
+			break;
 		}
 		default:
 			throw new InvalidHttpOutputTypeException("Processing type " + type + " is unknown");
-			break;
-
 		}
-		return new RawData[0];
 		RawData results[];
-		if (input.getContentType().equalsIgnoreCase(type)) {
-			log.fine(() -> input.getContentType() + " is the same type as  " + type);
-
+		if (result) {
+			if (sentDataIsCompleted) {
+				results = new RawData[1];
+				results[0] = input;
+			} else {
+				results = new RawData[0];
+			}
 		} else {
-			log.fine(() -> input.getContentType() + " is a different type than  " + type);
-			results = new RawData[0];
+			results = new RawData[1];
+			results[0] = input;
 		}
 		return results;
 	}