Changes

MultiSubDownloader/pom.xml

@@ -69,12 +69,15 @@
         </dependency>
         <dependency>
             <groupId>systems.manifold</groupId>
-            <artifactId>manifold-science</artifactId>
+            <artifactId>manifold-json-rt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <groupId>systems.manifold</groupId>
+            <artifactId>manifold-yaml-rt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>systems.manifold</groupId>
+            <artifactId>manifold-science</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openapitools</groupId>
@@ -93,13 +96,17 @@
             <artifactId>throwing-streams</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.pivovarit</groupId>
-            <artifactId>throwing-function</artifactId>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -171,6 +178,16 @@
                             <artifactId>manifold-strings</artifactId>
                             <version>${manifold.version}</version>
                         </path>
+                        <path>
+                            <groupId>systems.manifold</groupId>
+                            <artifactId>manifold-json</artifactId>
+                            <version>${manifold.version}</version>
+                        </path>
+                        <path>
+                            <groupId>systems.manifold</groupId>
+                            <artifactId>manifold-yaml</artifactId>
+                            <version>${manifold.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
@@ -235,31 +252,20 @@
                             <apiPackage>org.gestdown.api</apiPackage>
                             <invokerPackage>org.gestdown.invoker</invokerPackage>
                             <packageName>org.gestdown</packageName>
-                            <!--<language>java</language>-->
                             <skipValidateSpec>true</skipValidateSpec>
                             <apisToGenerate>Subtitles,TvShows</apisToGenerate>
-                            <modelsToGenerate>AbstractOpenApiSchema,EpisodeDto,EpisodeWithSubtitlesDto,ErrorResponse,SearchRequest,ShowDto,ShowSearchResponse,SubtitleDto,SubtitleSearchResponse,TvShowSubtitleResponse,WrongFormatResponse</modelsToGenerate>
+                            <!--                            <modelsToGenerate>AbstractOpenApiSchema,EpisodeDto,EpisodeWithSubtitlesDto,ErrorResponse,SearchRequest,ShowDto,ShowSearchResponse,SubtitleDto,SubtitleSearchResponse,TvShowSubtitleResponse,WrongFormatResponse</modelsToGenerate>-->
                             <generateModelTests>false</generateModelTests>
                             <configOptions>
                                 <typeMappings>integer=int,int=int</typeMappings>
                                 <useSwaggerAnnotations>false</useSwaggerAnnotations>
                                 <serializableModel>true</serializableModel>
                                 <booleanGetterPrefix>is</booleanGetterPrefix>
                                 <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
-                                <!--<sourceFolder>src/gen/java</sourceFolder>-->
-                                <!--<java8>true</java8>-->
                                 <dateLibrary>java8-localdatetime</dateLibrary>
                                 <useJakartaEe>true</useJakartaEe>
+                                <library>retrofit2</library>
                             </configOptions>
-
-                            <typeMappings>
-                                <typeMapping>OffsetDateTime=Instant</typeMapping>
-                                <typeMapping>LocalDateTime=Instant</typeMapping>
-                            </typeMappings>
-                            <importMappings>
-                                <importMapping>java.time.OffsetDateTime=java.time.Instant</importMapping>
-                                <importMapping>java.time.LocalDateTime=java.time.Instant</importMapping>
-                            </importMappings>
                         </configuration>
                     </execution>
                     <execution>
@@ -281,12 +287,13 @@
                             <generateModelTests>false</generateModelTests>
                             <configOptions>
                                 <typeMappings>integer=int,int=int</typeMappings>
-                                <useSwaggerAnnotations>false</useSwaggerAnnotations>
+                                <!--                                <useSwaggerAnnotations>false</useSwaggerAnnotations>-->
                                 <serializableModel>true</serializableModel>
                                 <booleanGetterPrefix>is</booleanGetterPrefix>
                                 <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
                                 <!--<sourceFolder>src/gen/java</sourceFolder>-->
                                 <useJakartaEe>true</useJakartaEe>
+                                <library>retrofit2</library>
                             </configOptions>
                         </configuration>
                     </execution>

MultiSubDownloader/src/main/java/extensions/java/awt/Component/ComponentExt.java

@@ -5,16 +5,18 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 import org.jspecify.annotations.Nullable;
 
-@UtilityClass
 @Extension
 public class ComponentExt {
 
+    private ComponentExt() {
+        // hide utility class constructor
+    }
+
     public static void setRecursive(@This Component component, Consumer<Component> consumer) {
         setRecursive(component, consumer, _ -> true);
     }

MultiSubDownloader/src/main/java/extensions/java/awt/Container/ContainerExt.java

@@ -2,14 +2,15 @@
 
 import java.awt.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
-@UtilityClass
 @Extension
 public class ContainerExt {
+    private ContainerExt() {
+        // hide utility class constructor
+    }
 
     public static @Self Container addComponent(@This Container component, Component child) {
         component.add(child);

MultiSubDownloader/src/main/java/extensions/java/awt/GridBagConstraints/GridBagConstraintsExt.java

@@ -2,14 +2,15 @@
 
 import java.awt.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
 @Extension
-@UtilityClass
 public class GridBagConstraintsExt {
+    private GridBagConstraintsExt() {
+        // hide utility class constructor
+    }
 
     public static @Self GridBagConstraints insets(@This GridBagConstraints gridBagConstraints, Insets insets) {
         gridBagConstraints.insets = insets;

MultiSubDownloader/src/main/java/extensions/java/awt/GridBagLayout/GridBagLayoutExt.java

@@ -2,15 +2,17 @@
 
 import java.awt.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
 @Extension
-@UtilityClass
 public class GridBagLayoutExt {
 
+    private GridBagLayoutExt() {
+        // hide utility class constructor
+    }
+
     public static @Self GridBagLayout columnWidths(@This GridBagLayout gridBagLayout, int[] columnWidths) {
         gridBagLayout.columnWidths = columnWidths;
         return gridBagLayout;

MultiSubDownloader/src/main/java/extensions/javax/swing/AbstractButton/AbstractButtonExt.java

@@ -5,15 +5,16 @@
 import java.awt.event.ActionListener;
 import java.util.function.Consumer;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 import org.lodder.subtools.sublibrary.util.function.BooleanConsumer;
 
-@UtilityClass
 @Extension
 public class AbstractButtonExt {
+    private AbstractButtonExt() {
+        // hide utility class constructor
+    }
 
     public static @Self AbstractButton actionListener(@This AbstractButton abstractButton, ActionListener listener) {
         abstractButton.addActionListener(listener);

MultiSubDownloader/src/main/java/extensions/javax/swing/JButton/JButtonExt.java

@@ -2,15 +2,17 @@
 
 import javax.swing.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
-@UtilityClass
 @Extension
 public class JButtonExt {
 
+    private JButtonExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JButton defaultButtonFor(@This JButton abstractButton, JRootPane rootPane) {
         rootPane.setDefaultButton(abstractButton);
         return abstractButton;

MultiSubDownloader/src/main/java/extensions/javax/swing/JCheckBox/JCheckBoxExt.java

@@ -2,15 +2,16 @@
 
 import javax.swing.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 import org.lodder.subtools.sublibrary.util.function.BooleanConsumer;
 
 @Extension
-@UtilityClass
 public class JCheckBoxExt {
+    private JCheckBoxExt() {
+        // hide utility class constructor
+    }
 
     public static @Self JCheckBox addCheckedChangeListener(@This JCheckBox checkBox, BooleanConsumer... listeners) {
         checkBox.addItemListener(e -> listeners.forEach(lis -> lis.accept(((JCheckBox) e.getSource()).isSelected())));

MultiSubDownloader/src/main/java/extensions/javax/swing/JComboBox/JComboBoxExt.java

@@ -7,17 +7,19 @@
 import java.util.function.Function;
 
 import com.google.common.collect.Iterables;
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 import manifold.ext.rt.api.ThisClass;
 import org.jspecify.annotations.Nullable;
 import org.lodder.subtools.multisubdownloader.gui.ToStringListCellRenderer;
 
-@UtilityClass
 @Extension
 public class JComboBoxExt {
+
+    private JComboBoxExt() {
+        // hide utility class constructor
+    }
 
     public static <E> JComboBox<E> create(@ThisClass Class<JComboBox<E>> thisClass, E... values) {
         return new JComboBox<>(values);

MultiSubDownloader/src/main/java/extensions/javax/swing/JComponent/JComponentExt.java

@@ -1,19 +1,21 @@
 package extensions.javax.swing.JComponent;
 
 import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.border.Border;
 import java.awt.*;
 
 import extensions.java.awt.Component.ComponentExt;
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 import org.jspecify.annotations.Nullable;
 
-@UtilityClass
 @Extension
 public class JComponentExt {
+
+    private JComponentExt() {
+        // hide utility class constructor
+    }
 
     public static @Self JComponent enabled(@This JComponent component, boolean enabled) {
         component.setEnabled(enabled);

MultiSubDownloader/src/main/java/extensions/javax/swing/JProgressBar/JProgressBarExt.java

@@ -2,16 +2,18 @@
 
 import javax.swing.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
 
-@UtilityClass
 @Extension
 public class JProgressBarExt {
 
+    private JProgressBarExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JProgressBar indeterminate(@This JProgressBar progressBar, boolean indeterminate) {
         progressBar.setIndeterminate(indeterminate);
         return progressBar;

MultiSubDownloader/src/main/java/extensions/javax/swing/JScrollPane/JScrollPaneExt.java

@@ -3,15 +3,17 @@
 import javax.swing.*;
 import java.awt.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
-@UtilityClass
 @Extension
 public class JScrollPaneExt {
 
+    private JScrollPaneExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JScrollPane viewportView(@This JScrollPane scrollPane, Component view) {
         scrollPane.setViewportView(view);
         return scrollPane;

MultiSubDownloader/src/main/java/extensions/javax/swing/JSlider/JSliderExt.java

@@ -2,15 +2,17 @@
 
 import javax.swing.*;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
-@UtilityClass
 @Extension
 public class JSliderExt {
 
+    private JSliderExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JSlider minimum(@This JSlider slider, int minimum) {
         slider.setMinimum(minimum);
         return slider;

MultiSubDownloader/src/main/java/extensions/javax/swing/JTabbedPane/TabbedPaneExt.java

@@ -4,15 +4,17 @@
 import java.awt.*;
 import java.util.function.Consumer;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
-@UtilityClass
 @Extension
 public class TabbedPaneExt {
 
+    private TabbedPaneExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JTabbedPane tabLayoutPolicy(@This JTabbedPane tabbedPane, int tabLayoutPolicy) {
         tabbedPane.tabLayoutPolicy = tabLayoutPolicy;
         return tabbedPane;

MultiSubDownloader/src/main/java/extensions/javax/swing/JTable/JTableExt.java

@@ -1,18 +1,20 @@
 package extensions.javax.swing.JTable;
 
 import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.TableModel;
 import java.util.function.Function;
 
-import lombok.experimental.UtilityClass;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.Self;
 import manifold.ext.rt.api.This;
 
 @Extension
-@UtilityClass
 public class JTableExt {
 
+    private JTableExt() {
+        // hide utility class constructor
+    }
+
     public static @Self JTable model(@This JTable jTable, TableModel dataModel) {
         jTable.setModel(dataModel);
         return jTable;