Skip to content

Commit 69a2032

Browse files
committed
Remove egregiously unused code
Either * no references from other code whatsoever * For KbTypeInfo, composed in KBModule but nothing ever asks KBModule for the typeinfo, and the part of the code that processes the typeinfo is uncovered * For JTG, looks like it was copied over as a script with arguments which were made obsolete by ModuleBuilder but they were never removed Also don't inlude compiled tuple modules in tests. In the future the SDK should be reworked to not used tuple modules in core code
1 parent f91c001 commit 69a2032

File tree

11 files changed

+4
-440
lines changed

11 files changed

+4
-440
lines changed

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ $JAVA_HOME/bin/java -cp ${lib.classpath}:${jar.absolute.path} us.kbase.tools.Wor
372372
<exclude name="**/test/**"/>
373373
<exclude name="**/fraser/neil/**"/>
374374
<exclude name="**/common/executionengine/**"/>
375+
<exclude name="**/common/service/**"/>
375376
<exclude name="**/catalog/**"/>
376377
<exclude name="**/narrativemethodstore/**"/>
377378
<exclude name="**/kbasejobservice/**"/>

src/java/us/kbase/common/service/Tuple3.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/java/us/kbase/jkidl/ParseNode.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/java/us/kbase/kidl/KbFuncdef.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.Map;
1111
import java.util.Set;
1212

13+
// TODO CODE don't make a dependency on SDK compiled code in the SDK
1314
import us.kbase.common.service.Tuple2;
1415

1516
/**

src/java/us/kbase/kidl/KbModule.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class KbModule implements KidlNode {
1919
private String comment;
2020
private List<String> options;
2121
private List<KbModuleComp> moduleComponents;
22-
private List<KbTypeInfo> typeInfoList;
2322
private Map<String, KbType> nameToType;
2423
private Map<String, KbFuncdef> nameToFuncdef;
2524
private String lastAuthTempMode = "none";
@@ -34,7 +33,6 @@ public KbModule(String serviceName, String moduleName, String comment) {
3433
this.comment = comment == null ? "" : comment;
3534
this.options = new ArrayList<String>();
3635
this.moduleComponents = new ArrayList<KbModuleComp>();
37-
this.typeInfoList = new ArrayList<KbTypeInfo>();
3836
this.nameToType = new LinkedHashMap<String, KbType>();
3937
nameToType.put("int", new KbScalar("int"));
4038
nameToType.put("float", new KbScalar("float"));
@@ -121,11 +119,6 @@ public void loadFromList(List<?> data) throws KidlParseException {
121119
}
122120
}
123121
moduleComponents = Collections.unmodifiableList(moduleComponents);
124-
typeInfoList = new ArrayList<KbTypeInfo>();
125-
for (Map<?,?> infoProps : Utils.repareTypingMap((List<?>)data.get(1))) {
126-
typeInfoList.add(new KbTypeInfo().loadFromMap(infoProps));
127-
}
128-
typeInfoList = Collections.unmodifiableList(typeInfoList);
129122
Map<?,?> typeMap = (Map<?,?>)data.get(2);
130123
nameToType = new LinkedHashMap<String, KbType>();
131124
for (Object key : typeMap.keySet()) {
@@ -156,10 +149,6 @@ public List<KbModuleComp> getModuleComponents() {
156149
return moduleComponents;
157150
}
158151

159-
public List<KbTypeInfo> getTypeInfoList() {
160-
return typeInfoList;
161-
}
162-
163152
public Map<String, KbType> getNameToType() {
164153
return nameToType;
165154
}
@@ -211,8 +200,6 @@ public String toString() {
211200
builder.append(options);
212201
builder.append(", moduleComponents=");
213202
builder.append(moduleComponents);
214-
builder.append(", typeInfoList=");
215-
builder.append(typeInfoList);
216203
builder.append(", nameToType=");
217204
builder.append(nameToType);
218205
builder.append(", lastAuthTempMode=");

src/java/us/kbase/kidl/KbTypeInfo.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/java/us/kbase/kidl/KbTypedef.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Map;
99
import java.util.Set;
1010

11+
//TODO CODE don't make a dependency on SDK compiled code in the SDK
1112
import us.kbase.common.service.Tuple2;
1213

1314
/**

src/java/us/kbase/kidl/SpecXmlHelper.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

src/java/us/kbase/kidl/Utils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.Set;
1212
import java.util.StringTokenizer;
1313

14+
//TODO CODE don't make a dependency on SDK compiled code in the SDK
1415
import us.kbase.common.service.Tuple2;
1516

1617
public class Utils {

0 commit comments

Comments
 (0)