#30 WIP extracted the IcecastMetadataUpdater and merged some of the icecast configuration method into a new superclass.

src/audio/broadcast/icecast/IcecastHTTPConfiguration.java

@@ -24,18 +24,8 @@ import audio.broadcast.BroadcastServerType;
 
 import java.util.Base64;
 
-public class IcecastHTTPConfiguration extends BroadcastConfiguration
+public class IcecastHTTPConfiguration extends IcecastConfiguration
 {
-    private String mUserName = "source";
-    private String mMountPoint = "stream";
-    private String mDescription;
-    private String mGenre;
-    private boolean mPublic;
-    private int mBitRate = 16; //kHz
-    private int mChannels = 1;
-    private int mSampleRate = 8000;
-    private String mURL;
-
     public IcecastHTTPConfiguration()
     {
         //no-arg JAXB constructor
@@ -84,234 +74,5 @@ public class IcecastHTTPConfiguration extends BroadcastConfiguration
         return BroadcastServerType.ICECAST_HTTP;
     }
 
-    /**
-     * Base64 encoded version of the username and password with prepended 'Basic ' tag.
-     */
-    public String getEncodedCredentials()
-    {
-        StringBuilder sb = new StringBuilder();
 
-        if(hasUserName())
-        {
-            sb.append(getUserName()).append(":").append(getPassword());
-        }
-        else
-        {
-            sb.append(getPassword());
-        }
-
-        String base64 = Base64.getEncoder().encodeToString(sb.toString().getBytes());
-
-        return "Basic " + base64;
-    }
-
-    /**
-     * User name.  Default is 'source'.
-     */
-    public String getUserName()
-    {
-        return mUserName;
-    }
-
-    /**
-     * Sets the user name.
-     */
-    public void setUserName(String userName)
-    {
-        mUserName = userName;
-    }
-
-    /**
-     * Indicates if this configuration has a user name
-     */
-    public boolean hasUserName()
-    {
-        return mUserName != null;
-    }
-
-    /**
-     * Mount point or path to the stream
-     * @return mount point
-     */
-    public String getMountPoint()
-    {
-        return mMountPoint;
-    }
-
-    /**
-     * Sets the mount point (path) for the stream
-     * @param mountPoint
-     */
-    public void setMountPoint(String mountPoint)
-    {
-        mMountPoint = mountPoint;
-    }
-
-    /**
-     * Indicates if this configuration has a mount point
-     */
-    public boolean hasMountPoint()
-    {
-        return mMountPoint != null;
-    }
-
-
-    /**
-     * Stream description
-     */
-    public String getDescription()
-    {
-        return mDescription;
-    }
-
-    /**
-     * Sets the stream description
-     */
-    public void setDescription(String description)
-    {
-        mDescription = description;
-    }
-
-    /**
-     * Indicates if this configuration contains a stream description
-     */
-    public boolean hasDescription()
-    {
-        return mDescription != null;
-    }
-
-    /**
-     * Stream genre
-     */
-    public String getGenre()
-    {
-        return mGenre;
-    }
-
-    /**
-     * Sets the stream genre
-     */
-    public void setGenre(String genre)
-    {
-        mGenre = genre;
-    }
-
-    /**
-     * Indicates if this configuration contains a genre
-     */
-    public boolean hasGenre()
-    {
-        return mGenre != null;
-    }
-
-    /**
-     * Public visibility of the broadcastAudio
-     */
-    public boolean isPublic()
-    {
-        return mPublic;
-    }
-
-    /**
-     * Sets public visibility of the broadcastAudio
-     * @param isPublic indicates if the broadcastAudio should be visible to the public
-     */
-    public void setPublic(boolean isPublic)
-    {
-        mPublic = isPublic;
-    }
-
-    /**
-     * Number of audio channels in the broadcastAudio
-     */
-    public int getChannels()
-    {
-        return mChannels;
-    }
-
-    /**
-     * Sets the number of audio channels in the broadcastAudio
-     */
-    public void setChannels(int channels)
-    {
-        mChannels = channels;
-    }
-
-    public boolean hasChannels()
-    {
-        return mChannels > 0;
-    }
-
-    /**
-     * Bit rate in bits per second
-     */
-    public int getBitRate()
-    {
-        return mBitRate;
-    }
-
-    /**
-     * Bit rate
-     * @param bitRate in samples per second
-     */
-    public void setBitRate(int bitRate)
-    {
-        mBitRate = bitRate;
-    }
-
-    /**
-     * Indicates if this configuration has a bit rate value
-     */
-    public boolean hasBitRate()
-    {
-        return mBitRate > 0;
-    }
-
-    /**
-     * Sample rate of the input PCM audio samples.  Default is 8 kHz
-     */
-    public int getSampleRate()
-    {
-        return mSampleRate;
-    }
-
-    /**
-     * Sets the input PCM audio sample rate
-     */
-    public void setSampleRate(int sampleRate)
-    {
-        mSampleRate = sampleRate;
-    }
-
-    /**
-     * Indicates if this configuration contains an audio sample rate
-     */
-    public boolean hasSampleRate()
-    {
-        return mSampleRate > 0;
-    }
-
-    /**
-     * URL associated with the broadcastAudio where users can find additional details.
-     */
-    public String getURL()
-    {
-        return mURL;
-    }
-
-    /**
-     * URL associated with the broadcastAudio where users can find additional details.
-     */
-    public void setURL(String url)
-    {
-        mURL = url;
-    }
-
-    /**
-     * Indicates if this configuration contains a stream URL
-     */
-    public boolean hasURL()
-    {
-        return mURL != null;
-    }
 }