Refactor message brokers: groovy to java, and new sensor feeds