Skip to content

Commit 306cd14

Browse files
committed
Remove some deprecated methods/constants
1 parent 6c4c3d9 commit 306cd14

File tree

8 files changed

+1
-87
lines changed

8 files changed

+1
-87
lines changed

src/io/calimero/ReturnCode.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ public static ReturnCode of(final int code) {
108108

109109
public int code() { return code; }
110110

111-
@Deprecated(forRemoval = true)
112-
public String friendly() { return name; }
113-
114111
public String name() { return name; }
115112

116113
public String description() { return description; }

src/io/calimero/datapoint/Datapoint.java

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public abstract class Datapoint
7777
private GroupAddress main;
7878
private volatile String name;
7979

80-
private volatile DptId dptId;
80+
private final DptId dptId;
8181

8282
// message priority for this datapoint
8383
private volatile Priority priority = Priority.LOW;
@@ -190,12 +190,6 @@ public final String getName()
190190
return name;
191191
}
192192

193-
@Deprecated(forRemoval = true)
194-
public final boolean isStateBased()
195-
{
196-
return this instanceof StateDP;
197-
}
198-
199193
/**
200194
* Sets the priority used for KNX messages of this datapoint.
201195
*
@@ -214,24 +208,6 @@ public final Priority getPriority()
214208
return priority;
215209
}
216210

217-
/**
218-
* @deprecated Set during construction.
219-
*/
220-
@Deprecated(forRemoval = true)
221-
public final void setDPT(final int mainNumber, final String dptID)
222-
{
223-
dptId = dptId(mainNumber, dptID);
224-
}
225-
226-
/**
227-
* @deprecated Use {@link #dptId()}
228-
*/
229-
@Deprecated(forRemoval = true)
230-
public final int getMainNumber()
231-
{
232-
return dptId.mainNumber();
233-
}
234-
235211
/**
236212
* Returns the datapoint type ID of a DPT translator to use for datapoint value
237213
* translation.

src/io/calimero/dptxlator/TranslatorTypes.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,6 @@ public record MainType(int mainNumber, Class<? extends DPTXlator> translator, St
208208
description = description == null ? "" : description;
209209
}
210210

211-
/**
212-
* @deprecated Returns the data type main number.
213-
*
214-
* @return main number as int
215-
*/
216-
@Deprecated(forRemoval = true)
217-
public int getMainNumber()
218-
{
219-
return mainNumber;
220-
}
221-
222211
/**
223212
* Creates a new translator for the given datapoint type.
224213
*
@@ -294,18 +283,6 @@ public DPTXlator createTranslator(final DptId dptId) throws KNXException
294283
}
295284
}
296285

297-
/**
298-
* @deprecated Returns the description to this main type, if any.
299-
* <p>
300-
*
301-
* @return description as String, or the empty string if no description set
302-
*/
303-
@Deprecated(forRemoval = true)
304-
public String getDescription()
305-
{
306-
return description;
307-
}
308-
309286
/**
310287
* Returns a map containing all implemented subtypes.
311288
* <p>

src/io/calimero/link/Connector.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,6 @@ public T target()
213213
return impl;
214214
}
215215

216-
@SuppressWarnings("removal")
217-
public void setKNXMedium(final KNXMediumSettings settings) {}
218-
219216
@Override
220217
public KNXMediumSettings getKNXMedium()
221218
{

src/io/calimero/link/KNXNetworkLink.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@
6464
*/
6565
public interface KNXNetworkLink extends AutoCloseable
6666
{
67-
/**
68-
* @deprecated
69-
*
70-
* @param settings medium settings to use, the expected subtype is according to the
71-
* KNX network medium
72-
*/
73-
@Deprecated(forRemoval = true)
74-
default void setKNXMedium(KNXMediumSettings settings) {}
75-
7667
/**
7768
* Returns the KNX medium settings used by this network link.
7869
* <p>

src/io/calimero/link/KNXNetworkLinkIP.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,6 @@ public class KNXNetworkLinkIP extends AbstractLink<KNXnetIPConnection>
125125
*/
126126
protected static final int TunnelingV1 = 1;
127127

128-
/**
129-
* @deprecated Use {@link #TunnelingV1}.
130-
*/
131-
@Deprecated(forRemoval = true)
132-
protected static final int TUNNELING = TunnelingV1;
133-
134128
/**
135129
* Service mode for link layer tunneling v2.
136130
*/

src/io/calimero/link/KNXNetworkMonitor.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@
6060
*/
6161
public interface KNXNetworkMonitor extends AutoCloseable
6262
{
63-
/**
64-
* @deprecated
65-
*
66-
* @param settings medium settings to use, the expected subtype is according to the
67-
* KNX network medium
68-
*/
69-
@Deprecated(forRemoval = true)
70-
default void setKNXMedium(KNXMediumSettings settings) {}
71-
7263
/**
7364
* Returns the KNX medium settings used by this monitor link.
7465
* <p>

src/io/calimero/process/ProcessCommunicatorImpl.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,6 @@ public ProcessCommunicatorImpl(final KNXNetworkLink link, final Security securit
193193
this(link, new SecureApplicationLayer(link, security), useGoDiagnostics);
194194
}
195195

196-
/**
197-
* @deprecated Use {@link #ProcessCommunicatorImpl(KNXNetworkLink, SecureApplicationLayer, boolean)}.
198-
*/
199-
@Deprecated(forRemoval = true)
200-
public ProcessCommunicatorImpl(final KNXNetworkLink link, final SecureApplicationLayer sal)
201-
throws KNXLinkClosedException {
202-
this(link, sal, true);
203-
}
204-
205196
/**
206197
* Creates a new process communicator using the supplied secure application layer, attached to the supplied KNX
207198
* network link. This constructor allows to specify the communication behavior with respect to KNX Data Secure,

0 commit comments

Comments
 (0)