MID-7484: legacy transport classes moved to transport.legacy

Previously it was under api.transports, which made little sense anyway.
Evolveum · Feb 15, 2022 · 14966db · 14966db
1 parent 9fd03fd
commit 14966db
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/...ns-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFunctions.java b/...ns-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFunctions.java
@@ -12,7 +12,7 @@
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.notifications.api.events.SimpleObjectRef;
-import com.evolveum.midpoint.notifications.impl.api.transports.TransportUtil;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.notifications.impl.formatters.TextFormatter;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.polystring.PolyString;

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java b/...-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
@@ -15,7 +15,7 @@
 import com.evolveum.midpoint.notifications.api.events.Event;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportService;
-import com.evolveum.midpoint.notifications.impl.api.transports.TransportUtil;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;

diff --git a/...ons-impl/src/main/java/com/evolveum/midpoint/notifications/impl/TransportServiceImpl.java b/...ons-impl/src/main/java/com/evolveum/midpoint/notifications/impl/TransportServiceImpl.java
@@ -19,10 +19,10 @@
 import com.evolveum.midpoint.notifications.api.transports.Message;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportService;
-import com.evolveum.midpoint.notifications.impl.api.transports.LegacyCustomTransport;
-import com.evolveum.midpoint.notifications.impl.api.transports.LegacyFileTransport;
-import com.evolveum.midpoint.notifications.impl.api.transports.LegacyMailTransport;
-import com.evolveum.midpoint.notifications.impl.api.transports.LegacySimpleSmsTransport;
+import com.evolveum.midpoint.notifications.impl.transport.legacy.LegacyCustomTransport;
+import com.evolveum.midpoint.notifications.impl.transport.legacy.LegacyFileTransport;
+import com.evolveum.midpoint.notifications.impl.transport.legacy.LegacyMailTransport;
+import com.evolveum.midpoint.notifications.impl.transport.legacy.LegacySimpleSmsTransport;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.repo.api.SystemConfigurationChangeEvent;
 import com.evolveum.midpoint.schema.result.OperationResult;

diff --git a/...ns/impl/api/transports/TransportUtil.java → ...cations/impl/transport/TransportUtil.java b/...ns/impl/api/transports/TransportUtil.java → ...cations/impl/transport/TransportUtil.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.notifications.impl.api.transports;
+package com.evolveum.midpoint.notifications.impl.transport;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -31,7 +31,7 @@ public class TransportUtil {
 
     private static final Trace LOGGER = TraceManager.getTrace(TransportUtil.class);
 
-    static void appendToFile(String filename, String text) throws IOException {
+    public static void appendToFile(String filename, String text) throws IOException {
         FileWriter fw = new FileWriter(filename, true);
         fw.append(text);
         fw.close();
@@ -78,7 +78,7 @@ public static String formatToFileOld(Message message) {
         return "============================================ " + "\n" + new Date() + "\n" + message.toString() + "\n\n";
     }
 
-    static String formatToFileNew(Message message, String transport) {
+    public static String formatToFileNew(Message message, String transport) {
         return "================ " + new Date() + " ======= [" + transport + "]\n" + message.debugDump() + "\n\n";
     }
 
@@ -125,7 +125,7 @@ private static boolean isRecipientAllowed(String recipient, NotificationTranspor
         return true;
     }
 
-    static int optionsForFilteringRecipient(
+    public static int optionsForFilteringRecipient(
             NotificationTransportConfigurationType transportConfigurationType) {
         int choices = 0;
         if (transportConfigurationType.getRecipientFilterExpression() != null) {

diff --git a/...api/transports/LegacyCustomTransport.java → ...ansport/legacy/LegacyCustomTransport.java b/...api/transports/LegacyCustomTransport.java → ...ansport/legacy/LegacyCustomTransport.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.notifications.impl.api.transports;
+package com.evolveum.midpoint.notifications.impl.transport.legacy;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.notifications.api.transports.Message;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportSupport;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismPropertyValue;

diff --git a/...l/api/transports/LegacyFileTransport.java → ...transport/legacy/LegacyFileTransport.java b/...l/api/transports/LegacyFileTransport.java → ...transport/legacy/LegacyFileTransport.java
@@ -4,9 +4,9 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.notifications.impl.api.transports;
+package com.evolveum.midpoint.notifications.impl.transport.legacy;
 
-import static com.evolveum.midpoint.notifications.impl.api.transports.TransportUtil.formatToFileNew;
+import static com.evolveum.midpoint.notifications.impl.transport.TransportUtil.formatToFileNew;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -16,6 +16,7 @@
 import com.evolveum.midpoint.notifications.api.transports.Message;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportSupport;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.result.OperationResult;

diff --git a/...l/api/transports/LegacyMailTransport.java → ...transport/legacy/LegacyMailTransport.java b/...l/api/transports/LegacyMailTransport.java → ...transport/legacy/LegacyMailTransport.java
@@ -4,9 +4,9 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.notifications.impl.api.transports;
+package com.evolveum.midpoint.notifications.impl.transport.legacy;
 
-import static com.evolveum.midpoint.notifications.impl.api.transports.TransportUtil.formatToFileOld;
+import static com.evolveum.midpoint.notifications.impl.transport.TransportUtil.formatToFileOld;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -36,6 +36,7 @@
 import com.evolveum.midpoint.notifications.api.transports.Message;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportSupport;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.notifications.impl.util.MimeTypeUtil;
 import com.evolveum.midpoint.prism.crypto.EncryptionException;
 import com.evolveum.midpoint.prism.crypto.Protector;

diff --git a/.../transports/LegacySimpleSmsTransport.java → ...port/legacy/LegacySimpleSmsTransport.java b/.../transports/LegacySimpleSmsTransport.java → ...port/legacy/LegacySimpleSmsTransport.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.notifications.impl.api.transports;
+package com.evolveum.midpoint.notifications.impl.transport.legacy;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -43,6 +43,7 @@
 import com.evolveum.midpoint.notifications.api.transports.Message;
 import com.evolveum.midpoint.notifications.api.transports.Transport;
 import com.evolveum.midpoint.notifications.api.transports.TransportSupport;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.notifications.impl.util.HttpUtil;
 import com.evolveum.midpoint.prism.MutablePrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismContext;

diff --git a/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java b/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java
@@ -18,7 +18,7 @@
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
-import com.evolveum.midpoint.notifications.impl.api.transports.TransportUtil;
+import com.evolveum.midpoint.notifications.impl.transport.TransportUtil;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;