Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Improving Resource API to support resource naming and typing

  • Loading branch information...
commit 92e4a9d97dd85d8ea8e28cd2ab0611ae974aa0ef 1 parent cd56c00
@etirelli etirelli authored
Showing with 880 additions and 987 deletions.
  1. +3 −2 drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java
  2. +2 −2 drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
  3. +8 −8 drools-compiler/src/main/java/org/drools/compiler/CompositeKnowledgeBuilderImpl.java
  4. +3 −5 drools-compiler/src/main/java/org/drools/compiler/DRLFactory.java
  5. +0 −1  drools-compiler/src/main/java/org/drools/compiler/DecisionTableProvider.java
  6. +3 −3 drools-compiler/src/main/java/org/drools/compiler/DrlExprParser.java
  7. +10 −10 drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
  8. +2 −2 drools-compiler/src/main/java/org/drools/compiler/PMMLCompiler.java
  9. +0 −3  drools-compiler/src/main/java/org/drools/compiler/PMMLCompilerFactory.java
  10. +2 −2 drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
  11. +8 −8 drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
  12. +0 −1  drools-compiler/src/main/java/org/drools/compiler/PackageBuilderErrors.java
  13. +2 −2 drools-compiler/src/main/java/org/drools/compiler/ResourceTypeBuilder.java
  14. +1 −1  drools-compiler/src/main/java/org/drools/compiler/ResourceTypeBuilderRegistry.java
  15. +14 −13 drools-compiler/src/main/java/org/drools/kproject/models/KieBaseModelImpl.java
  16. +11 −9 drools-compiler/src/main/java/org/drools/kproject/models/KieModuleModelImpl.java
  17. +7 −6 drools-compiler/src/main/java/org/drools/kproject/models/KieSessionModelImpl.java
  18. +4 −3 drools-compiler/src/main/java/org/drools/kproject/models/ListenerModelImpl.java
  19. +6 −5 drools-compiler/src/main/java/org/drools/kproject/models/QualifierModelImpl.java
  20. +4 −3 drools-compiler/src/main/java/org/drools/kproject/models/WorkItemHandlerModelImpl.java
  21. +9 −9 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieModule.java
  22. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieProject.java
  23. +16 −16 drools-compiler/src/main/java/org/kie/builder/impl/ClasspathKieProject.java
  24. +4 −4 drools-compiler/src/main/java/org/kie/builder/impl/CompositeKieModule.java
  25. +4 −4 drools-compiler/src/main/java/org/kie/builder/impl/FileKieModule.java
  26. +4 −10 drools-compiler/src/main/java/org/kie/builder/impl/InternalKieModule.java
  27. +7 −7 drools-compiler/src/main/java/org/kie/builder/impl/JarKieModule.java
  28. +14 −14 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderImpl.java
  29. +5 −5 drools-compiler/src/main/java/org/kie/builder/impl/KieContainerImpl.java
  30. +4 −4 drools-compiler/src/main/java/org/kie/builder/impl/KieFileSystemImpl.java
  31. +0 −3  drools-compiler/src/main/java/org/kie/builder/impl/KieJarVerifier.java
  32. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/KieModuleKieProject.java
  33. +5 −5 drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java
  34. +4 −4 drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
  35. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/MessageImpl.java
  36. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/Messages.java
  37. +0 −1  drools-compiler/src/main/java/org/kie/builder/impl/ProtoKieContainer.java
  38. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/ResultsImpl.java
  39. +4 −4 drools-compiler/src/main/java/org/kie/builder/impl/ZipKieModule.java
  40. +8 −7 drools-compiler/src/main/java/org/kie/util/CDIHelper.java
  41. +1 −2  drools-compiler/src/main/java/org/kie/util/ChangeSetBuilder.java
  42. +1 −1  drools-compiler/src/test/java/org/drools/CommonTestMethodBase.java
  43. +5 −7 drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
  44. +1 −6 drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
  45. +1 −2  drools-compiler/src/test/java/org/drools/beliefsystem/jtms/JTMSTest.java
  46. +1 −1  drools-compiler/src/test/java/org/drools/command/KBuilderBatchExecutionTest.java
  47. +1 −1  drools-compiler/src/test/java/org/drools/command/MoreBatchExecutionTest.java
  48. +3 −2 drools-compiler/src/test/java/org/drools/command/RegisterWorkItemHandlerTest.java
  49. +1 −1  drools-compiler/src/test/java/org/drools/command/SimpleBatchExecutionTest.java
  50. +1 −1  drools-compiler/src/test/java/org/drools/common/ActivationIteratorTest.java
  51. +1 −1  drools-compiler/src/test/java/org/drools/common/ActiveActivationsIteratorTest.java
  52. +1 −1  drools-compiler/src/test/java/org/drools/common/TerminalNodeIteratorTest.java
  53. +4 −5 drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java
  54. +1 −2  drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java
  55. +3 −6 drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
  56. +16 −17 drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
  57. +3 −5 drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java
  58. +4 −4 drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java
  59. +4 −3 drools-compiler/src/test/java/org/drools/compiler/RuleFlowErrorTest.java
  60. +2 −10 drools-compiler/src/test/java/org/drools/compiler/TypeDeclarationMergingTest.java
  61. +4 −2 drools-compiler/src/test/java/org/drools/compiler/TypeDeclarationTest.java
  62. +1 −3 drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java
  63. +6 −3 drools-compiler/src/test/java/org/drools/definitions/KnowledgePackageMetaDataTest.java
  64. +0 −2  drools-compiler/src/test/java/org/drools/factmodel/traits/Imp.java
  65. +5 −1 drools-compiler/src/test/java/org/drools/factmodel/traits/Imp2.java
  66. +2 −3 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxy2.java
  67. +6 −2 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxyWrapper2.java
  68. +5 −8 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxyWrapper3.java
  69. +6 −4 drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java
  70. +12 −8 drools-compiler/src/test/java/org/drools/factmodel/traits/TripleBasedTraitsTest.java
  71. +1 −5 drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
  72. +0 −4 drools-compiler/src/test/java/org/drools/integrationtests/AlphaNetworkModifyTest.java
  73. +14 −14 drools-compiler/src/test/java/org/drools/integrationtests/AnnotationsTest.java
  74. +0 −5 drools-compiler/src/test/java/org/drools/integrationtests/ArrayContainsTest.java
  75. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/BackwardChainingTest.java
  76. +4 −16 drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
  77. +6 −6 drools-compiler/src/test/java/org/drools/integrationtests/ConsequenceOffsetTest.java
  78. +4 −4 drools-compiler/src/test/java/org/drools/integrationtests/CustomOperatorTest.java
  79. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/DateComparisonTest.java
  80. +0 −4 drools-compiler/src/test/java/org/drools/integrationtests/DroolsEventList.java
  81. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/DroolsEventListTest.java
  82. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
  83. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
  84. +1 −8 drools-compiler/src/test/java/org/drools/integrationtests/EnumTest.java
  85. +1 −12 drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
  86. +0 −7 drools-compiler/src/test/java/org/drools/integrationtests/ExpressionConstraintsTest.java
  87. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/ExtendsTest.java
  88. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/FailureOnRemovalTest.java
  89. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/FireAllRulesCommandTest.java
  90. +6 −7 drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
  91. +1 −4 drools-compiler/src/test/java/org/drools/integrationtests/HelloWorldTest.java
  92. +4 −4 drools-compiler/src/test/java/org/drools/integrationtests/I18nTest.java
  93. +1 −8 drools-compiler/src/test/java/org/drools/integrationtests/IndexingTest.java
  94. +6 −2 drools-compiler/src/test/java/org/drools/integrationtests/IntegrationInterfacesTest.java
  95. +14 −17 drools-compiler/src/test/java/org/drools/integrationtests/KnowledgeBuilderTest.java
  96. +2 −2 drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBase.java
  97. +4 −8 drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java
  98. +1 −6 drools-compiler/src/test/java/org/drools/integrationtests/LinkingTest.java
  99. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/MBeansMonitoringTest.java
  100. +20 −20 drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
  101. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
  102. +10 −20 drools-compiler/src/test/java/org/drools/integrationtests/MiscTest2.java
  103. +4 −5 drools-compiler/src/test/java/org/drools/integrationtests/NamedConsequencesTest.java
  104. +4 −3 drools-compiler/src/test/java/org/drools/integrationtests/NewLineAtEoFTest.java
  105. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
  106. +3 −5 drools-compiler/src/test/java/org/drools/integrationtests/PackageBuilderThreadSafetyTest.java
  107. +13 −12 drools-compiler/src/test/java/org/drools/integrationtests/ParallelCompilationTest.java
  108. +11 −12 drools-compiler/src/test/java/org/drools/integrationtests/PropertySpecificTest.java
  109. +4 −4 drools-compiler/src/test/java/org/drools/integrationtests/Query2Test.java
  110. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/QueryTest.java
  111. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/QueryTest2.java
  112. +0 −1  drools-compiler/src/test/java/org/drools/integrationtests/SerializationHelper.java
  113. +5 −3 drools-compiler/src/test/java/org/drools/integrationtests/SerializedPackageMergeTest.java
  114. +1 −2  drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
  115. +1 −10 drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
  116. +4 −6 drools-compiler/src/test/java/org/drools/integrationtests/StatelessStressTest.java
  117. +1 −3 drools-compiler/src/test/java/org/drools/integrationtests/StrEvaluatorTest.java
  118. +6 −5 drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
  119. +6 −14 drools-compiler/src/test/java/org/drools/integrationtests/SubNetworkLinkingTest.java
  120. +2 −5 drools-compiler/src/test/java/org/drools/integrationtests/TimerAndCalendarTest.java
  121. +1 −1  drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
  122. +3 −2 drools-compiler/src/test/java/org/drools/integrationtests/UnmarshallingTest.java
  123. +3 −10 drools-compiler/src/test/java/org/drools/integrationtests/VarargsTest.java
  124. +2 −6 drools-compiler/src/test/java/org/drools/integrationtests/WorkingMemoryLoggerTest.java
  125. +0 −1  drools-compiler/src/test/java/org/drools/integrationtests/marshalling/FactHandleMarshallingTest.java
  126. +4 −2 drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingIssuesTest.java
  127. +1 −2  drools-compiler/src/test/java/org/drools/integrationtests/marshalling/MarshallingTest.java
  128. +2 −1  drools-compiler/src/test/java/org/drools/integrationtests/marshalling/WorkItemMarshallingTest.java
  129. +13 −22 drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java
  130. +5 −6 drools-compiler/src/test/java/org/drools/lang/api/DescrBuilderTest.java
  131. +2 −3 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java
  132. +1 −3 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AsmGeneratorTest.java
  133. +9 −5 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
  134. +11 −11 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaDialectBinaryEqualityTest.java
  135. +9 −9 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaDialectTest.java
  136. +5 −7 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzerTest.java
  137. +2 −3 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixerTest.java
  138. +13 −12 drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
  139. +1 −1  drools-compiler/src/test/java/org/drools/test/PositionalTest.java
  140. +1 −1  drools-compiler/src/test/java/org/drools/util/debug/SessionInspectorTest.java
  141. +0 −7 drools-core/src/main/java/org/drools/command/FinishedCommand.java
  142. +0 −1  drools-core/src/main/java/org/drools/command/GetSessionClockCommand.java
  143. +0 −12 drools-core/src/main/java/org/drools/command/GetVariableCommand.java
  144. +0 −3  drools-core/src/main/java/org/drools/command/KnowledgeBaseAddKnowledgePackagesCommand.java
  145. +1 −1  drools-core/src/main/java/org/drools/command/KnowledgeContextResolveFromContextCommand.java
  146. +0 −6 drools-core/src/main/java/org/drools/command/SetVariableCommandFromCommand.java
  147. +0 −1  drools-core/src/main/java/org/drools/command/SingleSessionCommandService.java
  148. +2 −2 drools-core/src/main/java/org/drools/command/builder/KnowledgeBuilderAddCommand.java
  149. +0 −3  drools-core/src/main/java/org/drools/command/builder/KnowledgeBuilderGetErrorsCommand.java
  150. +0 −4 drools-core/src/main/java/org/drools/command/builder/KnowledgeBuilderHasErrorsCommand.java
  151. +0 −2  drools-core/src/main/java/org/drools/command/builder/NewKnowledgeBuilderCommand.java
  152. +2 −2 drools-core/src/main/java/org/drools/event/KnowledgeAgentEventSupport.java
  153. +38 −13 drools-core/src/main/java/org/drools/io/impl/BaseResource.java
  154. +19 −7 drools-core/src/main/java/org/drools/io/impl/ByteArrayResource.java
  155. +3 −0  drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java
  156. +19 −1 drools-core/src/main/java/org/drools/io/impl/DescrResource.java
  157. +24 −3 drools-core/src/main/java/org/drools/io/impl/EncodedResource.java
  158. +7 −1 drools-core/src/main/java/org/drools/io/impl/FileSystemResource.java
  159. +2 −3 drools-core/src/main/java/org/drools/io/impl/KnowledgeResource.java
  160. +1 −1  drools-core/src/main/java/org/drools/io/impl/ReaderResource.java
  161. +1 −1  drools-core/src/main/java/org/drools/io/impl/ResourceChangeNotifierImpl.java
  162. +0 −2  drools-core/src/main/java/org/drools/io/impl/ResourceFactoryServiceImpl.java
  163. +8 −4 drools-core/src/main/java/org/drools/io/impl/UrlResource.java
  164. +5 −5 drools-core/src/main/java/org/drools/io/internal/InternalResource.java
  165. +0 −7 drools-core/src/main/java/org/drools/xml/changeset/AddHandler.java
  166. +1 −2  drools-core/src/main/java/org/drools/xml/changeset/DecisionTableConfigurationHandler.java
  167. +0 −7 drools-core/src/main/java/org/drools/xml/changeset/ModifyHandler.java
  168. +1 −1  drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java
  169. +2 −2 drools-core/src/test/java/org/drools/fluent/impl/AbstractFluentKnowledgeBase.java
  170. +0 −6 drools-core/src/test/java/org/drools/fluent/impl/AbstractFluentTest.java
  171. +2 −2 drools-core/src/test/java/org/drools/fluent/impl/MVELTestCommand.java
  172. +1 −1  drools-decisiontables/src/test/java/org/acme/insurance/launcher/PricingRuleLauncher.java
  173. +11 −11 drools-decisiontables/src/test/java/org/drools/decisiontable/ChangeSetTest.java
  174. +1 −1  drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
  175. +1 −1  drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
  176. +4 −5 drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
  177. +11 −11 drools-decisiontables/src/test/java/org/drools/decisiontable/ScannerChangeSetTest.java
  178. +14 −23 drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationExampleTest.java
  179. +1 −1  drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInXLSTest.java
  180. +3 −1 drools-persistence-jpa/src/test/java/org/drools/command/KBuilderBatchExecutionPersistenceTest.java
  181. +3 −1 drools-persistence-jpa/src/test/java/org/drools/command/MoreBatchExecutionPersistenceTest.java
  182. +3 −1 drools-persistence-jpa/src/test/java/org/drools/command/SimpleBatchExecutionPersistenceTest.java
  183. +0 −1  drools-persistence-jpa/src/test/java/org/drools/marshalling/util/CompareViaReflectionUtil.java
  184. +3 −1 drools-persistence-jpa/src/test/java/org/drools/marshalling/util/EntityManagerFactoryProxy.java
  185. +6 −1 drools-persistence-jpa/src/test/java/org/drools/marshalling/util/MarshalledData.java
  186. +5 −2 drools-persistence-jpa/src/test/java/org/drools/marshalling/util/MarshallingDBUtil.java
  187. +7 −3 drools-persistence-jpa/src/test/java/org/drools/marshalling/util/MarshallingTestUtil.java
  188. +9 −5 drools-persistence-jpa/src/test/java/org/drools/marshalling/util/TestMarshallingUtilsTest.java
  189. +2 −1  drools-persistence-jpa/src/test/java/org/drools/marshalling/util/UserTransactionProxy.java
  190. +6 −3 drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
  191. +3 −1 drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
  192. +0 −5 drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
  193. +6 −13 drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
  194. +1 −1  drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/MapPersistenceTest.java
  195. +12 −12 drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistenceTraitTest.java
  196. +4 −4 drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
  197. +7 −4 drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
  198. +5 −3 drools-persistence-jpa/src/test/java/org/drools/persistence/session/RuleFlowGroupRollbackTest.java
  199. +0 −1  drools-persistence-jpa/src/test/java/org/drools/persistence/util/LoggingPrintStream.java
  200. +6 −2 drools-persistence-jpa/src/test/java/org/drools/persistence/util/PersistenceUtil.java
  201. +6 −6 drools-persistence-jpa/src/test/java/org/drools/timer/integrationtests/TimerAndCalendarTest.java
  202. +15 −14 drools-persistence-jpa/src/test/java/org/kie/persistence/session/JpaPersistentStatefulSessionTest.java
  203. +1 −1  drools-verifier/src/main/java/org/drools/verifier/DefaultVerifierConfiguration.java
  204. +1 −1  drools-verifier/src/main/java/org/drools/verifier/EmptyVerifierConfiguration.java
  205. +2 −2 drools-verifier/src/main/java/org/drools/verifier/Verifier.java
  206. +1 −1  drools-verifier/src/main/java/org/drools/verifier/VerifierConfiguration.java
  207. +1 −1  drools-verifier/src/main/java/org/drools/verifier/VerifierConfigurationImpl.java
  208. +0 −1  drools-verifier/src/main/java/org/drools/verifier/builder/VerifierBuilderImpl.java
  209. +2 −2 drools-verifier/src/main/java/org/drools/verifier/builder/VerifierImpl.java
  210. +2 −2 drools-verifier/src/main/java/org/drools/verifier/builder/VerifierPackageBuilder.java
  211. +1 −1  drools-verifier/src/test/java/org/drools/verifier/RangeCheckTest.java
  212. +1 −1  drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java
  213. +1 −1  drools-verifier/src/test/java/org/drools/verifier/VerifierTestStandalone.java
  214. +1 −1  drools-verifier/src/test/java/org/drools/verifier/VerifyingScopeTest.java
  215. +1 −1  drools-verifier/src/test/java/org/drools/verifier/alwaysFalse/AlwaysFalseTest.java
  216. +1 −1  drools-verifier/src/test/java/org/drools/verifier/equivalence/EquivalentRulesTest.java
  217. +1 −1  drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentRestrictionsTest.java
  218. +1 −1  drools-verifier/src/test/java/org/drools/verifier/overlaps/OverlappingRestrictionsTest.java
  219. +1 −1  drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundancyTest.java
  220. +1 −1  drools-verifier/src/test/java/org/drools/verifier/redundancy/WarningsTest.java
  221. +1 −1  drools-verifier/src/test/java/org/drools/verifier/report/VerifierReportBuilderTest.java
  222. +1 −1  drools-verifier/src/test/java/org/drools/verifier/report/components/CauseTest.java
  223. +1 −1  drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantRestrictionsTest.java
  224. +1 −1  drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantSubPatternsTest.java
  225. +1 −1  drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantSubRulesTest.java
View
5 drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java
@@ -1,6 +1,7 @@
package org.drools.builder.impl;
-import com.sun.tools.xjc.Options;
+import java.util.Properties;
+
import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
import org.drools.builder.conf.impl.JaxbConfigurationImpl;
import org.drools.compiler.PackageBuilder;
@@ -13,7 +14,7 @@
import org.kie.builder.KnowledgeBuilderConfiguration;
import org.kie.builder.KnowledgeBuilderFactoryService;
-import java.util.Properties;
+import com.sun.tools.xjc.Options;
public class KnowledgeBuilderFactoryServiceImpl implements KnowledgeBuilderFactoryService {
View
4 drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
@@ -17,11 +17,11 @@
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderErrors;
import org.kie.builder.KnowledgeBuilderResults;
-import org.kie.builder.ResourceConfiguration;
-import org.kie.builder.ResourceType;
import org.kie.builder.ResultSeverity;
import org.kie.definition.KnowledgePackage;
import org.kie.io.Resource;
+import org.kie.io.ResourceConfiguration;
+import org.kie.io.ResourceType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
16 drools-compiler/src/main/java/org/drools/compiler/CompositeKnowledgeBuilderImpl.java
@@ -1,5 +1,11 @@
package org.drools.compiler;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.drools.builder.conf.impl.JaxbConfigurationImpl;
import org.drools.io.impl.BaseResource;
import org.drools.lang.descr.CompositePackageDescr;
@@ -7,15 +13,9 @@
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.TypeDeclarationDescr;
import org.kie.builder.CompositeKnowledgeBuilder;
-import org.kie.builder.ResourceConfiguration;
-import org.kie.builder.ResourceType;
import org.kie.io.Resource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.kie.io.ResourceConfiguration;
+import org.kie.io.ResourceType;
public class CompositeKnowledgeBuilderImpl implements CompositeKnowledgeBuilder {
View
8 drools-compiler/src/main/java/org/drools/compiler/DRLFactory.java
@@ -1,5 +1,8 @@
package org.drools.compiler;
+import java.io.InputStream;
+import java.io.Reader;
+
import org.antlr.runtime.ANTLRInputStream;
import org.antlr.runtime.ANTLRReaderStream;
import org.antlr.runtime.ANTLRStringStream;
@@ -19,11 +22,6 @@
import org.drools.lang.ParserHelper;
import org.kie.builder.conf.LanguageLevelOption;
-import java.io.InputStream;
-import java.io.Reader;
-
-import static org.drools.compiler.DRLFactory.buildParser;
-
public class DRLFactory {
private DRLFactory() { }
View
1  drools-compiler/src/main/java/org/drools/compiler/DecisionTableProvider.java
@@ -1,7 +1,6 @@
package org.drools.compiler;
import java.io.InputStream;
-import java.io.Reader;
import org.kie.Service;
import org.kie.builder.DecisionTableConfiguration;
View
6 drools-compiler/src/main/java/org/drools/compiler/DrlExprParser.java
@@ -16,6 +16,9 @@
package org.drools.compiler;
+import static org.drools.compiler.DRLFactory.getDRLExpressions;
+import static org.drools.compiler.DRLFactory.getDRLLexer;
+
import java.util.Collections;
import java.util.List;
@@ -30,9 +33,6 @@
import org.drools.lang.descr.ConstraintConnectiveDescr;
import org.kie.builder.conf.LanguageLevelOption;
-import static org.drools.compiler.DRLFactory.getDRLExpressions;
-import static org.drools.compiler.DRLFactory.getDRLLexer;
-
/**
* This is a helper class that provides helper methods to parse expressions
* using both the DRLExpressions parser and the DRLExprTree parser.
View
20 drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
@@ -16,6 +16,16 @@
package org.drools.compiler;
+import static org.drools.compiler.DRLFactory.buildLexer;
+import static org.drools.compiler.DRLFactory.buildParser;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.drools.io.impl.ClassPathResource;
import org.drools.io.impl.InputStreamResource;
import org.drools.io.impl.ReaderResource;
@@ -30,16 +40,6 @@
import org.kie.builder.conf.LanguageLevelOption;
import org.kie.io.Resource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.drools.compiler.DRLFactory.buildLexer;
-import static org.drools.compiler.DRLFactory.buildParser;
-
/**
* This is a low level parser API. This will return textual AST representations
* of the DRL source, including with DSL expanders if appropriate.
View
4 drools-compiler/src/main/java/org/drools/compiler/PMMLCompiler.java
@@ -16,11 +16,11 @@
package org.drools.compiler;
-import org.kie.Service;
-
import java.io.InputStream;
import java.util.Map;
+import org.kie.Service;
+
public interface PMMLCompiler extends Service {
public String compile(InputStream stream, Map<String,PackageRegistry> registries);
View
3  drools-compiler/src/main/java/org/drools/compiler/PMMLCompilerFactory.java
@@ -16,11 +16,8 @@
package org.drools.compiler;
-import org.kie.builder.DecisionTableConfiguration;
import org.kie.util.ServiceRegistryImpl;
-import java.io.InputStream;
-
public class PMMLCompilerFactory {
private static PMMLCompiler provider;
View
4 drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
@@ -129,8 +129,6 @@
import org.kie.builder.DecisionTableConfiguration;
import org.kie.builder.KnowledgeBuilderResult;
import org.kie.builder.KnowledgeBuilderResults;
-import org.kie.builder.ResourceConfiguration;
-import org.kie.builder.ResourceType;
import org.kie.builder.ResultSeverity;
import org.kie.builder.conf.PropertySpecificOption;
import org.kie.definition.KnowledgePackage;
@@ -141,6 +139,8 @@
import org.kie.definition.type.Position;
import org.kie.definition.type.PropertyReactive;
import org.kie.io.Resource;
+import org.kie.io.ResourceConfiguration;
+import org.kie.io.ResourceType;
import org.kie.runtime.rule.Match;
import org.kie.util.CompositeClassLoader;
import org.xml.sax.SAXException;
View
16 drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
@@ -16,6 +16,14 @@
package org.drools.compiler;
+import java.io.File;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+
import org.drools.RuntimeDroolsException;
import org.drools.base.evaluators.EvaluatorDefinition;
import org.drools.base.evaluators.EvaluatorRegistry;
@@ -52,14 +60,6 @@
import org.kie.util.ClassLoaderUtil;
import org.kie.util.CompositeClassLoader;
-import java.io.File;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
/**
* This class configures the package compiler.
* Dialects and their DialectConfigurations are handled by the DialectRegistry
View
1  drools-compiler/src/main/java/org/drools/compiler/PackageBuilderErrors.java
@@ -5,7 +5,6 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
-import java.util.Arrays;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderErrors;
View
4 drools-compiler/src/main/java/org/drools/compiler/ResourceTypeBuilder.java
@@ -1,8 +1,8 @@
package org.drools.compiler;
-import org.kie.builder.ResourceConfiguration;
-import org.kie.builder.ResourceType;
import org.kie.io.Resource;
+import org.kie.io.ResourceConfiguration;
+import org.kie.io.ResourceType;
public interface ResourceTypeBuilder {
View
2  drools-compiler/src/main/java/org/drools/compiler/ResourceTypeBuilderRegistry.java
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.kie.builder.ResourceType;
+import org.kie.io.ResourceType;
public class ResourceTypeBuilderRegistry {
View
27 drools-compiler/src/main/java/org/drools/kproject/models/KieBaseModelImpl.java
@@ -1,17 +1,6 @@
package org.drools.kproject.models;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.drools.core.util.AbstractXStreamConverter;
-import org.drools.core.util.Predicate;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.ResourceType;
-import org.kie.conf.AssertBehaviorOption;
-import org.kie.conf.EventProcessingOption;
+import static org.drools.core.util.IoUtils.recursiveListFile;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,7 +13,19 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import static org.drools.core.util.IoUtils.recursiveListFile;
+import org.drools.core.util.AbstractXStreamConverter;
+import org.drools.core.util.Predicate;
+import org.kie.builder.KieBaseModel;
+import org.kie.builder.KieModuleModel;
+import org.kie.builder.KieSessionModel;
+import org.kie.conf.AssertBehaviorOption;
+import org.kie.conf.EventProcessingOption;
+import org.kie.io.ResourceType;
+
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
public class KieBaseModelImpl
implements
View
20 drools-compiler/src/main/java/org/drools/kproject/models/KieModuleModelImpl.java
@@ -1,14 +1,5 @@
package org.drools.kproject.models;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
@@ -17,6 +8,17 @@
import java.util.List;
import java.util.Map;
+import org.drools.core.util.AbstractXStreamConverter;
+import org.kie.builder.KieBaseModel;
+import org.kie.builder.KieModuleModel;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
public class KieModuleModelImpl implements KieModuleModel {
public static String KMODULE_JAR_PATH = "META-INF/kmodule.xml";
View
13 drools-compiler/src/main/java/org/drools/kproject/models/KieSessionModelImpl.java
@@ -1,9 +1,8 @@
package org.drools.kproject.models;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.core.util.AbstractXStreamConverter;
import org.kie.builder.KieBaseModel;
import org.kie.builder.KieSessionModel;
@@ -11,8 +10,10 @@
import org.kie.builder.WorkItemHandlerModel;
import org.kie.runtime.conf.ClockTypeOption;
-import java.util.ArrayList;
-import java.util.List;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
public class KieSessionModelImpl
implements
View
7 drools-compiler/src/main/java/org/drools/kproject/models/ListenerModelImpl.java
@@ -1,12 +1,13 @@
package org.drools.kproject.models;
+import org.drools.core.util.AbstractXStreamConverter;
+import org.kie.builder.ListenerModel;
+import org.kie.builder.QualifierModel;
+
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.ListenerModel;
-import org.kie.builder.QualifierModel;
public class ListenerModelImpl implements ListenerModel {
View
11 drools-compiler/src/main/java/org/drools/kproject/models/QualifierModelImpl.java
@@ -1,14 +1,15 @@
package org.drools.kproject.models;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.drools.core.util.AbstractXStreamConverter;
+import org.kie.builder.QualifierModel;
+
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.QualifierModel;
-
-import java.util.HashMap;
-import java.util.Map;
public class QualifierModelImpl implements QualifierModel {
private String type;
View
7 drools-compiler/src/main/java/org/drools/kproject/models/WorkItemHandlerModelImpl.java
@@ -1,12 +1,13 @@
package org.drools.kproject.models;
+import org.drools.core.util.AbstractXStreamConverter;
+import org.kie.builder.QualifierModel;
+import org.kie.builder.WorkItemHandlerModel;
+
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.QualifierModel;
-import org.kie.builder.WorkItemHandlerModel;
public class WorkItemHandlerModelImpl implements WorkItemHandlerModel {
View
18 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieModule.java
@@ -1,5 +1,13 @@
package org.kie.builder.impl;
+import static org.kie.builder.impl.KieBuilderImpl.isKieExtension;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.core.util.StringUtils;
import org.drools.impl.InternalKnowledgeBase;
@@ -16,21 +24,13 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.KnowledgePackage;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.util.CompositeClassLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static org.kie.builder.impl.KieBuilderImpl.isKieExtension;
-
public abstract class AbstractKieModule
implements
InternalKieModule {
View
6 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieProject.java
@@ -1,11 +1,11 @@
package org.kie.builder.impl;
-import org.drools.kproject.models.KieBaseModelImpl;
-import org.kie.builder.KieBaseModel;
-
import java.util.HashMap;
import java.util.Map;
+import org.drools.kproject.models.KieBaseModelImpl;
+import org.kie.builder.KieBaseModel;
+
public abstract class AbstractKieProject implements KieProject {
protected Map<String, KieBaseModel> kBaseModels = new HashMap<String, KieBaseModel>();
View
32 drools-compiler/src/main/java/org/kie/builder/impl/ClasspathKieProject.java
@@ -1,21 +1,5 @@
package org.kie.builder.impl;
-import org.drools.core.util.StringUtils;
-import org.drools.kproject.GAVImpl;
-import org.drools.kproject.models.KieModuleModelImpl;
-import org.drools.xml.MinimalPomParser;
-import org.drools.xml.PomModel;
-import org.kie.builder.GAV;
-import org.kie.builder.KieFactory;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieRepository;
-import org.kie.builder.KieServices;
-import org.kie.builder.KieSessionModel;
-import org.kie.util.ClassLoaderUtil;
-import org.kie.util.CompositeClassLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
@@ -33,6 +17,22 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.drools.core.util.StringUtils;
+import org.drools.kproject.GAVImpl;
+import org.drools.kproject.models.KieModuleModelImpl;
+import org.drools.xml.MinimalPomParser;
+import org.drools.xml.PomModel;
+import org.kie.builder.GAV;
+import org.kie.builder.KieFactory;
+import org.kie.builder.KieModuleModel;
+import org.kie.builder.KieRepository;
+import org.kie.builder.KieServices;
+import org.kie.builder.KieSessionModel;
+import org.kie.util.ClassLoaderUtil;
+import org.kie.util.CompositeClassLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Discovers all KieModules on the classpath, via the kmodule.xml file.
* KieBaseModels and KieSessionModels are then indexed, with helper lookups
View
8 drools-compiler/src/main/java/org/kie/builder/impl/CompositeKieModule.java
@@ -1,15 +1,15 @@
package org.kie.builder.impl;
-import org.kie.builder.GAV;
-import org.kie.builder.KieModule;
-import org.kie.builder.KieModuleModel;
-
import java.io.File;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.kie.builder.GAV;
+import org.kie.builder.KieModule;
+import org.kie.builder.KieModuleModel;
+
public class CompositeKieModule implements InternalKieModule {
private final GAV gav;
View
8 drools-compiler/src/main/java/org/kie/builder/impl/FileKieModule.java
@@ -1,15 +1,15 @@
package org.kie.builder.impl;
-import org.drools.core.util.IoUtils;
-import org.kie.builder.GAV;
-import org.kie.builder.KieModuleModel;
+import static org.drools.core.util.IoUtils.readBytesFromInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Collection;
-import static org.drools.core.util.IoUtils.readBytesFromInputStream;
+import org.drools.core.util.IoUtils;
+import org.kie.builder.GAV;
+import org.kie.builder.KieModuleModel;
public class FileKieModule extends AbstractKieModule implements InternalKieModule {
private final File file;
View
14 drools-compiler/src/main/java/org/kie/builder/impl/InternalKieModule.java
@@ -1,18 +1,12 @@
package org.kie.builder.impl;
-import org.kie.KieBase;
-import org.kie.builder.GAV;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModule;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.definition.KnowledgePackage;
-
import java.io.File;
-import java.io.InputStream;
import java.util.Collection;
import java.util.Map;
-import java.util.zip.ZipFile;
+
+import org.kie.builder.GAV;
+import org.kie.builder.KieModule;
+import org.kie.builder.KieModuleModel;
public interface InternalKieModule extends KieModule {
View
14 drools-compiler/src/main/java/org/kie/builder/impl/JarKieModule.java
@@ -1,18 +1,18 @@
package org.kie.builder.impl;
-import org.drools.kproject.models.KieModuleModelImpl;
-import org.kie.builder.GAV;
-import org.kie.builder.KieModuleModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
+import static org.kie.builder.impl.KieBuilderImpl.buildKieModule;
import java.io.File;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
-import static org.kie.builder.impl.KieBuilderImpl.buildKieModule;
+import org.drools.kproject.models.KieModuleModelImpl;
+import org.kie.builder.GAV;
+import org.kie.builder.KieModuleModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JarKieModule extends MemoryKieModule {
View
28 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderImpl.java
@@ -1,5 +1,18 @@
package org.kie.builder.impl;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
import org.drools.commons.jci.compilers.CompilationResult;
import org.drools.commons.jci.compilers.EclipseJavaCompiler;
import org.drools.commons.jci.compilers.EclipseJavaCompilerSettings;
@@ -24,22 +37,9 @@
import org.kie.builder.KieModuleModel;
import org.kie.builder.KieServices;
import org.kie.builder.Message.Level;
-import org.kie.builder.ResourceType;
import org.kie.builder.Results;
import org.kie.io.Resource;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import org.kie.io.ResourceType;
public class KieBuilderImpl
implements
View
10 drools-compiler/src/main/java/org/kie/builder/impl/KieContainerImpl.java
@@ -1,5 +1,10 @@
package org.kie.builder.impl;
+import static org.kie.util.CDIHelper.wireListnersAndWIHs;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.drools.kproject.models.KieBaseModelImpl;
import org.drools.kproject.models.KieSessionModelImpl;
import org.kie.KieBase;
@@ -16,11 +21,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.kie.util.CDIHelper.wireListnersAndWIHs;
-
public class KieContainerImpl
implements
KieContainer {
View
8 drools-compiler/src/main/java/org/kie/builder/impl/KieFileSystemImpl.java
@@ -1,15 +1,15 @@
package org.kie.builder.impl;
+import static org.drools.core.util.IoUtils.readBytesFromInputStream;
+
+import java.io.IOException;
+
import org.drools.compiler.io.memory.MemoryFileSystem;
import org.drools.kproject.models.KieModuleModelImpl;
import org.kie.builder.GAV;
import org.kie.builder.KieFileSystem;
import org.kie.io.Resource;
-import java.io.IOException;
-
-import static org.drools.core.util.IoUtils.readBytesFromInputStream;
-
public class KieFileSystemImpl
implements
KieFileSystem {
View
3  drools-compiler/src/main/java/org/kie/builder/impl/KieJarVerifier.java
@@ -1,9 +1,6 @@
package org.kie.builder.impl;
import java.io.File;
-import java.util.Collection;
-
-import org.drools.commons.jci.readers.ResourceReader;
public class KieJarVerifier {
private MemoryKieModule kJar;
View
6 drools-compiler/src/main/java/org/kie/builder/impl/KieModuleKieProject.java
@@ -1,5 +1,8 @@
package org.kie.builder.impl;
+import java.util.HashMap;
+import java.util.Map;
+
import org.drools.core.util.ClassUtils;
import org.kie.builder.GAV;
import org.kie.builder.KieRepository;
@@ -9,9 +12,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Discovers all KieModules on the classpath, via the kmodule.xml file.
* KieBaseModels and KieSessionModels are then indexed, with helper lookups
View
10 drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java
@@ -1,5 +1,10 @@
package org.kie.builder.impl;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
import org.drools.io.internal.InternalResource;
import org.drools.kproject.GAVImpl;
import org.drools.kproject.models.KieModuleModelImpl;
@@ -14,11 +19,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
public class KieRepositoryImpl
implements
KieRepository {
View
8 drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
@@ -1,5 +1,9 @@
package org.kie.builder.impl;
+import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
+
+import java.io.File;
+
import org.drools.audit.KnowledgeRuntimeLoggerProviderImpl;
import org.drools.command.impl.CommandFactoryServiceImpl;
import org.drools.concurrent.ExecutorProviderImpl;
@@ -21,10 +25,6 @@
import org.kie.persistence.jpa.KieStoreServices;
import org.kie.util.ServiceRegistryImpl;
-import java.io.File;
-
-import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
-
public class KieServicesImpl implements KieServices {
private ResourceFactoryService resourceFactory;
View
6 drools-compiler/src/main/java/org/kie/builder/impl/MessageImpl.java
@@ -1,12 +1,12 @@
package org.kie.builder.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.commons.jci.problems.CompilationProblem;
import org.kie.builder.KnowledgeBuilderResult;
import org.kie.builder.Message;
-import java.util.ArrayList;
-import java.util.List;
-
public class MessageImpl implements Message {
private final long id;
View
6 drools-compiler/src/main/java/org/kie/builder/impl/Messages.java
@@ -1,13 +1,13 @@
package org.kie.builder.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.commons.jci.problems.CompilationProblem;
import org.kie.builder.KnowledgeBuilderResult;
import org.kie.builder.Message;
import org.kie.builder.Message.Level;
-import java.util.ArrayList;
-import java.util.List;
-
public class Messages {
private List<Message> messages = new ArrayList<Message>();
View
1  drools-compiler/src/main/java/org/kie/builder/impl/ProtoKieContainer.java
@@ -1,6 +1,5 @@
package org.kie.builder.impl;
-import org.kie.builder.KieModule;
import org.kie.util.CompositeClassLoader;
public class ProtoKieContainer {
View
6 drools-compiler/src/main/java/org/kie/builder/impl/ResultsImpl.java
@@ -1,11 +1,11 @@
package org.kie.builder.impl;
-import org.kie.builder.Message;
-import org.kie.builder.Results;
-
import java.util.Collections;
import java.util.List;
+import org.kie.builder.Message;
+import org.kie.builder.Results;
+
public class ResultsImpl implements Results {
private List<Message> insertedMessages;
View
8 drools-compiler/src/main/java/org/kie/builder/impl/ZipKieModule.java
@@ -1,9 +1,5 @@
package org.kie.builder.impl;
-import org.drools.core.util.IoUtils;
-import org.kie.builder.GAV;
-import org.kie.builder.KieModuleModel;
-
import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -11,6 +7,10 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.drools.core.util.IoUtils;
+import org.kie.builder.GAV;
+import org.kie.builder.KieModuleModel;
+
public class ZipKieModule extends AbstractKieModule implements InternalKieModule {
private final File file;
private Map<String, ZipEntry> zipEntries;
View
15 drools-compiler/src/main/java/org/kie/util/CDIHelper.java
@@ -1,5 +1,13 @@
package org.kie.util;
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
import org.kie.builder.KieSessionModel;
import org.kie.builder.ListenerModel;
import org.kie.builder.QualifierModel;
@@ -10,13 +18,6 @@
import org.kie.runtime.KieSession;
import org.kie.runtime.process.WorkItemHandler;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
public class CDIHelper {
public static void wireListnersAndWIHs(KieSessionModel model, KieSession kSession) {
View
3  drools-compiler/src/main/java/org/kie/util/ChangeSetBuilder.java
@@ -27,9 +27,8 @@
import org.drools.io.impl.ByteArrayResource;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.RuleDescr;
-import org.kie.builder.KieModule;
-import org.kie.builder.ResourceType;
import org.kie.builder.impl.InternalKieModule;
+import org.kie.io.ResourceType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
2  drools-compiler/src/test/java/org/drools/CommonTestMethodBase.java
@@ -19,10 +19,10 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderConfiguration;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.builder.conf.LanguageLevelOption;
import org.kie.definition.KnowledgePackage;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.Environment;
import org.kie.runtime.KnowledgeSessionConfiguration;
import org.kie.runtime.StatefulKnowledgeSession;
View
12 drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
@@ -1,20 +1,18 @@
package org.drools.api;
-import java.io.StringReader;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.util.Collection;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.KnowledgePackage;
-import org.kie.definition.process.Process;
import org.kie.definition.rule.Rule;
import org.kie.io.ResourceFactory;
-
-import static org.junit.Assert.*;
+import org.kie.io.ResourceType;
public class KnowledgeBuilderTest {
View
7 drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
@@ -1,18 +1,13 @@
package org.drools.api;
-import java.io.StringReader;
import java.util.Collection;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.KnowledgePackage;
import org.kie.io.ResourceFactory;
-
-import static org.junit.Assert.*;
+import org.kie.io.ResourceType;
public class KnowledgeSessionTest {
View
3  drools-compiler/src/test/java/org/drools/beliefsystem/jtms/JTMSTest.java
@@ -6,7 +6,6 @@
import static org.junit.Assert.fail;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.drools.BeliefSystemType;
@@ -22,8 +21,8 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.KnowledgeSessionConfiguration;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.FactHandle;
View
2  drools-compiler/src/test/java/org/drools/command/KBuilderBatchExecutionTest.java
@@ -19,12 +19,12 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderErrors;
-import org.kie.builder.ResourceType;
import org.kie.command.Command;
import org.kie.command.CommandFactory;
import org.kie.definition.KnowledgePackage;
import org.kie.io.Resource;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.ExecutionResults;
import org.kie.runtime.StatefulKnowledgeSession;
View
2  drools-compiler/src/test/java/org/drools/command/MoreBatchExecutionTest.java
@@ -26,10 +26,10 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.command.Command;
import org.kie.command.CommandFactory;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.ExecutionResults;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.QueryResults;
View
5 drools-compiler/src/test/java/org/drools/command/RegisterWorkItemHandlerTest.java
@@ -1,6 +1,7 @@
package org.drools.command;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.impl.DefaultWorkItemManager;
@@ -10,9 +11,9 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.command.CommandFactory;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.StatelessKnowledgeSession;
import org.kie.runtime.process.WorkItemHandler;
import org.kie.runtime.process.WorkItemManager;
View
2  drools-compiler/src/test/java/org/drools/command/SimpleBatchExecutionTest.java
@@ -28,10 +28,10 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.command.Command;
import org.kie.command.CommandFactory;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.ExecutionResults;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.FactHandle;
View
2  drools-compiler/src/test/java/org/drools/common/ActivationIteratorTest.java
@@ -9,8 +9,8 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.Match;
View
2  drools-compiler/src/test/java/org/drools/common/ActiveActivationsIteratorTest.java
@@ -12,8 +12,8 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.Match;
View
2  drools-compiler/src/test/java/org/drools/common/TerminalNodeIteratorTest.java
@@ -15,8 +15,8 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
public class TerminalNodeIteratorTest {
View
9 drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java
@@ -1,14 +1,13 @@
package org.drools.compiler;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
import java.io.IOException;
import java.io.InputStreamReader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
import org.drools.rule.Package;
+import org.junit.Test;
public class CompilerPerfProfileTest {
View
3  drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java
@@ -13,14 +13,13 @@
import org.drools.lang.dsl.DSLTokenizedMappingFile;
import org.drools.lang.dsl.DefaultExpander;
import org.drools.lang.dsl.DefaultExpanderResolver;
-import org.junit.Ignore;
import org.junit.Test;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderErrors;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.builder.conf.LanguageLevelOption;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
public class DrlParserTest {
View
9 drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
@@ -1,17 +1,14 @@
package org.drools.compiler;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.InputStreamReader;
import org.drools.DroolsTestCase;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class Java5Test extends DroolsTestCase {
@Test
View
33 drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
@@ -16,6 +16,22 @@
package org.drools.compiler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.drools.Cheese;
import org.drools.DroolsTestCase;
import org.drools.FactHandle;
@@ -29,7 +45,6 @@
import org.drools.common.ActivationNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.LogicalDependency;
-import org.drools.common.SimpleLogicalDependency;
import org.drools.commons.jci.compilers.EclipseJavaCompiler;
import org.drools.commons.jci.compilers.JaninoJavaCompiler;
import org.drools.commons.jci.compilers.JavaCompiler;
@@ -84,22 +99,6 @@
import org.kie.util.ClassLoaderUtil;
import org.kie.util.CompositeClassLoader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
public class PackageBuilderTest extends DroolsTestCase {
@After
View
8 drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java
@@ -1,15 +1,13 @@
package org.drools.compiler;
+import static org.junit.Assert.assertNotNull;
+
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
import org.drools.RuleBase;
import org.drools.integrationtests.DslTest;
+import org.junit.Test;
public class RuleBaseLoaderTest {
View
8 drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java
@@ -1,13 +1,13 @@
package org.drools.compiler;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.RuleDescr;
+import org.junit.Test;
public class RuleErrorTest {
View
7 drools-compiler/src/test/java/org/drools/compiler/RuleFlowErrorTest.java
@@ -1,9 +1,10 @@
package org.drools.compiler;
-import org.junit.After;
-import org.junit.Before;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.junit.Test;
-import static org.junit.Assert.*;
public class RuleFlowErrorTest {
View
12 drools-compiler/src/test/java/org/drools/compiler/TypeDeclarationMergingTest.java
@@ -1,27 +1,19 @@
package org.drools.compiler;
-import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
-import java.util.ArrayList;
-import java.util.List;
-
import org.drools.builder.impl.KnowledgeBuilderImpl;
-import org.drools.integrationtests.MVELTest.DMap;
-import org.drools.integrationtests.MVELTest.Triangle;
import org.drools.rule.TypeDeclaration;
import org.drools.rule.TypeDeclaration.Format;
import org.drools.rule.TypeDeclaration.Role;
import org.junit.Test;
-import org.kie.KnowledgeBase;
-import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.type.Position;
import org.kie.io.ResourceFactory;
-import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.io.ResourceType;
public class TypeDeclarationMergingTest {
View
6 drools-compiler/src/test/java/org/drools/compiler/TypeDeclarationTest.java
@@ -1,7 +1,9 @@
package org.drools.compiler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import junit.framework.Assert;
-import static org.junit.Assert.*;
import org.drools.definitions.impl.KnowledgePackageImp;
import org.drools.rule.TypeDeclaration;
@@ -9,12 +11,12 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
import org.kie.builder.KnowledgeBuilderResults;
-import org.kie.builder.ResourceType;
import org.kie.builder.ResultSeverity;
import org.kie.definition.type.FactField;
import org.kie.definition.type.FactType;
import org.kie.io.Resource;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
public class TypeDeclarationTest {
View
4 drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java
@@ -1,7 +1,5 @@
package org.drools.compiler.xml.changeset;
-import static org.junit.Assert.*;
-
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
@@ -24,9 +22,9 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderConfiguration;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.io.Resource;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.xml.sax.SAXException;
View
9 drools-compiler/src/test/java/org/drools/definitions/KnowledgePackageMetaDataTest.java
@@ -17,6 +17,11 @@
package org.drools.definitions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.drools.definitions.rule.impl.GlobalImpl;
import org.drools.io.impl.ByteArrayResource;
import org.junit.Test;
@@ -24,13 +29,11 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.KnowledgePackage;
import org.kie.definition.rule.Query;
import org.kie.definition.type.FactField;
import org.kie.definition.type.FactType;
-
-import static org.junit.Assert.*;
+import org.kie.io.ResourceType;
public class KnowledgePackageMetaDataTest {
View
2  drools-compiler/src/test/java/org/drools/factmodel/traits/Imp.java
@@ -16,8 +16,6 @@
package org.drools.factmodel.traits;
-import java.util.HashMap;
-import java.util.Map;
public class Imp {
View
6 drools-compiler/src/test/java/org/drools/factmodel/traits/Imp2.java
@@ -16,7 +16,11 @@
package org.drools.factmodel.traits;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
public class Imp2 {
View
5 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxy2.java
@@ -16,12 +16,11 @@
package org.drools.factmodel.traits;
+import java.util.Map;
+
import org.drools.spi.InternalReadAccessor;
import org.drools.spi.WriteAccessor;
-import java.lang.reflect.Field;
-import java.util.*;
-
public class StudentProxy2 extends TraitProxy implements IStudent {
public final Imp2 object;
View
8 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxyWrapper2.java
@@ -16,11 +16,15 @@
package org.drools.factmodel.traits;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.drools.spi.InternalReadAccessor;
import org.drools.spi.WriteAccessor;
-import java.util.*;
-
public class StudentProxyWrapper2 implements Map<String, Object>, MapWrapper {
Imp2 object;
View
13 drools-compiler/src/test/java/org/drools/factmodel/traits/StudentProxyWrapper3.java
@@ -16,17 +16,14 @@
package org.drools.factmodel.traits;
-import org.drools.core.util.Triple;
-import org.drools.core.util.TripleImpl;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
import org.drools.core.util.TripleStore;
import org.drools.spi.InternalReadAccessor;
import org.drools.spi.WriteAccessor;
-import org.kie.runtime.rule.Variable;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.*;
public class StudentProxyWrapper3 extends TripleBasedStruct {
View
10 drools-compiler/src/test/java/org/drools/factmodel/traits/TraitTest.java
@@ -16,6 +16,11 @@
package org.drools.factmodel.traits;
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -46,7 +51,6 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.command.Command;
import org.kie.command.CommandFactory;
import org.kie.definition.type.FactType;
@@ -54,15 +58,13 @@
import org.kie.event.rule.AgendaEventListener;
import org.kie.io.Resource;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.ClassObjectFilter;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.StatelessKnowledgeSession;
import org.kie.runtime.rule.FactHandle;
import org.mockito.ArgumentCaptor;
-import static org.mockito.Mockito.*;
-import static org.hamcrest.CoreMatchers.is;
-
public class TraitTest extends CommonTestMethodBase {
private static long t0;
View
20 drools-compiler/src/test/java/org/drools/factmodel/traits/TripleBasedTraitsTest.java
@@ -16,23 +16,27 @@
* limitations under the License.
*/
-import org.drools.base.DefaultKnowledgeHelper;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertSame;
+import static junit.framework.Assert.fail;
+
+import java.util.Date;
+
import org.drools.common.AbstractRuleBase;
import org.drools.impl.KnowledgeBaseImpl;
-import org.junit.*;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.kie.KnowledgeBase;
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
import org.kie.definition.type.FactType;
import org.kie.io.Resource;
import org.kie.io.ResourceFactory;
-
-import java.util.Date;
-import java.util.Map;
-
-import static junit.framework.Assert.*;
+import org.kie.io.ResourceType;
public class TripleBasedTraitsTest {
View
6 drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
@@ -24,21 +24,17 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatelessSession;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.junit.Test;
import org.kie.KnowledgeBase;
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
-import org.kie.builder.KnowledgeBuilderConfiguration;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderFactory;
-import org.kie.builder.ResourceType;
-import org.kie.builder.conf.LanguageLevelOption;
import org.kie.event.rule.AfterActivationFiredEvent;
import org.kie.event.rule.AgendaEventListener;
import org.kie.io.ResourceFactory;
+import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.rule.FactHandle;
import org.kie.runtime.rule.Match;
View
4 drools-compiler/src/test/java/org/drools/integrationtests/AlphaNetworkModifyTest.java
@@ -1,8 +1,5 @@
package org.drools.integrationtests;
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
import java.util.List;
import org.drools.Cat;
@@ -19,7 +16,6 @@
import org.drools.reteoo.ReteooWorkingMemoryInterface;
import org.junit.Test;
import org.kie.KnowledgeBase;
-import org.kie.runtime.StatefulKnowledgeSession;
public class AlphaNetworkModifyTest extends CommonTestMethodBase {
View
28 drools-compiler/src/test/java/org/drools/integrationtests/AnnotationsTest.java
@@ -16,6 +16,19 @@
package org.drools.integrationtests;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
+
+import java.io.StringReader;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+
import org.drools.io.impl.ByteArrayResource;