Drop UpgradeHelper

Signed-off-by: Stephen Gallagher <[email protected]>

Author: sgallagher

modulemd/include/modulemd-2.0/modulemd-module-index.h

@@ -636,33 +636,4 @@ modulemd_module_index_upgrade_defaults (ModulemdModuleIndex *self,
                                         GError **error);
 
 
-/**
- * modulemd_module_index_add_known_stream:
- * @self: This #ModulemdModuleIndex object.
- * @module_name: (in): The name of the known module being added.
- * @stream_name: (in): The name of the known module stream being added.
- *
- * This function adds a `module:stream` entry to the #ModulemdModuleIndex.
- * It will be used if and when libmodulemd needs to upgrade a
- * #ModulemdModuleStreamV2 object to a #ModulemdModuleStreamV3 object if it
- * encounters a module dependency that is specified as either `[ ]`
- * (all streams) or `[ -streamname ]` (all but some exclusions).
- *
- * When using the python bindings, a simplified way to set these values is to
- * call:
- *
- * |[<!-- language="Python" -->
- * idx = Modulemd.ModuleIndex.new()
- * idx.set_known_streams({"module_name": ["stream1", "stream2"]})
- * ]|
-
- *
- * Since: 2.10
- */
-void
-modulemd_module_index_add_known_stream (ModulemdModuleIndex *self,
-                                        const gchar *module_name,
-                                        const gchar *stream_name);
-
-
 G_END_DECLS

modulemd/include/private/modulemd-module-private.h

@@ -19,7 +19,6 @@
 #include "modulemd-module.h"
 #include "modulemd-translation.h"
 #include "modulemd-obsoletes.h"
-#include "private/modulemd-upgrade-helper.h"
 
 
 G_BEGIN_DECLS
@@ -175,22 +174,4 @@ modulemd_module_upgrade_streams (ModulemdModule *self,
                                  ModulemdModuleStreamVersionEnum mdversion,
                                  GError **error);
 
-/**
- * modulemd_module_associate_upgrade_helper:
- * @self: This #ModulemdModule object.
- * @upgrade_helper: (in)(transfer none): a #ModulemdUpgradeHelper to associate
- * with this module.
- *
- * Associates a #ModulemdUpgradeHelper, usually from a #ModulemdModuleIndex,
- * with this module to help with upgrades between #ModuleStreamV2 and
- * #ModuleStreamV3. This function will take a reference on the one passed in,
- * so modifications to the @upgrade_helper will affect subsequent changes to
- * this #ModulemdModule.
- *
- * Since: 2.10
- */
-void
-modulemd_module_associate_upgrade_helper (
-  ModulemdModule *self, ModulemdUpgradeHelper *upgrade_helper);
-
 G_END_DECLS

modulemd/include/private/modulemd-module-stream-private.h

@@ -19,7 +19,6 @@
 #include "modulemd-translation.h"
 #include "private/modulemd-module-stream-v1-private.h"
 #include "private/modulemd-module-stream-v2-private.h"
-#include "private/modulemd-upgrade-helper.h"
 #include "private/modulemd-yaml.h"
 #include <glib-object.h>
 
@@ -519,23 +518,4 @@ modulemd_module_stream_clear_autogen_module_name (ModulemdModuleStream *self);
 void
 modulemd_module_stream_clear_autogen_stream_name (ModulemdModuleStream *self);
 
-
-/**
- * modulemd_module_stream_associate_upgrade_helper:
- * @self: This #ModulemdModuleStream object.
- * @upgrade_helper: (in)(transfer none): a #ModulemdUpgradeHelper to associate
- * with this module.
- *
- * Associates a #ModulemdUpgradeHelper, usually from a #ModulemdModuleIndex,
- * with this stream to help with upgrades between #ModuleStreamV2 and
- * #ModuleStreamV3. This function will take a reference on the one passed in,
- * so modifications to the @upgrade_helper will affect subsequent changes to
- * this #ModulemdModuleStream.
- *
- * Since: 2.10
- */
-void
-modulemd_module_stream_associate_upgrade_helper (
-  ModulemdModuleStream *self, ModulemdUpgradeHelper *upgrade_helper);
-
 G_END_DECLS

modulemd/include/private/modulemd-upgrade-helper.h

@@ -83,7 +83,6 @@ modulemd_srcs = files(
     'modulemd-subdocument-info.c',
     'modulemd-translation.c',
     'modulemd-translation-entry.c',
-    'modulemd-upgrade-helper.c',
     'modulemd-util.c',
     'modulemd-yaml-util.c',
     'modulemd-obsoletes.c',
@@ -142,7 +141,6 @@ modulemd_priv_hdrs = files(
     'include/private/modulemd-subdocument-info-private.h',
     'include/private/modulemd-translation-private.h',
     'include/private/modulemd-translation-entry-private.h',
-    'include/private/modulemd-upgrade-helper.h',
     'include/private/modulemd-util.h',
     'include/private/modulemd-yaml.h',
     'include/private/gi-binding-renames.h',
@@ -325,7 +323,6 @@ c_tests = {
 'service_level'       : [ 'tests/test-modulemd-service-level.c' ],
 'translation'         : [ 'tests/test-modulemd-translation.c' ],
 'translation_entry'   : [ 'tests/test-modulemd-translation-entry.c' ],
-'upgrade_helper'      : [ 'tests/test-modulemd-upgrade-helper.c' ],
 'obsoletes'           : [ 'tests/test-modulemd-obsoletes.c' ],
 }
 

modulemd/meson.build

@@ -82,7 +82,6 @@
        <xi:include href="xml/modulemd-subdocument-info-private.xml"/>
        <xi:include href="xml/modulemd-translation-private.xml"/>
        <xi:include href="xml/modulemd-translation-entry-private.xml"/>
-       <xi:include href="xml/modulemd-upgrade-helper.xml"/>
        <xi:include href="xml/modulemd-obsoletes-private.xml"/>
     </chapter>
     <chapter>

modulemd/modulemd-docs.xml

@@ -39,7 +39,6 @@
 #include "private/modulemd-subdocument-info-private.h"
 #include "private/modulemd-translation-private.h"
 #include "private/modulemd-obsoletes-private.h"
-#include "private/modulemd-upgrade-helper.h"
 #include "private/modulemd-util.h"
 #include "private/modulemd-yaml.h"
 
@@ -55,8 +54,6 @@ struct _ModulemdModuleIndex
 
   ModulemdDefaultsVersionEnum defaults_mdversion;
   ModulemdModuleStreamVersionEnum stream_mdversion;
-
-  ModulemdUpgradeHelper *helper;
 };
 
 G_DEFINE_TYPE (ModulemdModuleIndex, modulemd_module_index, G_TYPE_OBJECT)
@@ -75,7 +72,6 @@ modulemd_module_index_finalize (GObject *object)
   ModulemdModuleIndex *self = (ModulemdModuleIndex *)object;
 
   g_clear_pointer (&self->modules, g_hash_table_unref);
-  g_clear_object (&self->helper);
 
   G_OBJECT_CLASS (modulemd_module_index_parent_class)->finalize (object);
 }
@@ -122,7 +118,6 @@ modulemd_module_index_init (ModulemdModuleIndex *self)
 {
   self->modules =
     g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-  self->helper = modulemd_upgrade_helper_new ();
 }
 
 
@@ -133,7 +128,6 @@ get_or_create_module (ModulemdModuleIndex *self, const gchar *module_name)
   if (module == NULL)
     {
       module = modulemd_module_new (module_name);
-      modulemd_module_associate_upgrade_helper (module, self->helper);
       g_hash_table_insert (self->modules, g_strdup (module_name), module);
     }
   return module;
@@ -1187,16 +1181,6 @@ modulemd_module_index_remove_module (ModulemdModuleIndex *self,
 }
 
 
-void
-modulemd_module_index_add_known_stream (ModulemdModuleIndex *self,
-                                        const gchar *module_name,
-                                        const gchar *stream_name)
-{
-  return modulemd_upgrade_helper_add_known_stream (
-    self->helper, module_name, stream_name);
-}
-
-
 gboolean
 modulemd_module_index_add_module_stream (ModulemdModuleIndex *self,
                                          ModulemdModuleStream *stream,

modulemd/modulemd-module-index.c

@@ -26,7 +26,6 @@
 #include "private/modulemd-module-stream-v2-private.h"
 #include "private/modulemd-packager-v3.h"
 #include "private/modulemd-subdocument-info-private.h"
-#include "private/modulemd-upgrade-helper.h"
 #include "private/modulemd-util.h"
 #include "private/modulemd-yaml.h"
 #include <errno.h>
@@ -40,7 +39,6 @@ typedef struct
   gchar *context;
   gchar *arch;
   ModulemdTranslation *translation;
-  ModulemdUpgradeHelper *helper;
 } ModulemdModuleStreamPrivate;
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ModulemdModuleStream,
@@ -323,7 +321,6 @@ modulemd_module_stream_finalize (GObject *object)
   g_clear_pointer (&priv->context, g_free);
   g_clear_pointer (&priv->arch, g_free);
   g_clear_object (&priv->translation);
-  g_clear_object (&priv->helper);
 
   G_OBJECT_CLASS (modulemd_module_stream_parent_class)->finalize (object);
 }
@@ -1601,18 +1598,3 @@ modulemd_module_stream_clear_autogen_stream_name (ModulemdModuleStream *self)
       modulemd_module_stream_set_stream_name (self, NULL);
     }
 }
-
-
-void
-modulemd_module_stream_associate_upgrade_helper (
-  ModulemdModuleStream *self, ModulemdUpgradeHelper *upgrade_helper)
-{
-  g_return_if_fail (MODULEMD_IS_MODULE_STREAM (self));
-  g_return_if_fail (MODULEMD_IS_UPGRADE_HELPER (upgrade_helper));
-
-  ModulemdModuleStreamPrivate *priv =
-    modulemd_module_stream_get_instance_private (self);
-
-  g_clear_object (&priv->helper);
-  priv->helper = g_object_ref (upgrade_helper);
-}