Skip to content

Commit ad92559

Browse files
NadaharNadahar
committed
Reorganized classes
1 parent 52130c5 commit ad92559

File tree

106 files changed

+3916
-2780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+3916
-2780
lines changed

‎src/main/java/org/digitalmediaserver/cast/CastDevice.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.digitalmediaserver.cast;
1717

18-
import static org.digitalmediaserver.cast.Util.requireNotBlank;
19-
import static org.digitalmediaserver.cast.Util.requireNotNull;
18+
import static org.digitalmediaserver.cast.util.Util.requireNotBlank;
19+
import static org.digitalmediaserver.cast.util.Util.requireNotNull;
2020
import java.io.IOException;
2121
import java.net.InetAddress;
2222
import java.net.InetSocketAddress;
@@ -41,11 +41,18 @@
4141
import javax.annotation.Nullable;
4242
import javax.jmdns.JmDNS;
4343
import javax.jmdns.ServiceInfo;
44-
import org.digitalmediaserver.cast.CastEvent.CastEventListener;
45-
import org.digitalmediaserver.cast.CastEvent.CastEventListenerList;
46-
import org.digitalmediaserver.cast.CastEvent.CastEventType;
47-
import org.digitalmediaserver.cast.CastEvent.ThreadedCastEventListenerList;
48-
import org.digitalmediaserver.cast.Volume.VolumeControlType;
44+
import org.digitalmediaserver.cast.event.CastEvent.CastEventListener;
45+
import org.digitalmediaserver.cast.event.CastEvent.CastEventListenerList;
46+
import org.digitalmediaserver.cast.event.CastEvent.CastEventType;
47+
import org.digitalmediaserver.cast.event.CastEvent.ThreadedCastEventListenerList;
48+
import org.digitalmediaserver.cast.message.entity.Application;
49+
import org.digitalmediaserver.cast.message.entity.ReceiverStatus;
50+
import org.digitalmediaserver.cast.message.entity.Volume;
51+
import org.digitalmediaserver.cast.message.enumeration.VirtualConnectionType;
52+
import org.digitalmediaserver.cast.message.enumeration.VolumeControlType;
53+
import org.digitalmediaserver.cast.message.request.Request;
54+
import org.digitalmediaserver.cast.message.response.Response;
55+
import org.digitalmediaserver.cast.util.Util;
4956

5057

5158
/**

‎src/main/java/org/digitalmediaserver/cast/CastDeviceMonitor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import javax.jmdns.ServiceEvent;
2323
import javax.jmdns.ServiceInfo;
2424
import javax.jmdns.ServiceListener;
25+
import org.digitalmediaserver.cast.util.Util;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728
import java.io.IOException;

‎src/main/java/org/digitalmediaserver/cast/CastException.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import java.io.IOException;
1919
import javax.annotation.Nonnull;
2020
import javax.annotation.Nullable;
21-
import org.digitalmediaserver.cast.StandardResponse.ErrorResponse;
21+
import org.digitalmediaserver.cast.message.response.ErrorResponse;
22+
import org.digitalmediaserver.cast.message.response.StandardResponse;
23+
import org.digitalmediaserver.cast.util.Util;
2224

2325

2426
/**

‎src/main/java/org/digitalmediaserver/cast/Channel.java‎

Lines changed: 49 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
*/
1616
package org.digitalmediaserver.cast;
1717

18-
import static org.digitalmediaserver.cast.Util.isBlank;
19-
import static org.digitalmediaserver.cast.Util.readB32Int;
20-
import static org.digitalmediaserver.cast.Util.requireNotBlank;
21-
import static org.digitalmediaserver.cast.Util.requireNotNull;
22-
import static org.digitalmediaserver.cast.Util.writeB32Int;
18+
import static org.digitalmediaserver.cast.util.Util.*;
2319
import java.io.Closeable;
2420
import java.io.IOException;
2521
import java.io.InputStream;
@@ -42,48 +38,66 @@
4238
import java.util.Set;
4339
import java.util.Timer;
4440
import java.util.TimerTask;
45-
import java.util.concurrent.RejectedExecutionException;
4641
import java.util.concurrent.TimeoutException;
4742
import java.util.concurrent.atomic.AtomicLong;
4843
import javax.annotation.Nonnull;
4944
import javax.annotation.Nullable;
5045
import javax.annotation.concurrent.GuardedBy;
5146
import javax.net.ssl.SSLContext;
5247
import javax.net.ssl.TrustManager;
53-
import org.digitalmediaserver.cast.CastChannel.CastMessage;
54-
import org.digitalmediaserver.cast.CastEvent.CastEventListener;
55-
import org.digitalmediaserver.cast.CastEvent.CastEventListenerList;
56-
import org.digitalmediaserver.cast.CastEvent.CastEventType;
57-
import org.digitalmediaserver.cast.CastEvent.DefaultCastEvent;
5848
import org.digitalmediaserver.cast.CastException.ErrorResponseCastException;
5949
import org.digitalmediaserver.cast.CastException.LaunchErrorCastException;
6050
import org.digitalmediaserver.cast.CastException.UnprocessedCastException;
6151
import org.digitalmediaserver.cast.CastException.UntypedCastException;
62-
import org.digitalmediaserver.cast.ImmutableCastMessage.ImmutableBinaryCastMessage;
63-
import org.digitalmediaserver.cast.ImmutableCastMessage.ImmutableStringCastMessage;
6452
import org.digitalmediaserver.cast.Session.SessionClosedListener;
65-
import org.digitalmediaserver.cast.StandardMessage.CloseConnection;
66-
import org.digitalmediaserver.cast.StandardMessage.Connect;
67-
import org.digitalmediaserver.cast.StandardMessage.Ping;
68-
import org.digitalmediaserver.cast.StandardMessage.Pong;
69-
import org.digitalmediaserver.cast.StandardRequest.GetAppAvailability;
70-
import org.digitalmediaserver.cast.StandardRequest.GetStatus;
71-
import org.digitalmediaserver.cast.StandardRequest.Launch;
72-
import org.digitalmediaserver.cast.StandardRequest.Load;
73-
import org.digitalmediaserver.cast.StandardRequest.Pause;
74-
import org.digitalmediaserver.cast.StandardRequest.Play;
75-
import org.digitalmediaserver.cast.StandardRequest.ResumeState;
76-
import org.digitalmediaserver.cast.StandardRequest.Seek;
77-
import org.digitalmediaserver.cast.StandardRequest.SetVolume;
78-
import org.digitalmediaserver.cast.StandardRequest.Stop;
79-
import org.digitalmediaserver.cast.StandardRequest.StopMedia;
80-
import org.digitalmediaserver.cast.StandardRequest.VolumeRequest;
81-
import org.digitalmediaserver.cast.StandardResponse.AppAvailabilityResponse;
82-
import org.digitalmediaserver.cast.StandardResponse.ErrorResponse;
83-
import org.digitalmediaserver.cast.StandardResponse.LaunchErrorResponse;
84-
import org.digitalmediaserver.cast.StandardResponse.MediaStatusResponse;
85-
import org.digitalmediaserver.cast.StandardResponse.ReceiverStatusResponse;
86-
import org.digitalmediaserver.cast.Volume.VolumeControlType;
53+
import org.digitalmediaserver.cast.event.CloseMessageEvent;
54+
import org.digitalmediaserver.cast.event.CustomMessageEvent;
55+
import org.digitalmediaserver.cast.event.CastEvent.CastEventListener;
56+
import org.digitalmediaserver.cast.event.CastEvent.CastEventListenerList;
57+
import org.digitalmediaserver.cast.event.CastEvent.CastEventType;
58+
import org.digitalmediaserver.cast.event.CastEvent.DefaultCastEvent;
59+
import org.digitalmediaserver.cast.message.ImmutableBinaryCastMessage;
60+
import org.digitalmediaserver.cast.message.ImmutableCastMessage;
61+
import org.digitalmediaserver.cast.message.ImmutableStringCastMessage;
62+
import org.digitalmediaserver.cast.message.Message;
63+
import org.digitalmediaserver.cast.message.StandardMessage.CloseConnection;
64+
import org.digitalmediaserver.cast.message.StandardMessage.Connect;
65+
import org.digitalmediaserver.cast.message.StandardMessage.Ping;
66+
import org.digitalmediaserver.cast.message.StandardMessage.Pong;
67+
import org.digitalmediaserver.cast.message.entity.Application;
68+
import org.digitalmediaserver.cast.message.entity.LoadOptions;
69+
import org.digitalmediaserver.cast.message.entity.Media;
70+
import org.digitalmediaserver.cast.message.entity.MediaStatus;
71+
import org.digitalmediaserver.cast.message.entity.MediaVolume;
72+
import org.digitalmediaserver.cast.message.entity.QueueData;
73+
import org.digitalmediaserver.cast.message.entity.ReceiverStatus;
74+
import org.digitalmediaserver.cast.message.entity.Volume;
75+
import org.digitalmediaserver.cast.message.enumeration.ResumeState;
76+
import org.digitalmediaserver.cast.message.enumeration.VirtualConnectionType;
77+
import org.digitalmediaserver.cast.message.enumeration.VolumeControlType;
78+
import org.digitalmediaserver.cast.message.request.Request;
79+
import org.digitalmediaserver.cast.message.request.GetAppAvailability;
80+
import org.digitalmediaserver.cast.message.request.StandardRequest.GetStatus;
81+
import org.digitalmediaserver.cast.message.request.Launch;
82+
import org.digitalmediaserver.cast.message.request.Load;
83+
import org.digitalmediaserver.cast.message.request.Pause;
84+
import org.digitalmediaserver.cast.message.request.Play;
85+
import org.digitalmediaserver.cast.message.request.Seek;
86+
import org.digitalmediaserver.cast.message.request.SetVolume;
87+
import org.digitalmediaserver.cast.message.request.Stop;
88+
import org.digitalmediaserver.cast.message.request.StopMedia;
89+
import org.digitalmediaserver.cast.message.request.VolumeRequest;
90+
import org.digitalmediaserver.cast.message.response.AppAvailabilityResponse;
91+
import org.digitalmediaserver.cast.message.response.ErrorResponse;
92+
import org.digitalmediaserver.cast.message.response.LaunchErrorResponse;
93+
import org.digitalmediaserver.cast.message.response.MediaStatusResponse;
94+
import org.digitalmediaserver.cast.message.response.ReceiverStatusResponse;
95+
import org.digitalmediaserver.cast.message.response.Response;
96+
import org.digitalmediaserver.cast.message.response.StandardResponse;
97+
import org.digitalmediaserver.cast.protobuf.CastChannel;
98+
import org.digitalmediaserver.cast.protobuf.CastChannel.CastMessage;
99+
import org.digitalmediaserver.cast.util.JacksonHelper;
100+
import org.digitalmediaserver.cast.util.X509TrustAllManager;
87101
import org.slf4j.Logger;
88102
import org.slf4j.LoggerFactory;
89103
import org.slf4j.Marker;

‎src/main/java/org/digitalmediaserver/cast/Session.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,17 @@
2222
import javax.annotation.Nullable;
2323
import javax.annotation.concurrent.GuardedBy;
2424
import javax.annotation.concurrent.ThreadSafe;
25-
import org.digitalmediaserver.cast.Media.MediaBuilder;
26-
import org.digitalmediaserver.cast.StandardRequest.Load;
27-
import org.digitalmediaserver.cast.StandardRequest.ResumeState;
25+
import org.digitalmediaserver.cast.message.request.Request;
26+
import org.digitalmediaserver.cast.message.entity.LoadOptions;
27+
import org.digitalmediaserver.cast.message.entity.Media;
28+
import org.digitalmediaserver.cast.message.entity.MediaStatus;
29+
import org.digitalmediaserver.cast.message.entity.MediaVolume;
30+
import org.digitalmediaserver.cast.message.entity.QueueData;
31+
import org.digitalmediaserver.cast.message.entity.Media.MediaBuilder;
32+
import org.digitalmediaserver.cast.message.enumeration.ResumeState;
33+
import org.digitalmediaserver.cast.message.request.Load;
34+
import org.digitalmediaserver.cast.message.response.Response;
35+
import org.digitalmediaserver.cast.util.Util;
2836

2937

3038
/**

0 commit comments

Comments
 (0)