diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ote.core')
71 files changed, 162 insertions, 162 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/Configuration.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/Configuration.java index 9b2d60ccf79..e92606ed5dc 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/Configuration.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/Configuration.java @@ -17,7 +17,7 @@ public class Configuration implements Serializable { private ArrayList<ConfigurationItem> items; public Configuration() { - items = new ArrayList<ConfigurationItem>(); + items = new ArrayList<>(); } public List<ConfigurationItem> getItems() { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java index b134063ccb1..550d2a777e9 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java @@ -192,7 +192,7 @@ public class OTETestEnvironmentClient { HeadlessClassServer classServer = null; Configuration localConfiguration = new Configuration(); try{ - List<File> bundlesToSend = new ArrayList<File>(); + List<File> bundlesToSend = new ArrayList<>(); bundlesToSend.add(oteBuilderRootFolder); classServer = new HeadlessClassServer(PortUtil.getInstance().getValidPort(), InetAddress.getLocalHost(), bundlesToSend); File[] jars = oteBuilderRootFolder.listFiles(new FilenameFilter(){ diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServer.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServer.java index 7ce0a6fb490..10d605f916a 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServer.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServer.java @@ -59,7 +59,7 @@ public class ClassServer extends Thread { hostName = new URL("http://" + address.getHostAddress() + ":" + server.getLocalPort() + "/"); } this.setName("OSEE ClassServer"); - this.resourceFinders = new ArrayList<ResourceFinder>(); + this.resourceFinders = new ArrayList<>(); } public void addResourceFinder(ResourceFinder finder) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServerPermissions.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServerPermissions.java index 6864208d6a9..3047dc666db 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServerPermissions.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/ClassServerPermissions.java @@ -24,7 +24,7 @@ public class ClassServerPermissions extends PermissionCollection { private final ArrayList<Permission> list; public ClassServerPermissions() { - list = new ArrayList<Permission>(); + list = new ArrayList<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/HeadlessClassServer.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/HeadlessClassServer.java index 7b11ae13ea3..2988e3f8227 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/HeadlessClassServer.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/HeadlessClassServer.java @@ -21,7 +21,7 @@ public class HeadlessClassServer { public HeadlessClassServer(int port, InetAddress address, List<File> bundleFolders) throws IOException{ // Thread.currentThread().setName("BundleClassServer"); classServer = new ClassServer(port, address); - jars = new ArrayList<BundleInfo>(); + jars = new ArrayList<>(); for(File dir:bundleFolders){ if(dir.exists() && dir.isDirectory()){ findJarFiles(dir, jars); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/PathResourceFinder.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/PathResourceFinder.java index 1c402fbe38c..31b8dc22756 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/PathResourceFinder.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/classserver/PathResourceFinder.java @@ -31,9 +31,9 @@ import org.eclipse.osee.framework.logging.OseeLog; public class PathResourceFinder extends ResourceFinder { - private final HashSet<JarFile> jars = new HashSet<JarFile>(128); - private final HashSet<String> dirs = new HashSet<String>(128); - private final HashMap<String, JarFile[]> map = new HashMap<String, JarFile[]>(128); + private final HashSet<JarFile> jars = new HashSet<>(128); + private final HashSet<String> dirs = new HashSet<>(128); + private final HashMap<String, JarFile[]> map = new HashMap<>(128); private final boolean trees; private final ClassServerPermissions perm; private static final int NUMBER_OF_FILE_READ_ATTEMPTS = 20; @@ -144,7 +144,7 @@ public class PathResourceFinder extends ResourceFinder { for (int j = 0; j < files.length; j++) { String jar = files[j]; if (jar.endsWith(".jar") || jar.endsWith(".zip")) { - ArrayList<JarFile> jfs = new ArrayList<JarFile>(10); + ArrayList<JarFile> jfs = new ArrayList<>(10); try { addJar(jar, jfs, base); map.put(jar.substring(0, jar.length() - 4), jfs.toArray(new JarFile[jfs.size()])); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/collections/ObjectPool.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/collections/ObjectPool.java index 5cbd4f6475b..e16ba417410 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/collections/ObjectPool.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/collections/ObjectPool.java @@ -9,7 +9,7 @@ public class ObjectPool<T> { public ObjectPool(ObjectPoolConfiguration<T> config) { this.config = config; - objs = new ArrayBlockingQueue<T>(config.getMaxSize()); + objs = new ArrayBlockingQueue<>(config.getMaxSize()); if(config.preallocate()){ for(int i = 0; i < config.getMaxSize(); i++){ objs.offer(config.make()); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/CopyOnWriteNoIteratorList.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/CopyOnWriteNoIteratorList.java index 871270afba8..d5c0a6f992e 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/CopyOnWriteNoIteratorList.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/CopyOnWriteNoIteratorList.java @@ -17,7 +17,7 @@ import java.util.concurrent.locks.ReentrantLock; public class CopyOnWriteNoIteratorList<E> { private ReentrantLock lock = new ReentrantLock(); - private AtomicReference<E[]> data = new AtomicReference<E[]>(); + private AtomicReference<E[]> data = new AtomicReference<>(); private Class<E> type; public CopyOnWriteNoIteratorList(Class<E> type){ diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/GCHelper.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/GCHelper.java index 5018c997953..14205dd57d2 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/GCHelper.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/GCHelper.java @@ -32,7 +32,7 @@ public class GCHelper { public GCHelper() { super(); - map = new ConcurrentHashMap<String, WeakReference<Object>>(1024); + map = new ConcurrentHashMap<>(1024); } public static GCHelper getGCHelper() { @@ -60,7 +60,7 @@ public class GCHelper { } public void writeGCResults(StringBuilder builder) { - TreeSet<String> live = new TreeSet<String>(); + TreeSet<String> live = new TreeSet<>(); System.gc(); for (Map.Entry<String, WeakReference<Object>> entry : map.entrySet()) { if (entry.getValue().get() != null) { @@ -78,7 +78,7 @@ public class GCHelper { } public List getInstancesOfType(Class type) { - List<Object> listOfObjects = new ArrayList<Object>(); + List<Object> listOfObjects = new ArrayList<>(); System.gc(); for (Map.Entry<String, WeakReference<Object>> entry : map.entrySet()) { if (entry.getValue().get() != null) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/MethodFormatter.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/MethodFormatter.java index 133bbdaca1c..58d7c314351 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/MethodFormatter.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/MethodFormatter.java @@ -30,7 +30,7 @@ import org.w3c.dom.Element; * @author Robert A. Fisher */ public class MethodFormatter implements Xmlizable, XmlizableStream { - private final Collection<Argument> arguments = new ArrayList<Argument>(); + private final Collection<Argument> arguments = new ArrayList<>(); public final class Argument { public final String Class; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java index 02d229d237b..e444d94cb47 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java @@ -30,7 +30,7 @@ public abstract class OseeTestThread { private static final Logger logger = Logger.getLogger("osee.test.core.OseeTestThread"); private final Thread thread; private final WeakReference<TestEnvironment> env; - private static final HashSet<OseeTestThread> threadList = new HashSet<OseeTestThread>(32); + private static final HashSet<OseeTestThread> threadList = new HashSet<>(32); private volatile Throwable causeOfDeath = null; private volatile Date timeOfDeath = null; @@ -57,7 +57,7 @@ public abstract class OseeTestThread { */ public OseeTestThread(String name, boolean isDaemon, ThreadGroup group, TestEnvironment env) { GCHelper.getGCHelper().addRefWatch(this); - this.env = new WeakReference<TestEnvironment>(env); + this.env = new WeakReference<>(env); thread = new Thread(group, name) { @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java index 9303058fdab..fef03f98621 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java @@ -103,7 +103,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable, X private final TestDescriptionRecord testDescription; @JsonProperty public int number; - protected List<RequirementRecord> traceability = new ArrayList<RequirementRecord>(); + protected List<RequirementRecord> traceability = new ArrayList<>(); /** * TestCase Constructor. @@ -129,7 +129,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable, X if (addToRunList) { this.number = testScript.addTestCase(this); } - this.testScript = new WeakReference<TestScript>(testScript); + this.testScript = new WeakReference<>(testScript); this.environment = testScript.getTestEnvironment(); GCHelper.getGCHelper().addRefWatch(this); } @@ -140,7 +140,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable, X // TODO we have two different traceability tags here.... we need to combine these or get rid // of them all together since define and the artifact framework specifies traceability // this.tracability = new ArrayList(); - this.traceability = new ArrayList<RequirementRecord>(); + this.traceability = new ArrayList<>(); this.standAlone = false; ; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestException.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestException.java index e1191c2264c..bd54922cdd8 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestException.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestException.java @@ -21,7 +21,7 @@ public class TestException extends RuntimeException { private final String threadCauseName; private final Level level; - private List<IHealthStatus> status = new ArrayList<IHealthStatus>(); + private List<IHealthStatus> status = new ArrayList<>(); public TestException(String message, Level level) { this(message, level, null); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestScript.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestScript.java index 22a98f36899..0d92ceccda8 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestScript.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestScript.java @@ -160,9 +160,9 @@ public abstract class TestScript implements ITimeout { private final boolean isMpLevel; private IScriptInitializer scriptInitializer; private final ScriptTypeEnum scriptType; - private final ArrayList<TestCase> selectiveRunList = new ArrayList<TestCase>(32); + private final ArrayList<TestCase> selectiveRunList = new ArrayList<>(32); private Date startTime; - private final ArrayList<TestCase> testCases = new ArrayList<TestCase>(32); + private final ArrayList<TestCase> testCases = new ArrayList<>(32); private final ITestPointTally testPointTally; protected CommandEndedStatusEnum status; private Throwable rootCause; @@ -240,7 +240,7 @@ public abstract class TestScript implements ITimeout { * @return reference to arrayList testCases. */ public/* TestCase */List<TestCase> getTestCases() { - ArrayList<TestCase> testCaseList = new ArrayList<TestCase>(); + ArrayList<TestCase> testCaseList = new ArrayList<>(); testCaseList.add(getSetupTestCase()); testCaseList.addAll(testCases); testCaseList.add(getTearDownTestCase()); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/AsynchRemoteJobs.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/AsynchRemoteJobs.java index 836f35f5a9d..20621c0f813 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/AsynchRemoteJobs.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/AsynchRemoteJobs.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.logging.OseeLog; public class AsynchRemoteJobs implements Runnable { private final LinkedList<Runnable> jobs; - private static WeakHashMap<Object, AsynchRemoteJobs> map = new WeakHashMap<Object, AsynchRemoteJobs>(); + private static WeakHashMap<Object, AsynchRemoteJobs> map = new WeakHashMap<>(); public static AsynchRemoteJobs getInstance(Object obj) { AsynchRemoteJobs asynchRemoteJobs = null; @@ -31,7 +31,7 @@ public class AsynchRemoteJobs implements Runnable { } public AsynchRemoteJobs() { - jobs = new LinkedList<Runnable>(); + jobs = new LinkedList<>(); Thread th = new Thread(this); th.setName("AsynchRemoteJobs[Test Environment]"); th.start(); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/ReportDataControl.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/ReportDataControl.java index 8342a827f17..53b4c3efa60 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/ReportDataControl.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/ReportDataControl.java @@ -27,8 +27,8 @@ public class ReportDataControl implements IReportData { private final ArrayList<ReportDataListener> queueListeners; public ReportDataControl() { - this.queueListeners = new ArrayList<ReportDataListener>(); - ArrayList<String> queueHeaders = new ArrayList<String>(); + this.queueListeners = new ArrayList<>(); + ArrayList<String> queueHeaders = new ArrayList<>(); queueHeaders.add("User"); queueHeaders.add("Script"); this.queueData = new ReportData(queueHeaders); @@ -69,7 +69,7 @@ public class ReportDataControl implements IReportData { ArrayList<String> values; for (int i = 0; i < cmds.size(); i++) { TestEnvironmentCommand cmd = cmds.get(i); - values = new ArrayList<String>(); + values = new ArrayList<>(); values.add(cmd.getDescription().getDescription()); queueData.addItem(cmd.getDescription().getGuid(), values); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java index 48ecdca956e..6ed89e0afce 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java @@ -76,13 +76,13 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; */ public abstract class TestEnvironment implements TestEnvironmentInterface, ITestEnvironmentAccessor, ITestContext { - private final List<ITestEnvironmentListener> envListeners = new ArrayList<ITestEnvironmentListener>(32); + private final List<ITestEnvironmentListener> envListeners = new ArrayList<>(32); private IExecutionUnitManagement executionUnitManagement; private File outDir = null; private final ITestStation testStation; private boolean batchMode = false; - private final HashMap<String, Remote> controlInterfaces = new HashMap<String, Remote>(); + private final HashMap<String, Remote> controlInterfaces = new HashMap<>(); private final IEnvironmentFactory factory; private IServiceConnector connector; private final IRuntimeLibraryManager runtimeManager; @@ -94,9 +94,9 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest @Deprecated private boolean isEnvSetup = false; @Deprecated - private final List<IScriptCompleteEvent> scriptCompleteListeners = new ArrayList<IScriptCompleteEvent>(); + private final List<IScriptCompleteEvent> scriptCompleteListeners = new ArrayList<>(); @Deprecated - private final List<IScriptSetupEvent> scriptSetupListeners = new ArrayList<IScriptSetupEvent>(); + private final List<IScriptSetupEvent> scriptSetupListeners = new ArrayList<>(); private OteServerSideEndprointRecieve oteServerSideEndpointRecieve; private OteServerSideEndpointSender oteServerSideEndpointSender; @@ -117,8 +117,8 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest this.testStation = factory.getTestStation(); this.runtimeManager = factory.getRuntimeManager(); - this.associatedObjectListeners = new HashMap<Class<?>, ArrayList<IAssociatedObjectListener>>(); - this.associatedObjects = new HashMap<Class<?>, Object>(100); + this.associatedObjectListeners = new HashMap<>(); + this.associatedObjects = new HashMap<>(100); this.batchMode = OteProperties.isOseeOteInBatchModeEnabled(); messagingServiceTracker = setupOteMessagingSenderAndReceiver(); @@ -231,7 +231,7 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest @Override public List<String> getQueueLabels() { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); list.add("Description"); return list; } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleCommandManager.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleCommandManager.java index 6fa4c732bc6..3a360c9002e 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleCommandManager.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleCommandManager.java @@ -15,7 +15,7 @@ import java.util.Hashtable; public class ConsoleCommandManager implements ICommandManager { - private final Hashtable<String, ConsoleCommand> cmdMap = new Hashtable<String, ConsoleCommand>(64); + private final Hashtable<String, ConsoleCommand> cmdMap = new Hashtable<>(64); private boolean isShutdown = false; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleShell.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleShell.java index c2d146ef6c3..1025085ae6a 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleShell.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/console/ConsoleShell.java @@ -24,7 +24,7 @@ public abstract class ConsoleShell { private boolean saveLastCmdFlag = true; public ConsoleShell(ICommandManager manager) { - this.manager = new WeakReference<ICommandManager>(manager); + this.manager = new WeakReference<>(manager); } public abstract void println(String string); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/BaseTestLifecycleListenerProvider.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/BaseTestLifecycleListenerProvider.java index ffd82453f59..2a85d0357f7 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/BaseTestLifecycleListenerProvider.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/BaseTestLifecycleListenerProvider.java @@ -29,7 +29,7 @@ public class BaseTestLifecycleListenerProvider implements ITestLifecycleListener public BaseTestLifecycleListenerProvider(IEventDataProvider eventProvider) { this.eventProvider = eventProvider; - listeners = new CopyOnWriteArrayList<ITestLifecycleListener>(); + listeners = new CopyOnWriteArrayList<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/MethodResultImpl.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/MethodResultImpl.java index 859827db41c..7b13317a55c 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/MethodResultImpl.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/MethodResultImpl.java @@ -31,7 +31,7 @@ public class MethodResultImpl implements IMethodResult { private ReturnCode returnCode; public MethodResultImpl(ReturnCode returnCode) { - statuses = new ArrayList<IHealthStatus>(); + statuses = new ArrayList<>(); this.returnCode = returnCode; } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/BaseCommandManager.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/BaseCommandManager.java index fec44b1f644..1f9e984a189 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/BaseCommandManager.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/BaseCommandManager.java @@ -33,7 +33,7 @@ public class BaseCommandManager implements ICommandManager { OteThreadManager threadManager = OteThreadManager.getInstance(); commands = Executors.newSingleThreadExecutor(threadManager.createNewFactory("ote.command")); commandResponse = Executors.newSingleThreadExecutor(threadManager.createNewFactory("ote.command.response")); - cmdMap = new ConcurrentHashMap<ITestServerCommand, Future<ITestCommandResult>>(); + cmdMap = new ConcurrentHashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/ElementHandlers.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/ElementHandlers.java index d22ac77cad6..d7efe949e88 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/ElementHandlers.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/ElementHandlers.java @@ -21,7 +21,7 @@ import org.xml.sax.SAXException; public abstract class ElementHandlers { private final String name; - private final List<IBaseSaxElementListener> listeners = new ArrayList<IBaseSaxElementListener>(); + private final List<IBaseSaxElementListener> listeners = new ArrayList<>(); public ElementHandlers(String name) { this.name = name; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/OteSaxHandler.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/OteSaxHandler.java index 034062181e9..856a7732ced 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/OteSaxHandler.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/saxparse/OteSaxHandler.java @@ -92,7 +92,7 @@ public class OteSaxHandler extends AbstractSaxHandler { Map<String, ElementHandlers> handlers; public OteSaxHandler() throws Exception { - handlers = new HashMap<String, ElementHandlers>(); + handlers = new HashMap<>(); addHandlers(new Global()); addHandlers(new AdditionalInfo()); addHandlers(new Actual()); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/testrun/BaseTestRunListenerProvider.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/testrun/BaseTestRunListenerProvider.java index a0f29c738a3..7f93cde3206 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/testrun/BaseTestRunListenerProvider.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/testrun/BaseTestRunListenerProvider.java @@ -25,7 +25,7 @@ public class BaseTestRunListenerProvider implements ITestRunListenerProvider { List<ITestRunListener> listeners; public BaseTestRunListenerProvider() { - listeners = new CopyOnWriteArrayList<ITestRunListener>(); + listeners = new CopyOnWriteArrayList<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadFactory.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadFactory.java index 2c64664f4f7..ba82b5eb314 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadFactory.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadFactory.java @@ -26,7 +26,7 @@ public class OteThreadFactory implements ThreadFactory { protected OteThreadFactory(String threadName) { this.threadName = threadName; - this.threads = new CopyOnWriteArrayList<WeakReference<OteThread>>(); + this.threads = new CopyOnWriteArrayList<>(); } @Override @@ -37,7 +37,7 @@ public class OteThreadFactory implements ThreadFactory { } public List<OteThread> getThreads() { - List<OteThread> toReturn = new ArrayList<OteThread>(); + List<OteThread> toReturn = new ArrayList<>(); for (WeakReference<OteThread> weak : threads) { OteThread thread = weak.get(); if (thread != null) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadManager.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadManager.java index 09e7242cb22..d5c4f7af2de 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadManager.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/thread/OteThreadManager.java @@ -26,7 +26,7 @@ public class OteThreadManager { private final Map<String, OteThreadFactory> factories; private OteThreadManager() { - this.factories = new HashMap<String, OteThreadFactory>(); + this.factories = new HashMap<>(); } public static OteThreadManager getInstance() { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/OTESessionManagerImpl.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/OTESessionManagerImpl.java index c21cf949bac..7476b892fd5 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/OTESessionManagerImpl.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/OTESessionManagerImpl.java @@ -14,7 +14,7 @@ public class OTESessionManagerImpl implements OTESessionManager { private UUID activeUserId; public OTESessionManagerImpl(){ - userMap = new ConcurrentHashMap<UUID, IUserSession>(); + userMap = new ConcurrentHashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/ScriptLogHandler.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/ScriptLogHandler.java index 13691a9dbcd..d6c51d959f1 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/ScriptLogHandler.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/ScriptLogHandler.java @@ -75,7 +75,7 @@ public class ScriptLogHandler extends Handler { document.createProcessingInstruction("xml-stylesheet", "type=\"text/xsl\" href=\"" + getXSLTransformName() + "\""); document.appendChild(processingInstruction); - records = new ArrayList<LogRecord>(); + records = new ArrayList<>(); document.appendChild(document.createComment("OUTFILE_COMMNET")); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ParentLogRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ParentLogRecord.java index 1aeef2540ee..e12af0dc309 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ParentLogRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ParentLogRecord.java @@ -10,7 +10,7 @@ import org.codehaus.jackson.annotate.JsonProperty; public class ParentLogRecord extends LogRecord { private static final long serialVersionUID = 684361479587503820L; - private Collection<LogRecord> records = new ArrayList<LogRecord>(); + private Collection<LogRecord> records = new ArrayList<>(); public ParentLogRecord() { super(Level.OFF, ""); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/PropertyStoreRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/PropertyStoreRecord.java index 6e1bd0c4660..30576b63d65 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/PropertyStoreRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/PropertyStoreRecord.java @@ -48,7 +48,7 @@ public class PropertyStoreRecord extends TestRecord { @JsonProperty public Map<String, String> getProperties() { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); if (store != null && !store.isEmpty()) { for (String key : store.keySet()) { if (nonEmptyString(store.get(key)) != null) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ScriptResultRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ScriptResultRecord.java index be80face194..bd2ca9351fa 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ScriptResultRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/ScriptResultRecord.java @@ -46,8 +46,8 @@ public class ScriptResultRecord extends TestRecord { */ public ScriptResultRecord(TestScript script) { super(script.getTestEnvironment(), TestLevel.TEST_POINT, script.getClass().getName(), false); - childElements = new ArrayList<Xmlizable>(1000); - childStreamElements = new ArrayList<XmlizableStream>(100); + childElements = new ArrayList<>(1000); + childStreamElements = new ArrayList<>(100); } public void addChildElement(Xmlizable xml) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java index 97bd9652ba7..fce46266cd6 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java @@ -41,11 +41,11 @@ import org.w3c.dom.Element; */ public abstract class TestRecord extends LogRecord implements Xmlizable, XmlizableStream { private static final long serialVersionUID = 2663140700880844240L; - private static final ArrayList<Pattern> stacktraceExcludes = new ArrayList<Pattern>(32); - private static final ArrayList<Pattern> stacktraceIncludes = new ArrayList<Pattern>(32); + private static final ArrayList<Pattern> stacktraceExcludes = new ArrayList<>(32); + private static final ArrayList<Pattern> stacktraceIncludes = new ArrayList<>(32); private static boolean filterTheStacktrace = true; private static boolean locationLogginOn = true; - private List<LogRecord> children = new ArrayList<LogRecord>(); + private List<LogRecord> children = new ArrayList<>(); public static void setLocationLoggingOn(boolean on) { locationLogginOn = on; @@ -239,7 +239,7 @@ public abstract class TestRecord extends LogRecord implements Xmlizable, Xmlizab @JsonProperty public List<String> getLocation() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); if (TestRecord.getLocationLoggingOn()) { StackTraceElement[] stackTrace = this.throwable.getStackTrace(); result.addAll(filterStackTrace(stackTrace)); @@ -255,7 +255,7 @@ public abstract class TestRecord extends LogRecord implements Xmlizable, Xmlizab // include everything if not filtered, otherwise ... // default is to include unless explicitly excluded, but only if not // explicitly included ... yuck - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (StackTraceElement stackElement : stackTrace) { final String className = stackElement.getClassName(); if (!filterTheStacktrace || included(className) || !excluded(className)) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java index 2989a7a4a44..191bac898be 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java @@ -57,8 +57,8 @@ public class TraceRecord extends TestRecord implements Xmlizable { this.objectName = objectName; this.methodName = methodName; this.methodArguments = methodArguments; - this.additionalElements = new ArrayList<Xmlizable>(); - this.additionalStreamElements = new ArrayList<XmlizableStream>(); + this.additionalElements = new ArrayList<>(); + this.additionalStreamElements = new ArrayList<>(); } public TraceRecord(ITestEnvironmentAccessor source, String objectName2, String methodName2, MethodFormatter methodArguments2) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecordEnd.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecordEnd.java index db430250c08..24b8a4aef2a 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecordEnd.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecordEnd.java @@ -38,8 +38,8 @@ public class TraceRecordEnd extends TestRecord implements Xmlizable { public TraceRecordEnd(ITestEnvironmentAccessor source, ReturnFormatter returnFormatter) { super(source, TestLevel.TRACE, "", true); this.returnFormatter = returnFormatter; - this.additionalElements = new ArrayList<Xmlizable>(); - this.additionalStreamElements = new ArrayList<XmlizableStream>(); + this.additionalElements = new ArrayList<>(); + this.additionalStreamElements = new ArrayList<>(); } public void addAdditionalElement(Xmlizable object) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/CheckGroup.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/CheckGroup.java index c15197757e0..dee71128eb9 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/CheckGroup.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/CheckGroup.java @@ -43,7 +43,7 @@ public class CheckGroup implements ITestGroup { */ public CheckGroup(Operation operation, String groupName) { super(); - testPoints = new ArrayList<ITestPoint>(); + testPoints = new ArrayList<>(); // this.allTrue = allTrue; this.operation = operation; this.groupName = groupName; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/RetryGroup.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/RetryGroup.java index 1693831914f..afba89e8a02 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/RetryGroup.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/testPoint/RetryGroup.java @@ -32,8 +32,8 @@ public class RetryGroup extends CheckGroup { public RetryGroup(String groupName) { super(Operation.OR, groupName); - childElements = new ArrayList<Xmlizable>(); - childStreamElements = new ArrayList<XmlizableStream>(); + childElements = new ArrayList<>(); + childStreamElements = new ArrayList<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointReceiveRunnable.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointReceiveRunnable.java index 727034d0aff..1be29c1460c 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointReceiveRunnable.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointReceiveRunnable.java @@ -29,7 +29,7 @@ public class OteEndpointReceiveRunnable implements Runnable { private Class<OteEndpointReceiveRunnable> logger = OteEndpointReceiveRunnable.class; private final InetSocketAddress address; - private CopyOnWriteArrayList<EndpointDataProcessor> dataProcessors = new CopyOnWriteArrayList<EndpointDataProcessor>(); + private CopyOnWriteArrayList<EndpointDataProcessor> dataProcessors = new CopyOnWriteArrayList<>(); public OteEndpointReceiveRunnable(InetSocketAddress address){ this.address = address; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointSendRunnable.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointSendRunnable.java index 281d062c94b..e3a9260c40c 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointSendRunnable.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteEndpointSendRunnable.java @@ -35,7 +35,7 @@ final class OteEndpointSendRunnable implements Runnable { try { threadChannel = openAndInitializeDatagramChannel(); boolean keepRunning = true; - final List<AddressBuffer> dataToSend = new ArrayList<AddressBuffer>(32); + final List<AddressBuffer> dataToSend = new ArrayList<>(32); System.setSecurityManager(null); while(keepRunning){ try{ diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpointSender.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpointSender.java index 8b28acb1f04..3ae2f4e789d 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpointSender.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpointSender.java @@ -31,7 +31,7 @@ public class OteUdpEndpointSender implements OteEndpointSender { private volatile Thread thread; public OteUdpEndpointSender(InetSocketAddress address){ - toSend = new ArrayBlockingQueue<AddressBuffer>(5000); + toSend = new ArrayBlockingQueue<>(5000); buffers = new ObjectPool<AddressBuffer>(new ObjectPoolConfiguration<AddressBuffer>(50,true) { @Override public AddressBuffer make() { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/OTEBundleLoader.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/OTEBundleLoader.java index 59e7b1c66ea..93f10b3c8e9 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/OTEBundleLoader.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/OTEBundleLoader.java @@ -77,9 +77,9 @@ public class OTEBundleLoader implements IRuntimeLibraryManager{ public OTEBundleLoader() { this.context = FrameworkUtil.getBundle(getClass()).getBundleContext(); - this.installedBundles = new LinkedList<Bundle>(); - this.runningBundles = new LinkedList<Bundle>(); - this.bundleNameToMd5Map = new HashMap<String, String>(); + this.installedBundles = new LinkedList<>(); + this.runningBundles = new LinkedList<>(); + this.bundleNameToMd5Map = new HashMap<>(); } @Override @@ -262,7 +262,7 @@ public class OTEBundleLoader implements IRuntimeLibraryManager{ @Override public void resetScriptLoader(Configuration oteConfiguration, String[] classPaths) throws Exception { - List<URL> urls = new ArrayList<URL>(); + List<URL> urls = new ArrayList<>(); if(oteConfiguration != null){ for(ConfigurationItem item:oteConfiguration.getItems()){ File file = serverRuntimeCache.get(item.getSymbolicName(), item.getMd5Digest()); @@ -303,7 +303,7 @@ public class OTEBundleLoader implements IRuntimeLibraryManager{ @JsonProperty public List<String> getBundleVersions() { Bundle[] bundles = ServiceUtility.getContext().getBundles(); - List<String> versions = new ArrayList<String>(); + List<String> versions = new ArrayList<>(); for(Bundle bundle: bundles ){ String version = bundle.getHeaders().get("Bundle-Version"); String implVersion = bundle.getHeaders().get("Implementation-Version"); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/RunTestListener.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/RunTestListener.java index 9816f6a665d..639962df7a6 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/RunTestListener.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/RunTestListener.java @@ -30,7 +30,7 @@ public class RunTestListener implements EventHandler { public RunTestListener(EventAdmin eventAdmin, OteUdpEndpoint oteEndpoint, OTEApi oteApi) { this.oteApi = oteApi; - handles = new ConcurrentHashMap<String, ICommandHandle>(); + handles = new ConcurrentHashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java index 8db478ce516..fe247740b09 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java @@ -18,8 +18,8 @@ import org.eclipse.osee.ote.properties.OtePropertiesCore; public class EndpointComponent implements OteUdpEndpoint { private OteUdpEndpointReceiverImpl receiver; - private HashMap<InetSocketAddress, OteUdpEndpointSender> senders = new HashMap<InetSocketAddress, OteUdpEndpointSender>(); - private CopyOnWriteNoIteratorList<OteUdpEndpointSender> broadcastThreaded = new CopyOnWriteNoIteratorList<OteUdpEndpointSender>(OteUdpEndpointSender.class);//for backwards compatibility + private HashMap<InetSocketAddress, OteUdpEndpointSender> senders = new HashMap<>(); + private CopyOnWriteNoIteratorList<OteUdpEndpointSender> broadcastThreaded = new CopyOnWriteNoIteratorList<>(OteUdpEndpointSender.class);//for backwards compatibility private boolean debug = false; public EndpointComponent(){ diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/message/event/send/OteEventMessageFutureImpl.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/message/event/send/OteEventMessageFutureImpl.java index 482d799e5db..4d5a906d48d 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/message/event/send/OteEventMessageFutureImpl.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/message/event/send/OteEventMessageFutureImpl.java @@ -61,7 +61,7 @@ public class OteEventMessageFutureImpl<T extends OteEventMessage, R extends OteE return th; } }); - timeoutRunnable = new TimeoutRunnable<T, R>(lock, condition, sentMessage, callable, this); + timeoutRunnable = new TimeoutRunnable<>(lock, condition, sentMessage, callable, this); wakeup = ex.schedule(timeoutRunnable, timeout, TimeUnit.MILLISECONDS); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/ElementPath.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/ElementPath.java index 19360586f1b..a6247f96d58 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/ElementPath.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/ElementPath.java @@ -26,7 +26,7 @@ public class ElementPath implements Serializable { private final boolean isHeaderElement; public static ElementPath decode(String encodedPath) { - List<Object> path = new LinkedList<Object>(); + List<Object> path = new LinkedList<>(); String[] components = encodedPath.split("\\+"); for (String component : components) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/IOInstrumentationDB.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/IOInstrumentationDB.java index d773119ba6e..5ea7b84f05f 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/IOInstrumentationDB.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/IOInstrumentationDB.java @@ -22,7 +22,7 @@ import org.eclipse.osee.ote.message.instrumentation.IOInstrumentation; */ public class IOInstrumentationDB { - private final Map<String, IOInstrumentation> ioInstrumentation = new ConcurrentHashMap<String, IOInstrumentation>();; + private final Map<String, IOInstrumentation> ioInstrumentation = new ConcurrentHashMap<>();; private final CopyOnWriteArraySet<IInstrumentationRegistrationListener> listeners = new CopyOnWriteArraySet<IInstrumentationRegistrationListener>(); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java index 2b9541cdae2..c164caf72cf 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java @@ -72,8 +72,8 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T private boolean destroyed = false; private DataType currentMemType; - private final Map<DataType, ArrayList<U>> memTypeToMessageMap = new HashMap<DataType, ArrayList<U>>(); - private final Map<DataType, ArrayList<T>> memToDataMap = new HashMap<DataType, ArrayList<T>>(); + private final Map<DataType, ArrayList<U>> memTypeToMessageMap = new HashMap<>(); + private final Map<DataType, ArrayList<T>> memToDataMap = new HashMap<>(); private final int phase; protected double rate; protected final double defaultRate; @@ -84,15 +84,15 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T @SuppressWarnings("rawtypes") private IMessageRequestor messageRequestor = null; private static final double doubleTolerance = 0.000001; - private final Set<DataType> memTypeActive = new HashSet<DataType>(); + private final Set<DataType> memTypeActive = new HashSet<>(); private T defaultMessageData; - private final List<IMemSourceChangeListener> preMemSourceChangeListeners = new CopyOnWriteArrayList<IMemSourceChangeListener>(); + private final List<IMemSourceChangeListener> preMemSourceChangeListeners = new CopyOnWriteArrayList<>(); private final List<IMemSourceChangeListener> postMemSourceChangeListeners = new CopyOnWriteArrayList<IMemSourceChangeListener>(); - private final List<IMessageDisposeListener> preMessageDisposeListeners = new CopyOnWriteArrayList<IMessageDisposeListener>(); - private final List<IMessageDisposeListener> postMessageDisposeListeners = new CopyOnWriteArrayList<IMessageDisposeListener>(); + private final List<IMessageDisposeListener> preMessageDisposeListeners = new CopyOnWriteArrayList<>(); + private final List<IMessageDisposeListener> postMessageDisposeListeners = new CopyOnWriteArrayList<>(); private final int defaultByteSize; private final int defaultOffset; @@ -105,7 +105,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T this.name = name; this.defaultByteSize = defaultByteSize; this.defaultOffset = defaultOffset; - elementMap = new LinkedHashMap<String, Element>(20); + elementMap = new LinkedHashMap<>(20); this.phase = phase; this.rate = rate; this.defaultRate = rate; @@ -351,7 +351,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T checkState(); ArrayList<U> list; if (!memTypeToMessageMap.containsKey(memType)) { - list = new ArrayList<U>(4); + list = new ArrayList<>(4); memTypeToMessageMap.put(memType, list); } else { list = memTypeToMessageMap.get(memType); @@ -387,7 +387,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T final DataType type = data.getType(); final ArrayList<T> list; if (!memToDataMap.containsKey(type)) { - list = new ArrayList<T>(); + list = new ArrayList<>(); memToDataMap.put(type, list); } else { list = memToDataMap.get(type); @@ -454,7 +454,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T */ public Collection<Element> getElements(DataType type) { checkState(); - LinkedList<Element> list = new LinkedList<Element>(); + LinkedList<Element> list = new LinkedList<>(); for (Element element : elementMap.values()) { Element e = element.switchMessages(getMessageTypeAssociation(type)); if (!e.isNonMappingElement()) { @@ -1325,12 +1325,12 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T } public ListIterator<Element> getElementIterator() { - ArrayList<Element> list = new ArrayList<Element>(elementMap.values()); + ArrayList<Element> list = new ArrayList<>(elementMap.values()); return list.listIterator(); } public ListIterator<Element> getElementIterator(Element elemnt) { - ArrayList<Element> list = new ArrayList<Element>(elementMap.values()); + ArrayList<Element> list = new ArrayList<>(elementMap.values()); int index = list.indexOf(elemnt); if (index >= 0) { return list.listIterator(index); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageProviderVersion.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageProviderVersion.java index 6dbc2c6309d..e1880226596 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageProviderVersion.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageProviderVersion.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; public class MessageProviderVersion { - Set<String> versions = new ConcurrentSkipListSet<String>(); + Set<String> versions = new ConcurrentSkipListSet<>(); public synchronized void add(MessageDefinitionProvider provider){ versions.add(generateVersion(provider)); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageState.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageState.java index 9d25226f3e5..2b42104dcad 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageState.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageState.java @@ -36,7 +36,7 @@ public final class MessageState implements Serializable { this.currentMemType = currentMemType; this.data = data; - this.availableMemTypes = new HashSet<DataType>(availableMemTypes); + this.availableMemTypes = new HashSet<>(availableMemTypes); this.mode = mode; } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java index e883707397f..67326b83b08 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java @@ -35,7 +35,7 @@ import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystemAcce */ public abstract class MessageSystemTestEnvironment extends TestEnvironment implements ITestEnvironmentMessageSystemAccessor, IMessageTestContext { protected URL[] clientClasses; - private final List<IPreScriptInstantiation> preInstantiation = new ArrayList<IPreScriptInstantiation>(); + private final List<IPreScriptInstantiation> preInstantiation = new ArrayList<>(); protected boolean promptResponse = false; private IOInstrumentationDB ioInstrumentation; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/ListCondition.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/ListCondition.java index f2f27479e71..9d9788946f0 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/ListCondition.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/ListCondition.java @@ -27,14 +27,14 @@ public class ListCondition<T extends Comparable<T>> extends AbstractCondition im for (int i = 0; i < list.length; i++) { list[i] = element.elementMask(list[i]); } - this.set = new HashSet<T>(Arrays.asList(list)); + this.set = new HashSet<>(Arrays.asList(list)); } public ListCondition(DiscreteElement<T> element, boolean inList, Collection<T> list) { this.element = element; this.inList = inList; - this.set = new HashSet<T>(); + this.set = new HashSet<>(); for (T item : list) { set.add(element.elementMask(item)); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/MultiMessageCondition.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/MultiMessageCondition.java index 25207bb8426..6e9f1a2f37d 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/MultiMessageCondition.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/condition/MultiMessageCondition.java @@ -52,8 +52,8 @@ public class MultiMessageCondition { private static final class Listener implements IOSEEMessageListener, ITimeout { private volatile boolean isTimedOut = false; private final Message[] messages; - private final HashSet<MessageData> messagesNotSeen = new HashSet<MessageData>(); - private final HashMap<MessageData, MessageCounter> hitCount = new HashMap<MessageData, MessageCounter>(); + private final HashSet<MessageData> messagesNotSeen = new HashSet<>(); + private final HashMap<MessageData, MessageCounter> hitCount = new HashMap<>(); private Listener(Message... messages) { this.messages = messages; @@ -208,7 +208,7 @@ public class MultiMessageCondition { mf.add(msg.getName()); } accessor.getLogger().methodCalledOnObject(accessor, "MultMessage", mf); - LinkedList<MessageCounter> msgsReceived = new LinkedList<MessageCounter>(); + LinkedList<MessageCounter> msgsReceived = new LinkedList<>(); MsgWaitResult result = waitForAnyTransmission(accessor, timeout, msgsReceived, messages); if (!result.isPassed()) { CheckPoint cp = @@ -233,7 +233,7 @@ public class MultiMessageCondition { mf.add(msg.getName()); } accessor.getLogger().methodCalledOnObject(accessor, "MultMessage", mf); - LinkedList<MessageCounter> msgsReceived = new LinkedList<MessageCounter>(); + LinkedList<MessageCounter> msgsReceived = new LinkedList<>(); MsgWaitResult result = waitForAnyTransmission(accessor, timeout, msgsReceived, messages); CheckPoint cp = new CheckPoint("MESSAGE_TRANSMISSION.ANY", "AT LEAST ONE", result.isPassed() ? "AT LEAST ONE" : "NONE", @@ -249,7 +249,7 @@ public class MultiMessageCondition { mf.add(msg.getName()); } accessor.getLogger().methodCalledOnObject(accessor, "MultMessage", mf); - LinkedList<MessageCounter> msgsReceived = new LinkedList<MessageCounter>(); + LinkedList<MessageCounter> msgsReceived = new LinkedList<>(); MsgWaitResult result = waitForAllTransmissions(accessor, timeout, msgsReceived, messages); if (result.isPassed()) { CheckPoint cp = diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/data/MessageData.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/data/MessageData.java index 3ebeb8cbac7..fc4afbde7bb 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/data/MessageData.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/data/MessageData.java @@ -67,8 +67,8 @@ public abstract class MessageData implements DataReaderListener, DataWriterListe private final MemoryResource mem; private final String typeName; private final String name; - private final CopyOnWriteNoIteratorList<Message> messages = new CopyOnWriteNoIteratorList<Message>(Message.class); - private final CopyOnWriteNoIteratorList<IMessageSendListener> messageSendListeners = new CopyOnWriteNoIteratorList<IMessageSendListener>(IMessageSendListener.class); + private final CopyOnWriteNoIteratorList<Message> messages = new CopyOnWriteNoIteratorList<>(Message.class); + private final CopyOnWriteNoIteratorList<IMessageSendListener> messageSendListeners = new CopyOnWriteNoIteratorList<>(IMessageSendListener.class); private final int defaultDataByteSize; private final DataType memType; private final boolean isEnabled = true; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java index add6b48ec16..3ef63f678c3 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java @@ -164,7 +164,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); boolean pass = c.check(); CheckPoint passFail = @@ -184,7 +184,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i checkAccessor(accessor); accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); boolean pass = c.check(); accessor.getLogger().methodEnded(accessor); return pass; @@ -194,7 +194,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i checkAccessor(accessor); accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); MsgWaitResult result = getMessage().waitForCondition(accessor, c, false, millis); accessor.getLogger().methodEnded(accessor); return result.isPassed(); @@ -389,7 +389,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); } - EqualsCondition<T> c = new EqualsCondition<T>(this, value); + EqualsCondition<T> c = new EqualsCondition<>(this, value); getMessage().waitForCondition(accessor, c, false, milliseconds); if (accessor != null) { accessor.getLogger().methodEnded(accessor); @@ -410,7 +410,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); } - EqualsCondition<T> c = new EqualsCondition<T>(this, true, value); + EqualsCondition<T> c = new EqualsCondition<>(this, true, value); getMessage().waitForCondition(accessor, c, false, milliseconds); if (accessor != null) { accessor.getLogger().methodEnded(accessor); @@ -435,7 +435,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); } - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); getMessage().waitForCondition(accessor, c, false, milliseconds); if (accessor != null) { accessor.getLogger().methodEnded(accessor); @@ -475,7 +475,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i getMessage()); } - NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + NotInRangeCondition<T> c = new NotInRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); getMessage().waitForCondition(accessor, c, false, milliseconds); if (accessor != null) { @@ -527,7 +527,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); - EqualsCondition<T> c = new EqualsCondition<T>(this, value); + EqualsCondition<T> c = new EqualsCondition<>(this, value); CheckPoint cp = waitWithCheckPoint(accessor, checkGroup, toString(value), c, false, milliseconds); accessor.getLogger().methodEnded(accessor); @@ -558,7 +558,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); CheckPoint cp = waitWithCheckPoint(accessor, checkGroup, "In " + expectedRangeString(toString(minValue), minInclusive, toString(maxValue), maxInclusive), c, false, @@ -841,7 +841,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i checkAccessor(accessor); accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); - EqualsCondition<T> c = new EqualsCondition<T>(this, value); + EqualsCondition<T> c = new EqualsCondition<>(this, value); waitWithCheckPoint(accessor, checkGroup, toString(value), c, true, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -851,7 +851,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i checkAccessor(accessor); accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); - EqualsCondition<T> c = new EqualsCondition<T>(this, value); + EqualsCondition<T> c = new EqualsCondition<>(this, value); getMessage().waitForCondition(accessor, c, true, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -861,7 +861,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i checkAccessor(accessor); accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); - EqualsCondition<T> c = new EqualsCondition<T>(this, true, value); + EqualsCondition<T> c = new EqualsCondition<>(this, true, value); getMessage().waitForCondition(accessor, c, true, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -895,7 +895,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(value).add(milliseconds), getMessage()); - EqualsCondition<T> c = new EqualsCondition<T>(this, true, value); + EqualsCondition<T> c = new EqualsCondition<>(this, true, value); waitWithCheckPoint(accessor, checkGroup, "Not " + toString(value), c, true, milliseconds); @@ -936,7 +936,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); waitWithCheckPoint(accessor, checkGroup, "In" + expectedRangeString(toString(minValue), minInclusive, toString(maxValue), maxInclusive), c, true, milliseconds); @@ -949,7 +949,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); - InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + InRangeCondition<T> c = new InRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); getMessage().waitForCondition(accessor, c, true, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -980,7 +980,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); - NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + NotInRangeCondition<T> c = new NotInRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); waitWithCheckPoint(accessor, checkGroup, "Not In" + expectedRangeString(toString(minValue), minInclusive, toString(maxValue), maxInclusive), c, true, milliseconds); @@ -994,7 +994,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i new MethodFormatter().add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds), getMessage()); - NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive); + NotInRangeCondition<T> c = new NotInRangeCondition<>(this, minValue, minInclusive, maxValue, maxInclusive); getMessage().waitForCondition(accessor, c, true, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -1026,7 +1026,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, getFullName(), new MethodFormatter().add(pulsedValue).add(nonPulsedValue).add(milliseconds), getMessage()); - final PulseCondition<T> c = new PulseCondition<T>(this, pulsedValue, nonPulsedValue, pulses); + final PulseCondition<T> c = new PulseCondition<>(this, pulsedValue, nonPulsedValue, pulses); MsgWaitResult result = getMessage().waitForCondition(accessor, c, false, milliseconds); CheckPoint passFail = @@ -1113,7 +1113,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i * @return if check passed */ public boolean checkList(ITestAccessor accessor, CheckGroup checkGroup, boolean isInList, T[] list, int milliseconds) throws InterruptedException { - ListCondition<T> c = new ListCondition<T>(this, isInList, list); + ListCondition<T> c = new ListCondition<>(this, isInList, list); if (accessor == null) { throw new NullPointerException("The parameter accessor is null"); @@ -1326,7 +1326,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(list).add(isInList).add(milliseconds), this.getMessage()); - ListCondition<T> c = new ListCondition<T>(this, isInList, list); + ListCondition<T> c = new ListCondition<>(this, isInList, list); getMessage().waitForCondition(accessor, c, false, milliseconds); accessor.getLogger().methodEnded(accessor); return c.getLastCheckValue(); @@ -1336,7 +1336,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), new MethodFormatter().add(list).add(isInList).add(milliseconds), this.getMessage()); - ListCondition<T> c = new ListCondition<T>(this, isInList, list); + ListCondition<T> c = new ListCondition<>(this, isInList, list); MsgWaitResult result = getMessage().waitForCondition(accessor, c, true, milliseconds); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java index 6223b61cb37..b031c5f3710 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java @@ -43,7 +43,7 @@ public abstract class Element implements ITimeout { private String elementPathAsString; public Element(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) { - this.msg = new WeakReference<Message<?,?,?>>(msg); + this.msg = new WeakReference<>(msg); this.elementName = elementName; this.messageData = messageData; this.byteOffset = byteOffset; @@ -51,7 +51,7 @@ public abstract class Element implements ITimeout { this.msb = msb; this.originalLsb = originalLsb; this.originalMsb = originalMsb; - elementPath = new ArrayList<Object>(); + elementPath = new ArrayList<>(); fullName = (msg != null ? msg.getName() : messageData.getName()) + "." + this.elementName; } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java index 2ee3ba96a8f..dd42ed10a2b 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java @@ -38,7 +38,7 @@ public abstract class RecordElement extends Element { */ public RecordElement(Message<?, ?, ?> message, String elementName, int index, MessageData messageData, int firstRecordBitOffset, int recordBitSize) { super(message, elementName, messageData, firstRecordBitOffset + index * recordBitSize, recordBitSize); - elementMap = new LinkedHashMap<String, Element>(); + elementMap = new LinkedHashMap<>(); BIT_OFFSET = this.bitOffset = firstRecordBitOffset + index * recordBitSize; this.recordBitSize = recordBitSize; this.firstRecordBitOffset = firstRecordBitOffset; diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java index 8994c0f1ce7..a887d541122 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java @@ -29,14 +29,14 @@ public class RecordMap<T extends RecordElement> extends RecordElement { public RecordMap(Message<?, ?, ?> message, MessageData messageData, String elementName, int numberOfRecords, IRecordFactory factory) { super(message, elementName, 1, messageData, 0, factory.getBitLength()); NUMBER_OF_RECORDS = numberOfRecords; - records = new HashMap<Integer, T>(numberOfRecords); + records = new HashMap<>(numberOfRecords); this.factory = factory; } public RecordMap(Message<?, ?, ?> message, MessageData messageData, int firstRecordByteOffset, int recordByteSize, int numberOfRecords) { super(message, "", 1, messageData, 0, 0); NUMBER_OF_RECORDS = numberOfRecords; - records = new HashMap<Integer, T>(numberOfRecords); + records = new HashMap<>(numberOfRecords); } @Override diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/enums/EmptyEnum.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/enums/EmptyEnum.java index 4cd23813001..ae5c1821c4b 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/enums/EmptyEnum.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/enums/EmptyEnum.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.EnumBase; public class EmptyEnum extends EnumBase implements Comparable<EmptyEnum> { private static final long serialVersionUID = 1305742348409814145L; - private static final HashMap<Integer, EmptyEnum> valuesMap = new HashMap<Integer, EmptyEnum>(16); + private static final HashMap<Integer, EmptyEnum> valuesMap = new HashMap<>(16); private final int value; @@ -57,7 +57,7 @@ public class EmptyEnum extends EnumBase implements Comparable<EmptyEnum> { @Override protected String[] getStringTable() { - List<String> retVal = new LinkedList<String>(); + List<String> retVal = new LinkedList<>(); for (EmptyEnum current : valuesMap.values()) { retVal.add("EMPTY_ENUM_" + current.getValue()); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessage.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessage.java index 1975d60e486..ede78c1da64 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessage.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessage.java @@ -48,7 +48,7 @@ public class OteEventMessage extends Message<MessageSystemTestEnvironment, OteEv } protected <T extends Enum<T> & IEnumValue<T>> EnumeratedElement<T> createEnumeratedElement(String name, int size, Class<T> clazz) { - EnumeratedElement<T> el = new EnumeratedElement<T>(this, name, clazz, getDefaultMessageData(), currentOffset, 0, size*8-1); + EnumeratedElement<T> el = new EnumeratedElement<>(this, name, clazz, getDefaultMessageData(), currentOffset, 0, size*8-1); currentOffset+=size; return el; } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessageUtil.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessageUtil.java index 44590b12312..f3e92137131 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessageUtil.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/OteEventMessageUtil.java @@ -50,7 +50,7 @@ public class OteEventMessageUtil { public static void sendEvent(OteEventMessage message, EventAdmin eventAdmin) { message.getHeader().UUID_HIGH.setNoLog((long) 0x0); message.getHeader().UUID_LOW.setNoLog((long) 0x0); - Map<String, Object> data = new HashMap<String, Object>(); + Map<String, Object> data = new HashMap<>(); data.put(BYTE_KEY, message.getData()); Event newevent = new Event(message.getHeader().TOPIC.getValue(), data); eventAdmin.sendEvent(newevent); @@ -59,7 +59,7 @@ public class OteEventMessageUtil { public static void postEvent(OteEventMessage message, EventAdmin eventAdmin) { message.getHeader().UUID_HIGH.setNoLog((long) 0x0); message.getHeader().UUID_LOW.setNoLog((long) 0x0); - Map<String, Object> data = new HashMap<String, Object>(); + Map<String, Object> data = new HashMap<>(); data.put(BYTE_KEY, message.getData()); Event newevent = new Event(message.getHeader().TOPIC.getValue(), data); eventAdmin.postEvent(newevent); @@ -131,7 +131,7 @@ public class OteEventMessageUtil { } public static ServiceRegistration<EventHandler> subscribe(String topic, EventHandler handler){ - Dictionary<String, String> props = new Hashtable<String, String>(); + Dictionary<String, String> props = new Hashtable<>(); props.put("event.topics", topic); return ServiceUtility.getContext().registerService(EventHandler.class, handler, props); } @@ -141,7 +141,7 @@ public class OteEventMessageUtil { if (context == null) { return null; } - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Hashtable<String, Object> props = new Hashtable<>(); props.put("event.topics", signal.getHeader().TOPIC.getValue()); return context.registerService(EventHandler.class, eventHandler, props); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java index 90ced956d01..27a5ec759bb 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java @@ -20,7 +20,7 @@ public class SOCKET_ADDRESS_RECORD extends ArrayElement{ public SOCKET_ADDRESS_RECORD(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) { super(msg, elementName, messageData, byteOffset, msb, lsb); - type = new EnumeratedElement<ADDRESS_TYPE>(msg, "type", ADDRESS_TYPE.class, messageData, byteOffset, 0, 7); + type = new EnumeratedElement<>(msg, "type", ADDRESS_TYPE.class, messageData, byteOffset, 0, 7); ipaddress = new ArrayElement(msg, "ipaddress", messageData, byteOffset + 1, 0, 8*16-1); port = new IntegerElement(msg, "port", messageData, ipaddress.getByteOffset() + 16, 0, 31); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteEndpointSendEventMessage.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteEndpointSendEventMessage.java index 53c00c5749a..cb12d805d2d 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteEndpointSendEventMessage.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteEndpointSendEventMessage.java @@ -61,7 +61,7 @@ public class OteEndpointSendEventMessage { public <T extends OteEventMessage, R extends OteEventMessage> OteEventMessageFuture<T, R> asynchSendAndResponse(Class<R> clazz, T message, OteEventMessageCallable<T, R> callable, long timeout){ int responseId = updateHeaderInfo(message); String responseTopic = message.getHeader().RESPONSE_TOPIC.getValue(); - OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureImpl<T, R>(clazz, callable, message, responseTopic, responseId, timeout); + OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureImpl<>(clazz, callable, message, responseTopic, responseId, timeout); endpoint.getOteEndpointThreadedSender(destination).send(message); return response; } @@ -82,7 +82,7 @@ public class OteEndpointSendEventMessage { public <T extends OteEventMessage, R extends OteEventMessage> OteEventMessageFuture<T, R> asynchSendAndMultipleResponse(Class<R> clazz, T message, OteEventMessageCallable<T, R> callable, long timeout){ int responseId = updateHeaderInfo(message); String responseTopic = message.getHeader().RESPONSE_TOPIC.getValue(); - OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureMultipleResponseImpl<T,R>(clazz, callable, message, responseTopic, responseId, timeout); + OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureMultipleResponseImpl<>(clazz, callable, message, responseTopic, responseId, timeout); endpoint.getOteEndpointThreadedSender(destination).send(message); return response; } @@ -95,7 +95,7 @@ public class OteEndpointSendEventMessage { * @return a future that you should cancel when done listening so resources can be cleaned up. */ public <R extends OteEventMessage> OteEventMessageResponseFuture<R> asynchResponse(Class<R> clazz, String topic, OteEventMessageResponseCallable<R> callable){ - OteEventMessageResponseFutureImpl<R> response = new OteEventMessageResponseFutureImpl<R>(clazz, callable, topic); + OteEventMessageResponseFutureImpl<R> response = new OteEventMessageResponseFutureImpl<>(clazz, callable, topic); return response; } @@ -114,7 +114,7 @@ public class OteEndpointSendEventMessage { try{ int responseId = updateHeaderInfo(message); message.getHeader().RESPONSE_TOPIC.setValue(responseTopic); - NotifyOnResponse<T> response = new NotifyOnResponse<T>(clazz, responseTopic, responseId, lock, responseReceived); + NotifyOnResponse<T> response = new NotifyOnResponse<>(clazz, responseTopic, responseId, lock, responseReceived); try{ endpoint.getOteEndpointThreadedSender(destination).send(message); long nanos = TimeUnit.MILLISECONDS.toNanos(timeout); @@ -149,7 +149,7 @@ public class OteEndpointSendEventMessage { try{ int responseId = updateHeaderInfo(sendMessage); sendMessage.getHeader().RESPONSE_TOPIC.setValue(responseMessage.getHeader().TOPIC.getValue()); - NotifyOnResponse<T> response = new NotifyOnResponse<T>(responseMessage, responseId, lock, responseReceived); + NotifyOnResponse<T> response = new NotifyOnResponse<>(responseMessage, responseId, lock, responseReceived); try{ endpoint.getOteEndpointThreadedSender(destination).send(sendMessage); long nanos = TimeUnit.MILLISECONDS.toNanos(timeout); @@ -205,7 +205,7 @@ public class OteEndpointSendEventMessage { try{ int responseId = updateHeaderInfo(sendMessage); sendMessage.getHeader().RESPONSE_TOPIC.setValue(responseMessage.getHeader().TOPIC.getValue()); - NotifyOnResponse<T> response = new NotifyOnResponse<T>(responseMessage, responseId, lock, responseReceived); + NotifyOnResponse<T> response = new NotifyOnResponse<>(responseMessage, responseId, lock, responseReceived); try{ endpoint.getOteEndpointInlineSender(destination).send(sendMessage); long nanos = TimeUnit.MILLISECONDS.toNanos(timeout); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteSendEventMessage.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteSendEventMessage.java index ed50926a27b..5a834ebb918 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteSendEventMessage.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/send/OteSendEventMessage.java @@ -58,7 +58,7 @@ public class OteSendEventMessage { public <T extends OteEventMessage, R extends OteEventMessage> OteEventMessageFuture<T, R> asynchSendAndResponse(Class<R> clazz, T message, OteEventMessageCallable<T, R> callable, long timeout){ int responseId = incrementSequenceNumber(message); String responseTopic = message.getHeader().RESPONSE_TOPIC.getValue(); - OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureImpl<T, R>(clazz, callable, message, responseTopic, responseId, timeout); + OteEventMessageFutureImpl<T, R> response = new OteEventMessageFutureImpl<>(clazz, callable, message, responseTopic, responseId, timeout); OteEventMessageUtil.postEvent(message, eventAdmin); return response; } @@ -71,7 +71,7 @@ public class OteSendEventMessage { * @return a future that you should cancel when done listening so resources can be cleaned up. */ public <R extends OteEventMessage> OteEventMessageResponseFuture<R> asynchResponse(Class<R> clazz, String topic, OteEventMessageResponseCallable<R> callable){ - OteEventMessageResponseFutureImpl<R> response = new OteEventMessageResponseFutureImpl<R>(clazz, callable, topic); + OteEventMessageResponseFutureImpl<R> response = new OteEventMessageResponseFutureImpl<>(clazz, callable, topic); return response; } @@ -90,7 +90,7 @@ public class OteSendEventMessage { try{ int responseId = incrementSequenceNumber(message); message.getHeader().RESPONSE_TOPIC.setValue(responseTopic); - NotifyOnResponse<T> response = new NotifyOnResponse<T>(clazz, responseTopic, responseId, lock, responseReceived); + NotifyOnResponse<T> response = new NotifyOnResponse<>(clazz, responseTopic, responseId, lock, responseReceived); try{ OteEventMessageUtil.postEvent(message, eventAdmin); long nanos = TimeUnit.MILLISECONDS.toNanos(timeout); @@ -125,7 +125,7 @@ public class OteSendEventMessage { try{ int responseId = incrementSequenceNumber(sendMessage); sendMessage.getHeader().RESPONSE_TOPIC.setValue(responseMessage.getHeader().TOPIC.getValue()); - NotifyOnResponse<T> response = new NotifyOnResponse<T>(responseMessage, responseId, lock, responseReceived); + NotifyOnResponse<T> response = new NotifyOnResponse<>(responseMessage, responseId, lock, responseReceived); try{ OteEventMessageUtil.postEvent(sendMessage, eventAdmin); long nanos = TimeUnit.MILLISECONDS.toNanos(timeout); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/instrumentation/BaseIOInstrumentation.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/instrumentation/BaseIOInstrumentation.java index c503f5adb4d..a40a41942ac 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/instrumentation/BaseIOInstrumentation.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/instrumentation/BaseIOInstrumentation.java @@ -30,7 +30,7 @@ public class BaseIOInstrumentation implements IOInstrumentation { private final DatagramChannel channel; public BaseIOInstrumentation() throws IOException { - addresses = new ArrayList<InetSocketAddress>(); + addresses = new ArrayList<>(); channel = DatagramChannel.open(); channel.configureBlocking(true); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/io/MessageIoManagementService.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/io/MessageIoManagementService.java index 28b3c8666e5..591f8690bc2 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/io/MessageIoManagementService.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/io/MessageIoManagementService.java @@ -20,7 +20,7 @@ import java.util.concurrent.locks.ReentrantLock; */ public class MessageIoManagementService implements IMessageIoManagementService { - private final HashSet<IMessageIoDriver> drivers = new HashSet<IMessageIoDriver>(); + private final HashSet<IMessageIoDriver> drivers = new HashSet<>(); private final Lock lock = new ReentrantLock(); private boolean ioStarted = false; @@ -47,7 +47,7 @@ public class MessageIoManagementService implements IMessageIoManagementService { lock.lock(); ioStarted = true; - Set<IMessageIoDriver> copiedDrivers = new HashSet<IMessageIoDriver>(drivers); + Set<IMessageIoDriver> copiedDrivers = new HashSet<>(drivers); lock.unlock(); for (IMessageIoDriver driver : copiedDrivers) { driver.start(); @@ -59,7 +59,7 @@ public class MessageIoManagementService implements IMessageIoManagementService { public void stopIO() { lock.lock(); ioStarted = false; - Set<IMessageIoDriver> copiedDrivers = new HashSet<IMessageIoDriver>(drivers); + Set<IMessageIoDriver> copiedDrivers = new HashSet<>(drivers); lock.unlock(); for (IMessageIoDriver driver : copiedDrivers) { driver.stop(); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java index 817cd0dc8b7..07e8abb28ea 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java @@ -72,8 +72,8 @@ public class MessageSystemListener implements IOSEEMessageReaderListener, IOSEEM private static final ThreadPoolExecutor threadPool = new ThreadPoolExecutor(5, Integer.MAX_VALUE, 60 * 30, TimeUnit.SECONDS, new SynchronousQueue<Runnable>()); - private final CopyOnWriteNoIteratorList<IOSEEMessageListener> fastListeners = new CopyOnWriteNoIteratorList<IOSEEMessageListener>(IOSEEMessageListener.class); - private final CopyOnWriteNoIteratorList<IOSEEMessageListener> slowListeners = new CopyOnWriteNoIteratorList<IOSEEMessageListener>(IOSEEMessageListener.class); + private final CopyOnWriteNoIteratorList<IOSEEMessageListener> fastListeners = new CopyOnWriteNoIteratorList<>(IOSEEMessageListener.class); + private final CopyOnWriteNoIteratorList<IOSEEMessageListener> slowListeners = new CopyOnWriteNoIteratorList<>(IOSEEMessageListener.class); private volatile boolean disposed = false; /** @@ -82,7 +82,7 @@ public class MessageSystemListener implements IOSEEMessageReaderListener, IOSEEM */ public MessageSystemListener(Message<?, ?, ?> msg) { super(); - this.message = new WeakReference<Message<?,?,?>>(msg); + this.message = new WeakReference<>(msg); } /** diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/RealTime.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/RealTime.java index 3d731ae6bd6..21c1b4b5313 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/RealTime.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/RealTime.java @@ -41,7 +41,7 @@ public class RealTime extends TimerControl { @Override public void addTask(final EnvironmentTask task, final TestEnvironment environment) { if (!handleMap.containsKey(task)) { - final WeakReference<TestEnvironment> te = new WeakReference<TestEnvironment>(environment); + final WeakReference<TestEnvironment> te = new WeakReference<>(environment); final ScheduledFuture<?> handle = schedulePeriodicTask(new Runnable() { final Benchmark bm = new Benchmark(task.getClass().getName() + ":" + task.getHzRate() + "Hz", (long) (1000000.0 / task.getHzRate())); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/SimulatedTime.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/SimulatedTime.java index 15ee762d861..2c78d216dbd 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/SimulatedTime.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/timer/SimulatedTime.java @@ -58,7 +58,7 @@ public class SimulatedTime extends TimerControl { private final Collection<CycleCountDown> scriptCycleCounters; private final IScriptControl scriptControl; private int cycleCount; - private final CopyOnWriteArrayList<Task> tasks = new CopyOnWriteArrayList<Task>(); + private final CopyOnWriteArrayList<Task> tasks = new CopyOnWriteArrayList<>(); private final long sysTime; @@ -68,8 +68,8 @@ public class SimulatedTime extends TimerControl { public SimulatedTime(IScriptControl scriptControl) throws IOException { super(3); this.scriptControl = scriptControl; - cycleCounters = new HashSet<CycleCountDown>(32); - scriptCycleCounters = new HashSet<CycleCountDown>(32); + cycleCounters = new HashSet<>(32); + scriptCycleCounters = new HashSet<>(32); cycleCount = 0; sysTime = System.currentTimeMillis(); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/SubscriptionDetails.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/SubscriptionDetails.java index 32ee14f8e62..fdbd070a9e6 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/SubscriptionDetails.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/SubscriptionDetails.java @@ -29,7 +29,7 @@ public class SubscriptionDetails implements Serializable { public SubscriptionDetails(SubscriptionKey key, byte[] currentData, Set<DataType> availableMemTypes) { this.key = key; this.currentData = currentData; - this.availableMemTypes = new HashSet<DataType>(availableMemTypes); + this.availableMemTypes = new HashSet<>(availableMemTypes); } public SubscriptionKey getKey() { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/UdpFileTransferHandler.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/UdpFileTransferHandler.java index ed40b2bbcee..9b6db88c764 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/UdpFileTransferHandler.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/UdpFileTransferHandler.java @@ -41,7 +41,7 @@ public class UdpFileTransferHandler { private final Selector selector; private volatile boolean done = false; - private final HashMap<SelectionKey, Handle> handles = new HashMap<SelectionKey, Handle>(); + private final HashMap<SelectionKey, Handle> handles = new HashMap<>(); private final Object gate = new Object(); private final class Handle implements IFileTransferHandle { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java index 43480efe796..87e6a25b2ab 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java @@ -33,13 +33,13 @@ public class MessageRecorder { private static final int NUM_BUFFERS = 3; private WritableByteChannel channel; - private final ArrayList<IMessageEntry> msgsToRecord = new ArrayList<IMessageEntry>(64); + private final ArrayList<IMessageEntry> msgsToRecord = new ArrayList<>(64); private final Lock recLock = new ReentrantLock(); private volatile boolean isRecording = false; private final IMessageEntryFactory factory; private final ExecutorService taskHandler = Executors.newFixedThreadPool(2); - private final ArrayBlockingQueue<ByteBuffer> bufferQueue = new ArrayBlockingQueue<ByteBuffer>(NUM_BUFFERS); + private final ArrayBlockingQueue<ByteBuffer> bufferQueue = new ArrayBlockingQueue<>(NUM_BUFFERS); public MessageRecorder(IMessageEntryFactory factory) { this.factory = factory; |