Moved classes to dto package to reduce SAT warning

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
openhab · Jan 1, 2022 · d3c7ba6 · d3c7ba6
1 parent be1c72e
commit d3c7ba6
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/...ab.voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleCloudAPI.java b/...ab.voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleCloudAPI.java
@@ -44,15 +44,15 @@
 import org.openhab.core.auth.client.oauth2.OAuthResponseException;
 import org.openhab.core.i18n.CommunicationException;
 import org.openhab.core.io.net.http.HttpRequestBuilder;
-import org.openhab.voice.googletts.internal.protocol.AudioConfig;
-import org.openhab.voice.googletts.internal.protocol.AudioEncoding;
-import org.openhab.voice.googletts.internal.protocol.ListVoicesResponse;
-import org.openhab.voice.googletts.internal.protocol.SsmlVoiceGender;
-import org.openhab.voice.googletts.internal.protocol.SynthesisInput;
-import org.openhab.voice.googletts.internal.protocol.SynthesizeSpeechRequest;
-import org.openhab.voice.googletts.internal.protocol.SynthesizeSpeechResponse;
-import org.openhab.voice.googletts.internal.protocol.Voice;
-import org.openhab.voice.googletts.internal.protocol.VoiceSelectionParams;
+import org.openhab.voice.googletts.internal.dto.AudioConfig;
+import org.openhab.voice.googletts.internal.dto.AudioEncoding;
+import org.openhab.voice.googletts.internal.dto.ListVoicesResponse;
+import org.openhab.voice.googletts.internal.dto.SsmlVoiceGender;
+import org.openhab.voice.googletts.internal.dto.SynthesisInput;
+import org.openhab.voice.googletts.internal.dto.SynthesizeSpeechRequest;
+import org.openhab.voice.googletts.internal.dto.SynthesizeSpeechResponse;
+import org.openhab.voice.googletts.internal.dto.Voice;
+import org.openhab.voice.googletts.internal.dto.VoiceSelectionParams;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
@@ -364,9 +364,9 @@ public byte[] synthesizeSpeech(String text, GoogleTTSVoice voice, String codec)
             initialized = false;
             voices.clear();
         } catch (FileNotFoundException e) {
-            logger.warn("Could not write file {} to cache: ", audioFileInCache, e.getMessage());
+            logger.warn("Could not write file {} to cache: {}", audioFileInCache, e.getMessage());
         } catch (IOException e) {
-            logger.debug("An unexpected IOException occured: %s", e.getMessage());
+            logger.debug("An unexpected IOException occured: {}", e.getMessage());
         }
         return null;
     }

diff --git a/....voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleTTSService.java b/....voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleTTSService.java
@@ -32,7 +32,7 @@
 import org.openhab.core.voice.TTSException;
 import org.openhab.core.voice.TTSService;
 import org.openhab.core.voice.Voice;
-import org.openhab.voice.googletts.internal.protocol.AudioEncoding;
+import org.openhab.voice.googletts.internal.dto.AudioEncoding;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Activate;

diff --git a/...ab.voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleTTSVoice.java b/...ab.voice.googletts/src/main/java/org/openhab/voice/googletts/internal/GoogleTTSVoice.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.voice.Voice;
-import org.openhab.voice.googletts.internal.protocol.SsmlVoiceGender;
+import org.openhab.voice.googletts.internal.dto.SsmlVoiceGender;
 
 /**
  * Implementation of the Voice interface for Google Cloud TTS Service.

diff --git a/...gletts/internal/protocol/AudioConfig.java → ...e/googletts/internal/dto/AudioConfig.java b/...gletts/internal/protocol/AudioConfig.java → ...e/googletts/internal/dto/AudioConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * The configuration of the synthesized audio.

diff --git a/...etts/internal/protocol/AudioEncoding.java → ...googletts/internal/dto/AudioEncoding.java b/...etts/internal/protocol/AudioEncoding.java → ...googletts/internal/dto/AudioEncoding.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * Configuration to set up audio encoder.

diff --git a/...internal/protocol/ListVoicesResponse.java → ...etts/internal/dto/ListVoicesResponse.java b/...internal/protocol/ListVoicesResponse.java → ...etts/internal/dto/ListVoicesResponse.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 import java.util.List;
 

diff --git a/...ts/internal/protocol/SsmlVoiceGender.java → ...ogletts/internal/dto/SsmlVoiceGender.java b/...ts/internal/protocol/SsmlVoiceGender.java → ...ogletts/internal/dto/SsmlVoiceGender.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * Gender of the voice as described in SSML voice element.

diff --git a/...tts/internal/protocol/SynthesisInput.java → ...oogletts/internal/dto/SynthesisInput.java b/...tts/internal/protocol/SynthesisInput.java → ...oogletts/internal/dto/SynthesisInput.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * Contains text input to be synthesized. Either text or ssml must be supplied. Supplying both or neither returns

diff --git a/...nal/protocol/SynthesizeSpeechRequest.java → ...internal/dto/SynthesizeSpeechRequest.java b/...nal/protocol/SynthesizeSpeechRequest.java → ...internal/dto/SynthesizeSpeechRequest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * Synthesizes speech synchronously: receive results after all text input has been processed.

diff --git a/...al/protocol/SynthesizeSpeechResponse.java → ...nternal/dto/SynthesizeSpeechResponse.java b/...al/protocol/SynthesizeSpeechResponse.java → ...nternal/dto/SynthesizeSpeechResponse.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * The message returned to the client by the text.synthesize method.

diff --git a/...ce/googletts/internal/protocol/Voice.java → ...b/voice/googletts/internal/dto/Voice.java b/...ce/googletts/internal/protocol/Voice.java → ...b/voice/googletts/internal/dto/Voice.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 import java.util.List;
 

diff --git a/...ternal/protocol/VoiceSelectionParams.java → ...ts/internal/dto/VoiceSelectionParams.java b/...ternal/protocol/VoiceSelectionParams.java → ...ts/internal/dto/VoiceSelectionParams.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.voice.googletts.internal.protocol;
+package org.openhab.voice.googletts.internal.dto;
 
 /**
  * Description of which voice to use for a synthesis request.